Fixed junky UI in window size expanded

VictorKabata · Oct 17, 2023 · 9d77eec · 9d77eec
1 parent 8d86146
commit 9d77eec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 89 deletions.
diff --git a/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/components/MovieCardPagerExpanded.kt b/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/components/MovieCardPagerExpanded.kt
diff --git a/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/screens/home/HomeScreen.kt b/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/screens/home/HomeScreen.kt
@@ -140,7 +140,11 @@ fun HomeScreen(
                 // inputFieldColors = TextFieldDefaults.colors()
             )
         ) {
-            SearchScreen(navigator = navigator, searchUiState = searchUiState)
+            SearchScreen(
+                navigator = navigator,
+                searchUiState = searchUiState,
+                windowSize = windowSize
+            )
         }
         //endregion
 
@@ -168,7 +172,8 @@ fun HomeScreen(
                 ) {
                     //region Now Playing Movies
                     homeUiState.nowPlayingMovies?.let { nowPlayingMovies ->
-                        val pagerState = rememberPagerState(pageCount = { nowPlayingMovies.size })
+                        val pagerState =
+                            rememberPagerState(pageCount = { nowPlayingMovies.size })
 
                         HorizontalPager(
                             modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),

diff --git a/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/screens/search/SearchScreen.kt b/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/screens/search/SearchScreen.kt
@@ -19,10 +19,15 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.vickikbt.shared.ui.components.MovieCardPortrait
 import com.vickikbt.shared.utils.SearchUiState
+import com.vickikbt.shared.utils.WindowSize
 import moe.tlaster.precompose.navigation.Navigator
 
 @Composable
-fun SearchScreen(navigator: Navigator, searchUiState: SearchUiState) {
+fun SearchScreen(
+    navigator: Navigator,
+    searchUiState: SearchUiState,
+    windowSize: WindowSize = WindowSize.COMPACT
+) {
     Box(modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.surface)) {
         if (searchUiState.isLoading) {
             CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
@@ -38,7 +43,8 @@ fun SearchScreen(navigator: Navigator, searchUiState: SearchUiState) {
                     modifier = Modifier.fillMaxSize()
                         .padding(vertical = 12.dp, horizontal = 16.dp)
                         .align(Alignment.Center),
-                    columns = GridCells.Adaptive(minSize = 150.dp),
+                    columns = if (windowSize == WindowSize.COMPACT) GridCells.Fixed(2)
+                    else GridCells.Adaptive(minSize = 150.dp),
                     contentPadding = PaddingValues(bottom = 90.dp),
                     horizontalArrangement = Arrangement.Center
                 ) {