Skip to content

Commit 5b926a0

Browse files
imknownimknown
committed
Chore: Rename: remove "Stable"
Signed-off-by: imknown <imknown@qq.com>
1 parent ebd1922 commit 5b926a0

8 files changed

Lines changed: 80 additions & 80 deletions

File tree

‎app/src/main/java/net/imknown/android/forefrontinfo/ui/MainActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import net.imknown.android.forefrontinfo.R
1515
import net.imknown.android.forefrontinfo.databinding.MainActivityBinding
1616
import net.imknown.android.forefrontinfo.ui.base.ext.viewBinding
1717
import net.imknown.android.forefrontinfo.ui.base.ext.windowInsetsCompatTypes
18-
import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid10
18+
import net.imknown.android.forefrontinfo.ui.common.isAtLeastAndroid10
1919
import net.imknown.android.forefrontinfo.ui.home.HomeFragment
2020
import net.imknown.android.forefrontinfo.ui.others.OthersFragment
2121
import net.imknown.android.forefrontinfo.ui.prop.PropFragment
@@ -33,7 +33,7 @@ class MainActivity : AppCompatActivity() {
3333
// https://developer.android.com/develop/ui/views/layout/edge-to-edge-manually#change-color
3434
// https://developer.android.com/develop/ui/compose/layouts/system-bars#create-transparent
3535
enableEdgeToEdge()
36-
if (isAtLeastStableAndroid10()) {
36+
if (isAtLeastAndroid10()) {
3737
window.setNavigationBarContrastEnforced(false)
3838
}
3939

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ val sdkInt: Int by lazy {
5555

5656
/** E.g.: 3600001 */
5757
private val sdkIntFull: Int by lazy {
58-
if (isAtLeastStableAndroid16()) {
58+
if (isAtLeastAndroid16()) {
5959
if (isStableAndroid()) {
6060
Build.VERSION.SDK_INT_FULL
6161
} else {
@@ -72,24 +72,24 @@ val sdkFull: String by lazy {
7272
"$sdkInt.${sdkIntFull.toMinor()}"
7373
}
7474

75-
private fun Int.toMinor(): Int = if (isAtLeastStableAndroid16()) {
75+
private fun Int.toMinor(): Int = if (isAtLeastAndroid16()) {
7676
Build.getMinorSdkVersion(this)
7777
} else {
7878
this % SDK_INT_MULTIPLIER
7979
}
8080

81-
fun isAtLeastStableAndroid6() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M || sdkInt >= Build.VERSION_CODES.M
82-
fun isAtLeastStableAndroid7() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || sdkInt >= Build.VERSION_CODES.N
83-
fun isAtLeastStableAndroid8() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O || sdkInt >= Build.VERSION_CODES.O
84-
fun isAtLeastStableAndroid8P1() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 || sdkInt >= Build.VERSION_CODES.O_MR1
85-
fun isAtLeastStableAndroid9() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P || sdkInt >= Build.VERSION_CODES.P
86-
fun isAtLeastStableAndroid10() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q || sdkInt >= Build.VERSION_CODES.Q
87-
fun isAtLeastStableAndroid11() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || sdkInt >= Build.VERSION_CODES.R
88-
fun isAtLeastStableAndroid12() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S || sdkInt >= Build.VERSION_CODES.S
89-
fun isAtLeastStableAndroid13() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU || sdkInt >= Build.VERSION_CODES.TIRAMISU
90-
// fun isAtLeastStableAndroid14() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE || sdkInt >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
91-
// fun isAtLeastStableAndroid15() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM || sdkInt >= Build.VERSION_CODES.VANILLA_ICE_CREAM
92-
fun isAtLeastStableAndroid16() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA || sdkInt >= Build.VERSION_CODES.BAKLAVA
81+
fun isAtLeastAndroid6() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M || sdkInt >= Build.VERSION_CODES.M
82+
fun isAtLeastAndroid7() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || sdkInt >= Build.VERSION_CODES.N
83+
fun isAtLeastAndroid8() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O || sdkInt >= Build.VERSION_CODES.O
84+
fun isAtLeastAndroid8p1() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 || sdkInt >= Build.VERSION_CODES.O_MR1
85+
fun isAtLeastAndroid9() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P || sdkInt >= Build.VERSION_CODES.P
86+
fun isAtLeastAndroid10() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q || sdkInt >= Build.VERSION_CODES.Q
87+
fun isAtLeastAndroid11() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || sdkInt >= Build.VERSION_CODES.R
88+
fun isAtLeastAndroid12() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S || sdkInt >= Build.VERSION_CODES.S
89+
fun isAtLeastAndroid13() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU || sdkInt >= Build.VERSION_CODES.TIRAMISU
90+
// fun isAtLeastAndroid14() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE || sdkInt >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
91+
// fun isAtLeastAndroid15() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM || sdkInt >= Build.VERSION_CODES.VANILLA_ICE_CREAM
92+
fun isAtLeastAndroid16() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA || sdkInt >= Build.VERSION_CODES.BAKLAVA
9393

9494
fun isStableAndroid() = Build.VERSION.CODENAME == CODENAME_RELEASE
9595
fun isPreviewAndroid() = !isStableAndroid()
@@ -108,7 +108,7 @@ fun isSupportedByUpstreamAndroid(lld: Lld) = isStableAndroid()
108108
* [Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY]: Android 13+
109109
* [Build.VERSION.CODENAME]
110110
*/
111-
fun getAndroidDessertPreview(): String = if (isAtLeastStableAndroid13()) {
111+
fun getAndroidDessertPreview(): String = if (isAtLeastAndroid13()) {
112112
val codename = Build.VERSION.CODENAME
113113
codename + if (codename != Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY) {
114114
", " + Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY
@@ -119,7 +119,7 @@ fun getAndroidDessertPreview(): String = if (isAtLeastStableAndroid13()) {
119119
Build.VERSION.CODENAME
120120
}
121121

122-
fun Context.isGoEdition() = isAtLeastStableAndroid8P1() && isLowRamDevice()
122+
fun Context.isGoEdition() = isAtLeastAndroid8p1() && isLowRamDevice()
123123

124124
private fun Context.isLowRamDevice() = ContextCompat.getSystemService(
125125
this, ActivityManager::class.java

‎app/src/main/java/net/imknown/android/forefrontinfo/ui/home/datasource/LldDataSource.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import io.ktor.http.headers
1414
import net.imknown.android.forefrontinfo.BuildConfig
1515
import net.imknown.android.forefrontinfo.base.extension.isChinaMainlandTimezone
1616
import net.imknown.android.forefrontinfo.ui.common.LldManager
17-
import net.imknown.android.forefrontinfo.ui.common.isAtLeastStableAndroid16
17+
import net.imknown.android.forefrontinfo.ui.common.isAtLeastAndroid16
1818
import java.io.IOException
1919
import java.net.Proxy
2020
import java.net.ProxySelector
@@ -47,7 +47,7 @@ class LldDataSource {
4747
engine {
4848
addInterceptor { chain ->
4949
val thread = Thread.currentThread()
50-
val id = if (isAtLeastStableAndroid16()) {
50+
val id = if (isAtLeastAndroid16()) {
5151
thread.threadId()
5252
} else {
5353
@Suppress("DEPRECATION")

0 commit comments

Comments
 (0)