[fix]: disable NavigationBarContrast with present dock on Android 10+

F0x1d · Oct 8, 2023 · ebde1b2 · ebde1b2
1 parent c2c7ab8
commit ebde1b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/src/main/java/com/f0x1d/logfox/ui/activity/MainActivity.kt b/app/src/main/java/com/f0x1d/logfox/ui/activity/MainActivity.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
@@ -90,6 +91,7 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
         }
     }
 
+    @SuppressLint("NewApi")
     override fun onDestinationChanged(controller: NavController, destination: NavDestination, arguments: Bundle?) {
         val barShown = when (destination.id) {
             R.id.setupFragment -> false
@@ -113,6 +115,8 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
 
                 else -> getColor(R.color.navbar_transparent_background)
             }
+        } else if (gesturesAvailable) {
+            window.isNavigationBarContrastEnforced = !(barShown && !isHorizontalOrientation)
         }
 
         if (this.barShown != barShown) {
@@ -145,4 +149,4 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
     }
 
     private val ActivityMainBinding.barView get() = bottomNavigation ?: navigationRail
-}
+}
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="LogFoxMaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog.Centered">
         <item name="buttonBarPositiveButtonStyle">@style/LogFoxMaterialAlertDialog.Button</item>
         <item name="buttonBarNegativeButtonStyle">@style/LogFoxMaterialAlertDialog.Button</item>
@@ -19,6 +19,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
     </style>
 
     <style name="LogFoxPreferenceTheme" parent="PreferenceThemeOverlay">