aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2020-02-17 23:38:10 -0800
committerAllan Wang <me@allanwang.ca>2020-02-17 23:38:10 -0800
commit388af789948cc7409589e5853dea0b3f14ea239b (patch)
treebec26aa4636416d42d4c206e1de7400f116ec215 /core
parentcfac5f0db6527aace725de14f07b19ba85b5e07e (diff)
downloadkau-388af789948cc7409589e5853dea0b3f14ea239b.tar.gz
kau-388af789948cc7409589e5853dea0b3f14ea239b.tar.bz2
kau-388af789948cc7409589e5853dea0b3f14ea239b.zip
Create new kpref model
Diffstat (limited to 'core')
-rw-r--r--core/src/main/kotlin/ca/allanwang/kau/kpref/KPref.kt35
-rw-r--r--core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefBuilder.kt132
-rw-r--r--core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt12
-rw-r--r--core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt22
-rw-r--r--core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefSingleDelegate.kt14
5 files changed, 161 insertions, 54 deletions
diff --git a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPref.kt b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPref.kt
index fc7a76a..2f8a6aa 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPref.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPref.kt
@@ -15,10 +15,7 @@
*/
package ca.allanwang.kau.kpref
-import android.content.Context
-import android.content.SharedPreferences
import ca.allanwang.kau.kotlin.ILazyResettable
-import ca.allanwang.kau.logging.KL
/**
* Created by Allan Wang on 2017-06-07.
@@ -32,30 +29,16 @@ import ca.allanwang.kau.logging.KL
* Furthermore, all kprefs are held in the [prefMap],
* so if you wish to reset a preference, you must also invalidate the kpref
* from that map
- *
- * You may optionally override [deleteKeys]. This will be called on initialization
- * And delete all keys returned from that method
*/
-open class KPref(builder: KPrefBuilder = KPrefBuilderAndroid) : KPrefBuilder by builder {
-
- lateinit var PREFERENCE_NAME: String
- lateinit var sp: SharedPreferences
+open class KPref private constructor(
+ val preferenceName: String,
+ val builder: KPrefBuilder
+) : KPrefBuilder by builder {
- fun initialize(
- c: Context,
- preferenceName: String,
- sharedPrefs: SharedPreferences = c.applicationContext.getSharedPreferences(preferenceName, Context.MODE_PRIVATE)
- ) {
- PREFERENCE_NAME = preferenceName
- sp = sharedPrefs
- KL.d { "Shared Preference $preferenceName has been initialized" }
- val toDelete = deleteKeys()
- if (toDelete.isNotEmpty()) {
- val edit = sp.edit()
- toDelete.forEach { edit.remove(it) }
- edit.apply()
- }
- }
+ constructor(preferenceName: String, factory: KPrefFactory) : this(
+ preferenceName,
+ factory.createBuilder(preferenceName)
+ )
internal val prefMap: MutableMap<String, ILazyResettable<*>> = mutableMapOf()
@@ -64,6 +47,4 @@ open class KPref(builder: KPrefBuilder = KPrefBuilderAndroid) : KPrefBuilder by
}
operator fun get(key: String): ILazyResettable<*>? = prefMap[key]
-
- open fun deleteKeys(): Array<String> = arrayOf()
}
diff --git a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefBuilder.kt b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefBuilder.kt
index 8f6d0c5..b8fb8ea 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefBuilder.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefBuilder.kt
@@ -15,22 +15,44 @@
*/
package ca.allanwang.kau.kpref
+import android.content.SharedPreferences
+
interface KPrefBuilder {
- fun KPref.kpref(key: String, fallback: Boolean, postSetter: (value: Boolean) -> Unit = {}): KPrefDelegate<Boolean>
+ fun KPref.kpref(
+ key: String,
+ fallback: Boolean,
+ postSetter: (value: Boolean) -> Unit = {}
+ ): KPrefDelegate<Boolean>
- fun KPref.kpref(key: String, fallback: Float, postSetter: (value: Float) -> Unit = {}): KPrefDelegate<Float>
+ fun KPref.kpref(
+ key: String,
+ fallback: Float,
+ postSetter: (value: Float) -> Unit = {}
+ ): KPrefDelegate<Float>
@Deprecated(
"Double is not supported in SharedPreferences; cast to float yourself",
ReplaceWith("kpref(key, fallback.toFloat(), postSetter)"),
DeprecationLevel.WARNING
)
- fun KPref.kpref(key: String, fallback: Double, postSetter: (value: Float) -> Unit = {}): KPrefDelegate<Float> =
+ fun KPref.kpref(
+ key: String,
+ fallback: Double,
+ postSetter: (value: Float) -> Unit = {}
+ ): KPrefDelegate<Float> =
kpref(key, fallback.toFloat(), postSetter)
- fun KPref.kpref(key: String, fallback: Int, postSetter: (value: Int) -> Unit = {}): KPrefDelegate<Int>
+ fun KPref.kpref(
+ key: String,
+ fallback: Int,
+ postSetter: (value: Int) -> Unit = {}
+ ): KPrefDelegate<Int>
- fun KPref.kpref(key: String, fallback: Long, postSetter: (value: Long) -> Unit = {}): KPrefDelegate<Long>
+ fun KPref.kpref(
+ key: String,
+ fallback: Long,
+ postSetter: (value: Long) -> Unit = {}
+ ): KPrefDelegate<Long>
fun KPref.kpref(
key: String,
@@ -38,32 +60,97 @@ interface KPrefBuilder {
postSetter: (value: Set<String>) -> Unit = {}
): KPrefDelegate<Set<String>>
- fun KPref.kpref(key: String, fallback: String, postSetter: (value: String) -> Unit = {}): KPrefDelegate<String>
+ fun KPref.kpref(
+ key: String,
+ fallback: String,
+ postSetter: (value: String) -> Unit = {}
+ ): KPrefDelegate<String>
fun KPref.kprefSingle(key: String): KPrefSingleDelegate
+
+ /**
+ * Remove keys from pref so they revert to the default
+ */
+ fun KPref.deleteKeys(keys: Array<String>)
}
-object KPrefBuilderAndroid : KPrefBuilder {
+class KPrefBuilderAndroid(val sp: SharedPreferences) : KPrefBuilder {
override fun KPref.kpref(key: String, fallback: Boolean, postSetter: (value: Boolean) -> Unit) =
- KPrefDelegateAndroid(key, fallback, this, KPrefBooleanTransaction, postSetter)
+ KPrefDelegateAndroid(
+ key,
+ fallback,
+ this,
+ this@KPrefBuilderAndroid,
+ KPrefBooleanTransaction,
+ postSetter
+ )
override fun KPref.kpref(key: String, fallback: Float, postSetter: (value: Float) -> Unit) =
- KPrefDelegateAndroid(key, fallback, this, KPrefFloatTransaction, postSetter)
+ KPrefDelegateAndroid(
+ key,
+ fallback,
+ this,
+ this@KPrefBuilderAndroid,
+ KPrefFloatTransaction,
+ postSetter
+ )
override fun KPref.kpref(key: String, fallback: Int, postSetter: (value: Int) -> Unit) =
- KPrefDelegateAndroid(key, fallback, this, KPrefIntTransaction, postSetter)
+ KPrefDelegateAndroid(
+ key,
+ fallback,
+ this,
+ this@KPrefBuilderAndroid,
+ KPrefIntTransaction,
+ postSetter
+ )
override fun KPref.kpref(key: String, fallback: Long, postSetter: (value: Long) -> Unit) =
- KPrefDelegateAndroid(key, fallback, this, KPrefLongTransaction, postSetter)
-
- override fun KPref.kpref(key: String, fallback: Set<String>, postSetter: (value: Set<String>) -> Unit) =
- KPrefDelegateAndroid(key, fallback, this, KPrefSetTransaction, postSetter)
+ KPrefDelegateAndroid(
+ key,
+ fallback,
+ this,
+ this@KPrefBuilderAndroid,
+ KPrefLongTransaction,
+ postSetter
+ )
+
+ override fun KPref.kpref(
+ key: String,
+ fallback: Set<String>,
+ postSetter: (value: Set<String>) -> Unit
+ ) =
+ KPrefDelegateAndroid(
+ key,
+ fallback,
+ this,
+ this@KPrefBuilderAndroid,
+ KPrefSetTransaction,
+ postSetter
+ )
override fun KPref.kpref(key: String, fallback: String, postSetter: (value: String) -> Unit) =
- KPrefDelegateAndroid(key, fallback, this, KPrefStringTransaction, postSetter)
-
- override fun KPref.kprefSingle(key: String) = KPrefSingleDelegateAndroid(key, this)
+ KPrefDelegateAndroid(
+ key,
+ fallback,
+ this,
+ this@KPrefBuilderAndroid,
+ KPrefStringTransaction,
+ postSetter
+ )
+
+ override fun KPref.kprefSingle(key: String) =
+ KPrefSingleDelegateAndroid(key, this, this@KPrefBuilderAndroid)
+
+ override fun KPref.deleteKeys(keys: Array<String>) {
+ // Remove pref listing
+ sp.edit().apply {
+ keys.forEach { remove(it) }
+ }.apply()
+ // Clear cached values
+ keys.forEach { prefMap[it]?.invalidate() }
+ }
}
object KPrefBuilderInMemory : KPrefBuilder {
@@ -80,11 +167,20 @@ object KPrefBuilderInMemory : KPrefBuilder {
override fun KPref.kpref(key: String, fallback: Long, postSetter: (value: Long) -> Unit) =
KPrefDelegateInMemory(key, fallback, this, postSetter)
- override fun KPref.kpref(key: String, fallback: Set<String>, postSetter: (value: Set<String>) -> Unit) =
+ override fun KPref.kpref(
+ key: String,
+ fallback: Set<String>,
+ postSetter: (value: Set<String>) -> Unit
+ ) =
KPrefDelegateInMemory(key, fallback, this, postSetter)
override fun KPref.kpref(key: String, fallback: String, postSetter: (value: String) -> Unit) =
KPrefDelegateInMemory(key, fallback, this, postSetter)
override fun KPref.kprefSingle(key: String) = KPrefSingleDelegateInMemory(key, this)
+
+ override fun KPref.deleteKeys(keys: Array<String>) {
+ // Clear cached values
+ keys.forEach { prefMap[it]?.invalidate() }
+ }
}
diff --git a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt
index 684b139..d54c54d 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt
@@ -15,6 +15,7 @@
*/
package ca.allanwang.kau.kpref
+import android.content.SharedPreferences
import ca.allanwang.kau.kotlin.ILazyResettable
/**
@@ -35,19 +36,22 @@ class KPrefDelegateAndroid<T> internal constructor(
private val key: String,
private val fallback: T,
private val pref: KPref,
+ private val prefBuilder: KPrefBuilderAndroid,
private val transaction: KPrefTransaction<T>,
private var postSetter: (value: T) -> Unit = {}
) : KPrefDelegate<T> {
private object UNINITIALIZED
+ private val sp: SharedPreferences get() = prefBuilder.sp
+
@Volatile
private var _value: Any? = UNINITIALIZED
private val lock = this
init {
if (pref.prefMap.containsKey(key))
- throw KPrefException("$key is already used elsewhere in preference ${pref.PREFERENCE_NAME}")
+ throw KPrefException("$key is already used elsewhere in preference ${pref.preferenceName}")
pref.prefMap[key] = this@KPrefDelegateAndroid
}
@@ -67,7 +71,7 @@ class KPrefDelegateAndroid<T> internal constructor(
if (_v2 !== UNINITIALIZED) {
_v2 as T
} else {
- _value = transaction.get(pref.sp, key, fallback)
+ _value = transaction.get(sp, key, fallback)
_value as T
}
}
@@ -79,7 +83,7 @@ class KPrefDelegateAndroid<T> internal constructor(
override operator fun setValue(any: Any, property: kotlin.reflect.KProperty<*>, t: T) {
_value = t
- val editor = pref.sp.edit()
+ val editor = sp.edit()
transaction.set(editor, key, t)
editor.apply()
postSetter(t)
@@ -101,7 +105,7 @@ class KPrefDelegateInMemory<T> internal constructor(
init {
if (pref.prefMap.containsKey(key))
- throw KPrefException("$key is already used elsewhere in preference ${pref.PREFERENCE_NAME}")
+ throw KPrefException("$key is already used elsewhere in preference ${pref.preferenceName}")
pref.prefMap[key] = this
}
diff --git a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt
new file mode 100644
index 0000000..0c49b88
--- /dev/null
+++ b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt
@@ -0,0 +1,22 @@
+package ca.allanwang.kau.kpref
+
+import android.content.Context
+
+interface KPrefFactory {
+ fun createBuilder(preferenceName: String): KPrefBuilder
+}
+
+/**
+ * Default factory for Android preferences
+ */
+class KPrefFactoryAndroid(context: Context) : KPrefFactory {
+
+ val context: Context = context.applicationContext
+
+ override fun createBuilder(preferenceName: String): KPrefBuilder =
+ KPrefBuilderAndroid(context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE))
+}
+
+object KPrefFactoryInMemory : KPrefFactory {
+ override fun createBuilder(preferenceName: String): KPrefBuilder = KPrefBuilderInMemory
+} \ No newline at end of file
diff --git a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefSingleDelegate.kt b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefSingleDelegate.kt
index ae1f855..9d03a16 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefSingleDelegate.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefSingleDelegate.kt
@@ -15,6 +15,7 @@
*/
package ca.allanwang.kau.kpref
+import android.content.SharedPreferences
import ca.allanwang.kau.kotlin.ILazyResettable
/**
@@ -29,16 +30,19 @@ interface KPrefSingleDelegate : ILazyResettable<Boolean>
class KPrefSingleDelegateAndroid internal constructor(
private val key: String,
- private val pref: KPref
+ private val pref: KPref,
+ private val prefBuilder: KPrefBuilderAndroid
) : KPrefSingleDelegate {
@Volatile
private var _value: Boolean? = null
private val lock = this
+ private val sp: SharedPreferences get() = prefBuilder.sp
+
init {
if (pref.prefMap.containsKey(key))
- throw KPrefException("$key is already used elsewhere in preference ${pref.PREFERENCE_NAME}")
+ throw KPrefException("$key is already used elsewhere in preference ${pref.preferenceName}")
pref.prefMap[key] = this
}
@@ -57,9 +61,9 @@ class KPrefSingleDelegateAndroid internal constructor(
if (_v2 != null) {
_v2
} else {
- _value = pref.sp.getBoolean(key, true)
+ _value = sp.getBoolean(key, true)
if (_value!!) {
- pref.sp.edit().putBoolean(key, false).apply()
+ sp.edit().putBoolean(key, false).apply()
_value = false
true
} else false
@@ -82,7 +86,7 @@ class KPrefSingleDelegateInMemory internal constructor(
init {
if (pref.prefMap.containsKey(key))
- throw KPrefException("$key is already used elsewhere in preference ${pref.PREFERENCE_NAME}")
+ throw KPrefException("$key is already used elsewhere in preference ${pref.preferenceName}")
pref.prefMap[key] = this
}