diff options
| -rw-r--r-- | packages/SettingsLib/Spa/build.gradle.kts | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/LoadingBarPageProvider.kt (renamed from packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/LoadingBarPage.kt) | 10 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/gradle/libs.versions.toml | 6 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/spa/build.gradle.kts | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/LoadingBar.kt | 13 |
5 files changed, 15 insertions, 20 deletions
diff --git a/packages/SettingsLib/Spa/build.gradle.kts b/packages/SettingsLib/Spa/build.gradle.kts index c755623c6f08..4147813bd059 100644 --- a/packages/SettingsLib/Spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/build.gradle.kts @@ -29,7 +29,7 @@ val androidTop: String = File(rootDir, "../../../../..").canonicalPath allprojects { extra["androidTop"] = androidTop - extra["jetpackComposeVersion"] = "1.7.0-alpha04" + extra["jetpackComposeVersion"] = "1.7.0-alpha05" } subprojects { diff --git a/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/LoadingBarPage.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/LoadingBarPageProvider.kt index 247990c69cd8..f1cbc3729a78 100644 --- a/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/LoadingBarPage.kt +++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/LoadingBarPageProvider.kt @@ -17,6 +17,8 @@ package com.android.settingslib.spa.gallery.page import android.os.Bundle +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button import androidx.compose.material3.Text @@ -32,6 +34,7 @@ import com.android.settingslib.spa.framework.common.SettingsEntryBuilder import com.android.settingslib.spa.framework.common.SettingsPageProvider import com.android.settingslib.spa.framework.common.createSettingsPage import com.android.settingslib.spa.framework.compose.navigator +import com.android.settingslib.spa.framework.theme.SettingsDimension import com.android.settingslib.spa.framework.theme.SettingsTheme import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.PreferenceModel @@ -72,10 +75,11 @@ object LoadingBarPageProvider : SettingsPageProvider { Text(text = "Resume") } } + Spacer(modifier = Modifier.height(SettingsDimension.itemPaddingVertical)) + LinearLoadingBar(isLoading = loading) + Spacer(modifier = Modifier.height(SettingsDimension.itemPaddingVertical)) + CircularLoadingBar(isLoading = loading) } - - LinearLoadingBar(isLoading = loading, yOffset = 104.dp) - CircularLoadingBar(isLoading = loading) } } diff --git a/packages/SettingsLib/Spa/gradle/libs.versions.toml b/packages/SettingsLib/Spa/gradle/libs.versions.toml index ff2a1e8d8184..0ee9d595d875 100644 --- a/packages/SettingsLib/Spa/gradle/libs.versions.toml +++ b/packages/SettingsLib/Spa/gradle/libs.versions.toml @@ -15,11 +15,11 @@ # [versions] -agp = "8.3.0" -compose-compiler = "1.5.10" +agp = "8.3.1" +compose-compiler = "1.5.11" dexmaker-mockito = "2.28.3" jvm = "17" -kotlin = "1.9.22" +kotlin = "1.9.23" truth = "1.1.5" [libraries] diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts index f2b9235e92b4..2f2ac2467a6c 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/spa/build.gradle.kts @@ -57,13 +57,13 @@ dependencies { api("androidx.slice:slice-builders:1.1.0-alpha02") api("androidx.slice:slice-core:1.1.0-alpha02") api("androidx.slice:slice-view:1.1.0-alpha02") - api("androidx.compose.material3:material3:1.3.0-alpha02") + api("androidx.compose.material3:material3:1.3.0-alpha03") api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion") api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion") api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion") api("androidx.lifecycle:lifecycle-livedata-ktx") api("androidx.lifecycle:lifecycle-runtime-compose") - api("androidx.navigation:navigation-compose:2.8.0-alpha03") + api("androidx.navigation:navigation-compose:2.8.0-alpha05") api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha") api("com.google.android.material:material:1.7.0-alpha03") debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion") diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/LoadingBar.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/LoadingBar.kt index 1741f134f3d1..be178ff26f1f 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/LoadingBar.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/LoadingBar.kt @@ -17,7 +17,6 @@ package com.android.settingslib.spa.widget.ui import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.absoluteOffset import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.CircularProgressIndicator @@ -25,23 +24,15 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp /** * Indeterminate linear progress bar. Expresses an unspecified wait time. */ @Composable -fun LinearLoadingBar( - isLoading: Boolean, - xOffset: Dp = 0.dp, - yOffset: Dp = 0.dp -) { +fun LinearLoadingBar(isLoading: Boolean) { if (isLoading) { LinearProgressIndicator( - modifier = Modifier - .fillMaxWidth() - .absoluteOffset(xOffset, yOffset) + modifier = Modifier.fillMaxWidth() ) } } |