[DO NOT USE] Cleanup preference default args
This commit is contained in:
1 parent
626475a91f
commit
66ed7a04a4
4 files changed
+3
-16
No files matched your search
@@ -139,12 +139,9 @@ fun AdvancedScreen() {
|
||||
)
|
||||
SwitchPreference(
|
||||
title = stringResource(id = R.string.settings_advanced_built_in_hosts_title),
|
||||
summary = null,
|
||||
value = Settings::builtInHosts,
|
||||
)
|
||||
Preference(
|
||||
title = stringResource(id = R.string.settings_advanced_dns_over_http_title),
|
||||
) {
|
||||
Preference(title = stringResource(id = R.string.settings_advanced_dns_over_http_title)) {
|
||||
val builder = EditTextDialogBuilder(context, Settings.dohUrl, context.getString(R.string.settings_advanced_dns_over_http_hint))
|
||||
builder.setTitle(R.string.settings_advanced_dns_over_http_title)
|
||||
builder.setPositiveButton(android.R.string.ok, null)
|
||||
@@ -173,7 +170,6 @@ fun AdvancedScreen() {
|
||||
)
|
||||
SwitchPreference(
|
||||
title = stringResource(id = R.string.preload_thumb_aggressively),
|
||||
summary = null,
|
||||
value = Settings::preloadThumbAggressively,
|
||||
)
|
||||
val exportFailed = stringResource(id = R.string.settings_advanced_export_data_failed)
|
||||
@@ -258,10 +254,7 @@ fun AdvancedScreen() {
|
||||
}
|
||||
}
|
||||
}
|
||||
Preference(
|
||||
title = stringResource(id = R.string.open_by_default),
|
||||
summary = null,
|
||||
) {
|
||||
Preference(title = stringResource(id = R.string.open_by_default)) {
|
||||
context.run {
|
||||
try {
|
||||
@SuppressLint("InlinedApi")
|
||||
|
||||
@@ -70,7 +70,6 @@ fun EhScreen() {
|
||||
)
|
||||
SwitchPreference(
|
||||
title = stringResource(id = R.string.black_dark_theme),
|
||||
summary = null,
|
||||
value = Settings::blackDarkTheme,
|
||||
)
|
||||
SimpleMenuPreferenceInt(
|
||||
@@ -127,21 +126,17 @@ fun EhScreen() {
|
||||
)
|
||||
SwitchPreference(
|
||||
title = stringResource(id = R.string.settings_eh_metered_network_warning),
|
||||
summary = null,
|
||||
value = Settings::meteredNetworkWarning,
|
||||
)
|
||||
SwitchPreference(
|
||||
title = stringResource(id = R.string.settings_eh_request_news),
|
||||
summary = null,
|
||||
value = Settings::requestNews,
|
||||
)
|
||||
Preference(
|
||||
title = stringResource(id = R.string.settings_eh_request_news_timepicker),
|
||||
summary = null,
|
||||
)
|
||||
SwitchPreference(
|
||||
title = stringResource(id = R.string.settings_eh_hide_hv_events),
|
||||
summary = null,
|
||||
value = Settings::requestNews,
|
||||
)
|
||||
Spacer(modifier = Modifier.size(it.calculateBottomPadding()))
|
||||
|
||||
@@ -62,7 +62,7 @@ fun Preference(title: String, summary: String? = null, onClick: () -> Unit = {})
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun SwitchPreference(title: String, summary: String?, value: KMutableProperty0<Boolean>, enabled: Boolean = true) {
|
||||
fun SwitchPreference(title: String, summary: String? = null, value: KMutableProperty0<Boolean>, enabled: Boolean = true) {
|
||||
var v by remember { mutableStateOf(value.get()) }
|
||||
fun mutate() = value.set((!value.get()).also { v = it })
|
||||
SwitchPref(checked = v, onMutate = ::mutate, title = title, summary = summary, enabled = enabled)
|
||||
|
||||
@@ -40,7 +40,6 @@ fun SecurityScreen() {
|
||||
Column(modifier = Modifier.padding(it).nestedScroll(scrollBehavior.nestedScrollConnection)) {
|
||||
SwitchPreference(
|
||||
title = stringResource(id = R.string.settings_privacy_require_unlock),
|
||||
summary = null,
|
||||
value = Settings::security,
|
||||
enabled = LocalContext.current.isAuthenticationSupported(),
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user