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

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

Merge "[Spa] New SuwScaffold" into main

parents 43a268fb d7ebc21d

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.6.0-beta01"

    extra["jetpackComposeVersion"] = "1.6.0-beta02"

}



subprojects {

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import com.android.settingslib.spa.gallery.preference.PreferencePageProvider 
import com.android.settingslib.spa.gallery.preference.SwitchPreferencePageProvider

import com.android.settingslib.spa.gallery.preference.TwoTargetSwitchPreferencePageProvider

import com.android.settingslib.spa.gallery.scaffold.SearchScaffoldPageProvider

import com.android.settingslib.spa.gallery.scaffold.SuwScaffoldPageProvider

import com.android.settingslib.spa.gallery.ui.CategoryPageProvider

import com.android.settingslib.spa.gallery.ui.CopyablePageProvider

import com.android.settingslib.spa.gallery.ui.SpinnerPageProvider
@@ -100,6 +101,7 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) { 
                SettingsExposedDropdownMenuCheckBoxProvider,

                SettingsTextFieldPasswordPageProvider,

                SearchScaffoldPageProvider,

                SuwScaffoldPageProvider,

                CardPageProvider,

                CopyablePageProvider,

            ),

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/home/HomePageProvider.kt

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.settingslib.spa.gallery.page.SettingsPagerPageProvider 
import com.android.settingslib.spa.gallery.page.SliderPageProvider

import com.android.settingslib.spa.gallery.preference.PreferenceMainPageProvider

import com.android.settingslib.spa.gallery.scaffold.SearchScaffoldPageProvider

import com.android.settingslib.spa.gallery.scaffold.SuwScaffoldPageProvider

import com.android.settingslib.spa.gallery.ui.CategoryPageProvider

import com.android.settingslib.spa.gallery.ui.CopyablePageProvider

import com.android.settingslib.spa.gallery.ui.SpinnerPageProvider
@@ -59,6 +60,7 @@ object HomePageProvider : SettingsPageProvider { 
            OperateListPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            ArgumentPageProvider.buildInjectEntry("foo")!!.setLink(fromPage = owner).build(),

            SearchScaffoldPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            SuwScaffoldPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            SliderPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            SpinnerPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            SettingsPagerPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/scaffold/SuwScaffoldPageProvider.kt

0 → 100644
+85 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.spa.gallery.scaffold



import android.os.Bundle

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.padding

import androidx.compose.material.icons.Icons

import androidx.compose.material.icons.outlined.SignalCellularAlt

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

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.gallery.R

import com.android.settingslib.spa.widget.illustration.Illustration

import com.android.settingslib.spa.widget.illustration.IllustrationModel

import com.android.settingslib.spa.widget.illustration.ResourceType

import com.android.settingslib.spa.widget.preference.Preference

import com.android.settingslib.spa.widget.preference.PreferenceModel

import com.android.settingslib.spa.widget.scaffold.BottomAppBarButton

import com.android.settingslib.spa.widget.scaffold.SuwScaffold

import com.android.settingslib.spa.widget.ui.SettingsBody



private const val TITLE = "Sample SuwScaffold"



object SuwScaffoldPageProvider : SettingsPageProvider {

    override val name = "SuwScaffold"



    private val owner = createSettingsPage()



    fun buildInjectEntry() = SettingsEntryBuilder.createInject(owner = owner)

        .setUiLayoutFn {

            Preference(object : PreferenceModel {

                override val title = TITLE

                override val onClick = navigator(name)

            })

        }



    @Composable

    override fun Page(arguments: Bundle?) {

        Page()

    }

}



@Composable

private fun Page() {

    SuwScaffold(

        imageVector = Icons.Outlined.SignalCellularAlt,

        title = "Connect to mobile network",

        actionButton = BottomAppBarButton("Next") {},

        dismissButton = BottomAppBarButton("Cancel") {},

    ) {

        Column(Modifier.padding(SettingsDimension.itemPadding)) {

            SettingsBody("To add another SIM, download a new eSIM.")

        }

        Illustration(object : IllustrationModel {

            override val resId = R.drawable.accessibility_captioning_banner

            override val resourceType = ResourceType.IMAGE

        })

        Column(Modifier.padding(SettingsDimension.itemPadding)) {

            SettingsBody("To add another SIM, download a new eSIM.")

        }

        Illustration(object : IllustrationModel {

            override val resId = R.drawable.accessibility_captioning_banner

            override val resourceType = ResourceType.IMAGE

        })

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 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.2.0-alpha11")

    api("androidx.compose.material3:material3:1.2.0-alpha12")

    api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion")

    api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion")

    api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion")