From 5de5dbabefcf8f34df9b6b16b792d96aecf82b28 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 5 Jun 2023 11:19:09 +0800 Subject: [PATCH] AdvancedScreen placeholder --- .../main/java/com/hippo/ehviewer/Settings.kt | 4 +- .../ehviewer/ui/settings/AdvancedScreen.kt | 49 ++++++++++++++++++- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt index 3cd3c1ec9..30de48352 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.kt +++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt @@ -85,10 +85,10 @@ object Settings : DefaultPreferences() { var needSignIn by boolPref("need_sign_in", true) var selectSite by boolPref("select_site", true) val blackDarkTheme by boolPref(KEY_BLACK_DARK_THEME, false) - val preloadThumbAggressively by boolPref("preload_thumb_aggressively", false) + var preloadThumbAggressively by boolPref("preload_thumb_aggressively", false) var dF by boolPref(KEY_DOMAIN_FRONTING, false) val downloadOriginImage by boolPref("download_origin_image", false) - val bypassVpn by boolPref(KEY_BYPASS_VPN, true) + var bypassVpn by boolPref(KEY_BYPASS_VPN, true) val thumbSizeDp by intPref(KEY_THUMB_SIZE, 120) var favLocalCount by intPref("fav_local", 0) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt index fbdd4fae2..b18d33b49 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt @@ -1,7 +1,11 @@ package com.hippo.ehviewer.ui.settings import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material3.Icon @@ -35,7 +39,7 @@ fun AdvancedScreen() { ) }, ) { - Column(modifier = Modifier.padding(it).nestedScroll(scrollBehavior.nestedScrollConnection)) { + Column(modifier = Modifier.padding(top = it.calculateTopPadding()).nestedScroll(scrollBehavior.nestedScrollConnection).verticalScroll(rememberScrollState())) { SwitchPreference( title = stringResource(id = R.string.settings_advanced_save_parse_error_body), summary = stringResource(id = R.string.settings_advanced_save_parse_error_body_summary), @@ -62,6 +66,49 @@ fun AdvancedScreen() { entryValueRes = R.array.app_language_entry_values, value = Settings::language, ) + Preference( + title = stringResource(id = R.string.settings_advanced_proxy), + ) + 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), + ) + SwitchPreference( + title = stringResource(id = R.string.settings_advanced_domain_fronting_title), + summary = stringResource(id = R.string.settings_advanced_domain_fronting_summary), + value = Settings::dF, + ) + SwitchPreference( + title = stringResource(id = R.string.settings_advanced_bypass_vpn_title), + summary = stringResource(id = R.string.settings_advanced_bypass_vpn_summary), + value = Settings::bypassVpn, + ) + SwitchPreference( + title = stringResource(id = R.string.preload_thumb_aggressively), + summary = null, + value = Settings::preloadThumbAggressively, + ) + Preference( + title = stringResource(id = R.string.settings_advanced_export_data), + summary = stringResource(id = R.string.settings_advanced_export_data_summary), + ) + Preference( + title = stringResource(id = R.string.settings_advanced_import_data), + summary = stringResource(id = R.string.settings_advanced_import_data_summary), + ) + Preference( + title = stringResource(id = R.string.settings_advanced_backup_favorite), + summary = stringResource(id = R.string.settings_advanced_backup_favorite_summary), + ) + Preference( + title = stringResource(id = R.string.open_by_default), + summary = null, + ) + Spacer(modifier = Modifier.size(it.calculateBottomPadding())) } } }