Skip to content

Unwrap OverrideSettingsDesign #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 1 commit into from
Apr 24, 2026
Merged

Unwrap OverrideSettingsDesign #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 9 additions & 29 deletions app/src/main/kotlin/com/github/kr328/clash/settings/OverrideSettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,15 @@
package com.github.kr328.clash.settings

import com.github.kr328.clash.core.Clash
import com.github.kr328.clash.settings.ui.OverrideSettingsDesign
import com.github.kr328.clash.ui.DesignActivity
import com.github.kr328.clash.util.withClash
import kotlinx.coroutines.isActive
import kotlinx.coroutines.selects.select
import android.os.Bundle
import androidx.activity.compose.setContent
import com.github.kr328.clash.settings.ui.OverrideSettingsScreen
import com.github.kr328.clash.ui.BaseActivity
import com.github.kr328.clash.ui.theme.MihomoTheme

class OverrideSettingsActivity : DesignActivity<OverrideSettingsDesign>() {
override suspend fun main() {
val configuration = withClash { queryOverride(Clash.OverrideSlot.Persist) }
class OverrideSettingsActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

defer { withClash { patchOverride(Clash.OverrideSlot.Persist, configuration) } }

val design = OverrideSettingsDesign(this, configuration)

setContentDesign(design)

while (isActive) {
select {
events.onReceive {}

design.requests.onReceive {
when (it) {
OverrideSettingsDesign.Request.ResetOverride -> {
defer { withClash { clearOverride(Clash.OverrideSlot.Persist) } }
finish()
}
}
}
}
}
setContent { MihomoTheme { OverrideSettingsScreen(onResetCompleted = ::finish) } }
}
}
18 changes: 9 additions & 9 deletions app/src/main/kotlin/com/github/kr328/clash/settings/ui/MetaFeatureSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fun MetaFeatureSettingsScreen(
onResetCompleted: () -> Unit,
) {
val context = LocalContext.current
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
val configuration by viewModel.configuration.collectAsStateWithLifecycle()
val importResult by viewModel.importResult.collectAsStateWithLifecycle()
val importedText = stringResource(R.string.geofile_imported)
var pendingImportType by remember { mutableStateOf<ImportType?>(null) }
Expand Down Expand Up @@ -87,7 +87,7 @@ fun MetaFeatureSettingsScreen(
}

MetaFeatureSettingsContent(
configuration = uiState,
configuration = configuration,
actions = viewModel,
modifier = modifier,
showResetConfirmDialog = showResetConfirmDialog,
Expand Down Expand Up @@ -273,7 +273,7 @@ private fun LazyListScope.metaSnifferPreferenceItems(
SettingsEditTextListPreferenceItem(
title = R.string.sniff_http_ports,
placeholder = R.string.dont_modify,
value = configuration.sniffer.sniff.http.ports,
values = configuration.sniffer.sniff.http.ports,
onValueChange = actions::updateSniffHttpPorts,
enabled = enabled,
)
Expand All @@ -296,7 +296,7 @@ private fun LazyListScope.metaSnifferPreferenceItems(
SettingsEditTextListPreferenceItem(
title = R.string.sniff_tls_ports,
placeholder = R.string.dont_modify,
value = configuration.sniffer.sniff.tls.ports,
values = configuration.sniffer.sniff.tls.ports,
onValueChange = actions::updateSniffTlsPorts,
enabled = enabled,
)
Expand All @@ -319,7 +319,7 @@ private fun LazyListScope.metaSnifferPreferenceItems(
SettingsEditTextListPreferenceItem(
title = R.string.sniff_quic_ports,
placeholder = R.string.dont_modify,
value = configuration.sniffer.sniff.quic.ports,
values = configuration.sniffer.sniff.quic.ports,
onValueChange = actions::updateSniffQuicPorts,
enabled = enabled,
)
Expand Down Expand Up @@ -381,7 +381,7 @@ private fun LazyListScope.metaSnifferPreferenceItems(
SettingsEditTextListPreferenceItem(
title = R.string.force_domain,
placeholder = R.string.dont_modify,
value = configuration.sniffer.forceDomain,
values = configuration.sniffer.forceDomain,
onValueChange = actions::updateForceDomain,
enabled = enabled,
)
Expand All @@ -391,7 +391,7 @@ private fun LazyListScope.metaSnifferPreferenceItems(
SettingsEditTextListPreferenceItem(
title = R.string.skip_domain,
placeholder = R.string.dont_modify,
value = configuration.sniffer.skipDomain,
values = configuration.sniffer.skipDomain,
onValueChange = actions::updateSkipDomain,
enabled = enabled,
)
Expand All @@ -401,7 +401,7 @@ private fun LazyListScope.metaSnifferPreferenceItems(
SettingsEditTextListPreferenceItem(
title = R.string.skip_src_address,
placeholder = R.string.dont_modify,
value = configuration.sniffer.skipSrcAddress,
values = configuration.sniffer.skipSrcAddress,
onValueChange = actions::updateSkipSrcAddress,
enabled = enabled,
)
Expand All @@ -411,7 +411,7 @@ private fun LazyListScope.metaSnifferPreferenceItems(
SettingsEditTextListPreferenceItem(
title = R.string.skip_dst_address,
placeholder = R.string.dont_modify,
value = configuration.sniffer.skipDstAddress,
values = configuration.sniffer.skipDstAddress,
onValueChange = actions::updateSkipDstAddress,
enabled = enabled,
)
Expand Down
Loading