SharedPreferenceProvider: Allow empty key name (Get key name from property name)

Signed-off-by: Fung <fython@163.com>

Author: fython

demo/src/main/kotlin/moe/feng/kotlinyan/TestSettings.kt

@@ -5,10 +5,10 @@ import moe.feng.kotlinyan.common.SharedPreferencesProvider
 
 class TestSettings private constructor(context: Context): SharedPreferencesProvider(context, "TestSettings") {
 
-	var a by stringValue("a", "Test")
-	var b by intValue("b", 888)
-	var c by booleanValue("c", true)
-	var d by floatValue("d", .666F)
-	var e by longValue("e", 666L)
+	var a by stringValue(defValue = "Test")
+	var b by intValue(defValue = 888)
+	var c by booleanValue(defValue = true)
+	var d by floatValue(defValue = .666F)
+	var e by longValue(defValue = 666L)
 
 }

gradle.properties

@@ -1,6 +1,6 @@
 BUILD_TOOLS_VERSION=26.0.1
 org.gradle.jvmargs=-Xmx1536m
-VERSION_NAME=0.2.2
+VERSION_NAME=0.2.2.1
 TARGET_SDK_VERSION=26
-VERSION_CODE=8
+VERSION_CODE=9
 MIN_SDK_VERSION=19

kotlinyan-common/src/main/kotlin/moe/feng/kotlinyan/common/SharedPreferencesExtensions.kt

@@ -31,75 +31,75 @@ interface ISharedPreferencesProvider: ContextExtensions {
 
 	val sharedPref: SharedPreferences
 
-	fun stringValue(key: String, defValue: String? = null) = StringSharedPreferenceGetter(key, defValue)
-	fun intValue(key: String, defValue: Int = 0) = IntSharedPreferenceGetter(key, defValue)
-	fun booleanValue(key: String, defValue: Boolean = false) = BooleanSharedPreferenceGetter(key, defValue)
-	fun longValue(key: String, defValue: Long = 0) = LongSharedPreferenceGetter(key, defValue)
-	fun floatValue(key: String, defValue: Float = 0F) = FloatSharedPreferenceGetter(key, defValue)
+	fun stringValue(key: String? = null, defValue: String? = null) = StringSharedPreferenceGetter(key, defValue)
+	fun intValue(key: String? = null, defValue: Int = 0) = IntSharedPreferenceGetter(key, defValue)
+	fun booleanValue(key: String? = null, defValue: Boolean = false) = BooleanSharedPreferenceGetter(key, defValue)
+	fun longValue(key: String? = null, defValue: Long = 0) = LongSharedPreferenceGetter(key, defValue)
+	fun floatValue(key: String? = null, defValue: Float = 0F) = FloatSharedPreferenceGetter(key, defValue)
 
 }
 
-class StringSharedPreferenceGetter internal constructor(private val key: String,
+class StringSharedPreferenceGetter internal constructor(private val key: String? = null,
                                                         private val defValue: String? = null)
 	: ReadWriteProperty<ISharedPreferencesProvider, String?>, AndroidExtensions {
 
 	override fun getValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>): String?
-			= thisRef.sharedPref[key].asString(defValue)
+			= thisRef.sharedPref[key ?: property.name].asString(defValue)
 
 	override fun setValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>, value: String?) {
-		thisRef.sharedPref[key] = value
+		thisRef.sharedPref[key ?: property.name] = value
 	}
 
 }
 
-class IntSharedPreferenceGetter internal constructor(private val key: String,
+class IntSharedPreferenceGetter internal constructor(private val key: String? = null,
                                                      private val defValue: Int = 0)
 	: ReadWriteProperty<ISharedPreferencesProvider, Int>, AndroidExtensions {
 
 	override fun getValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>): Int
-			= thisRef.sharedPref[key].asInt(defValue)
+			= thisRef.sharedPref[key ?: property.name].asInt(defValue)
 
 	override fun setValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>, value: Int) {
-		thisRef.sharedPref[key] = value
+		thisRef.sharedPref[key ?: property.name] = value
 	}
 
 }
 
-class BooleanSharedPreferenceGetter internal constructor(private val key: String,
+class BooleanSharedPreferenceGetter internal constructor(private val key: String? = null,
                                                      private val defValue: Boolean = false)
 	: ReadWriteProperty<ISharedPreferencesProvider, Boolean>, AndroidExtensions {
 
 	override fun getValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>): Boolean
-			= thisRef.sharedPref[key].asBoolean(defValue)
+			= thisRef.sharedPref[key ?: property.name].asBoolean(defValue)
 
 	override fun setValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>, value: Boolean) {
-		thisRef.sharedPref[key] = value
+		thisRef.sharedPref[key ?: property.name] = value
 	}
 
 }
 
-class LongSharedPreferenceGetter internal constructor(private val key: String,
+class LongSharedPreferenceGetter internal constructor(private val key: String? = null,
                                                          private val defValue: Long = 0)
 	: ReadWriteProperty<ISharedPreferencesProvider, Long>, AndroidExtensions {
 
 	override fun getValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>): Long
-			= thisRef.sharedPref[key].asLong(defValue)
+			= thisRef.sharedPref[key ?: property.name].asLong(defValue)
 
 	override fun setValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>, value: Long) {
-		thisRef.sharedPref[key] = value
+		thisRef.sharedPref[key ?: property.name] = value
 	}
 
 }
 
-class FloatSharedPreferenceGetter internal constructor(private val key: String,
+class FloatSharedPreferenceGetter internal constructor(private val key: String? = null,
                                                        private val defValue: Float = 0F)
 	: ReadWriteProperty<ISharedPreferencesProvider, Float>, AndroidExtensions {
 
 	override fun getValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>): Float
-			= thisRef.sharedPref[key].asFloat(defValue)
+			= thisRef.sharedPref[key ?: property.name].asFloat(defValue)
 
 	override fun setValue(thisRef: ISharedPreferencesProvider, property: KProperty<*>, value: Float) {
-		thisRef.sharedPref[key] = value
+		thisRef.sharedPref[key ?: property.name] = value
 	}
 
 }