From 53dc20109d65dbfc082e9342253619c35eaaa659 Mon Sep 17 00:00:00 2001 From: kr328 Date: Tue, 25 May 2021 22:49:03 +0800 Subject: [PATCH] Improve: migrate to latest dependencies --- .../clash/design/OverrideSettingsDesign.kt | 6 ++--- .../kr328/clash/design/component/ProxyMenu.kt | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/design/src/premium/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt b/design/src/premium/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt index 95e2ce0c..6bfd597e 100644 --- a/design/src/premium/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt +++ b/design/src/premium/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt @@ -238,7 +238,7 @@ class OverrideSettingsDesign( summary = R.string.sideload_geoip_summary ) { clicked { - requests.offer(Request.EditSideloadGeoip) + requests.trySend(Request.EditSideloadGeoip) } } @@ -379,7 +379,7 @@ class OverrideSettingsDesign( placeholder = R.string.dont_modify, configure = dnsDependencies::add, ) - + editableTextMap( value = configuration.dns::nameserverPolicy, keyAdapter = TextAdapter.String, @@ -396,6 +396,6 @@ class OverrideSettingsDesign( } fun requestClear() { - requests.offer(Request.ResetOverride) + requests.trySend(Request.ResetOverride) } } diff --git a/design/src/premium/java/com/github/kr328/clash/design/component/ProxyMenu.kt b/design/src/premium/java/com/github/kr328/clash/design/component/ProxyMenu.kt index 8f88e10b..89c81f40 100644 --- a/design/src/premium/java/com/github/kr328/clash/design/component/ProxyMenu.kt +++ b/design/src/premium/java/com/github/kr328/clash/design/component/ProxyMenu.kt @@ -32,51 +32,51 @@ class ProxyMenu( R.id.not_selectable -> { uiStore.proxyExcludeNotSelectable = item.isChecked - requests.offer(ProxyDesign.Request.ReLaunch) + requests.trySend(ProxyDesign.Request.ReLaunch) } R.id.single -> { uiStore.proxySingleLine = true updateConfig() - requests.offer(ProxyDesign.Request.ReloadAll) + requests.trySend(ProxyDesign.Request.ReloadAll) } R.id.multiple -> { uiStore.proxySingleLine = false updateConfig() - requests.offer(ProxyDesign.Request.ReloadAll) + requests.trySend(ProxyDesign.Request.ReloadAll) } R.id.default_ -> { uiStore.proxySort = ProxySort.Default - requests.offer(ProxyDesign.Request.ReloadAll) + requests.trySend(ProxyDesign.Request.ReloadAll) } R.id.name -> { uiStore.proxySort = ProxySort.Title - requests.offer(ProxyDesign.Request.ReloadAll) + requests.trySend(ProxyDesign.Request.ReloadAll) } R.id.delay -> { uiStore.proxySort = ProxySort.Delay - requests.offer(ProxyDesign.Request.ReloadAll) + requests.trySend(ProxyDesign.Request.ReloadAll) } R.id.dont_modify -> { - requests.offer(ProxyDesign.Request.PatchMode(null)) + requests.trySend(ProxyDesign.Request.PatchMode(null)) } R.id.direct_mode -> { - requests.offer(ProxyDesign.Request.PatchMode(TunnelState.Mode.Direct)) + requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Direct)) } R.id.global_mode -> { - requests.offer(ProxyDesign.Request.PatchMode(TunnelState.Mode.Global)) + requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Global)) } R.id.rule_mode -> { - requests.offer(ProxyDesign.Request.PatchMode(TunnelState.Mode.Rule)) + requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Rule)) } R.id.script_mode -> { - requests.offer(ProxyDesign.Request.PatchMode(TunnelState.Mode.Script)) + requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Script)) } else -> return false }