Hide new checkbox when expanded layout is closed

dotWee · Mar 13, 2016 · 8194880 · 8194880
1 parent 5fcc9c6
commit 8194880
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -61,20 +61,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/devel/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/devel/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/devel/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevel/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevel/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevel/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevel/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevel/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevel/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevel/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevel/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -96,20 +96,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "de.dotwee.micropinner"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 22
-        versionName "v1.9"
+        versionCode 23
+        versionName "v1.9.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/de/dotwee/micropinner/presenter/MainPresenterImpl.java b/app/src/main/java/de/dotwee/micropinner/presenter/MainPresenterImpl.java
@@ -138,10 +138,14 @@ public void onShowActions() {
      */
     @Override
     public void onViewExpand(boolean expand) {
-        View view = mainActivity.findViewById(R.id.checkBoxPersistentPin);
+        int[] expandedIds = new int[]{R.id.checkBoxPersistentPin, R.id.checkBoxShowActions};
 
-        if (view != null) {
-            view.setVisibility(expand ? View.VISIBLE : View.GONE);
+        for (int id : expandedIds) {
+            View view = mainActivity.findViewById(id);
+
+            if (view != null) {
+                view.setVisibility(expand ? View.VISIBLE : View.GONE);
+            }
         }
 
         preferencesHandler.setAdvancedUse(expand);

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -99,4 +99,10 @@
     - Pin's notification actions are now optional
     - Updated german and french translation
     - Reduced application size to 670kb
-- download: [Github](https://github.com/dotWee/MicroPinner/releases/download/release-v1.9/release_v1.9.apk)
+- download: [Github](https://github.com/dotWee/MicroPinner/releases/download/release-v1.9/release_v1.9.apk)
+
+#### [Version: 1.9.1 / 13th March 2016]
+- sha1 checksum: c3f172244e132b31174d29668413ba315f396750
+- changes:
+    - Hide new checkbox when expanded layout is closed
+- download: [Github](https://github.com/dotWee/MicroPinner/releases/download/release-v1.9.1/release_v1.9.1.apk)