From a0e73a9aa99ead51225b274c0198df97f78f300b Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Thu, 5 Dec 2024 09:25:11 +0800 Subject: [PATCH] Fix typos --- V2rayNG/app/src/main/java/com/v2ray/ang/dto/RulesetItem.kt | 2 +- .../src/main/java/com/v2ray/ang/handler/SettingsManager.kt | 2 +- .../app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt | 4 ++-- .../java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/RulesetItem.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/RulesetItem.kt index 06a41bfa..9005f559 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/RulesetItem.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/RulesetItem.kt @@ -9,5 +9,5 @@ data class RulesetItem( var network: String? = null, var protocol: List? = null, var enabled: Boolean = true, - var looked: Boolean? = false, + var locked: Boolean? = false, ) \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt index 15cde2c9..864d1799 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt @@ -70,7 +70,7 @@ object SettingsManager { private fun resetRoutingRulesetsCommon(rulesetList: MutableList) { val rulesetNew: MutableList = mutableListOf() MmkvManager.decodeRoutingRulesets()?.forEach { key -> - if (key.looked == true) { + if (key.locked == true) { rulesetNew.add(key) } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt index bc4456f6..48d4da37 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt @@ -37,7 +37,7 @@ class RoutingEditActivity : BaseActivity() { private fun bindingServer(rulesetItem: RulesetItem): Boolean { binding.etRemarks.text = Utils.getEditable(rulesetItem.remarks) - binding.chkLocked.isChecked = rulesetItem.looked == true + binding.chkLocked.isChecked = rulesetItem.locked == true binding.etDomain.text = Utils.getEditable(rulesetItem.domain?.joinToString(",")) binding.etIp.text = Utils.getEditable(rulesetItem.ip?.joinToString(",")) binding.etPort.text = Utils.getEditable(rulesetItem.port) @@ -60,7 +60,7 @@ class RoutingEditActivity : BaseActivity() { rulesetItem.apply { remarks = binding.etRemarks.text.toString() - looked = binding.chkLocked.isChecked + locked = binding.chkLocked.isChecked domain = binding.etDomain.text.toString().takeIf { it.isNotEmpty() } ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() } ip = binding.etIp.text.toString().takeIf { it.isNotEmpty() } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt index 25c97b49..bd48ea59 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt @@ -25,7 +25,7 @@ class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : Recy holder.itemRoutingSettingBinding.domainIp.text = (ruleset.domain ?: ruleset.ip ?: ruleset.port)?.toString() holder.itemRoutingSettingBinding.outboundTag.text = ruleset.outboundTag holder.itemRoutingSettingBinding.chkEnable.isChecked = ruleset.enabled - holder.itemRoutingSettingBinding.imgLocked.isVisible = ruleset.looked == true + holder.itemRoutingSettingBinding.imgLocked.isVisible = ruleset.locked == true holder.itemView.setBackgroundColor(Color.TRANSPARENT) holder.itemRoutingSettingBinding.layoutEdit.setOnClickListener {