Fixes #17

Signed-off-by: enricocid <enrico2588@gmail.com>
enricocid · Mar 1, 2020 · 37cf221 · 37cf221
1 parent 9e20147
commit 37cf221
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/project/app/src/main/java/com/iven/vectorify/ui/MainActivity.kt b/project/app/src/main/java/com/iven/vectorify/ui/MainActivity.kt
@@ -5,6 +5,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
+import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
@@ -85,6 +86,7 @@ class MainActivity : AppCompatActivity(R.layout.vectorify_activity),
 
     private val sSwapColor get() = mTempVectorColor != mTempBackgroundColor
 
+    private val sThemeNight get() = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
     private var sThemeChanged = false
     private var sRestoreVectorFromBundle = false
 
@@ -183,7 +185,7 @@ class MainActivity : AppCompatActivity(R.layout.vectorify_activity),
                     statusBarColor = Color.TRANSPARENT
                     navigationBarColor = Color.TRANSPARENT
                 }
-                Utils.handleLightSystemBars(decorView)
+                Utils.handleLightSystemBars(sThemeNight, decorView)
                 edgeToEdge {
                     decorView.fit { Edge.Top }
                     mBottomBar.fit { Edge.Bottom + Edge.Right }
@@ -602,7 +604,7 @@ class MainActivity : AppCompatActivity(R.layout.vectorify_activity),
                 GridLayoutManager(context, 3, RecyclerView.VERTICAL, false)
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) window?.apply {
-                Utils.handleLightSystemBars(decorView)
+                Utils.handleLightSystemBars(sThemeNight, decorView)
                 edgeToEdge {
                     getRecyclerView().fit { Edge.Bottom }
                     decorView.fit { Edge.Top }

diff --git a/project/app/src/main/java/com/iven/vectorify/utils/Utils.kt b/project/app/src/main/java/com/iven/vectorify/utils/Utils.kt
@@ -49,15 +49,11 @@ object Utils {
         else -> R.drawable.ic_theme_auto
     }
 
-    @JvmStatic
-    private fun isThemeNight() =
-        AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
-
     @JvmStatic
     @TargetApi(Build.VERSION_CODES.O_MR1)
-    fun handleLightSystemBars(view: View) {
+    fun handleLightSystemBars(isThemeNight: Boolean, view: View) {
         view.systemUiVisibility =
-            if (isThemeNight()) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+            if (isThemeNight) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
     }
 
     //method to open live wallpaper intent