mirror of
https://github.com/fromchat-messenger/app.git
synced 2026-09-23 03:25:06 +03:00
Remove duplicate AsyncSettings implementation, clean up
This commit is contained in:
@@ -720,6 +720,7 @@ val ActivityInfo.launchIntent get() = Intent().apply {
|
||||
flags = FLAG_ACTIVITY_NEW_TASK
|
||||
}
|
||||
|
||||
@SuppressLint("QueryPermissionsNeeded")
|
||||
@RequiresPermission(Manifest.permission.QUERY_ALL_PACKAGES)
|
||||
fun ActivityInfo.isLauncher(context: Context): Boolean {
|
||||
with (context) {
|
||||
|
||||
+11
@@ -93,4 +93,15 @@ class AndroidSettings(): Settings {
|
||||
preferences.remove(stringSetPreferencesKey(key))
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun contains(key: String): Boolean {
|
||||
return dataStore.data.map { preferences ->
|
||||
preferences.contains(stringPreferencesKey(key)) ||
|
||||
preferences.contains(intPreferencesKey(key)) ||
|
||||
preferences.contains(longPreferencesKey(key)) ||
|
||||
preferences.contains(floatPreferencesKey(key)) ||
|
||||
preferences.contains(booleanPreferencesKey(key)) ||
|
||||
preferences.contains(stringSetPreferencesKey(key))
|
||||
}.first()
|
||||
}
|
||||
}
|
||||
-128
@@ -1,128 +0,0 @@
|
||||
package com.pr0gramm3r101.utils.settings
|
||||
|
||||
import androidx.datastore.core.DataStore
|
||||
import androidx.datastore.preferences.core.Preferences
|
||||
import androidx.datastore.preferences.core.booleanPreferencesKey
|
||||
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.core.stringSetPreferencesKey
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.flow.map
|
||||
|
||||
class AndroidAsyncSettings : AsyncSettings {
|
||||
private val dataStore: DataStore<Preferences>
|
||||
get() = DataStoreSingleton.dataStore
|
||||
|
||||
override suspend fun putString(key: String, value: String) {
|
||||
dataStore.edit { preferences ->
|
||||
preferences[stringPreferencesKey(key)] = value
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getString(key: String, default: String): String {
|
||||
return dataStore.data.map { preferences ->
|
||||
preferences[stringPreferencesKey(key)] ?: default
|
||||
}.first()
|
||||
}
|
||||
|
||||
override suspend fun putInt(key: String, value: Int) {
|
||||
dataStore.edit { preferences ->
|
||||
preferences[intPreferencesKey(key)] = value
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getInt(key: String, default: Int): Int {
|
||||
return dataStore.data.map { preferences ->
|
||||
preferences[intPreferencesKey(key)] ?: default
|
||||
}.first()
|
||||
}
|
||||
|
||||
override suspend fun putLong(key: String, value: Long) {
|
||||
dataStore.edit { preferences ->
|
||||
preferences[longPreferencesKey(key)] = value
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getLong(key: String, default: Long): Long {
|
||||
return dataStore.data.map { preferences ->
|
||||
preferences[longPreferencesKey(key)] ?: default
|
||||
}.first()
|
||||
}
|
||||
|
||||
override suspend fun putFloat(key: String, value: Float) {
|
||||
dataStore.edit { preferences ->
|
||||
preferences[floatPreferencesKey(key)] = value
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getFloat(key: String, default: Float): Float {
|
||||
return dataStore.data.map { preferences ->
|
||||
preferences[floatPreferencesKey(key)] ?: default
|
||||
}.first()
|
||||
}
|
||||
|
||||
override suspend fun putBoolean(key: String, value: Boolean) {
|
||||
dataStore.edit { preferences ->
|
||||
preferences[booleanPreferencesKey(key)] = value
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getBoolean(key: String, default: Boolean): Boolean {
|
||||
return dataStore.data.map { preferences ->
|
||||
preferences[booleanPreferencesKey(key)] ?: default
|
||||
}.first()
|
||||
}
|
||||
|
||||
override suspend fun putStringSet(key: String, value: Set<String>) {
|
||||
dataStore.edit { preferences ->
|
||||
preferences[stringSetPreferencesKey(key)] = value
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getStringSet(key: String, default: Set<String>): Set<String> {
|
||||
return dataStore.data.map { preferences ->
|
||||
preferences[stringSetPreferencesKey(key)] ?: default
|
||||
}.first()
|
||||
}
|
||||
|
||||
override suspend fun putStringList(key: String, value: List<String>) {
|
||||
putStringSet(key, value.toSet())
|
||||
}
|
||||
|
||||
override suspend fun getStringList(key: String, default: List<String>): List<String> {
|
||||
return getStringSet(key, default.toSet()).toList()
|
||||
}
|
||||
|
||||
override suspend fun remove(key: String) {
|
||||
dataStore.edit { preferences ->
|
||||
preferences.remove(stringPreferencesKey(key))
|
||||
preferences.remove(intPreferencesKey(key))
|
||||
preferences.remove(longPreferencesKey(key))
|
||||
preferences.remove(floatPreferencesKey(key))
|
||||
preferences.remove(booleanPreferencesKey(key))
|
||||
preferences.remove(stringSetPreferencesKey(key))
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun contains(key: String): Boolean {
|
||||
return dataStore.data.map { preferences ->
|
||||
preferences.contains(stringPreferencesKey(key)) ||
|
||||
preferences.contains(intPreferencesKey(key)) ||
|
||||
preferences.contains(longPreferencesKey(key)) ||
|
||||
preferences.contains(floatPreferencesKey(key)) ||
|
||||
preferences.contains(booleanPreferencesKey(key)) ||
|
||||
preferences.contains(stringSetPreferencesKey(key))
|
||||
}.first()
|
||||
}
|
||||
|
||||
override suspend fun clear() {
|
||||
dataStore.edit { preferences ->
|
||||
preferences.clear()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
actual val asyncSettings: AsyncSettings = AndroidAsyncSettings()
|
||||
+3
-1
@@ -1,3 +1,5 @@
|
||||
package com.pr0gramm3r101.utils.settings
|
||||
|
||||
actual val settings: Settings get() = AndroidSettings()
|
||||
actual val settings: Settings get() = AndroidSettings()
|
||||
actual val secureSettings: Settings
|
||||
get() = TODO("Not yet implemented")
|
||||
Reference in New Issue
Block a user