[fix]: navbar on huawei devices

F0x1d · Dec 17, 2023 · 4481990 · 4481990
1 parent 892b113
commit 4481990
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/app/src/main/java/com/f0x1d/logfox/extensions/APIExtensions.kt b/app/src/main/java/com/f0x1d/logfox/extensions/APIExtensions.kt
@@ -5,7 +5,7 @@ import android.os.Build
 val isAtLeastAndroid13 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
 
 val gesturesAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
-val contrastedNavBarAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
+val contrastedNavBarAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 || isHuawei
 
 val notificationsDynamicColorAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
 val notificationsChannelsAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O

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
@@ -21,7 +21,6 @@ import com.f0x1d.logfox.extensions.context.hasNotificationsPermission
 import com.f0x1d.logfox.extensions.context.isHorizontalOrientation
 import com.f0x1d.logfox.extensions.contrastedNavBarAvailable
 import com.f0x1d.logfox.extensions.gesturesAvailable
-import com.f0x1d.logfox.extensions.isHuawei
 import com.f0x1d.logfox.ui.activity.base.BaseViewModelActivity
 import com.f0x1d.logfox.utils.event.Event
 import com.f0x1d.logfox.viewmodel.MainViewModel
@@ -136,16 +135,14 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
             else -> true
         }
 
-        if (!isHuawei) {
-            if (!gesturesAvailable && contrastedNavBarAvailable) {
-                window.navigationBarColor = when {
-                    barShown && !isHorizontalOrientation -> Color.TRANSPARENT
+        if (!gesturesAvailable && contrastedNavBarAvailable) {
+            window.navigationBarColor = when {
+                barShown && !isHorizontalOrientation -> Color.TRANSPARENT
 
-                    else -> getColor(R.color.navbar_transparent_background)
-                }
-            } else if (gesturesAvailable) {
-                window.isNavigationBarContrastEnforced = !(barShown && !isHorizontalOrientation)
+                else -> getColor(R.color.navbar_transparent_background)
             }
+        } else if (gesturesAvailable) {
+            window.isNavigationBarContrastEnforced = !(barShown && !isHorizontalOrientation)
         }
 
         if (this.barShown != barShown) {

diff --git a/app/src/main/java/com/f0x1d/logfox/ui/activity/base/BaseActivity.kt b/app/src/main/java/com/f0x1d/logfox/ui/activity/base/BaseActivity.kt
@@ -10,7 +10,6 @@ import com.f0x1d.logfox.R
 import com.f0x1d.logfox.extensions.context.viewPump
 import com.f0x1d.logfox.extensions.contrastedNavBarAvailable
 import com.f0x1d.logfox.extensions.gesturesAvailable
-import com.f0x1d.logfox.extensions.isHuawei
 import com.f0x1d.logfox.extensions.views.snackbar
 import dev.chrisbanes.insetter.applyInsetter
 import io.github.inflationx.viewpump.ViewPumpContextWrapper
@@ -24,7 +23,7 @@ abstract class BaseActivity<T : ViewBinding>: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
-        if (!isHuawei) window.navigationBarColor = when {
+        window.navigationBarColor = when {
             !contrastedNavBarAvailable -> getColor(
                 R.color.transparent_black
             )