checking if silent shutter is available and new icon

jonasjuffinger · Nov 1, 2017 · 7a109d2 · 7a109d2
1 parent f48173c
commit 7a109d2
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/app/TimeLapse-release-0.3.apk b/app/TimeLapse-release-0.3.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 10
-    buildToolsVersion "20.0.0"
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "com.jonasjuffinger.timelapse"
         minSdkVersion 10
         targetSdkVersion 10
-        versionCode 3
-        versionName "0.3"
+        versionCode 4
+        versionName "0.3.1"
     }
     buildTypes {
         release {
@@ -25,9 +25,8 @@ android {
 }
 
 android.applicationVariants.all { variant ->
-    variant.outputs.each { output ->
-        def apkName = "TimeLapse-${output.baseName}-${variant.versionName}.apk"
-        output.outputFile = new File(output.outputFile.parent, apkName)
+    variant.outputs.all { output ->
+        outputFileName =  "TimeLapse-${output.baseName}-${variant.versionName}.apk"
     }
 }
 

diff --git a/app/release/TimeLapse-release-0.3.1.apk b/app/release/TimeLapse-release-0.3.1.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -0,0 +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"}}]
diff --git a/app/src/main/java/com/jonasjuffinger/timelapse/ShootActivity.java b/app/src/main/java/com/jonasjuffinger/timelapse/ShootActivity.java
@@ -116,7 +116,8 @@ protected void onResume() {
 
         final Camera.Parameters params = cameraEx.createEmptyParameters();
         final CameraEx.ParametersModifier modifier = cameraEx.createParametersModifier(params);
-        modifier.setSilentShutterMode(settings.silentShutter);
+        if(modifier.isSupportedSilentShutterMode())
+            modifier.setSilentShutterMode(settings.silentShutter);
         cameraEx.getNormalCamera().setParameters(params);
 
         pictureReviewTime = autoReviewControl.getPictureReviewTime();

diff --git a/app/src/main/res/drawable/icon.png b/app/src/main/res/drawable/icon.png
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 11 23:14:57 CET 2017
+#Wed Nov 01 21:14:52 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip