Remove blank space below BrandTopAppBar in LargeWindow mode

Infomaniak · Sep 25, 2024 · c8915b4 · c8915b4
1 parent 5a86860
commit c8915b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt b/...java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt
@@ -123,11 +123,11 @@ private fun AppNavigationRail(
             )
         },
         containerColor = SwissTransferTheme.colors.navigationItemBackground,
+        windowInsets = WindowInsets(left = 0, top = 0, right = 0, bottom = 0),
     ) {
         navigationItems.forEach { navigationItem ->
             NavigationRailItem(
                 icon = { NavigationIcon(false, navigationItem) },
-                label = {},
                 selected = currentDestination == navigationItem.destination,
                 onClick = { onClick(navigationItem.destination) },
             )

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/MainScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/MainScaffold.kt
@@ -67,7 +67,7 @@ private fun MainScaffold(
             } else {
                 Column {
                     Box(modifier = Modifier.weight(1.0f)) { content() }
-                    HorizontalDivider()
+                    if (navType == NavigationSuiteType.NavigationBar) HorizontalDivider()
                 }
             }
         }

diff --git a/...ain/java/com/infomaniak/swisstransfer/ui/screen/main/components/PhoneTopAppBarScaffold.kt b/...ain/java/com/infomaniak/swisstransfer/ui/screen/main/components/PhoneTopAppBarScaffold.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
 
 @Composable
 fun PhoneTopAppBarScaffold(
@@ -32,6 +33,11 @@ fun PhoneTopAppBarScaffold(
         topBar = { if (LocalNavType.current == NavigationSuiteType.NavigationBar) phoneTopAppBar() },
         floatingActionButton = floatingActionButton,
     ) { contentPadding ->
-        content(contentPadding)
+        val paddingValues = if (LocalNavType.current == NavigationSuiteType.NavigationBar) {
+            contentPadding
+        } else {
+            PaddingValues(all = 0.dp)
+        }
+        content(paddingValues)
     }
 }