Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69a62d57 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Fix LoadingBarPage" into main

parents 1ae8b771 fcc24eca

packages/SettingsLib/Spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -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 {

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/LoadingBarPage.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/LoadingBarPageProvider.kt

+7 −3
Original line number Diff line number Diff line
@@ -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,12 +75,13 @@ object LoadingBarPageProvider : SettingsPageProvider { 
                    Text(text = "Resume")

                }

            }

        }



        LinearLoadingBar(isLoading = loading, yOffset = 104.dp)

            Spacer(modifier = Modifier.height(SettingsDimension.itemPaddingVertical))

            LinearLoadingBar(isLoading = loading)

            Spacer(modifier = Modifier.height(SettingsDimension.itemPaddingVertical))

            CircularLoadingBar(isLoading = loading)

        }

    }

}



@Preview(showBackground = true)

@Composable

packages/SettingsLib/Spa/gradle/libs.versions.toml

+3 −3
Original line number Diff line number Diff line
@@ -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]

packages/SettingsLib/Spa/spa/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -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")

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/LoadingBar.kt

+2 −11
Original line number Diff line number Diff line
@@ -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()

        )

    }

}