Chore: Improve SDK Extension

Signed-off-by: imknown <imknown@qq.com>

Author: imknown

app/src/main/java/net/imknown/android/forefrontinfo/ui/home/HomeViewModel.kt

@@ -141,6 +141,7 @@ class HomeViewModel(
 
             withContext(Dispatchers.Default) {
                 tempModels += homeRepository.detectAndroid(lld)
+                tempModels += homeRepository.detectSdkExtension(lld)
                 tempModels += homeRepository.detectBuildId(lld)
                 tempModels += homeRepository.detectSecurityPatches(lld)
                 tempModels += homeRepository.detectPerformanceClass()

app/src/main/java/net/imknown/android/forefrontinfo/ui/home/repository/HomeRepository.kt

@@ -44,7 +44,6 @@ import net.imknown.android.forefrontinfo.ui.common.sdkIntFull
 import net.imknown.android.forefrontinfo.ui.home.datasource.AndroidDataSource
 import net.imknown.android.forefrontinfo.ui.home.datasource.LldDataSource
 import net.imknown.android.forefrontinfo.ui.home.datasource.MountDataSource
-import net.imknown.android.forefrontinfo.ui.home.model.EXTENSION_NONE
 import net.imknown.android.forefrontinfo.ui.home.model.Lld
 import net.imknown.android.forefrontinfo.ui.settings.datasource.AppInfoDataSource
 import java.io.File
@@ -108,24 +107,15 @@ class HomeRepository(
             myNameAndDessert += " (Go)"
         }
 
-        var mine = MyApplication.getMyString(R.string.android_info, myNameAndDessert, myApiFull)
-
-        var myExtension = EXTENSION_NONE
-        if (isAtLeastStableAndroid11()) {
-            myExtension = getSdkExtension(Build.VERSION.SDK_INT)
-            mine += "\n" + MyApplication.getMyString(R.string.android_info_sdk_extension,myExtension)
-        }
+        val mine = MyApplication.getMyString(R.string.android_info, myNameAndDessert, myApiFull)
         // endregion [Mine]
 
         fun oneLine(android: Lld.Androids.Android) =
             MyApplication.getMyString(R.string.android_info, android.version, android.apiFull)
 
         val lldAndroid = lld.android
 
-        var latestStable = oneLine(lldAndroid.stable)
-        if (isAtLeastStableAndroid11()) {
-            latestStable += "\n" + MyApplication.getMyString(R.string.android_info_sdk_extension,lldAndroid.stable.extension) + "\n"
-        }
+        val latestStable = oneLine(lldAndroid.stable)
         val lowestSupport = oneLine(lldAndroid.support)
         val stablePreview = oneLine(lldAndroid.stablePreview) // Beta
         val latestPreview = oneLine(lldAndroid.preview) // Canary
@@ -134,7 +124,7 @@ class HomeRepository(
         val infoDetailArgs = arrayOf(mine, latestStable, lowestSupport, stablePreview, latestPreview, latestInternal)
 
         @AttrRes val color = when {
-            (isLatestStableAndroid(lld) || isLatestPreviewAndroid(lld)) && myExtension >= lldAndroid.stable.extension -> R.attr.colorNoProblem
+            isLatestStableAndroid(lld) || isLatestPreviewAndroid(lld) -> R.attr.colorNoProblem
             isSupportedByUpstreamAndroid(lld) -> R.attr.colorWaring
             else -> R.attr.colorCritical
         }
@@ -146,6 +136,23 @@ class HomeRepository(
         )
     }
 
+    fun detectSdkExtension(lld: Lld): MyModel {
+        val lldStableExtension = lld.android.stable.extension
+
+        val (myExtension, color) = if (isAtLeastStableAndroid11()) {
+            val myExtension = getSdkExtension(Build.VERSION.SDK_INT)
+            val color = myExtension >= lldStableExtension
+            myExtension to color
+        } else {
+            MyApplication.getMyString(R.string.result_not_supported) to false
+        }
+        return toColoredMyModel(
+            MyApplication.getMyString(R.string.android_sdk_extension_title),
+            MyApplication.getMyString(R.string.android_sdk_extension_detail, myExtension, lldStableExtension),
+            color
+        )
+    }
+
     fun detectBuildId(lld: Lld): MyModel {
         val buildIdResult = Build.ID
         val systemBuildIdResult = getStringProperty(AndroidDataSource.PROP_RO_SYSTEM_BUILD_ID, isAtLeastStableAndroid9())

app/src/main/java/net/imknown/android/forefrontinfo/ui/home/res/values-fr-rFR/strings.xml

@@ -19,9 +19,11 @@
     <string name="android_info_title">"Version d'Android"</string>
     <string name="android_info">%1$s (API %2$s)</string>
     <string name="android_info_preview">Aperçu</string>
-    <string name="android_info_sdk_extension">Extension SDK: %1$s</string>
     <string name="android_info_detail">Moi: %1$s\n\nDernière stable: %2$s\nPlus faible prise en charge: %3$s\nDernière Béta: %4$s\nDernière aperçu: %5$s\nDernière interne: %6$s</string>
 
+    <string name="android_sdk_extension_title">Extension SDK</string>
+    <string name="android_sdk_extension_detail">Moi: %1$s\n\nDernière stable: %2$s</string>
+
     <string name="android_build_id_title">Id de build Android</string>
     <string name="android_build_id_detail">Moi: %1$s\nMon system: %2$s\nMon vendor: %3$s\nMon ODM: %4$s\n\nDernière stable: %5$s\n%6$s</string>
     <string name="android_build_id">%1$s (%2$s)</string>

app/src/main/java/net/imknown/android/forefrontinfo/ui/home/res/values-zh-rCN/strings.xml

@@ -19,9 +19,11 @@
     <string name="android_info_title">Android 版本</string>
     <string name="android_info">%1$s（API %2$s）</string>
     <string name="android_info_preview">预览</string>
-    <string name="android_info_sdk_extension">SDK 扩展: %1$s</string>
     <string name="android_info_detail">我的：%1$s\n\n最新稳定：%2$s\n最低支持：%3$s\n最新 Beta：%4$s\n最新预览：%5$s\n最新内部：%6$s</string>
 
+    <string name="android_sdk_extension_title">SDK 扩展</string>
+    <string name="android_sdk_extension_detail">我的：%1$s\n\n最新稳定：%2$s</string>
+
     <string name="android_build_id_title">Android 构建 id</string>
     <string name="android_build_id">%1$s（%2$s）</string>
     <string name="android_build_id_detail">我的：%1$s\n我的系统：%2$s\n我的供应商：%3$s\n我的 ODM：%4$s\n\n最新稳定：%5$s\n%6$s</string>

app/src/main/java/net/imknown/android/forefrontinfo/ui/home/res/values-zh-rTW/strings.xml

@@ -19,9 +19,11 @@
     <string name="android_info_title">Android 版本</string>
     <string name="android_info">%1$s（API %2$s）</string>
     <string name="android_info_preview">預覽</string>
-    <string name="android_info_sdk_extension">SDK 擴充: %1$s</string>
     <string name="android_info_detail">我的：%1$s\n\n最新穩定：%2$s\n最低支援：%3$s\n最新 Beta：%4$s\n最新預覽：%5$s\n最新內部：%6$s</string>
 
+    <string name="android_sdk_extension_title">SDK 擴充</string>
+    <string name="android_sdk_extension_detail">我的：%1$s\n\n最新穩定：%2$s</string>
+
     <string name="android_build_id_title">Android 構建 ID</string>
     <string name="android_build_id">%1$s（%2$s）</string>
     <string name="android_build_id_detail">我的：%1$s\n我的系統：%2$s\n我的供應商：%3$s\n我的 ODM：%4$s\n\n最新穩定：%5$s\n%6$s</string>

app/src/main/java/net/imknown/android/forefrontinfo/ui/home/res/values/strings.xml

@@ -19,9 +19,11 @@
     <string name="android_info_title">Android version</string>
     <string name="android_info">%1$s (API %2$s)</string>
     <string name="android_info_preview">Preview</string>
-    <string name="android_info_sdk_extension">SDK Extension: %1$s</string>
     <string name="android_info_detail">Mine: %1$s\n\nLatest stable: %2$s\nLowest support: %3$s\nLatest Beta: %4$s\nLatest preview: %5$s\nLatest internal: %6$s</string>
 
+    <string name="android_sdk_extension_title">SDK Extension</string>
+    <string name="android_sdk_extension_detail">Mine: %1$s\n\nLatest stable: %2$s</string>
+
     <string name="android_build_id_title">Android build ids</string>
     <string name="android_build_id_detail">Mine: %1$s\nMy system: %2$s\nMy vendor: %3$s\nMy ODM: %4$s\n\nLatest stable: %5$s\n%6$s</string>
     <string name="android_build_id">%1$s (%2$s)</string>