Skip to content

Commit 175263c

Browse files
fankesfankes
committed
Modify merge to YukiHookAPI new usage
1 parent f95fe45 commit 175263c

5 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎app/src/main/java/com/fankes/miui/notify/data/ConfigData.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ package com.fankes.miui.notify.data
2626

2727
import android.content.Context
2828
import com.fankes.miui.notify.const.IconRuleSourceSyncType
29-
import com.highcapable.yukihookapi.hook.factory.modulePrefs
29+
import com.highcapable.yukihookapi.hook.factory.prefs
3030
import com.highcapable.yukihookapi.hook.log.loggerW
3131
import com.highcapable.yukihookapi.hook.param.PackageParam
3232
import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData
@@ -111,7 +111,7 @@ object ConfigData {
111111
* @return [String]
112112
*/
113113
private fun getString(data: PrefsData<String>) = when (instance) {
114-
is Context -> (instance as Context).modulePrefs.get(data)
114+
is Context -> (instance as Context).prefs().get(data)
115115
is PackageParam -> (instance as PackageParam).prefs.get(data)
116116
else -> error("Unknown type for get prefs data")
117117
}
@@ -123,7 +123,7 @@ object ConfigData {
123123
*/
124124
private fun putString(data: PrefsData<String>, value: String) {
125125
when (instance) {
126-
is Context -> (instance as Context).modulePrefs.put(data, value)
126+
is Context -> (instance as Context).prefs().edit { put(data, value) }
127127
is PackageParam -> loggerW(msg = "Not support for this method")
128128
else -> error("Unknown type for put prefs data")
129129
}
@@ -135,7 +135,7 @@ object ConfigData {
135135
* @return [Int]
136136
*/
137137
internal fun getInt(data: PrefsData<Int>) = when (instance) {
138-
is Context -> (instance as Context).modulePrefs.get(data)
138+
is Context -> (instance as Context).prefs().get(data)
139139
is PackageParam -> (instance as PackageParam).prefs.get(data)
140140
else -> error("Unknown type for get prefs data")
141141
}
@@ -147,7 +147,7 @@ object ConfigData {
147147
*/
148148
internal fun putInt(data: PrefsData<Int>, value: Int) {
149149
when (instance) {
150-
is Context -> (instance as Context).modulePrefs.put(data, value)
150+
is Context -> (instance as Context).prefs().edit { put(data, value) }
151151
is PackageParam -> loggerW(msg = "Not support for this method")
152152
else -> error("Unknown type for put prefs data")
153153
}
@@ -159,7 +159,7 @@ object ConfigData {
159159
* @return [Boolean]
160160
*/
161161
internal fun getBoolean(data: PrefsData<Boolean>) = when (instance) {
162-
is Context -> (instance as Context).modulePrefs.get(data)
162+
is Context -> (instance as Context).prefs().get(data)
163163
is PackageParam -> (instance as PackageParam).prefs.get(data)
164164
else -> error("Unknown type for get prefs data")
165165
}
@@ -171,7 +171,7 @@ object ConfigData {
171171
*/
172172
internal fun putBoolean(data: PrefsData<Boolean>, value: Boolean) {
173173
when (instance) {
174-
is Context -> (instance as Context).modulePrefs.put(data, value)
174+
is Context -> (instance as Context).prefs().edit { put(data, value) }
175175
is PackageParam -> loggerW(msg = "Not support for this method")
176176
else -> error("Unknown type for put prefs data")
177177
}

‎app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import android.graphics.Color
2929
import com.fankes.miui.notify.bean.IconDataBean
3030
import com.fankes.miui.notify.data.ConfigData
3131
import com.fankes.miui.notify.utils.factory.*
32-
import com.highcapable.yukihookapi.hook.factory.modulePrefs
32+
import com.highcapable.yukihookapi.hook.factory.prefs
3333
import com.highcapable.yukihookapi.hook.param.PackageParam
3434
import org.json.JSONArray
3535
import org.json.JSONObject
@@ -47,7 +47,7 @@ class IconPackParams(private val context: Context? = null, private val param: Pa
4747
* 已存储的 JSON 数据
4848
* @return [String]
4949
*/
50-
internal val storageDataJson get() = (context?.modulePrefs ?: param?.prefs)?.direct()?.get(ConfigData.NOTIFY_ICONS_DATA)
50+
internal val storageDataJson get() = (context?.prefs() ?: param?.prefs)?.direct()?.get(ConfigData.NOTIFY_ICONS_DATA)
5151

5252
/**
5353
* 获取图标数据
@@ -134,5 +134,5 @@ class IconPackParams(private val context: Context? = null, private val param: Pa
134134
* 保存图标数据
135135
* @param dataJson 图标数据 JSON
136136
*/
137-
fun save(dataJson: String) = context?.modulePrefs?.put(ConfigData.NOTIFY_ICONS_DATA, dataJson)
137+
fun save(dataJson: String) = context?.prefs()?.edit { put(ConfigData.NOTIFY_ICONS_DATA, dataJson) }
138138
}

‎app/src/main/java/com/fankes/miui/notify/params/factory/DataFactory.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ package com.fankes.miui.notify.params.factory
2525

2626
import android.content.Context
2727
import com.fankes.miui.notify.bean.IconDataBean
28-
import com.highcapable.yukihookapi.hook.factory.modulePrefs
28+
import com.highcapable.yukihookapi.hook.factory.prefs
2929
import com.highcapable.yukihookapi.hook.param.PackageParam
3030

3131
/**
@@ -38,14 +38,14 @@ fun PackageParam.isAppNotifyHookOf(bean: IconDataBean) = prefs.getBoolean(bean.t
3838
* 获取此 APP 的通知图标是否被 Hook
3939
* @param bean 图标 bean
4040
*/
41-
fun Context.isAppNotifyHookOf(bean: IconDataBean) = modulePrefs.getBoolean(bean.toEnabledName(), bean.isEnabled)
41+
fun Context.isAppNotifyHookOf(bean: IconDataBean) = prefs().getBoolean(bean.toEnabledName(), bean.isEnabled)
4242

4343
/**
4444
* 设置 Hook 此 APP 的通知图标
4545
* @param bean 图标 bean
4646
* @param isHook 是否 Hook
4747
*/
48-
fun Context.putAppNotifyHookOf(bean: IconDataBean, isHook: Boolean) = modulePrefs.putBoolean(bean.toEnabledName(), isHook)
48+
fun Context.putAppNotifyHookOf(bean: IconDataBean, isHook: Boolean) = prefs().edit { putBoolean(bean.toEnabledName(), isHook) }
4949

5050
/**
5151
* 获取此 APP 的通知图标是否被全部 Hook
@@ -57,11 +57,11 @@ fun PackageParam.isAppNotifyHookAllOf(bean: IconDataBean) = prefs.getBoolean(bea
5757
* 获取此 APP 的通知图标是否被全部 Hook
5858
* @param bean 图标 bean
5959
*/
60-
fun Context.isAppNotifyHookAllOf(bean: IconDataBean) = modulePrefs.getBoolean(bean.toEnabledAllName(), bean.isEnabledAll)
60+
fun Context.isAppNotifyHookAllOf(bean: IconDataBean) = prefs().getBoolean(bean.toEnabledAllName(), bean.isEnabledAll)
6161

6262
/**
6363
* 设置全部 Hook 此 APP 的通知图标
6464
* @param bean 图标 bean
6565
* @param isHook 是否 Hook
6666
*/
67-
fun Context.putAppNotifyHookAllOf(bean: IconDataBean, isHook: Boolean) = modulePrefs.putBoolean(bean.toEnabledAllName(), isHook)
67+
fun Context.putAppNotifyHookAllOf(bean: IconDataBean, isHook: Boolean) = prefs().edit { putBoolean(bean.toEnabledAllName(), isHook) }

‎app/src/main/java/com/fankes/miui/notify/utils/tool/I18nWarnTool.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ package com.fankes.miui.notify.utils.tool
2424

2525
import android.content.Context
2626
import com.fankes.miui.notify.utils.factory.showDialog
27-
import com.highcapable.yukihookapi.hook.factory.modulePrefs
27+
import com.highcapable.yukihookapi.hook.factory.prefs
2828
import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData
2929
import java.util.*
3030

@@ -41,8 +41,8 @@ object I18nWarnTool {
4141
* @param context 实例
4242
*/
4343
fun checkingOrShowing(context: Context) {
44-
fun saveReaded() = context.modulePrefs.put(LOCALE_WARN_READED, value = true)
45-
if (Locale.getDefault().language.startsWith("zh").not() && context.modulePrefs.get(LOCALE_WARN_READED).not())
44+
fun saveReaded() = context.prefs().edit { put(LOCALE_WARN_READED, value = true) }
45+
if (Locale.getDefault().language.startsWith("zh").not() && context.prefs().get(LOCALE_WARN_READED).not())
4646
context.showDialog {
4747
title = "Notice of I18n Support"
4848
msg = "This Xposed Module is only for Chinese and the Chinese region.\n\n" +

‎app/src/main/java/com/fankes/miui/notify/utils/tool/YukiPromoteTool.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import com.fankes.miui.notify.BuildConfig
2727
import com.fankes.miui.notify.utils.factory.openBrowser
2828
import com.fankes.miui.notify.utils.factory.showDialog
2929
import com.highcapable.yukihookapi.YukiHookAPI
30-
import com.highcapable.yukihookapi.hook.factory.modulePrefs
30+
import com.highcapable.yukihookapi.hook.factory.prefs
3131
import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData
3232

3333
/**
@@ -43,8 +43,8 @@ object YukiPromoteTool {
4343
* @param context 实例
4444
*/
4545
fun promote(context: Context) {
46-
fun saveReaded() = context.modulePrefs.put(YUKI_PROMOTE_READED, value = true)
47-
if (context.modulePrefs.get(YUKI_PROMOTE_READED).not())
46+
fun saveReaded() = context.prefs().edit { put(YUKI_PROMOTE_READED, value = true) }
47+
if (context.prefs().get(YUKI_PROMOTE_READED).not())
4848
context.showDialog {
4949
title = "面向开发者的推广"
5050
msg = "你想快速拥有一个自己的 Xposed 模块吗，你只需要拥有基础的 Android 开发经验以及使用 Kotlin 编程语言即可。\n\n" +

0 commit comments

Comments
 (0)