From 5e4d1f550d95c54712c703f9986ccf8b2a7447a3 Mon Sep 17 00:00:00 2001 From: flavio Date: Mon, 16 Oct 2023 18:08:19 +0200 Subject: [PATCH] PrefScreen: optional contentPadding parameter --- .../src/main/java/com/jamal/composeprefs3/ui/PrefsScreen.kt | 5 ++++- .../java/com/jamal/composeprefs3sample/SettingsScreen.kt | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/PrefsScreen.kt b/ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/PrefsScreen.kt index 99781bd..41ca483 100644 --- a/ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/PrefsScreen.kt +++ b/ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/PrefsScreen.kt @@ -1,6 +1,7 @@ package com.jamal.composeprefs3.ui import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height @@ -19,6 +20,7 @@ lateinit var LocalPrefsDataStore: ProvidableCompositionLocal Unit ) { LocalPrefsDataStore = staticCompositionLocalOf { dataStore } @@ -36,7 +39,7 @@ fun PrefsScreen( CompositionLocalProvider(LocalPrefsDataStore provides dataStore) { Column { Spacer(modifier = Modifier.height(12.dp)) - LazyColumn(modifier = modifier.fillMaxSize()) { + LazyColumn(modifier = modifier.fillMaxSize(), contentPadding = contentPadding) { items(prefsScope.prefsItems.size) { index -> prefsScope.getPrefsItem(index)() diff --git a/app/src/main/java/com/jamal/composeprefs3sample/SettingsScreen.kt b/app/src/main/java/com/jamal/composeprefs3sample/SettingsScreen.kt index 83dfe69..ee7c9ee 100644 --- a/app/src/main/java/com/jamal/composeprefs3sample/SettingsScreen.kt +++ b/app/src/main/java/com/jamal/composeprefs3sample/SettingsScreen.kt @@ -1,5 +1,6 @@ package com.jamal.composeprefs3sample +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Home @@ -11,6 +12,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.jamal.composeprefs3.ui.GroupHeader import com.jamal.composeprefs3.ui.PrefsScreen @@ -22,7 +24,7 @@ import com.jamal.composeprefs3.ui.prefs.* fun SettingsScreen() { Scaffold(topBar = { SettingsTopBar() }) { padding -> - PrefsScreen(dataStore = LocalContext.current.dataStore, modifier = Modifier.padding(padding)) { + PrefsScreen(dataStore = LocalContext.current.dataStore, modifier = Modifier.padding(padding), contentPadding = PaddingValues(5.dp)) { prefsGroup({ GroupHeader(