添加搜索仓库和搜索用户排序功能

Author: fmtcias

app/src/main/java/com/fmt/github/data/storage/Preference.kt

@@ -9,7 +9,8 @@ import kotlin.reflect.KProperty
 /**
  * 基于属性代理封装SharedPreferences
  */
-class Preference<T>(private val key: String, private val defaultValue: T) : ReadWriteProperty<Any, T> {
+class Preference<T>(private val key: String, private val defaultValue: T) :
+    ReadWriteProperty<Any?, T> {
 
     companion object {
         private const val SHARE_PRE_NAME = "open_github"
@@ -26,21 +27,24 @@ class Preference<T>(private val key: String, private val defaultValue: T) : Read
         }
     }
 
-    override fun getValue(thisRef: Any, property: KProperty<*>): T = findPreference(key, defaultValue)
+    override fun getValue(thisRef: Any?, property: KProperty<*>): T =
+        findPreference(key, defaultValue)
 
-    override fun setValue(thisRef: Any, property: KProperty<*>, value: T) = putPreference(key, value)
+    override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) =
+        putPreference(key, value)
 
-    private fun findPreference(key: String, defaultValue: T): T {
-        return when (defaultValue) {
-            is Int -> mPreferences.getInt(key, defaultValue)
-            is Long -> mPreferences.getLong(key, defaultValue)
-            is Boolean -> mPreferences.getBoolean(key, defaultValue)
-            is String -> mPreferences.getString(key, defaultValue)
-            is Float -> mPreferences.getFloat(key, defaultValue)
+    private fun findPreference(key: String, defaultValue: T): T = with(mPreferences) {
+        when (defaultValue) {
+            is Int -> getInt(key, defaultValue)
+            is Long -> getLong(key, defaultValue)
+            is Boolean -> getBoolean(key, defaultValue)
+            is String -> getString(key, defaultValue)
+            is Float -> getFloat(key, defaultValue)
             else -> throw IllegalArgumentException("This type can't be saved into SharedPreferences")
         } as T
     }
 
+
     private fun putPreference(key: String, value: T) {
         with(mPreferences.edit()) {
             when (value) {

app/src/main/java/com/fmt/github/ext/CommonExt.kt

@@ -2,5 +2,5 @@ package com.fmt.github.ext
 
 import com.fmt.github.config.Settings
 
-fun isLogin(): Boolean = !Settings.Account.token.isNullOrBlank()
+fun isLogin(): Boolean = !Settings.Account.token.isBlank()