From b523e47102142fe72849673b12fe852f1f68697b Mon Sep 17 00:00:00 2001
From: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com>
Date: Wed, 2 Jun 2021 21:44:11 +0200
Subject: [PATCH] Fix label visibility for tablet ui (#343)

* fix label visibility for tablet ui

* change to less code
---
 .../eu/kanade/tachiyomi/ui/main/MainActivity.kt    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 5ecd9f2b0..30802e71b 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -302,7 +302,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
 
         // SY -->
         preferences.bottomBarLabels()
-            .asImmediateFlow { setBottomNavLabelVisibility() }
+            .asImmediateFlow { setNavLabelVisibility() }
             .launchIn(lifecycleScope)
         // SY <--
     }
@@ -590,13 +590,11 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
     private val nav: NavigationBarView
         get() = binding.bottomNav ?: binding.sideNav!!
 
-    private fun setBottomNavLabelVisibility() {
-        binding.bottomNav?.let {
-            if (preferences.bottomBarLabels().get()) {
-                it.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_LABELED
-            } else {
-                it.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_SELECTED
-            }
+    private fun setNavLabelVisibility() {
+        if (preferences.bottomBarLabels().get()) {
+            nav.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_LABELED
+        } else {
+            nav.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_SELECTED
         }
     }