Skip to content

PrefScreen: optional contentPadding parameter #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
newfla wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PrefScreen: optional contentPadding parameter #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/PrefsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,6 +20,7 @@ lateinit var LocalPrefsDataStore: ProvidableCompositionLocal<DataStore<Preferenc
*
* @param dataStore DataStore which will be used to save all the preferences
* @param modifier Modifier applied to the [LazyColumn] holding the list of Prefs
* @param contentPadding PaddingValues applied to the [LazyColumn] holding the list of Prefs
*
*/
@Composable
Expand All @@ -27,6 +29,7 @@ fun PrefsScreen(
modifier: Modifier = Modifier,
dividerThickness: Dp = 1.dp, // 0 for no divider
dividerIndent: Dp = 0.dp, // indents on both sides
contentPadding: PaddingValues = PaddingValues(0.dp),
content: PrefsScope.() -> Unit
) {
LocalPrefsDataStore = staticCompositionLocalOf { dataStore }
Expand All @@ -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)()
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/jamal/composeprefs3sample/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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(
Expand Down