Add enabled to SettingsGroup

Fix padding in Sample
alorma · May 23, 2024 · 415078d · 415078d
1 parent 981d75f
commit 415078d
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 15 deletions.
diff --git a/...oidMain/kotlin/com/alorma/compose/settings/sample/shared/previews/SettingsGroupPreview.kt b/...oidMain/kotlin/com/alorma/compose/settings/sample/shared/previews/SettingsGroupPreview.kt
@@ -0,0 +1,43 @@
+package com.alorma.compose.settings.sample.shared.previews
+
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import com.alorma.compose.settings.ui.SettingsCheckbox
+import com.alorma.compose.settings.ui.SettingsGroup
+import com.alorma.compose.settings.ui.SettingsMenuLink
+import com.alorma.compose.settings.ui.SettingsSwitch
+import theme.ComposeSettingsTheme
+
+@SuperPreviews
+@Composable
+internal fun SettingsGroupPreview(
+  @PreviewParameter(provider = BooleanStateProvider::class) state: Boolean,
+) {
+  ComposeSettingsTheme {
+    Surface {
+      SettingsGroup(
+        title = {
+          Text(text = "SettingsGroupPreview")
+        },
+        enabled = state,
+      ) {
+        SettingsMenuLink(
+          title = { Text(text = "Menu link tile") },
+          onClick = {},
+        )
+        SettingsCheckbox(
+          state = true,
+          title = { Text(text = "Checkbox tile") },
+          onCheckedChange = {},
+        )
+        SettingsSwitch(
+          state = true,
+          title = { Text(text = "Switch tile") },
+          onCheckedChange = {},
+        )
+      }
+    }
+  }
+}
diff --git a/composeApp/src/commonMain/kotlin/App.kt b/composeApp/src/commonMain/kotlin/App.kt
@@ -41,14 +41,15 @@ fun App(
     ) {
       when (windowSizeClass.widthSizeClass) {
         WindowWidthSizeClass.Compact, WindowWidthSizeClass.Medium -> {
-          SettingsScreen()
+          SettingsScreen(modifier = Modifier.padding(it))
         }
 
         else -> {
           val drawerState = rememberDrawerState(DrawerValue.Open)
           val scope = rememberCoroutineScope()
 
           DismissibleNavigationDrawer(
+            modifier = Modifier.padding(it),
             drawerState = drawerState,
             drawerContent = {
               DismissibleDrawerSheet { SettingsScreen() }

diff --git a/composeApp/src/commonMain/kotlin/SettingsScreen.kt b/composeApp/src/commonMain/kotlin/SettingsScreen.kt
@@ -18,12 +18,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.alorma.compose.settings.ui.SettingsCheckbox
-import com.alorma.compose.settings.ui.SettingsMenuLink
-import com.alorma.compose.settings.ui.SettingsRadioButton
-import com.alorma.compose.settings.ui.SettingsSlider
-import com.alorma.compose.settings.ui.SettingsSwitch
-import com.alorma.compose.settings.ui.SettingsTriStateCheckbox
+import com.alorma.compose.settings.ui.*
 import internal.MultiChoiceAlertDialog
 import internal.SampleData
 import internal.SampleSection
@@ -56,6 +51,7 @@ fun SettingsScreen(modifier: Modifier = Modifier) {
       SettingsMenuLinkSectionSample(iconState.value)
       SettingsSliderSectionSample(iconState.value)
       SettingsSelectorsSample(iconState.value)
+      SettingsGroupSectionSample(iconState.value)
     }
   }
 }
@@ -332,10 +328,46 @@ private fun SettingsSelectorsSample(showIcon: Boolean) {
         items = items.toImmutableList(),
         selectedItemKeys = multipleSelectionState.value?.split("|").orEmpty().toImmutableList(),
         onItemsSelected = { selectedItemKey ->
-          multipleSelectionState.value = selectedItemKey.joinToString("|")
+          if (selectedItemKey.isNotEmpty()) {
+            multipleSelectionState.value = selectedItemKey.joinToString("|")
+          }
           showMultiChoiceDialog.value = false
         },
       )
     }
   }
 }
+
+@Composable
+private fun SettingsGroupSectionSample(showIcon: Boolean) {
+  SampleSection(title = "SettingsGroup") {
+    val groupEnabled = remember { mutableStateOf(true) }
+    SettingsGroup(
+      title = { Text("Group title") },
+      enabled = groupEnabled.value
+    ) {
+      SettingsSwitch(
+        state = groupEnabled.value,
+        title = { Text(text = "Group Enabled") },
+        subtitle = { Text(text = "This Switch is always enabled") },
+        icon = iconSampleOrNull(showIcon),
+        enabled = true,
+        onCheckedChange = { groupEnabled.value = it },
+      )
+      SettingsMenuLink(
+        title = { Text(text = "Menu") },
+        onClick = { },
+        icon = iconSampleOrNull(showIcon),
+      )
+
+      val state = remember { mutableStateOf(false) }
+      SettingsCheckbox(
+        state = state.value,
+        title = { Text(text = "Checkbox") },
+        subtitle = { Text(text = "Checkbox subtitle") },
+        icon = iconSampleOrNull(showIcon),
+        onCheckedChange = { state.value = it },
+      )
+    }
+  }
+}
diff --git a/...e/src/commonMain/kotlin/com/alorma/compose/settings/ui/base/internal/CompositionLocals.kt b/...e/src/commonMain/kotlin/com/alorma/compose/settings/ui/base/internal/CompositionLocals.kt
@@ -0,0 +1,7 @@
+package com.alorma.compose.settings.ui.base.internal
+
+import androidx.compose.runtime.compositionLocalOf
+
+val LocalSettingsGroupEnabled = compositionLocalOf {
+    true
+}
diff --git a/ui-tiles-extended/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSlider.kt b/ui-tiles-extended/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSlider.kt
@@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
 import com.alorma.compose.settings.ui.base.internal.SettingsTileScaffold
 
 @Composable
@@ -22,7 +23,7 @@ fun SettingsSlider(
   modifier: Modifier = Modifier,
   subtitle: @Composable (() -> Unit)? = null,
   icon: @Composable (() -> Unit)? = null,
-  enabled: Boolean = true,
+  enabled: Boolean = LocalSettingsGroupEnabled.current,
   valueRange: ClosedFloatingPointRange<Float> = 0f..1f,
   steps: Int = 0,
   onValueChangeFinished: (() -> Unit)? = null,

diff --git a/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt b/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt
@@ -10,14 +10,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.unit.Dp
+import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
 import com.alorma.compose.settings.ui.base.internal.SettingsTileScaffold
 
 @Composable
 fun SettingsCheckbox(
   state: Boolean,
   title: @Composable () -> Unit,
   modifier: Modifier = Modifier,
-  enabled: Boolean = true,
+  enabled: Boolean = LocalSettingsGroupEnabled.current,
   icon: @Composable (() -> Unit)? = null,
   subtitle: @Composable (() -> Unit)? = null,
   checkboxColors: CheckboxColors = CheckboxDefaults.colors(),

diff --git a/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsGroup.kt b/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsGroup.kt
@@ -10,13 +10,16 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
 
 @Composable
 fun SettingsGroup(
   modifier: Modifier = Modifier,
+  enabled: Boolean = true,
   contentPadding: PaddingValues = PaddingValues(0.dp),
   title: @Composable (() -> Unit)? = null,
   content: @Composable ColumnScope.() -> Unit,
@@ -31,7 +34,9 @@ fun SettingsGroup(
       if (title != null) {
         SettingsGroupTitle(title)
       }
-      content()
+      CompositionLocalProvider(LocalSettingsGroupEnabled provides enabled) {
+        content()
+      }
     }
   }
 }

diff --git a/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsMenuLink.kt b/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsMenuLink.kt
@@ -6,13 +6,14 @@ import androidx.compose.material3.ListItemDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
+import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
 import com.alorma.compose.settings.ui.base.internal.SettingsTileScaffold
 
 @Composable
 fun SettingsMenuLink(
   title: @Composable () -> Unit,
   modifier: Modifier = Modifier,
-  enabled: Boolean = true,
+  enabled: Boolean = LocalSettingsGroupEnabled.current,
   icon: (@Composable () -> Unit)? = null,
   subtitle: (@Composable () -> Unit)? = null,
   action: (@Composable () -> Unit)? = null,

diff --git a/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsRadioButton.kt b/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsRadioButton.kt
@@ -10,14 +10,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.unit.Dp
+import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
 import com.alorma.compose.settings.ui.base.internal.SettingsTileScaffold
 
 @Composable
 fun SettingsRadioButton(
   state: Boolean,
   title: @Composable () -> Unit,
   modifier: Modifier = Modifier,
-  enabled: Boolean = true,
+  enabled: Boolean = LocalSettingsGroupEnabled.current,
   icon: @Composable (() -> Unit)? = null,
   subtitle: @Composable (() -> Unit)? = null,
   checkboxColors: RadioButtonColors = RadioButtonDefaults.colors(),

diff --git a/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSwitch.kt b/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSwitch.kt
@@ -10,14 +10,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.unit.Dp
+import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
 import com.alorma.compose.settings.ui.base.internal.SettingsTileScaffold
 
 @Composable
 fun SettingsSwitch(
   state: Boolean,
   title: @Composable () -> Unit,
   modifier: Modifier = Modifier,
-  enabled: Boolean = true,
+  enabled: Boolean = LocalSettingsGroupEnabled.current,
   icon: @Composable (() -> Unit)? = null,
   subtitle: @Composable (() -> Unit)? = null,
   switchColors: SwitchColors = SwitchDefaults.colors(),

diff --git a/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsTriStateCheckbox.kt b/ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsTriStateCheckbox.kt
@@ -15,14 +15,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.state.ToggleableState
 import androidx.compose.ui.unit.Dp
+import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
 import com.alorma.compose.settings.ui.base.internal.SettingsTileScaffold
 
 @Composable
 fun SettingsTriStateCheckbox(
   state: Boolean?,
   title: @Composable () -> Unit,
   modifier: Modifier = Modifier,
-  enabled: Boolean = true,
+  enabled: Boolean = LocalSettingsGroupEnabled.current,
   icon: @Composable (() -> Unit)? = null,
   subtitle: @Composable (() -> Unit)? = null,
   checkboxColors: CheckboxColors = CheckboxDefaults.colors(),