Pārlūkot izejas kodu

fixed list bottom padding

sirekanian 3 gadi atpakaļ
vecāks
revīzija
809bb7a5fc

+ 1 - 1
app/src/main/java/com/sirekanian/acf/MainActivity.kt

@@ -48,7 +48,7 @@ class MainActivity : ComponentActivity() {
                             MainProgress(insets, state.progress)
                         },
                         toolbarElevation = state.toolbarElevation,
-                        content = { insets -> MainContent(insets, state.list, data) },
+                        content = { insets -> MainContent(insets, state, data) },
                         contentVisible = hasData,
                         fab = { MainFab(onClick = { state.search.isOpened = true }) },
                         fabVisible = !state.search.isOpened,

+ 6 - 4
app/src/main/java/com/sirekanian/acf/ui/MainContent.kt

@@ -8,21 +8,23 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.unit.dp
 import com.sirekanian.acf.D
-import com.sirekanian.acf.ListState
+import com.sirekanian.acf.MainState
 import com.sirekanian.acf.data.Warmonger
 import com.sirekanian.acf.ext.plus
 import com.sirekanian.acf.ext.pointerInputOnDown
 
 @Composable
-fun MainContent(insets: PaddingValues, listState: ListState, data: List<Warmonger>) {
-    val paddings = PaddingValues(top = D.toolbarSize, bottom = D.fabSize + D.fabPadding)
+fun MainContent(insets: PaddingValues, state: MainState, data: List<Warmonger>) {
+    val bottomPadding = if (state.search.isOpened) 0.dp else D.fabSize + D.fabPadding
+    val paddings = PaddingValues(top = D.toolbarSize, bottom = bottomPadding)
     val focusManager = LocalFocusManager.current
     LazyColumn(
         modifier = Modifier
             .fillMaxSize()
             .pointerInputOnDown(Unit) { focusManager.clearFocus() },
-        state = listState.lazyListState,
+        state = state.list.lazyListState,
         contentPadding = insets + paddings + D.listPaddings,
         verticalArrangement = Arrangement.spacedBy(D.cardSpacing)
     ) {