From 65cca8aa3483bb1fbcbbcf81ecc6ffe913f7092f Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sun, 29 Jun 2025 17:29:20 +0100 Subject: [PATCH] Don't show users own languages TODO: Add red x to items Rename Settings to AppSettings (routes, classes) Add explainer --- .../com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt | 4 ++++ .../amethyst/ui/screen/loggedIn/AccountViewModel.kt | 2 ++ .../ui/screen/loggedIn/settings/UserSettingsScreen.kt | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt index c6a6bb951..8ee4e293f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt @@ -113,6 +113,10 @@ class AccountSyncedSettings( security.warnAboutPostsWithReports = syncedSettingsInternal.security.warnAboutPostsWithReports } } + + fun dontTranslateFromFilteredBySpokenLanguages(): Set { + return languages.dontTranslateFrom - getLanguagesSpokenByUser() + } } @Stable diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt index 2edbbd430..f4d592aac 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt @@ -898,6 +898,8 @@ class AccountViewModel( fun dontTranslateFrom() = account.settings.syncedSettings.languages.dontTranslateFrom + fun dontTranslateFromFilteredBySpokenLanguages() = account.settings.syncedSettings.dontTranslateFromFilteredBySpokenLanguages() + fun toggleDontTranslateFrom(languageCode: String) = account.toggleDontTranslateFrom(languageCode) fun translateTo() = account.settings.syncedSettings.languages.translateTo diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/UserSettingsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/UserSettingsScreen.kt index e95ca4664..4c025091e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/UserSettingsScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/UserSettingsScreen.kt @@ -96,7 +96,7 @@ fun UserSettingsScreen( @Composable fun DontTranslateFromSetting(accountViewModel: AccountViewModel) { var expanded by remember { mutableStateOf(false) } - val selectedLanguages = accountViewModel.dontTranslateFrom().toMutableSet() + val selectedLanguages = accountViewModel.dontTranslateFromFilteredBySpokenLanguages().toMutableSet() Column { SettingsRow(