Add delete all for DataStore and Include text style for preferences

jeluchu · Aug 20, 2024 · 5632477 · 5632477
1 parent ce0e171
commit 5632477
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/jchucomponents-prefs/src/main/kotlin/com/jeluchu/prefs/datastore/DataStoreHelpers.kt b/jchucomponents-prefs/src/main/kotlin/com/jeluchu/prefs/datastore/DataStoreHelpers.kt
@@ -114,6 +114,10 @@ class DataStoreHelpers {
         dataStore?.data?.first()?.toPreferences()?.get(key) ?: default
     }
 
+    fun clearAllPreferences() = runBlocking {
+        dataStore?.edit { preferences -> preferences.clear() }
+    }
+
     companion object {
         var dataStore: DataStore<Preferences>? = null
         val Context.defaultPreferencesDataStore by preferencesDataStore(name = "default")

diff --git a/...i/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/preferences/PreferenceItem.kt b/...i/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/preferences/PreferenceItem.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.jeluchu.jchucomponents.ktx.colors.opacity
@@ -35,6 +36,8 @@ fun PreferenceItem(
     onLongClickLabel: String? = null,
     onLongClick: (() -> Unit)? = null,
     onClickLabel: String? = null,
+    titleStyle: TextStyle = MaterialTheme.typography.titleLarge,
+    descriptionStyle: TextStyle = MaterialTheme.typography.bodyMedium,
     onClick: () -> Unit = {},
 ) = Surface(
     modifier = Modifier.combinedClickable(
@@ -95,13 +98,15 @@ fun PreferenceItem(
             PreferenceItemTitle(
                 text = title,
                 enabled = enabled,
+                style = titleStyle,
                 color = contentColor
             )
 
             if (description != null) PreferenceItemDescription(
                 enabled = enabled,
                 text = description,
-                color = contentColor
+                color = contentColor,
+                style = descriptionStyle
             )
         }
     }

diff --git a/...src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/preferences/PreferenceSwitch.kt b/...src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/preferences/PreferenceSwitch.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.jeluchu.jchucomponents.ktx.colors.opacity
@@ -36,6 +37,8 @@ fun PreferenceSwitch(
     contentColor: Color = Color.DarkGray,
     colors: SwitchColors = SwitchDefaults.colors(),
     checkedIcon: ImageVector = Icons.Outlined.Check,
+    titleStyle: TextStyle = MaterialTheme.typography.titleLarge,
+    descriptionStyle: TextStyle = MaterialTheme.typography.bodyMedium,
     onClick: (() -> Unit) = {},
 ) {
     val thumbContent: (@Composable () -> Unit)? = if (isChecked) {
@@ -80,12 +83,14 @@ fun PreferenceSwitch(
                 PreferenceItemTitle(
                     text = title,
                     enabled = enabled,
+                    style = titleStyle,
                     color = contentColor
                 )
                 if (!description.isNullOrEmpty()) PreferenceItemDescription(
                     enabled = enabled,
                     text = description,
-                    color = contentColor
+                    color = contentColor,
+                    style = descriptionStyle
                 )
             }
             Switch(