From f03c5a05287f8a393c36830276f3b4a8af73e837 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sun, 6 Aug 2017 18:23:54 +0200 Subject: [PATCH] CameraOptions return sets, not lists --- .../com/flurgle/camerakit/CameraOptions.java | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/camerakit/src/main/base/com/flurgle/camerakit/CameraOptions.java b/camerakit/src/main/base/com/flurgle/camerakit/CameraOptions.java index 827d04a8..a262edd7 100644 --- a/camerakit/src/main/base/com/flurgle/camerakit/CameraOptions.java +++ b/camerakit/src/main/base/com/flurgle/camerakit/CameraOptions.java @@ -4,9 +4,12 @@ package com.flurgle.camerakit; import android.annotation.TargetApi; import android.hardware.Camera; import android.hardware.camera2.CameraCharacteristics; +import android.support.annotation.NonNull; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * Options telling you what is available and what is not. @@ -14,10 +17,10 @@ import java.util.List; @SuppressWarnings("deprecation") public class CameraOptions { - private List supportedWhiteBalance = new ArrayList<>(5); - private List supportedFacing = new ArrayList<>(2); - private List supportedFlash = new ArrayList<>(3); - private List supportedFocus = new ArrayList<>(3); + private Set supportedWhiteBalance = new HashSet<>(5); + private Set supportedFacing = new HashSet<>(2); + private Set supportedFlash = new HashSet<>(4); + private Set supportedFocus = new HashSet<>(4); private boolean zoomSupported; private boolean videoSnapshotSupported; @@ -68,56 +71,60 @@ public class CameraOptions { /** - * List of supported facing values. + * Set of supported facing values. * * @see CameraConstants#FACING_BACK * @see CameraConstants#FACING_FRONT - * @return a list of supported values. + * @return a set of supported values. */ - public List getSupportedFacing() { + @NonNull + public Set getSupportedFacing() { return supportedFacing; } /** - * List of supported flash values. + * Set of supported flash values. * * @see CameraConstants#FLASH_AUTO * @see CameraConstants#FLASH_OFF * @see CameraConstants#FLASH_ON * @see CameraConstants#FLASH_TORCH - * @return a list of supported values. + * @return a set of supported values. */ - public List getSupportedFlash() { + @NonNull + public Set getSupportedFlash() { return supportedFlash; } /** - * List of supported white balance values. + * Set of supported white balance values. * * @see CameraConstants#WHITE_BALANCE_AUTO * @see CameraConstants#WHITE_BALANCE_CLOUDY * @see CameraConstants#WHITE_BALANCE_DAYLIGHT * @see CameraConstants#WHITE_BALANCE_FLUORESCENT * @see CameraConstants#WHITE_BALANCE_INCANDESCENT - * @return a list of supported values. + * @return a set of supported values. */ - public List getSupportedWhiteBalance() { + @NonNull + public Set getSupportedWhiteBalance() { return supportedWhiteBalance; } /** - * List of supported focus values. + * Set of supported focus values. * * @see CameraConstants#FOCUS_FIXED * @see CameraConstants#FOCUS_CONTINUOUS * @see CameraConstants#FOCUS_TAP * @see CameraConstants#FOCUS_TAP_WITH_MARKER - * @return a list of supported values. + * @return a set of supported values. */ - public List getSupportedFocus() { + @NonNull + public Set getSupportedFocus() { return supportedFocus; }