Remove previous implementation

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
@@ -27,7 +27,6 @@ import com.vitorpamplona.amethyst.R
data class Settings(
val theme: ThemeType = ThemeType.SYSTEM,
val preferredLanguage: String? = null,
val dontTranslateFrom: Set<String> = emptySet(),
val automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS,
val automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS,
val automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS,
@@ -52,7 +52,6 @@ class SharedPreferencesViewModel : ViewModel() {
sharedPrefs.theme = savedSettings.theme
sharedPrefs.language = savedSettings.preferredLanguage
sharedPrefs.dontTranslateFrom = savedSettings.dontTranslateFrom
sharedPrefs.automaticallyShowImages = savedSettings.automaticallyShowImages
sharedPrefs.automaticallyStartPlayback = savedSettings.automaticallyStartPlayback
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() {
if (sharedPrefs.language != null) {
viewModelScope.launch(Dispatchers.Main) {
@@ -197,7 +188,6 @@ class SharedPreferencesViewModel : ViewModel() {
Settings(
sharedPrefs.theme,
sharedPrefs.language,
sharedPrefs.dontTranslateFrom,
sharedPrefs.automaticallyShowImages,
sharedPrefs.automaticallyStartPlayback,
sharedPrefs.automaticallyShowUrlPreview,
@@ -38,7 +38,7 @@ import com.vitorpamplona.amethyst.model.ThemeType
class SharedSettingsState {
var theme by mutableStateOf(ThemeType.SYSTEM)
var language by mutableStateOf<String?>(null)
var dontTranslateFrom by mutableStateOf<Set<String>>(emptySet())
var automaticallyShowImages by mutableStateOf(ConnectivityType.ALWAYS)
var automaticallyStartPlayback by mutableStateOf(ConnectivityType.ALWAYS)
var automaticallyShowUrlPreview by mutableStateOf(ConnectivityType.ALWAYS)
@@ -120,11 +120,12 @@ fun getLanguageIndex(
): Int {
val language = sharedPreferencesViewModel.sharedPrefs.language
var languageIndex: Int
if (language != null) {
languageIndex = languageEntries.values.toTypedArray().indexOf(language)
} else {
languageIndex = languageEntries.values.toTypedArray().indexOf(Locale.current.toLanguageTag())
}
languageIndex =
if (language != null) {
languageEntries.values.toTypedArray().indexOf(language)
} else {
languageEntries.values.toTypedArray().indexOf(Locale.current.toLanguageTag())
}
if (languageIndex == -1) {
languageIndex = languageEntries.values.toTypedArray().indexOf(Locale.current.language)
}