From 3b3482e7539e71bf2900cc9b48bc23612214ec09 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 11 Mar 2026 16:19:07 +0000 Subject: [PATCH] feat: move NamecoinSettingsSection to its own route and screen Extract the Namecoin settings from PrivacyOptionsScreen into a dedicated NamecoinSettingsScreen with its own Route.NamecoinSettings route. Add a "Namecoin Settings" entry to AllSettingsScreen so users can navigate to it directly from the settings list. https://claude.ai/code/session_013gEw6fJYFiFoe4zETo8dpC --- .../amethyst/ui/navigation/AppNavigation.kt | 4 +- .../amethyst/ui/navigation/routes/Routes.kt | 2 + .../loggedIn/privacy/PrivacyOptionsScreen.kt | 35 +------- .../loggedIn/settings/AllSettingsScreen.kt | 7 ++ .../settings/NamecoinSettingsScreen.kt | 87 +++++++++++++++++++ amethyst/src/main/res/values/strings.xml | 1 + 6 files changed, 101 insertions(+), 35 deletions(-) create mode 100644 amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/NamecoinSettingsScreen.kt diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt index 2330f62e8..16f37d02d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt @@ -102,6 +102,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.newUser.ImportFollowListSel import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.NotificationScreen import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.publicMessages.NewPublicMessageScreen import com.vitorpamplona.amethyst.ui.screen.loggedIn.privacy.PrivacyOptionsScreen +import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.NamecoinSettingsScreen import com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.ProfileScreen import com.vitorpamplona.amethyst.ui.screen.loggedIn.qrcode.ShowQRScreen import com.vitorpamplona.amethyst.ui.screen.loggedIn.redirect.LoadRedirectScreen @@ -174,7 +175,8 @@ fun AppNavigation( composableFromEnd { AllSettingsScreen(accountViewModel, nav) } composableFromEnd { AccountBackupScreen(accountViewModel, nav) } composableFromEnd { SecurityFiltersScreen(accountViewModel, nav) } - composableFromEnd { PrivacyOptionsScreen(Amethyst.instance.torPrefs.value, Amethyst.instance.namecoinPrefs, nav) } + composableFromEnd { PrivacyOptionsScreen(Amethyst.instance.torPrefs.value, nav) } + composableFromEnd { NamecoinSettingsScreen(Amethyst.instance.namecoinPrefs, nav) } composableFromEnd { BookmarkListScreen(accountViewModel, nav) } composableFromEnd { DraftListScreen(accountViewModel, nav) } composableFromEnd { SettingsScreen(accountViewModel, nav) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/routes/Routes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/routes/Routes.kt index 6a33ae49b..b55b4dd06 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/routes/Routes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/routes/Routes.kt @@ -49,6 +49,8 @@ sealed class Route { @Serializable object PrivacyOptions : Route() + @Serializable object NamecoinSettings : Route() + @Serializable object Bookmarks : Route() @Serializable object BookmarkGroups : Route() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/privacy/PrivacyOptionsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/privacy/PrivacyOptionsScreen.kt index 5d65ae4f0..5a21fcb12 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/privacy/PrivacyOptionsScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/privacy/PrivacyOptionsScreen.kt @@ -21,38 +21,29 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.privacy import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable -import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.amethyst.R -import com.vitorpamplona.amethyst.model.preferences.NamecoinSharedPreferences import com.vitorpamplona.amethyst.ui.navigation.navs.INav import com.vitorpamplona.amethyst.ui.navigation.topbars.SavingTopBar -import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.NamecoinSettingsSection import com.vitorpamplona.amethyst.ui.tor.PrivacySettingsBody import com.vitorpamplona.amethyst.ui.tor.TorDialogViewModel import com.vitorpamplona.amethyst.ui.tor.TorSettings import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow -import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @Composable fun PrivacyOptionsScreen( torSettingsFlow: TorSettingsFlow, - namecoinPrefs: NamecoinSharedPreferences, nav: INav, ) { val dialogViewModel = viewModel() @@ -67,20 +58,16 @@ fun PrivacyOptionsScreen( torSettings } - PrivacyOptionsScreenContents(dialogViewModel, namecoinPrefs, onPost = torSettingsFlow::update, nav) + PrivacyOptionsScreenContents(dialogViewModel, onPost = torSettingsFlow::update, nav) } @OptIn(ExperimentalMaterial3Api::class) @Composable fun PrivacyOptionsScreenContents( dialogViewModel: TorDialogViewModel, - namecoinPrefs: NamecoinSharedPreferences, onPost: (TorSettings) -> Unit, nav: INav, ) { - val namecoinSettings by namecoinPrefs.settings.collectAsState() - val scope = rememberCoroutineScope() - Scaffold( topBar = { SavingTopBar( @@ -104,26 +91,6 @@ fun PrivacyOptionsScreenContents( ).padding(horizontal = 10.dp), ) { PrivacySettingsBody(dialogViewModel) - - Spacer(Modifier.height(16.dp)) - - NamecoinSettingsSection( - settings = namecoinSettings, - onToggleEnabled = { enabled -> - scope.launch { namecoinPrefs.setEnabled(enabled) } - }, - onAddServer = { server -> - scope.launch { namecoinPrefs.addServer(server) } - }, - onRemoveServer = { server -> - scope.launch { namecoinPrefs.removeServer(server) } - }, - onReset = { - scope.launch { namecoinPrefs.reset() } - }, - ) - - Spacer(Modifier.height(16.dp)) } } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt index ebb8058e8..4dcf56f79 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt @@ -146,6 +146,13 @@ fun AllSettingsScreen( onClick = { nav.nav(Route.PrivacyOptions) }, ) HorizontalDivider() + SettingsNavigationRow( + title = R.string.namecoin_settings, + icon = Icons.Outlined.Security, + tint = tint, + onClick = { nav.nav(Route.NamecoinSettings) }, + ) + HorizontalDivider() SettingsNavigationRow( title = R.string.ui_preferences, icon = Icons.Outlined.Settings, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/NamecoinSettingsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/NamecoinSettingsScreen.kt new file mode 100644 index 000000000..3bd232550 --- /dev/null +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/NamecoinSettingsScreen.kt @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2025 Vitor Pamplona + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +package com.vitorpamplona.amethyst.ui.screen.loggedIn.settings + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.vitorpamplona.amethyst.R +import com.vitorpamplona.amethyst.model.preferences.NamecoinSharedPreferences +import com.vitorpamplona.amethyst.ui.navigation.navs.INav +import com.vitorpamplona.amethyst.ui.navigation.topbars.TopBarWithBackButton +import com.vitorpamplona.amethyst.ui.stringRes +import kotlinx.coroutines.launch + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun NamecoinSettingsScreen( + namecoinPrefs: NamecoinSharedPreferences, + nav: INav, +) { + val namecoinSettings by namecoinPrefs.settings.collectAsState() + val scope = rememberCoroutineScope() + + Scaffold( + topBar = { + TopBarWithBackButton(stringRes(id = R.string.namecoin_settings), nav::popBack) + }, + ) { + Column( + Modifier + .padding(it) + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(horizontal = 10.dp), + ) { + Spacer(Modifier.height(16.dp)) + + NamecoinSettingsSection( + settings = namecoinSettings, + onToggleEnabled = { enabled -> + scope.launch { namecoinPrefs.setEnabled(enabled) } + }, + onAddServer = { server -> + scope.launch { namecoinPrefs.addServer(server) } + }, + onRemoveServer = { server -> + scope.launch { namecoinPrefs.removeServer(server) } + }, + onReset = { + scope.launch { namecoinPrefs.reset() } + }, + ) + + Spacer(Modifier.height(16.dp)) + } + } +} diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index 9666bd69d..5a84a6aaa 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -1745,4 +1745,5 @@ "Enter the profile of a friend or community leader. You can use their npub, NIP-05 address, or a Namecoin name like alice@example.bit or id/alice for blockchain-verified identities." Select All %1$d%% uptime + Namecoin Settings