diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt index 105826ab8..8b511e8fd 100644 --- a/app/src/main/java/com/aurora/store/MainActivity.kt +++ b/app/src/main/java/com/aurora/store/MainActivity.kt @@ -41,7 +41,6 @@ import com.aurora.store.util.AppUtil import com.aurora.store.util.Preferences import com.aurora.store.util.Preferences.PREFERENCE_DEFAULT_SELECTED_TAB import com.aurora.store.view.ui.sheets.NetworkDialogSheet -import com.google.android.material.navigation.NavigationBarView import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch @@ -100,7 +99,7 @@ class MainActivity : AppCompatActivity() { } } - (B.navView as NavigationBarView).apply { + B.navView.apply { val alphaColor = ColorUtils.setAlphaComponent(this@MainActivity.accentColor(), 100) setupWithNavController(navController) itemActiveIndicatorColor = ColorStateList.valueOf(alphaColor) @@ -150,7 +149,7 @@ class MainActivity : AppCompatActivity() { lifecycleScope.launch { appUtil.updates.collectLatest { list -> - (B.navView as NavigationBarView).getOrCreateBadge(R.id.updatesFragment).apply { + B.navView.getOrCreateBadge(R.id.updatesFragment).apply { isVisible = !list.isNullOrEmpty() number = list?.size ?: 0 } diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml index 42cbdcc90..143b32701 100644 --- a/app/src/main/res/layout-sw600dp/activity_main.xml +++ b/app/src/main/res/layout-sw600dp/activity_main.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> + app:menuGravity="center" + tools:viewBindingType="com.google.android.material.navigation.NavigationBarView" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d5b44776a..e87a91b53 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,7 +21,8 @@ + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> + app:menu="@menu/menu_bottom_nav" + tools:viewBindingType="com.google.android.material.navigation.NavigationBarView" />