mirror of
https://github.com/fankes/ColorOSNotifyIcon.git
synced 2025-09-06 18:55:37 +08:00
Merge code
This commit is contained in:
@@ -41,7 +41,11 @@ import androidx.core.widget.doOnTextChanged
|
|||||||
import com.fankes.coloros.notify.R
|
import com.fankes.coloros.notify.R
|
||||||
import com.fankes.coloros.notify.databinding.DiaSourceFromBinding
|
import com.fankes.coloros.notify.databinding.DiaSourceFromBinding
|
||||||
import com.fankes.coloros.notify.databinding.DiaSourceFromStringBinding
|
import com.fankes.coloros.notify.databinding.DiaSourceFromStringBinding
|
||||||
import com.fankes.coloros.notify.hook.HookConst
|
import com.fankes.coloros.notify.hook.HookConst.SOURCE_SYNC_WAY
|
||||||
|
import com.fankes.coloros.notify.hook.HookConst.SOURCE_SYNC_WAY_CUSTOM_URL
|
||||||
|
import com.fankes.coloros.notify.hook.HookConst.TYPE_SOURCE_SYNC_WAY_1
|
||||||
|
import com.fankes.coloros.notify.hook.HookConst.TYPE_SOURCE_SYNC_WAY_2
|
||||||
|
import com.fankes.coloros.notify.hook.HookConst.TYPE_SOURCE_SYNC_WAY_3
|
||||||
import com.fankes.coloros.notify.param.IconPackParams
|
import com.fankes.coloros.notify.param.IconPackParams
|
||||||
import com.fankes.coloros.notify.ui.activity.ConfigureActivity
|
import com.fankes.coloros.notify.ui.activity.ConfigureActivity
|
||||||
import com.fankes.coloros.notify.utils.factory.openBrowser
|
import com.fankes.coloros.notify.utils.factory.openBrowser
|
||||||
@@ -75,8 +79,8 @@ object IconRuleManagerTool {
|
|||||||
fun syncByHand(context: Context, it: () -> Unit) =
|
fun syncByHand(context: Context, it: () -> Unit) =
|
||||||
context.showDialog {
|
context.showDialog {
|
||||||
title = "同步列表"
|
title = "同步列表"
|
||||||
var sourceType = context.modulePrefs.getInt(HookConst.SOURCE_SYNC_WAY, HookConst.TYPE_SOURCE_SYNC_WAY_1)
|
var sourceType = context.modulePrefs.getInt(SOURCE_SYNC_WAY, TYPE_SOURCE_SYNC_WAY_1)
|
||||||
var customUrl = context.modulePrefs.getString(HookConst.SOURCE_SYNC_WAY_CUSTOM_URL)
|
var customUrl = context.modulePrefs.getString(SOURCE_SYNC_WAY_CUSTOM_URL)
|
||||||
bind<DiaSourceFromBinding>().apply {
|
bind<DiaSourceFromBinding>().apply {
|
||||||
diaSfText.apply {
|
diaSfText.apply {
|
||||||
if (customUrl.isNotBlank()) {
|
if (customUrl.isNotBlank()) {
|
||||||
@@ -85,33 +89,33 @@ object IconRuleManagerTool {
|
|||||||
}
|
}
|
||||||
doOnTextChanged { text, _, _, _ ->
|
doOnTextChanged { text, _, _, _ ->
|
||||||
customUrl = text.toString()
|
customUrl = text.toString()
|
||||||
context.modulePrefs.putString(HookConst.SOURCE_SYNC_WAY_CUSTOM_URL, text.toString())
|
context.modulePrefs.putString(SOURCE_SYNC_WAY_CUSTOM_URL, text.toString())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
diaSfTextLin.isVisible = sourceType == HookConst.TYPE_SOURCE_SYNC_WAY_3
|
diaSfTextLin.isVisible = sourceType == TYPE_SOURCE_SYNC_WAY_3
|
||||||
diaSfRd1.isChecked = sourceType == HookConst.TYPE_SOURCE_SYNC_WAY_1
|
diaSfRd1.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_1
|
||||||
diaSfRd2.isChecked = sourceType == HookConst.TYPE_SOURCE_SYNC_WAY_2
|
diaSfRd2.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_2
|
||||||
diaSfRd3.isChecked = sourceType == HookConst.TYPE_SOURCE_SYNC_WAY_3
|
diaSfRd3.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_3
|
||||||
diaSfRd1.setOnClickListener {
|
diaSfRd1.setOnClickListener {
|
||||||
diaSfRd2.isChecked = false
|
diaSfRd2.isChecked = false
|
||||||
diaSfRd3.isChecked = false
|
diaSfRd3.isChecked = false
|
||||||
diaSfTextLin.isVisible = false
|
diaSfTextLin.isVisible = false
|
||||||
sourceType = HookConst.TYPE_SOURCE_SYNC_WAY_1
|
sourceType = TYPE_SOURCE_SYNC_WAY_1
|
||||||
context.modulePrefs.putInt(HookConst.SOURCE_SYNC_WAY, HookConst.TYPE_SOURCE_SYNC_WAY_1)
|
context.modulePrefs.putInt(SOURCE_SYNC_WAY, TYPE_SOURCE_SYNC_WAY_1)
|
||||||
}
|
}
|
||||||
diaSfRd2.setOnClickListener {
|
diaSfRd2.setOnClickListener {
|
||||||
diaSfRd1.isChecked = false
|
diaSfRd1.isChecked = false
|
||||||
diaSfRd3.isChecked = false
|
diaSfRd3.isChecked = false
|
||||||
diaSfTextLin.isVisible = false
|
diaSfTextLin.isVisible = false
|
||||||
sourceType = HookConst.TYPE_SOURCE_SYNC_WAY_2
|
sourceType = TYPE_SOURCE_SYNC_WAY_2
|
||||||
context.modulePrefs.putInt(HookConst.SOURCE_SYNC_WAY, HookConst.TYPE_SOURCE_SYNC_WAY_2)
|
context.modulePrefs.putInt(SOURCE_SYNC_WAY, TYPE_SOURCE_SYNC_WAY_2)
|
||||||
}
|
}
|
||||||
diaSfRd3.setOnClickListener {
|
diaSfRd3.setOnClickListener {
|
||||||
diaSfRd1.isChecked = false
|
diaSfRd1.isChecked = false
|
||||||
diaSfRd2.isChecked = false
|
diaSfRd2.isChecked = false
|
||||||
diaSfTextLin.isVisible = true
|
diaSfTextLin.isVisible = true
|
||||||
sourceType = HookConst.TYPE_SOURCE_SYNC_WAY_3
|
sourceType = TYPE_SOURCE_SYNC_WAY_3
|
||||||
context.modulePrefs.putInt(HookConst.SOURCE_SYNC_WAY, HookConst.TYPE_SOURCE_SYNC_WAY_3)
|
context.modulePrefs.putInt(SOURCE_SYNC_WAY, TYPE_SOURCE_SYNC_WAY_3)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
confirmButton { sync(context, it) }
|
confirmButton { sync(context, it) }
|
||||||
@@ -165,14 +169,14 @@ object IconRuleManagerTool {
|
|||||||
* @param it 成功后回调
|
* @param it 成功后回调
|
||||||
*/
|
*/
|
||||||
fun sync(context: Context, it: () -> Unit) {
|
fun sync(context: Context, it: () -> Unit) {
|
||||||
val sourceType = context.modulePrefs.getInt(HookConst.SOURCE_SYNC_WAY, HookConst.TYPE_SOURCE_SYNC_WAY_1)
|
val sourceType = context.modulePrefs.getInt(SOURCE_SYNC_WAY, TYPE_SOURCE_SYNC_WAY_1)
|
||||||
val customUrl = context.modulePrefs.getString(HookConst.SOURCE_SYNC_WAY_CUSTOM_URL)
|
val customUrl = context.modulePrefs.getString(SOURCE_SYNC_WAY_CUSTOM_URL)
|
||||||
when (sourceType) {
|
when (sourceType) {
|
||||||
HookConst.TYPE_SOURCE_SYNC_WAY_1 ->
|
TYPE_SOURCE_SYNC_WAY_1 ->
|
||||||
onRefreshing(context, url = "https://raw.fastgit.org/fankes/AndroidNotifyIconAdapt/main", it)
|
onRefreshing(context, url = "https://raw.fastgit.org/fankes/AndroidNotifyIconAdapt/main", it)
|
||||||
HookConst.TYPE_SOURCE_SYNC_WAY_2 ->
|
TYPE_SOURCE_SYNC_WAY_2 ->
|
||||||
onRefreshing(context, url = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main", it)
|
onRefreshing(context, url = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main", it)
|
||||||
HookConst.TYPE_SOURCE_SYNC_WAY_3 ->
|
TYPE_SOURCE_SYNC_WAY_3 ->
|
||||||
if (customUrl.isNotBlank())
|
if (customUrl.isNotBlank())
|
||||||
if (customUrl.startsWith("http://") || customUrl.startsWith("https://"))
|
if (customUrl.startsWith("http://") || customUrl.startsWith("https://"))
|
||||||
onRefreshingCustom(context, customUrl, it)
|
onRefreshingCustom(context, customUrl, it)
|
||||||
@@ -367,7 +371,6 @@ object IconRuleManagerTool {
|
|||||||
private fun pushNotify(context: Context, title: String, msg: String) {
|
private fun pushNotify(context: Context, title: String, msg: String) {
|
||||||
if (context !is AppCompatActivity)
|
if (context !is AppCompatActivity)
|
||||||
context.getSystemService<NotificationManager>()?.apply {
|
context.getSystemService<NotificationManager>()?.apply {
|
||||||
areNotificationsEnabled()
|
|
||||||
createNotificationChannel(
|
createNotificationChannel(
|
||||||
NotificationChannel(
|
NotificationChannel(
|
||||||
"notifyRuleUpdateId", "通知图标优化规则",
|
"notifyRuleUpdateId", "通知图标优化规则",
|
||||||
|
Reference in New Issue
Block a user