Merge branch 'develop' into main

jeluchu · Jul 8, 2023 · 23fbbc5 · 23fbbc5
2 parents e2ea272 + 8387880
commit 23fbbc5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 76 deletions.
diff --git a/jchucomponents-core/build.gradle b/jchucomponents-core/build.gradle
@@ -77,7 +77,7 @@ afterEvaluate {
                 from components.release
                 groupId = "com.github.jeluchu"
                 artifactId = "jchucomponents-core"
-                version = "1.7.1"
+                version = "1.7.2"
             }
         }
     }

diff --git a/jchucomponents-ktx/build.gradle b/jchucomponents-ktx/build.gradle
@@ -64,7 +64,7 @@ afterEvaluate {
                 from components.release
                 groupId = "com.github.jeluchu"
                 artifactId = "jchucomponents-ktx"
-                version = "1.7.1"
+                version = "1.7.2"
             }
         }
     }

diff --git a/jchucomponents-prefs/build.gradle b/jchucomponents-prefs/build.gradle
@@ -63,7 +63,7 @@ afterEvaluate {
                 from components.release
                 groupId = "com.github.jeluchu"
                 artifactId = "jchucomponents-prefs"
-                version = "1.7.1"
+                version = "1.7.2"
             }
         }
     }

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
@@ -8,7 +8,13 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.platform.LocalContext
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.doublePreferencesKey
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.floatPreferencesKey
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.longPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.jeluchu.prefs.extensions.empty
@@ -117,6 +123,13 @@ class DataStoreHelpers {
             dataStore = context.defaultPreferencesDataStore
         }
 
+        fun intPrefsKey(name: String) = intPreferencesKey(name)
+        fun floatPrefsKey(name: String) = floatPreferencesKey(name)
+        fun longPrefsKey(name: String) = longPreferencesKey(name)
+        fun doublePrefsKey(name: String) = doublePreferencesKey(name)
+        fun stringPrefsKey(name: String) = stringPreferencesKey(name)
+        fun booleanPrefsKey(name: String) = booleanPreferencesKey(name)
+
         fun <T> DataStore<Preferences>.getValueSync(
             key: Preferences.Key<T>
         ) = runBlocking { data.first() }[key]

diff --git a/jchucomponents-prefs/src/main/kotlin/com/jeluchu/prefs/datastore/DataStoreService.kt b/jchucomponents-prefs/src/main/kotlin/com/jeluchu/prefs/datastore/DataStoreService.kt
diff --git a/jchucomponents-qr/build.gradle b/jchucomponents-qr/build.gradle
@@ -59,7 +59,7 @@ afterEvaluate {
                 from components.release
                 groupId = "com.github.jeluchu"
                 artifactId = "jchucomponents-qr"
-                version = "1.7.1"
+                version = "1.7.2"
             }
         }
     }

diff --git a/jchucomponents-ui/build.gradle b/jchucomponents-ui/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = "com.github.jeluchu"
                 artifactId = "jchucomponents-ui"
-                version = "1.7.1"
+                version = "1.7.2"
             }
         }
     }