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

Remove previous implementation

Browse Source 
TODO:
Rename Settings to AppSettings (routes, classes)
Don't show users own languages
Remove language from drop down
Add explainer
Change to dropdown with Xs
This commit is contained in:
David Kaspar
2025-06-25 20:54:19 +02:00
parent f0670971ef
commit 759ef44440
4 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt
-1
View File
@@ -27,7 +27,6 @@ import com.vitorpamplona.amethyst.R
data class Settings( data class Settings(
val theme: ThemeType = ThemeType.SYSTEM, val theme: ThemeType = ThemeType.SYSTEM,
val preferredLanguage: String? = null, val preferredLanguage: String? = null,
val dontTranslateFrom: Set<String> = emptySet(),
val automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS, val automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS,
val automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS, val automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS,
val automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS, val automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedPreferencesViewModel.kt
-10
View File
@@ -52,7 +52,6 @@ class SharedPreferencesViewModel : ViewModel() {
sharedPrefs.theme = savedSettings.theme sharedPrefs.theme = savedSettings.theme
sharedPrefs.language = savedSettings.preferredLanguage sharedPrefs.language = savedSettings.preferredLanguage
sharedPrefs.dontTranslateFrom = savedSettings.dontTranslateFrom
sharedPrefs.automaticallyShowImages = savedSettings.automaticallyShowImages sharedPrefs.automaticallyShowImages = savedSettings.automaticallyShowImages
sharedPrefs.automaticallyStartPlayback = savedSettings.automaticallyStartPlayback sharedPrefs.automaticallyStartPlayback = savedSettings.automaticallyStartPlayback
sharedPrefs.automaticallyShowUrlPreview = savedSettings.automaticallyShowUrlPreview sharedPrefs.automaticallyShowUrlPreview = savedSettings.automaticallyShowUrlPreview
@@ -83,14 +82,6 @@ class SharedPreferencesViewModel : ViewModel() {
} }
} }
fun removeDontTranslateFrom(languageCode: String) {
val newSet = sharedPrefs.dontTranslateFrom.minus(languageCode)
if (newSet != sharedPrefs.dontTranslateFrom) {
sharedPrefs.dontTranslateFrom = newSet
saveSharedSettings()
}
}
fun updateLanguageInTheUI() { fun updateLanguageInTheUI() {
if (sharedPrefs.language != null) { if (sharedPrefs.language != null) {
viewModelScope.launch(Dispatchers.Main) { viewModelScope.launch(Dispatchers.Main) {
@@ -197,7 +188,6 @@ class SharedPreferencesViewModel : ViewModel() {
Settings( Settings(
sharedPrefs.theme, sharedPrefs.theme,
sharedPrefs.language, sharedPrefs.language,
sharedPrefs.dontTranslateFrom,
sharedPrefs.automaticallyShowImages, sharedPrefs.automaticallyShowImages,
sharedPrefs.automaticallyStartPlayback, sharedPrefs.automaticallyStartPlayback,
sharedPrefs.automaticallyShowUrlPreview, sharedPrefs.automaticallyShowUrlPreview,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedSettingsState.kt
+1 -1
View File
@@ -38,7 +38,7 @@ import com.vitorpamplona.amethyst.model.ThemeType
class SharedSettingsState { class SharedSettingsState {
var theme by mutableStateOf(ThemeType.SYSTEM) var theme by mutableStateOf(ThemeType.SYSTEM)
var language by mutableStateOf<String?>(null) var language by mutableStateOf<String?>(null)
var dontTranslateFrom by mutableStateOf<Set<String>>(emptySet())
var automaticallyShowImages by mutableStateOf(ConnectivityType.ALWAYS) var automaticallyShowImages by mutableStateOf(ConnectivityType.ALWAYS)
var automaticallyStartPlayback by mutableStateOf(ConnectivityType.ALWAYS) var automaticallyStartPlayback by mutableStateOf(ConnectivityType.ALWAYS)
var automaticallyShowUrlPreview by mutableStateOf(ConnectivityType.ALWAYS) var automaticallyShowUrlPreview by mutableStateOf(ConnectivityType.ALWAYS)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AppSettingsScreen.kt
+6 -5
View File
@@ -120,11 +120,12 @@ fun getLanguageIndex(
): Int { ): Int {
val language = sharedPreferencesViewModel.sharedPrefs.language val language = sharedPreferencesViewModel.sharedPrefs.language
var languageIndex: Int var languageIndex: Int
if (language != null) { languageIndex =
languageIndex = languageEntries.values.toTypedArray().indexOf(language) if (language != null) {
} else { languageEntries.values.toTypedArray().indexOf(language)
languageIndex = languageEntries.values.toTypedArray().indexOf(Locale.current.toLanguageTag()) } else {
} languageEntries.values.toTypedArray().indexOf(Locale.current.toLanguageTag())
}
if (languageIndex == -1) { if (languageIndex == -1) {
languageIndex = languageEntries.values.toTypedArray().indexOf(Locale.current.language) languageIndex = languageEntries.values.toTypedArray().indexOf(Locale.current.language)
} }