From e04c4da1d631b211222b8044e96a16971ada3e66 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 1 Dec 2017 11:37:48 +0100
Subject: [PATCH] set translucent navigation bar programmatically where
 appropriate

---
 app/build.gradle                                     |  2 +-
 app/src/main/AndroidManifest.xml                     | 12 ++++--------
 .../gallery/activities/PhotoVideoActivity.kt         |  2 ++
 .../gallery/activities/ViewPagerActivity.kt          |  1 +
 app/src/main/res/values-v21/styles.xml               |  7 -------
 app/src/main/res/values/styles.xml                   | 12 ------------
 6 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/build.gradle b/app/build.gradle
index 4c0b8b22a..ce8bb2bd8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,7 +47,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.0.16'
+    implementation 'com.simplemobiletools:commons:3.0.17'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b550c3128..a6e97ccb7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,8 +60,7 @@
         <activity
             android:name=".activities.ViewPagerActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:parentActivityName=".activities.MediaActivity"
-            android:theme="@style/FullScreenTheme">
+            android:parentActivityName=".activities.MediaActivity">
 
             <intent-filter>
                 <action android:name="com.android.camera.action.REVIEW"/>
@@ -96,8 +95,7 @@
 
         <activity
             android:name=".activities.PhotoVideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/FullScreenTheme"/>
+            android:configChanges="orientation|keyboardHidden|screenSize"/>
 
         <activity
             android:name=".activities.IncludedFoldersActivity"
@@ -111,8 +109,7 @@
 
         <activity
             android:name=".activities.PhotoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/FullScreenTheme">
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
@@ -125,8 +122,7 @@
 
         <activity
             android:name=".activities.VideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/FullScreenTheme">
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
index e92593e3b..4711f1c62 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
@@ -40,6 +40,8 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.fragment_holder)
+        setTranslucentNavigation()
+
         handlePermission(PERMISSION_WRITE_STORAGE) {
             if (it) {
                 checkIntent(savedInstanceState)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index d0c9b7a61..47b0f6e53 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -80,6 +80,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_medium)
+        setTranslucentNavigation()
 
         handlePermission(PERMISSION_WRITE_STORAGE) {
             if (it) {
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 78a798255..000000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <style name="FullScreenTheme" parent="FullScreenTheme.Base">
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 54db9f7d0..0be50415b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,16 +2,4 @@
 
     <style name="AppTheme" parent="AppTheme.Base"/>
 
-    <style name="FullScreenTheme.Base" parent="AppTheme">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="actionBarStyle">@style/MyFullScreenActionBar</item>
-        <item name="android:actionBarStyle">@style/MyFullScreenActionBar</item>
-    </style>
-
-    <style name="FullScreenTheme" parent="FullScreenTheme.Base"/>
-
-    <style name="MyFullScreenActionBar" parent="Widget.AppCompat.Light.ActionBar">
-        <item name="titleTextStyle">@style/AppTheme.ActionBar.TitleTextStyle</item>
-    </style>
-
 </resources>