Skip to content

Commit 4f31a4e

Browse files
committed
docs + small adjustments
1 parent 70094d9 commit 4f31a4e

File tree

97 files changed

+3946
-1090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3946
-1090
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ plugins {
1212
alias(libs.plugins.compose) apply false
1313
alias(libs.plugins.gradle.maven.publish.plugin) apply false
1414
alias(libs.plugins.dokka) apply false
15+
alias(libs.plugins.binary.compatibility.validator) apply false
1516
}

demo/android/src/main/java/com/michaelflisar/composepreferences/demo/MainActivity.kt

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ import androidx.activity.compose.BackHandler
44
import androidx.compose.foundation.layout.Arrangement
55
import androidx.compose.foundation.layout.Column
66
import androidx.compose.foundation.layout.ColumnScope
7+
import androidx.compose.foundation.layout.PaddingValues
8+
import androidx.compose.foundation.layout.Row
9+
import androidx.compose.foundation.layout.Spacer
710
import androidx.compose.foundation.layout.fillMaxWidth
811
import androidx.compose.foundation.layout.padding
12+
import androidx.compose.foundation.layout.width
913
import androidx.compose.foundation.rememberScrollState
1014
import androidx.compose.foundation.verticalScroll
1115
import androidx.compose.material.icons.Icons
@@ -19,23 +23,18 @@ import androidx.compose.runtime.Composable
1923
import androidx.compose.runtime.CompositionLocalProvider
2024
import androidx.compose.runtime.LaunchedEffect
2125
import androidx.compose.runtime.MutableState
22-
import androidx.compose.runtime.derivedStateOf
23-
import androidx.compose.runtime.getValue
2426
import androidx.compose.runtime.mutableIntStateOf
25-
import androidx.compose.runtime.remember
2627
import androidx.compose.runtime.saveable.rememberSaveable
28+
import androidx.compose.ui.Alignment
2729
import androidx.compose.ui.Modifier
2830
import androidx.compose.ui.platform.LocalContext
2931
import androidx.compose.ui.unit.dp
3032
import com.michaelflisar.composepreferences.core.PreferenceScreen
31-
import com.michaelflisar.composepreferences.core.styles.DefaultStyle
3233
import com.michaelflisar.composepreferences.core.styles.ModernStyle
33-
import com.michaelflisar.composepreferences.core.styles.PreferenceStyleDefaults
3434
import com.michaelflisar.composepreferences.demo.classes.DemoDataStore
3535
import com.michaelflisar.composepreferences.demo.classes.DemoPrefs
3636
import com.michaelflisar.composepreferences.demo.classes.DemoStyle
3737
import com.michaelflisar.composepreferences.demo.classes.LocalDataStore
38-
import com.michaelflisar.composepreferences.demo.composables.MyInfoLine
3938
import com.michaelflisar.composepreferences.demo.demos.PrefScreenCustomDemo
4039
import com.michaelflisar.composepreferences.demo.demos.PrefScreenDemo
4140
import com.michaelflisar.composepreferences.demo.demos.PrefScreenDemoFilter
@@ -49,7 +48,7 @@ import com.michaelflisar.toolbox.androiddemoapp.DemoActivity
4948
import com.michaelflisar.toolbox.androiddemoapp.composables.DemoAppThemeRegion
5049
import com.michaelflisar.toolbox.androiddemoapp.composables.DemoCollapsibleRegion
5150
import com.michaelflisar.toolbox.androiddemoapp.composables.rememberDemoExpandedRegions
52-
import com.michaelflisar.toolbox.composables.MyColumn
51+
import com.michaelflisar.toolbox.components.MyColumn
5352
import java.text.NumberFormat
5453
import java.util.Locale
5554

@@ -140,11 +139,9 @@ private fun Root(
140139
regionId = 1,
141140
state = regionState
142141
) {
143-
// this shape looks better if settings are not used on full screen width
144-
// => so we overwrite the settings for this area
145142
val settings = DemoPrefs.preferenceSettings(
146143
style = ModernStyle.create(
147-
horizontalOuterItemPadding = 0.dp
144+
outerPadding = PaddingValues(0.dp)
148145
),
149146
animationSpec = null
150147
)
@@ -239,4 +236,29 @@ private fun Root(
239236
}
240237

241238
}
239+
}
240+
241+
@Composable
242+
private fun MyInfoLine(
243+
label: String,
244+
info: String,
245+
modifier: Modifier = Modifier,
246+
showEqualSign: Boolean = true
247+
) {
248+
Row(
249+
verticalAlignment = Alignment.CenterVertically,
250+
modifier = modifier
251+
) {
252+
Text(label, style = MaterialTheme.typography.titleSmall, modifier = Modifier.weight(1f))
253+
if (showEqualSign) {
254+
Text(
255+
"=",
256+
style = MaterialTheme.typography.titleSmall,
257+
modifier = Modifier.padding(horizontal = 4.dp)
258+
)
259+
} else {
260+
Spacer(modifier = Modifier.width(4.dp))
261+
}
262+
Text(info, style = MaterialTheme.typography.bodySmall, modifier = Modifier.weight(1f))
263+
}
242264
}

demo/android/src/main/java/com/michaelflisar/composepreferences/demo/Preview.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ import androidx.compose.ui.graphics.Color
2828
import androidx.compose.ui.tooling.preview.Preview
2929
import androidx.compose.ui.unit.dp
3030
import com.michaelflisar.composepreferences.core.PreferenceInfo
31-
import com.michaelflisar.composepreferences.core.PreferenceSectionHeader
31+
import com.michaelflisar.composepreferences.core.PreferenceSection
3232
import com.michaelflisar.composepreferences.core.preview.PreviewPreference
3333
import com.michaelflisar.composepreferences.core.scopes.PreferenceRootScope
34-
import com.michaelflisar.composepreferences.core.scopes.PreferenceScope
3534
import com.michaelflisar.composepreferences.screen.bool.PreferenceBool
3635
import com.michaelflisar.composepreferences.screen.button.PreferenceButton
3736
import com.michaelflisar.composepreferences.screen.color.PreferenceColor
@@ -65,12 +64,12 @@ private fun PreviewAll() {
6564
)
6665
},
6766
{
68-
PreferenceSectionHeader(
67+
PreferenceSection(
6968
title = "Section Header"
7069
) {}
7170
},
7271
{
73-
PreferenceSectionHeader(
72+
PreferenceSection(
7473
icon = { Icon(Icons.Default.Info, null) },
7574
title = "Section Header",
7675
subtitle = "This is a description"

demo/android/src/main/java/com/michaelflisar/composepreferences/demo/classes/DemoPrefs.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@ object DemoPrefs : SettingsModel(DataStoreStorage.create(name = "demo1_prefs"))
7676
when (it) {
7777
DemoStyle.Default -> DefaultStyle.create()
7878
DemoStyle.Modern -> ModernStyle.create(
79-
sectionColors = PreferenceItemDefaults.colors(
80-
containerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
81-
contentColor = MaterialTheme.colorScheme.onSurface
82-
)
79+
sectionGroupItemBackgroundColor = MaterialTheme.colorScheme.surfaceContainerHighest,
80+
sectionGroupItemForegroundColor = MaterialTheme.colorScheme.onSurface
8381
)
8482
}
8583
},

demo/android/src/main/java/com/michaelflisar/composepreferences/demo/composables/DemoPreferenceGroup.kt

Lines changed: 0 additions & 34 deletions
This file was deleted.

demo/android/src/main/java/com/michaelflisar/composepreferences/demo/composables/MyInfoLine.kt

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)