added dials to change time interval

jonasjuffinger · Dec 21, 2017 · 632754d · 632754d
1 parent da847a6
commit 632754d
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.jonasjuffinger.timelapse"
         minSdkVersion 10
         targetSdkVersion 10
-        versionCode 4
-        versionName "0.3.1"
+        versionCode 6
+        versionName "0.3.3"
     }
     buildTypes {
         release {

diff --git a/app/release/TimeLapse-release-0.3.3.apk b/app/release/TimeLapse-release-0.3.3.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4},"path":"TimeLapse-release-0.3.1.apk","properties":{"packageId":"com.jonasjuffinger.timelapse","split":"","minSdkVersion":"10"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6},"path":"TimeLapse-release-0.3.3.apk","properties":{"packageId":"com.jonasjuffinger.timelapse","split":"","minSdkVersion":"10"}}]
diff --git a/app/src/main/java/com/github/ma1co/pmcademo/app/BaseActivity.java b/app/src/main/java/com/github/ma1co/pmcademo/app/BaseActivity.java
@@ -92,6 +92,12 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
             case ScalarInput.ISV_DIAL_2_CLOCKWISE:
             case ScalarInput.ISV_DIAL_2_COUNTERCW:
                 return onLowerDialChanged(getDialStatus(ScalarInput.ISV_DIAL_2_STATUS) / 22);
+            case ScalarInput.ISV_DIAL_3_CLOCKWISE:
+            case ScalarInput.ISV_DIAL_3_COUNTERCW:
+                return onThirdDialChanged(getDialStatus(ScalarInput.ISV_DIAL_3_STATUS) / 22);
+            case ScalarInput.ISV_DIAL_KURU_CLOCKWISE:
+            case ScalarInput.ISV_DIAL_KURU_COUNTERCW:
+                return onKuruDialChanged(getDialStatus(ScalarInput.ISV_DIAL_KURU_STATUS) / 22);
             case ScalarInput.ISV_KEY_MODE_DIAL:
                 return onModeDialChanged(getDialStatus(ScalarInput.ISV_KEY_MODE_DIAL));
             default:
@@ -185,6 +191,8 @@ protected int getDialStatus(int key) {
     protected boolean onLensDetached() { return false; }
     protected boolean onUpperDialChanged(int value) { return false; }
     protected boolean onLowerDialChanged(int value) { return false; }
+    protected boolean onThirdDialChanged(int value) { return false; }
+    protected boolean onKuruDialChanged(int value) { return false; }
     protected boolean onModeDialChanged(int value) { return false; }
 
     protected boolean onDeleteKeyDown() {

diff --git a/app/src/main/java/com/jonasjuffinger/timelapse/SettingsActivity.java b/app/src/main/java/com/jonasjuffinger/timelapse/SettingsActivity.java
@@ -241,12 +241,29 @@ void updateTimes() {
         }
     }
 
+    protected boolean onUpperDialChanged(int value) {
+        sbInterval.dialChanged(value);
+        sbShots.dialChanged(value);
+        return true;
+    }
+
     protected boolean onLowerDialChanged(int value) {
         sbInterval.dialChanged(value);
         sbShots.dialChanged(value);
         return true;
     }
 
+    protected boolean onThirdDialChanged(int value) {
+        sbInterval.dialChanged(value);
+        sbShots.dialChanged(value);
+        return true;
+    }
+
+    protected boolean onKuruDialChanged(int value) {
+        sbInterval.dialChanged(value);
+        sbShots.dialChanged(value);
+        return true;
+    }
 
     @Override
     protected boolean onMenuKeyUp()

diff --git a/app/src/main/java/com/jonasjuffinger/timelapse/ShootActivity.java b/app/src/main/java/com/jonasjuffinger/timelapse/ShootActivity.java
@@ -116,9 +116,13 @@ protected void onResume() {
 
         final Camera.Parameters params = cameraEx.createEmptyParameters();
         final CameraEx.ParametersModifier modifier = cameraEx.createParametersModifier(params);
-        if(modifier.isSupportedSilentShutterMode())
+        // setSilentShutterMode doesn't exist on all cameras
+        try {
             modifier.setSilentShutterMode(settings.silentShutter);
-        cameraEx.getNormalCamera().setParameters(params);
+            cameraEx.getNormalCamera().setParameters(params);
+        }
+        catch(NoSuchMethodError ignored)
+        {}
 
         pictureReviewTime = autoReviewControl.getPictureReviewTime();
         log(Integer.toString(pictureReviewTime));

diff --git a/gradlew b/gradlew