refactor: enhance UI padding management in Kotlin classes

- Add padding imports and modifiers for UI components in various Kotlin Composable functions - Refactor Home, MagazineOverview, and Settings Kotlin classes to support dynamic inner padding - Remove unused UI components and modifiers from HomeLayout class Signed-off-by: jnelle <[email protected]>
Nelle-Bendlage-IT · Jul 27, 2024 · ff99db7 · ff99db7
1 parent 5d0d186
commit ff99db7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 28 deletions.
diff --git a/composeApp/src/commonMain/kotlin/features/home/Home.kt b/composeApp/src/commonMain/kotlin/features/home/Home.kt
@@ -1,6 +1,8 @@
 package features.home
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -12,6 +14,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
@@ -30,6 +33,7 @@ fun Home(
     getMainFeedClipsPagination: (offset: Int) -> Unit,
     getMainFeedClips: (offset: Int, count: Int) -> Unit,
     isInitial: Boolean,
+    innerPadding: PaddingValues
 ) {
     val lazyColumnListState = rememberLazyListState()
     var lastCalledIndex by remember { mutableStateOf<Int?>(null) }
@@ -58,6 +62,7 @@ fun Home(
 
         is ViewState.Success -> {
             LazyColumn(
+                Modifier.padding(innerPadding),
                 verticalArrangement = Arrangement.spacedBy(16.dp),
                 state = lazyColumnListState,
             ) {

diff --git a/composeApp/src/commonMain/kotlin/features/home/HomeLayout.kt b/composeApp/src/commonMain/kotlin/features/home/HomeLayout.kt
@@ -1,15 +1,12 @@
 package features.home
 
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
 import cafe.adriel.voyager.core.screen.Screen
 import com.mgtvapi.viewModel.HomeViewModel
 import com.mgtvapi.viewModel.MagazineOverviewViewModel
@@ -46,30 +43,32 @@ class HomeLayout : Screen {
                 )
             },
         ) { innerPadding ->
-            Box(modifier = Modifier.padding(innerPadding)) {
-                when (route) {
-                    HomeRoute.Home ->
-                        Home(
-                            mainFeedClipsState = homeViewModel.clips.collectAsState().value,
-                            mainFeedClipsPaginationState = homeViewModel.paginationLoading.collectAsState().value,
-                            getMainFeedClips = { offset, count ->
-                                homeViewModel.getMainFeedClips(offset, count)
-                            },
-                            getMainFeedClipsPagination = { offset ->
-                                homeViewModel.getMainFeedClipsPagination(offset)
-                            },
-                            isInitial = homeViewModel.isInitial.collectAsState().value,
-                        )
-
-                    HomeRoute.Tv -> MagazineOverview(
-                        magazines = magazineOverviewViewModel.magazines.collectAsState().value,
-                        fetchMagazines = { magazineOverviewViewModel.fetchMagazines() }
+            when (route) {
+                HomeRoute.Home ->
+                    Home(
+                        mainFeedClipsState = homeViewModel.clips.collectAsState().value,
+                        mainFeedClipsPaginationState = homeViewModel.paginationLoading.collectAsState().value,
+                        getMainFeedClips = { offset, count ->
+                            homeViewModel.getMainFeedClips(offset, count)
+                        },
+                        getMainFeedClipsPagination = { offset ->
+                            homeViewModel.getMainFeedClipsPagination(offset)
+                        },
+                        isInitial = homeViewModel.isInitial.collectAsState().value,
+                        innerPadding = innerPadding
                     )
 
-                    HomeRoute.Settings -> Settings(
-                        onLogOutPressed = { homeViewModel.logout() }
-                    )
-                }
+                HomeRoute.Tv -> MagazineOverview(
+                    magazines = magazineOverviewViewModel.magazines.collectAsState().value,
+                    fetchMagazines = { magazineOverviewViewModel.fetchMagazines() },
+                    innerPadding = innerPadding
+                )
+
+                HomeRoute.Settings -> Settings(
+                    onLogOutPressed = { homeViewModel.logout() },
+                    innerPadding = innerPadding
+                )
+
             }
         }
     }

diff --git a/composeApp/src/commonMain/kotlin/features/magazineOverview/MagazineOverview.kt b/composeApp/src/commonMain/kotlin/features/magazineOverview/MagazineOverview.kt
@@ -29,7 +29,8 @@ import common.screens.MagazineScreen
 @Composable
 fun MagazineOverview(
     fetchMagazines: () -> Unit,
-    magazines: ViewState<List<Magazine>>
+    magazines: ViewState<List<Magazine>>,
+    innerPadding: PaddingValues
 ) {
     val navigator = LocalNavigator.currentOrThrow
 
@@ -43,6 +44,7 @@ fun MagazineOverview(
         is ViewState.Error -> Text(magazines.message, style = MaterialTheme.typography.bodyLarge)
         is ViewState.Success -> {
             LazyVerticalGrid(
+                modifier = Modifier.padding(innerPadding),
                 contentPadding = PaddingValues(5.dp),
                 columns = GridCells.Adaptive(minSize = 128.dp)
             ) {

diff --git a/composeApp/src/commonMain/kotlin/features/settings/Settings.kt b/composeApp/src/commonMain/kotlin/features/settings/Settings.kt
@@ -1,6 +1,7 @@
 package features.settings
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -12,11 +13,11 @@ import androidx.compose.ui.unit.dp
 
 
 @Composable
-fun Settings(onLogOutPressed: () -> Unit) {
+fun Settings(onLogOutPressed: () -> Unit, innerPadding: PaddingValues) {
 
     Column {
         Button(
-            modifier = Modifier.fillMaxWidth().padding(top = 20.dp),
+            modifier = Modifier.fillMaxWidth().padding(innerPadding),
             shape = RoundedCornerShape(30.dp),
             onClick = { onLogOutPressed() }
         ) {