update locale utils and language preference

Author: 314systems

app/src/main/kotlin/com/vrem/util/LocaleUtils.kt

@@ -62,8 +62,6 @@ val baseSupportedLocales: List<Locale> =
         UKRAINIAN,
     ).toList()
 
-private const val SEPARATOR: String = "_"
-
 fun findByCountryCode(countryCode: String): Locale =
     availableLocales.firstOrNull { countryCode.toCapitalize(Locale.getDefault()) == it.country }
         ?: currentLocale
@@ -73,25 +71,19 @@ fun allCountries(): List<Locale> = countriesLocales.values.toList()
 fun supportedLanguages(): List<Locale> =
     (baseSupportedLocales + currentLocale).distinct()
 
+fun supportedLanguageTags(): List<String> =
+    listOf("") + baseSupportedLocales.map { it.toLanguageTag() }
+
 fun findByLanguageTag(languageTag: String): Locale {
-    val languageTagPredicate: (Locale) -> Boolean = {
-        val locale: Locale = fromLanguageTag(languageTag)
+    if (languageTag.isEmpty()) return currentLocale
+    val locale = Locale.forLanguageTag(languageTag)
+    return baseSupportedLocales.firstOrNull {
         it.language == locale.language && it.country == locale.country
-    }
-    return supportedLanguages().firstOrNull(languageTagPredicate) ?: currentLocale
+    } ?: currentLocale
 }
 
 fun currentCountryCode(): String = currentLocale.country
 
-fun currentLanguageTag(): String = toLanguageTag(currentLocale)
+fun currentLanguageTag(): String = currentLocale.toLanguageTag()
 
-fun toLanguageTag(locale: Locale): String = locale.language + SEPARATOR + locale.country
-
-private fun fromLanguageTag(languageTag: String): Locale {
-    val codes: Array<String> = languageTag.split(SEPARATOR).toTypedArray()
-    return when (codes.size) {
-        1 -> Locale.forLanguageTag(codes[0])
-        2 -> Locale.forLanguageTag("${codes[0]}-${codes[1].toCapitalize(currentLocale)}")
-        else -> currentLocale
-    }
-}
+fun toLanguageTag(locale: Locale): String = locale.toLanguageTag()

app/src/main/kotlin/com/vrem/util/StringUtils.kt

@@ -27,3 +27,6 @@ fun String.Companion.nullToEmpty(value: String?): String = value ?: String.EMPTY
 fun String.specialTrim(): String = this.trim { it <= ' ' }.replace(" +".toRegex(), String.SPACE_SEPARATOR)
 
 fun String.toCapitalize(locale: Locale): String = this.replaceFirstChar { word -> word.uppercase(locale) }
+
+fun String.titlecaseFirst(locale: Locale): String =
+    replaceFirstChar { it.titlecase(locale) }

app/src/main/kotlin/com/vrem/wifianalyzer/settings/LanguagePreference.kt

@@ -19,20 +19,22 @@ package com.vrem.wifianalyzer.settings
 
 import android.content.Context
 import android.util.AttributeSet
-import com.vrem.util.currentLanguageTag
-import com.vrem.util.supportedLanguages
-import com.vrem.util.toCapitalize
-import com.vrem.util.toLanguageTag
+import com.vrem.util.supportedLanguageTags
+import com.vrem.util.titlecaseFirst
+import com.vrem.wifianalyzer.R
 import java.util.Locale
 
-private fun data(): List<Data> =
-    supportedLanguages()
-        .map { map(it) }
-        .sorted()
-
-private fun map(it: Locale): Data = Data(toLanguageTag(it), it.getDisplayName(it).toCapitalize(Locale.getDefault()))
+private fun data(context: Context): List<Data> =
+    supportedLanguageTags().map { tag ->
+        if (tag.isEmpty()) {
+            Data("", context.getString(R.string.system_default))
+        } else {
+            val locale = Locale.forLanguageTag(tag)
+            Data(tag, locale.getDisplayName(locale).titlecaseFirst(locale))
+        }
+    }
 
 class LanguagePreference(
     context: Context,
     attrs: AttributeSet,
-) : CustomPreference(context, attrs, data(), currentLanguageTag())
+) : CustomPreference(context, attrs, data(context), "")