Merge dev: SemVer suffix, locale cleanup

Author: onesyue

app/src/main/java/com/github/kr328/clash/AppSettingsActivity.kt

@@ -79,12 +79,6 @@ class AppSettingsActivity : BaseActivity<AppSettingsDesign>(), Behavior {
             Language.System -> ""
             Language.English -> "en"
             Language.ChineseSimplified -> "zh"
-            Language.ChineseTraditional -> "zh-TW"
-            Language.ChineseHK -> "zh-HK"
-            Language.Japanese -> "ja-JP"
-            Language.Korean -> "ko-KR"
-            Language.Vietnamese -> "vi"
-            Language.Russian -> "ru"
         }
         val locales = if (tag.isEmpty()) {
             LocaleListCompat.getEmptyLocaleList()

app/src/main/java/com/github/kr328/clash/UserSettingsActivity.kt

@@ -179,10 +179,10 @@ class UserSettingsActivity : BaseActivity<UserSettingsDesign>() {
                     .readTimeout(10, TimeUnit.SECONDS)
                     .build()
 
-                val isAlpha = currentVersion.contains("Alpha", ignoreCase = true)
+                val isAlpha = currentVersion.contains("-alpha", ignoreCase = true)
                 val cleanCurrent = currentVersion
-                    .replace(".Alpha", "")
-                    .replace(".Meta", "")
+                    .replace("-alpha", "", ignoreCase = true)
+                    .replace("-meta", "", ignoreCase = true)
                     .replace(".debug", "")
 
                 val apiUrl = if (isAlpha) {
@@ -260,12 +260,6 @@ class UserSettingsActivity : BaseActivity<UserSettingsDesign>() {
             getString(R.string.lang_system),
             getString(R.string.lang_english),
             getString(R.string.lang_chinese_simplified),
-            getString(R.string.lang_chinese_traditional),
-            getString(R.string.lang_chinese_hk),
-            getString(R.string.lang_japanese),
-            getString(R.string.lang_korean),
-            getString(R.string.lang_vietnamese),
-            getString(R.string.lang_russian),
         )
         val currentIdx = languages.indexOf(uiStore.language).coerceAtLeast(0)
 
@@ -285,12 +279,6 @@ class UserSettingsActivity : BaseActivity<UserSettingsDesign>() {
             Language.System -> ""
             Language.English -> "en"
             Language.ChineseSimplified -> "zh"
-            Language.ChineseTraditional -> "zh-TW"
-            Language.ChineseHK -> "zh-HK"
-            Language.Japanese -> "ja-JP"
-            Language.Korean -> "ko-KR"
-            Language.Vietnamese -> "vi"
-            Language.Russian -> "ru"
         }
         val locales = if (tag.isEmpty()) {
             LocaleListCompat.getEmptyLocaleList()

build.gradle.kts

@@ -102,7 +102,7 @@ subprojects {
                 isDefault = true
                 dimension = flavorDimensionList[0]
                 if (!removeSuffix) {
-                    versionNameSuffix = ".Alpha"
+                    versionNameSuffix = "-alpha"
                 }
 
 
@@ -120,7 +120,7 @@ subprojects {
 
                 dimension = flavorDimensionList[0]
                 if (!removeSuffix) {
-                    versionNameSuffix = ".Meta"
+                    versionNameSuffix = "-meta"
                 }
 
                 buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")

design/src/main/java/com/github/kr328/clash/design/AppSettingsDesign.kt

@@ -75,12 +75,6 @@ class AppSettingsDesign(
                     R.string.lang_system,
                     R.string.lang_english,
                     R.string.lang_chinese_simplified,
-                    R.string.lang_chinese_traditional,
-                    R.string.lang_chinese_hk,
-                    R.string.lang_japanese,
-                    R.string.lang_korean,
-                    R.string.lang_vietnamese,
-                    R.string.lang_russian,
                 ),
                 icon = R.drawable.ic_baseline_language,
                 title = R.string.language

design/src/main/java/com/github/kr328/clash/design/UserSettingsDesign.kt

@@ -127,7 +127,7 @@ class UserSettingsDesign(
                 title = R.string.check_update,
                 summary = R.string.check_update_summary,
             ) {
-                val channelName = if (versionName.contains("Alpha", ignoreCase = true))
+                val channelName = if (versionName.contains("-alpha", ignoreCase = true))
                     context.getString(R.string.update_channel_alpha)
                 else
                     context.getString(R.string.update_channel_release)

design/src/main/java/com/github/kr328/clash/design/model/Language.kt

@@ -4,10 +4,4 @@ enum class Language {
     System,
     English,
     ChineseSimplified,
-    ChineseTraditional,
-    ChineseHK,
-    Japanese,
-    Korean,
-    Vietnamese,
-    Russian,
 }