From cc5c5d721c8e4a88c28b191c824a0fbf7b8bea69 Mon Sep 17 00:00:00 2001 From: Dylan McIntyre Date: Mon, 23 Jan 2017 15:13:56 -0500 Subject: [PATCH] rename on to visible for tap to focus --- README.md | 2 +- camerakit/src/main/java/com/flurgle/camerakit/CameraKit.java | 2 +- camerakit/src/main/java/com/flurgle/camerakit/CameraView.java | 4 ++-- camerakit/src/main/res/values/attrs.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e9a331ae..1f62ca46 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ camera.setCameraListener(new CameraListener() { | Value | Description | | --------------| -------------| -| `on` | Tap to focus is enabled and a visible focus circle appears when tapped, similar to the Android built-in camera. | +| `visible` | Tap to focus is enabled and a visible focus circle appears when tapped, similar to the Android built-in camera. | | `invisible` | Tap to focus is enabled, but no focus circle appears. | | `off` | Tap to focus is off. | diff --git a/camerakit/src/main/java/com/flurgle/camerakit/CameraKit.java b/camerakit/src/main/java/com/flurgle/camerakit/CameraKit.java index 69674ab3..aa805f59 100644 --- a/camerakit/src/main/java/com/flurgle/camerakit/CameraKit.java +++ b/camerakit/src/main/java/com/flurgle/camerakit/CameraKit.java @@ -15,7 +15,7 @@ public class CameraKit { public static final int PICTURE_MODE_SPEED = 1; public static final int PICTURE_MODE_AUTO = 2; - public static final int TAP_TO_FOCUS_ON = 0; + public static final int TAP_TO_FOCUS_VISIBLE = 0; public static final int TAP_TO_FOCUS_INVISIBLE = 1; public static final int TAP_TO_FOCUS_OFF = 2; diff --git a/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java b/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java index 2bc6278b..7acd6264 100644 --- a/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java +++ b/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java @@ -49,7 +49,7 @@ public class CameraView extends FrameLayout { } @Retention(RetentionPolicy.SOURCE) - @IntDef({TAP_TO_FOCUS_ON, TAP_TO_FOCUS_INVISIBLE, TAP_TO_FOCUS_OFF}) + @IntDef({TAP_TO_FOCUS_VISIBLE, TAP_TO_FOCUS_INVISIBLE, TAP_TO_FOCUS_OFF}) @interface TapToFocus { } @@ -105,7 +105,7 @@ public class CameraView extends FrameLayout { } if (attr == R.styleable.CameraView_ckTapToFocus) { - mTapToFocus = a.getInteger(R.styleable.CameraView_ckTapToFocus, TAP_TO_FOCUS_ON); + mTapToFocus = a.getInteger(R.styleable.CameraView_ckTapToFocus, TAP_TO_FOCUS_VISIBLE); } if (attr == R.styleable.CameraView_android_adjustViewBounds) { diff --git a/camerakit/src/main/res/values/attrs.xml b/camerakit/src/main/res/values/attrs.xml index f646eda2..5b474faa 100644 --- a/camerakit/src/main/res/values/attrs.xml +++ b/camerakit/src/main/res/values/attrs.xml @@ -23,7 +23,7 @@ - +