nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of https://github.com/vitorpamplona/amethyst

Browse Source
This commit is contained in:
Vitor Pamplona
2026-04-06 12:03:57 -04:00
parent 5a36d0b7ae da953ae9c3
commit a649ab7b0e
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt
+24 -23
View File
@@ -140,29 +140,6 @@ fun AllSettingsScreen(
tint = tint,
onClick = { nav.nav(Route.UserSettings) },
)
accountViewModel.account.settings.keyPair.privKey?.let {
HorizontalDivider()
SettingsNavigationRow(
title = R.string.backup_keys,
icon = Icons.Outlined.Key,
tint = tint,
onClick = { nav.nav(Route.AccountBackup) },
)
HorizontalDivider()
SettingsNavigationRow(
title = R.string.request_to_vanish,
icon = Icons.Outlined.DeleteForever,
tint = tint,
onClick = { nav.nav(Route.RequestToVanish) },
)
}
HorizontalDivider()
SettingsNavigationRow(
title = R.string.vanish_history,
icon = Icons.Outlined.History,
tint = tint,
onClick = { nav.nav(Route.VanishEvents) },
)
HorizontalDivider(thickness = 4.dp)
SettingsSectionHeader(R.string.app_settings)
SettingsNavigationRow(
@@ -200,6 +177,30 @@ fun AllSettingsScreen(
tint = tint,
onClick = { nav.nav(Route.ReactionsSettings) },
)
HorizontalDivider(thickness = 4.dp)
SettingsSectionHeader(R.string.danger_zone)
accountViewModel.account.settings.keyPair.privKey?.let {
SettingsNavigationRow(
title = R.string.backup_keys,
icon = Icons.Outlined.Key,
tint = tint,
onClick = { nav.nav(Route.AccountBackup) },
)
HorizontalDivider()
SettingsNavigationRow(
title = R.string.request_to_vanish,
icon = Icons.Outlined.DeleteForever,
tint = tint,
onClick = { nav.nav(Route.RequestToVanish) },
)
HorizontalDivider()
}
SettingsNavigationRow(
title = R.string.vanish_history,
icon = Icons.Outlined.History,
tint = tint,
onClick = { nav.nav(Route.VanishEvents) },
)
}
}
}
amethyst/src/main/res/values/strings.xml
+1
View File
@@ -997,6 +997,7 @@
<string name="settings">Settings</string>
<string name="account_settings">Account Settings</string>
<string name="app_settings">App Settings</string>
<string name="danger_zone">Danger Zone</string>
<string name="connectivity_type_always">Always</string>
<string name="connectivity_type_wifi_only">Wifi-only</string>
<string name="connectivity_type_unmetered_wifi_only">Unmetered WiFi</string>