Mattia Iavarone
7 years ago
parent
901cd782af
commit
a531f8e5dd
@ -1,64 +0,0 @@ |
|||||||
package com.otaliastudios.cameraview; |
|
||||||
|
|
||||||
|
|
||||||
import java.util.Arrays; |
|
||||||
import java.util.List; |
|
||||||
|
|
||||||
import static com.otaliastudios.cameraview.CameraConstants.*; |
|
||||||
|
|
||||||
|
|
||||||
/** |
|
||||||
* Gestures listen to finger gestures over the {@link CameraView} bounds and can be mapped |
|
||||||
* to one or more camera controls using XML attributes or {@link CameraView#mapGesture(Gesture, int)}. |
|
||||||
* |
|
||||||
* Not every gesture can control a certain action. For example, pinch gestures can only control |
|
||||||
* continuous values, such as zoom or AE correction. Single point gestures, on the other hand, |
|
||||||
* can only control point actions such as focusing or capturing a picture. |
|
||||||
*/ |
|
||||||
public enum Gesture { |
|
||||||
|
|
||||||
/** |
|
||||||
* Pinch gesture, typically assigned to the zoom control. |
|
||||||
* This gesture can be mapped to: |
|
||||||
* |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_ZOOM} |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_AE_CORRECTION} |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_NONE} |
|
||||||
*/ |
|
||||||
PINCH(GESTURE_ACTION_ZOOM, GESTURE_ACTION_AE_CORRECTION), |
|
||||||
|
|
||||||
/** |
|
||||||
* Single tap gesture, typically assigned to the focus control. |
|
||||||
* This gesture can be mapped to: |
|
||||||
* |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_FOCUS} |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_FOCUS_WITH_MARKER} |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_CAPTURE} |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_NONE} |
|
||||||
*/ |
|
||||||
TAP(GESTURE_ACTION_FOCUS, GESTURE_ACTION_FOCUS_WITH_MARKER, GESTURE_ACTION_CAPTURE), |
|
||||||
// DOUBLE_TAP(GESTURE_ACTION_FOCUS, GESTURE_ACTION_FOCUS_WITH_MARKER, GESTURE_ACTION_CAPTURE),
|
|
||||||
|
|
||||||
/** |
|
||||||
* Long tap gesture. |
|
||||||
* This gesture can be mapped to: |
|
||||||
* |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_FOCUS} |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_FOCUS_WITH_MARKER} |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_CAPTURE} |
|
||||||
* - {@link CameraConstants#GESTURE_ACTION_NONE} |
|
||||||
*/ |
|
||||||
LONG_TAP(GESTURE_ACTION_FOCUS, GESTURE_ACTION_FOCUS_WITH_MARKER, GESTURE_ACTION_CAPTURE); |
|
||||||
|
|
||||||
|
|
||||||
Gesture(@GestureAction Integer... controls) { |
|
||||||
mControls = Arrays.asList(controls); |
|
||||||
} |
|
||||||
|
|
||||||
private List<Integer> mControls; |
|
||||||
|
|
||||||
boolean isAssignableTo(@GestureAction Integer control) { |
|
||||||
return control == GESTURE_ACTION_NONE || mControls.contains(control); |
|
||||||
} |
|
||||||
|
|
||||||
} |
|
||||||
@ -0,0 +1,62 @@ |
|||||||
|
package com.otaliastudios.cameraview; |
||||||
|
|
||||||
|
|
||||||
|
import java.util.Arrays; |
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
|
||||||
|
/** |
||||||
|
* Gestures listen to finger gestures over the {@link CameraView} bounds and can be mapped |
||||||
|
* to one or more camera controls using XML attributes or {@link CameraView#mapGesture(Gesture, GestureAction)}. |
||||||
|
* |
||||||
|
* Not every gesture can control a certain action. For example, pinch gestures can only control |
||||||
|
* continuous values, such as zoom or AE correction. Single point gestures, on the other hand, |
||||||
|
* can only control point actions such as focusing or capturing a picture. |
||||||
|
*/ |
||||||
|
public enum Gesture { |
||||||
|
|
||||||
|
/** |
||||||
|
* Pinch gesture, typically assigned to the zoom control. |
||||||
|
* This gesture can be mapped to: |
||||||
|
* |
||||||
|
* - {@link GestureAction#ZOOM} |
||||||
|
* - {@link GestureAction#EXPOSURE_CORRECTION} |
||||||
|
* - {@link GestureAction#NONE} |
||||||
|
*/ |
||||||
|
PINCH(GestureAction.ZOOM, GestureAction.EXPOSURE_CORRECTION), |
||||||
|
|
||||||
|
/** |
||||||
|
* Single tap gesture, typically assigned to the focus control. |
||||||
|
* This gesture can be mapped to: |
||||||
|
* |
||||||
|
* - {@link GestureAction#FOCUS} |
||||||
|
* - {@link GestureAction#FOCUS_WITH_MARKER} |
||||||
|
* - {@link GestureAction#CAPTURE} |
||||||
|
* - {@link GestureAction#NONE} |
||||||
|
*/ |
||||||
|
TAP(GestureAction.FOCUS, GestureAction.FOCUS_WITH_MARKER, GestureAction.CAPTURE), |
||||||
|
// DOUBLE_TAP(GestureAction.FOCUS, GestureAction.FOCUS_WITH_MARKER, GestureAction.CAPTURE),
|
||||||
|
|
||||||
|
/** |
||||||
|
* Long tap gesture. |
||||||
|
* This gesture can be mapped to: |
||||||
|
* |
||||||
|
* - {@link GestureAction#FOCUS} |
||||||
|
* - {@link GestureAction#FOCUS_WITH_MARKER} |
||||||
|
* - {@link GestureAction#CAPTURE} |
||||||
|
* - {@link GestureAction#NONE} |
||||||
|
*/ |
||||||
|
LONG_TAP(GestureAction.FOCUS, GestureAction.FOCUS_WITH_MARKER, GestureAction.CAPTURE); |
||||||
|
|
||||||
|
|
||||||
|
Gesture(GestureAction... controls) { |
||||||
|
mControls = Arrays.asList(controls); |
||||||
|
} |
||||||
|
|
||||||
|
private List<GestureAction> mControls; |
||||||
|
|
||||||
|
boolean isAssignableTo(GestureAction control) { |
||||||
|
return control == GestureAction.NONE || mControls.contains(control); |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
@ -1,14 +1,83 @@ |
|||||||
package com.otaliastudios.cameraview; |
package com.otaliastudios.cameraview; |
||||||
|
|
||||||
import android.support.annotation.IntDef; |
|
||||||
|
|
||||||
import java.lang.annotation.Retention; |
/** |
||||||
import java.lang.annotation.RetentionPolicy; |
* Gestures actions are actions over camera controls that can be mapped to certain gestures over |
||||||
|
* the screen, using XML attributes or {@link CameraView#mapGesture(Gesture, GestureAction)}. |
||||||
|
* |
||||||
|
* Not every gesture can control a certain action. For example, pinch gestures can only control |
||||||
|
* continuous values, such as zoom or AE correction. Single point gestures, on the other hand, |
||||||
|
* can only control point actions such as focusing or capturing a picture. |
||||||
|
*/ |
||||||
|
public enum GestureAction { |
||||||
|
|
||||||
import static com.otaliastudios.cameraview.CameraConstants.*; |
/** |
||||||
|
* No action. This can be mapped to any gesture to disable it. |
||||||
|
*/ |
||||||
|
NONE(0), |
||||||
|
|
||||||
@Retention(RetentionPolicy.SOURCE) |
/** |
||||||
@IntDef({GESTURE_ACTION_NONE, GESTURE_ACTION_FOCUS, GESTURE_ACTION_FOCUS_WITH_MARKER, |
* Auto focus control, typically assigned to the tap gesture. |
||||||
GESTURE_ACTION_AE_CORRECTION, GESTURE_ACTION_CAPTURE, GESTURE_ACTION_ZOOM}) |
* This action can be mapped to: |
||||||
public @interface GestureAction { |
* |
||||||
|
* - {@link Gesture#TAP} |
||||||
|
* - {@link Gesture#LONG_TAP} |
||||||
|
*/ |
||||||
|
FOCUS(1), |
||||||
|
|
||||||
|
/** |
||||||
|
* Auto focus control, typically assigned to the tap gesture. |
||||||
|
* On top of {@link #FOCUS}, this will draw a default marker on screen. |
||||||
|
* This action can be mapped to: |
||||||
|
* |
||||||
|
* - {@link Gesture#TAP} |
||||||
|
* - {@link Gesture#LONG_TAP} |
||||||
|
*/ |
||||||
|
FOCUS_WITH_MARKER(2), |
||||||
|
|
||||||
|
/** |
||||||
|
* When triggered, this action will fire a picture shoot. |
||||||
|
* This action can be mapped to: |
||||||
|
* |
||||||
|
* - {@link Gesture#TAP} |
||||||
|
* - {@link Gesture#LONG_TAP} |
||||||
|
*/ |
||||||
|
CAPTURE(3), |
||||||
|
|
||||||
|
/** |
||||||
|
* Zoom control, typically assigned to the pinch gesture. |
||||||
|
* This action can be mapped to: |
||||||
|
* |
||||||
|
* - {@link Gesture#PINCH} |
||||||
|
*/ |
||||||
|
ZOOM(4), |
||||||
|
|
||||||
|
/** |
||||||
|
* Exposure correction control. |
||||||
|
* This action can be mapped to: |
||||||
|
* |
||||||
|
* - {@link Gesture#PINCH} |
||||||
|
*/ |
||||||
|
EXPOSURE_CORRECTION(5); |
||||||
|
|
||||||
|
|
||||||
|
private int value; |
||||||
|
|
||||||
|
GestureAction(int value) { |
||||||
|
this.value = value; |
||||||
|
} |
||||||
|
|
||||||
|
private int value() { |
||||||
|
return value; |
||||||
|
} |
||||||
|
|
||||||
|
static GestureAction fromValue(int value) { |
||||||
|
GestureAction[] list = GestureAction.values(); |
||||||
|
for (GestureAction action : list) { |
||||||
|
if (action.value() == value) { |
||||||
|
return action; |
||||||
|
} |
||||||
|
} |
||||||
|
return null; |
||||||
|
} |
||||||
} |
} |
||||||
|
|||||||
Loading…
Reference in new issue