Feat: Android 16 QPR2 (API 36.1)

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

Author: imknown

app/src/main/java/net/imknown/android/forefrontinfo/ui/common/AndroidVersionExt.kt

@@ -13,6 +13,9 @@ import kotlin.reflect.KClass
 
 private const val CODENAME_RELEASE = "REL"
 
+/** [Build.VERSION_CODES_FULL].SDK_INT_MULTIPLIER */
+private const val SDK_INT_MULTIPLIER = 1_00000
+
 /** See: [Build.VERSION].RESOURCES_SDK_INT */
 private fun listCodes(kClass: KClass<*>): List<Pair<String?, Int>> {
     val fields = try {
@@ -40,7 +43,7 @@ private fun listCodes(kClass: KClass<*>): List<Pair<String?, Int>> {
 
 private fun latestApiOrNull(kClass: KClass<*>) = listCodes(kClass).lastOrNull()?.second
 
-val sdkInt by lazy {
+val sdkInt: Int by lazy {
     if (isStableAndroid()) {
         Build.VERSION.SDK_INT
     } else {
@@ -49,19 +52,30 @@ val sdkInt by lazy {
     }
 }
 
-val sdkIntFull by lazy {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+private val sdkIntFull: Int by lazy {
+    if (isAtLeastStableAndroid16()) {
         if (isStableAndroid()) {
             Build.VERSION.SDK_INT_FULL
         } else {
             latestApiOrNull(Build.VERSION_CODES_FULL::class)
                 ?: Build.VERSION.SDK_INT_FULL
         }
     } else {
-        sdkInt
+        sdkInt * SDK_INT_MULTIPLIER
     }
 }
 
+/** E.g.: "36.1" */
+val sdkFull: String by lazy {
+     "$sdkInt.${sdkIntFull.toMinor()}"
+}
+
+private fun Int.toMinor(): Int = if (isAtLeastStableAndroid16()) {
+    Build.getMinorSdkVersion(this)
+} else {
+    this % SDK_INT_MULTIPLIER
+}
+
 fun isAtLeastStableAndroid6() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M || sdkInt >= Build.VERSION_CODES.M
 fun isAtLeastStableAndroid7() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || sdkInt >= Build.VERSION_CODES.N
 fun isAtLeastStableAndroid8() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O || sdkInt >= Build.VERSION_CODES.O
@@ -82,7 +96,7 @@ fun isLatestStableAndroid(lld: Lld) = isStableAndroid()
         && Build.VERSION.SDK_INT >= lld.android.stable.api.toInt()
 
 fun isLatestPreviewAndroid(lld: Lld) = isPreviewAndroid()
-        && sdkInt >= lld.android.preview.api.toInt()
+        && sdkFull >= lld.android.preview.apiFull
 
 fun isSupportedByUpstreamAndroid(lld: Lld) = isStableAndroid()
         && Build.VERSION.SDK_INT >= lld.android.support.api.toInt()
@@ -109,9 +123,6 @@ private fun Context.isLowRamDevice() = ContextCompat.getSystemService(
     this, ActivityManager::class.java
 )?.isLowRamDevice == true
 
-@RequiresApi(Build.VERSION_CODES.BAKLAVA)
-fun getAndroidApiLevelMinor(sdkIntFull: Int): Int = Build.getMinorSdkVersion(sdkIntFull)
-
 @RequiresApi(Build.VERSION_CODES.R)
 fun getSdkExtension(extension: Int): Int = SdkExtensions.getExtensionVersion(extension)
 

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

@@ -19,7 +19,6 @@ import net.imknown.android.forefrontinfo.base.extension.formatToLocalZonedDateti
 import net.imknown.android.forefrontinfo.base.extension.fullMessage
 import net.imknown.android.forefrontinfo.ui.base.list.MyModel
 import net.imknown.android.forefrontinfo.ui.base.list.toColoredMyModel
-import net.imknown.android.forefrontinfo.ui.common.getAndroidApiLevelMinor
 import net.imknown.android.forefrontinfo.ui.common.getAndroidDessertPreview
 import net.imknown.android.forefrontinfo.ui.common.getBooleanProperty
 import net.imknown.android.forefrontinfo.ui.common.getSdkExtension
@@ -29,7 +28,6 @@ import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid10
 import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid11
 import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid12
 import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid13
-import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid16
 import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid6
 import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid7
 import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid8
@@ -39,8 +37,8 @@ import net.imknown.android.forefrontinfo.ui.common.isLatestPreviewAndroid
 import net.imknown.android.forefrontinfo.ui.common.isLatestStableAndroid
 import net.imknown.android.forefrontinfo.ui.common.isStableAndroid
 import net.imknown.android.forefrontinfo.ui.common.isSupportedByUpstreamAndroid
+import net.imknown.android.forefrontinfo.ui.common.sdkFull
 import net.imknown.android.forefrontinfo.ui.common.sdkInt
-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
@@ -80,12 +78,6 @@ class HomeRepository(
 
     fun detectAndroid(lld: Lld): MyModel {
         // region [Mine]
-        val myApiFull = if (isAtLeastStableAndroid16()) {
-            "$sdkInt.${getAndroidApiLevelMinor(sdkIntFull)}"
-        } else {
-            sdkInt.toString()
-        }
-
         var myNameAndDessert = if (isStableAndroid()) {
             val dessert = lld.android.known.find {
                 it.api.toInt() == sdkInt
@@ -94,7 +86,7 @@ class HomeRepository(
             Build.VERSION.RELEASE + ", " + dessert
         } else {
             val android = lld.android.known.find {
-                it.apiFull == myApiFull
+                it.apiFull == sdkFull
             }
             if (android != null) {
                 val preview = MyApplication.getMyString(R.string.android_info_preview)
@@ -107,7 +99,7 @@ class HomeRepository(
             myNameAndDessert += " (Go)"
         }
 
-        val mine = MyApplication.getMyString(R.string.android_info, myNameAndDessert, myApiFull)
+        val mine = MyApplication.getMyString(R.string.android_info, myNameAndDessert, sdkFull)
         // endregion [Mine]
 
         fun oneLine(android: Lld.Androids.Android) =