make bottom bar smaller and accounting navigationbar insets

daniebeler · Jan 26, 2025 · 8151787 · 8151787
1 parent 90242c1
commit 8151787
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/app/src/main/java/com/daniebeler/pfpixelix/MainActivity.kt b/app/src/main/java/com/daniebeler/pfpixelix/MainActivity.kt
@@ -14,7 +14,9 @@ import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -42,6 +44,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowCompat
 import androidx.navigation.NavHostController
@@ -63,14 +66,14 @@ import com.daniebeler.pfpixelix.ui.composables.direct_messages.chat.ChatComposab
 import com.daniebeler.pfpixelix.ui.composables.direct_messages.conversations.ConversationsComposable
 import com.daniebeler.pfpixelix.ui.composables.edit_post.EditPostComposable
 import com.daniebeler.pfpixelix.ui.composables.edit_profile.EditProfileComposable
+import com.daniebeler.pfpixelix.ui.composables.explore.ExploreComposable
 import com.daniebeler.pfpixelix.ui.composables.followers.FollowersMainComposable
 import com.daniebeler.pfpixelix.ui.composables.mention.MentionComposable
 import com.daniebeler.pfpixelix.ui.composables.newpost.NewPostComposable
 import com.daniebeler.pfpixelix.ui.composables.notifications.NotificationsComposable
 import com.daniebeler.pfpixelix.ui.composables.profile.other_profile.OtherProfileComposable
 import com.daniebeler.pfpixelix.ui.composables.profile.own_profile.AccountSwitchBottomSheet
 import com.daniebeler.pfpixelix.ui.composables.profile.own_profile.OwnProfileComposable
-import com.daniebeler.pfpixelix.ui.composables.explore.ExploreComposable
 import com.daniebeler.pfpixelix.ui.composables.settings.about_instance.AboutInstanceComposable
 import com.daniebeler.pfpixelix.ui.composables.settings.about_pixelix.AboutPixelixComposable
 import com.daniebeler.pfpixelix.ui.composables.settings.blocked_accounts.BlockedAccountsComposable
@@ -158,7 +161,8 @@ class MainActivity : ComponentActivity() {
                 Scaffold(contentWindowInsets = WindowInsets(0.dp),bottomBar = {
                     BottomBar(navController = navController,
                         avatar = avatar,
-                        openAccountSwitchBottomSheet = { showAccountSwitchBottomSheet = true })
+                        openAccountSwitchBottomSheet = { showAccountSwitchBottomSheet = true }, context = this
+                    )
                 }) { paddingValues ->
                     Box(
                         modifier = Modifier.padding(paddingValues)
@@ -391,16 +395,20 @@ fun NavigationGraph(navController: NavHostController) {
 
 @Composable
 fun BottomBar(
-    navController: NavHostController, avatar: String, openAccountSwitchBottomSheet: () -> Unit
+    navController: NavHostController, avatar: String, openAccountSwitchBottomSheet: () -> Unit, context: Context
 ) {
     val screens = listOf(
         Destinations.HomeScreen,
         Destinations.Search,
         Destinations.NotificationsScreen,
         Destinations.OwnProfile
     )
+    val systemNavigationBarHeight = WindowInsets.navigationBars.asPaddingValues(Density(context)).calculateBottomPadding()
 
-    NavigationBar(Modifier.height(90.dp)) {
+    NavigationBar(
+        modifier = Modifier
+            .height(60.dp + systemNavigationBarHeight)
+    ){
         val navBackStackEntry by navController.currentBackStackEntryAsState()
         val currentRoute = navBackStackEntry?.destination?.route
         screens.forEach { screen ->