diff --git a/app/src/main/java/com/fankes/coloros/notify/data/ConfigData.kt b/app/src/main/java/com/fankes/coloros/notify/data/ConfigData.kt index b91a2a6..805b1f8 100644 --- a/app/src/main/java/com/fankes/coloros/notify/data/ConfigData.kt +++ b/app/src/main/java/com/fankes/coloros/notify/data/ConfigData.kt @@ -27,7 +27,7 @@ package com.fankes.coloros.notify.data import android.content.Context import com.fankes.coloros.notify.const.IconRuleSourceSyncType import com.fankes.coloros.notify.utils.factory.isUpperOfAndroidS -import com.highcapable.yukihookapi.hook.factory.modulePrefs +import com.highcapable.yukihookapi.hook.factory.prefs import com.highcapable.yukihookapi.hook.log.loggerW import com.highcapable.yukihookapi.hook.param.PackageParam import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData @@ -118,7 +118,7 @@ object ConfigData { * @return [String] */ private fun getString(data: PrefsData) = when (instance) { - is Context -> (instance as Context).modulePrefs.get(data) + is Context -> (instance as Context).prefs().get(data) is PackageParam -> (instance as PackageParam).prefs.get(data) else -> error("Unknown type for get prefs data") } @@ -130,7 +130,7 @@ object ConfigData { */ private fun putString(data: PrefsData, value: String) { when (instance) { - is Context -> (instance as Context).modulePrefs.put(data, value) + is Context -> (instance as Context).prefs().edit { put(data, value) } is PackageParam -> loggerW(msg = "Not support for this method") else -> error("Unknown type for put prefs data") } @@ -142,7 +142,7 @@ object ConfigData { * @return [Int] */ internal fun getInt(data: PrefsData) = when (instance) { - is Context -> (instance as Context).modulePrefs.get(data) + is Context -> (instance as Context).prefs().get(data) is PackageParam -> (instance as PackageParam).prefs.get(data) else -> error("Unknown type for get prefs data") } @@ -154,7 +154,7 @@ object ConfigData { */ internal fun putInt(data: PrefsData, value: Int) { when (instance) { - is Context -> (instance as Context).modulePrefs.put(data, value) + is Context -> (instance as Context).prefs().edit { put(data, value) } is PackageParam -> loggerW(msg = "Not support for this method") else -> error("Unknown type for put prefs data") } @@ -166,7 +166,7 @@ object ConfigData { * @return [Boolean] */ internal fun getBoolean(data: PrefsData) = when (instance) { - is Context -> (instance as Context).modulePrefs.get(data) + is Context -> (instance as Context).prefs().get(data) is PackageParam -> (instance as PackageParam).prefs.get(data) else -> error("Unknown type for get prefs data") } @@ -178,7 +178,7 @@ object ConfigData { */ internal fun putBoolean(data: PrefsData, value: Boolean) { when (instance) { - is Context -> (instance as Context).modulePrefs.put(data, value) + is Context -> (instance as Context).prefs().edit { put(data, value) } is PackageParam -> loggerW(msg = "Not support for this method") else -> error("Unknown type for put prefs data") } diff --git a/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt b/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt index b76b233..420ddad 100644 --- a/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt +++ b/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt @@ -29,7 +29,7 @@ import android.graphics.Color import com.fankes.coloros.notify.bean.IconDataBean import com.fankes.coloros.notify.data.ConfigData import com.fankes.coloros.notify.utils.factory.* -import com.highcapable.yukihookapi.hook.factory.modulePrefs +import com.highcapable.yukihookapi.hook.factory.prefs import com.highcapable.yukihookapi.hook.param.PackageParam import org.json.JSONArray import org.json.JSONObject @@ -47,7 +47,7 @@ class IconPackParams(private val context: Context? = null, private val param: Pa * 已存储的 JSON 数据 * @return [String] */ - internal val storageDataJson get() = (context?.modulePrefs ?: param?.prefs)?.direct()?.get(ConfigData.NOTIFY_ICONS_DATA) + internal val storageDataJson get() = (context?.prefs() ?: param?.prefs)?.direct()?.get(ConfigData.NOTIFY_ICONS_DATA) /** * 获取图标数据 @@ -134,5 +134,5 @@ class IconPackParams(private val context: Context? = null, private val param: Pa * 保存图标数据 * @param dataJson 图标数据 JSON */ - fun save(dataJson: String) = context?.modulePrefs?.put(ConfigData.NOTIFY_ICONS_DATA, dataJson) + fun save(dataJson: String) = context?.prefs()?.edit { put(ConfigData.NOTIFY_ICONS_DATA, dataJson) } } diff --git a/app/src/main/java/com/fankes/coloros/notify/param/factory/DataFactory.kt b/app/src/main/java/com/fankes/coloros/notify/param/factory/DataFactory.kt index aed4660..0411052 100644 --- a/app/src/main/java/com/fankes/coloros/notify/param/factory/DataFactory.kt +++ b/app/src/main/java/com/fankes/coloros/notify/param/factory/DataFactory.kt @@ -25,7 +25,7 @@ package com.fankes.coloros.notify.param.factory import android.content.Context import com.fankes.coloros.notify.bean.IconDataBean -import com.highcapable.yukihookapi.hook.factory.modulePrefs +import com.highcapable.yukihookapi.hook.factory.prefs import com.highcapable.yukihookapi.hook.param.PackageParam /** @@ -38,14 +38,14 @@ fun PackageParam.isAppNotifyHookOf(bean: IconDataBean) = prefs.getBoolean(bean.t * 获取此 APP 的通知图标是否被 Hook * @param bean 图标 bean */ -fun Context.isAppNotifyHookOf(bean: IconDataBean) = modulePrefs.getBoolean(bean.toEnabledName(), bean.isEnabled) +fun Context.isAppNotifyHookOf(bean: IconDataBean) = prefs().getBoolean(bean.toEnabledName(), bean.isEnabled) /** * 设置 Hook 此 APP 的通知图标 * @param bean 图标 bean * @param isHook 是否 Hook */ -fun Context.putAppNotifyHookOf(bean: IconDataBean, isHook: Boolean) = modulePrefs.putBoolean(bean.toEnabledName(), isHook) +fun Context.putAppNotifyHookOf(bean: IconDataBean, isHook: Boolean) = prefs().edit { putBoolean(bean.toEnabledName(), isHook) } /** * 获取此 APP 的通知图标是否被全部 Hook @@ -57,11 +57,11 @@ fun PackageParam.isAppNotifyHookAllOf(bean: IconDataBean) = prefs.getBoolean(bea * 获取此 APP 的通知图标是否被全部 Hook * @param bean 图标 bean */ -fun Context.isAppNotifyHookAllOf(bean: IconDataBean) = modulePrefs.getBoolean(bean.toEnabledAllName(), bean.isEnabledAll) +fun Context.isAppNotifyHookAllOf(bean: IconDataBean) = prefs().getBoolean(bean.toEnabledAllName(), bean.isEnabledAll) /** * 设置全部 Hook 此 APP 的通知图标 * @param bean 图标 bean * @param isHook 是否 Hook */ -fun Context.putAppNotifyHookAllOf(bean: IconDataBean, isHook: Boolean) = modulePrefs.putBoolean(bean.toEnabledAllName(), isHook) \ No newline at end of file +fun Context.putAppNotifyHookAllOf(bean: IconDataBean, isHook: Boolean) = prefs().edit { putBoolean(bean.toEnabledAllName(), isHook) } \ No newline at end of file diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/I18nWarnTool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/I18nWarnTool.kt index 8fa6b6c..b319051 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/I18nWarnTool.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/I18nWarnTool.kt @@ -24,7 +24,7 @@ package com.fankes.coloros.notify.utils.tool import android.content.Context import com.fankes.coloros.notify.utils.factory.showDialog -import com.highcapable.yukihookapi.hook.factory.modulePrefs +import com.highcapable.yukihookapi.hook.factory.prefs import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData import java.util.* @@ -41,8 +41,8 @@ object I18nWarnTool { * @param context 实例 */ fun checkingOrShowing(context: Context) { - fun saveReaded() = context.modulePrefs.put(LOCALE_WARN_READED, value = true) - if (Locale.getDefault().language.startsWith("zh").not() && context.modulePrefs.get(LOCALE_WARN_READED).not()) + fun saveReaded() = context.prefs().edit { put(LOCALE_WARN_READED, value = true) } + if (Locale.getDefault().language.startsWith("zh").not() && context.prefs().get(LOCALE_WARN_READED).not()) context.showDialog { title = "Notice of I18n Support" msg = "This Xposed Module is only for Chinese and the Chinese region.\n\n" + diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/YukiPromoteTool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/YukiPromoteTool.kt index 6e2101c..06e9f60 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/YukiPromoteTool.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/YukiPromoteTool.kt @@ -27,7 +27,7 @@ import com.fankes.coloros.notify.BuildConfig import com.fankes.coloros.notify.utils.factory.openBrowser import com.fankes.coloros.notify.utils.factory.showDialog import com.highcapable.yukihookapi.YukiHookAPI -import com.highcapable.yukihookapi.hook.factory.modulePrefs +import com.highcapable.yukihookapi.hook.factory.prefs import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData /** @@ -43,8 +43,8 @@ object YukiPromoteTool { * @param context 实例 */ fun promote(context: Context) { - fun saveReaded() = context.modulePrefs.put(YUKI_PROMOTE_READED, value = true) - if (context.modulePrefs.get(YUKI_PROMOTE_READED).not()) + fun saveReaded() = context.prefs().edit { put(YUKI_PROMOTE_READED, value = true) } + if (context.prefs().get(YUKI_PROMOTE_READED).not()) context.showDialog { title = "面向开发者的推广" msg = "你想快速拥有一个自己的 Xposed 模块吗，你只需要拥有基础的 Android 开发经验以及使用 Kotlin 编程语言即可。\n\n" +