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

Commit dc9146b7 authored by Zekan Qian's avatar Zekan Qian
Browse files

Always use Spp to generate SettingsPage in Gallery 

Bug: 244122804
Test: unit-test & local build gallery
Change-Id: I5eb215fda55753b7bb61bee1a78dcc14e237d12e
parent fdace52c

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

+15 −16
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import androidx.compose.material.icons.outlined.WarningAmber 
import androidx.compose.runtime.Composable

import androidx.compose.ui.tooling.preview.Preview

import com.android.settingslib.spa.framework.common.SettingsEntryBuilder

import com.android.settingslib.spa.framework.common.SettingsPage

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.SettingsTheme

import com.android.settingslib.spa.widget.button.ActionButton
@@ -39,13 +39,24 @@ private const val TITLE = "Sample ActionButton" 
object ActionButtonPageProvider : SettingsPageProvider {

    override val name = "ActionButton"



    override fun getTitle(arguments: Bundle?): String {

        return TITLE

    }



    @Composable

    override fun Page(arguments: Bundle?) {

        ActionButtonPage()

        RegularScaffold(title = TITLE) {

            val actionButtons = listOf(

                ActionButton(text = "Open", imageVector = Icons.Outlined.Launch) {},

                ActionButton(text = "Uninstall", imageVector = Icons.Outlined.Delete) {},

                ActionButton(text = "Force stop", imageVector = Icons.Outlined.WarningAmber) {},

            )

            ActionButtons(actionButtons)

        }

    }



    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))

        return SettingsEntryBuilder.createInject(owner = createSettingsPage())

            .setUiLayoutFn {

                Preference(object : PreferenceModel {

                    override val title = TITLE
@@ -55,22 +66,10 @@ object ActionButtonPageProvider : SettingsPageProvider { 
    }

}



@Composable

fun ActionButtonPage() {

    RegularScaffold(title = TITLE) {

        val actionButtons = listOf(

            ActionButton(text = "Open", imageVector = Icons.Outlined.Launch) {},

            ActionButton(text = "Uninstall", imageVector = Icons.Outlined.Delete) {},

            ActionButton(text = "Force stop", imageVector = Icons.Outlined.WarningAmber) {},

        )

        ActionButtons(actionButtons)

    }

}



@Preview(showBackground = true)

@Composable

private fun ActionButtonPagePreview() {

    SettingsTheme {

        ActionButtonPage()

        ActionButtonPageProvider.Page(null)

    }

}

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

+7 −13
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.tooling.preview.Preview

import com.android.settingslib.spa.framework.common.SettingsEntry

import com.android.settingslib.spa.framework.common.SettingsEntryBuilder

import com.android.settingslib.spa.framework.common.SettingsPage

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.SettingsTheme

import com.android.settingslib.spa.widget.chart.BarChart
@@ -36,7 +36,6 @@ import com.android.settingslib.spa.widget.chart.PieChartData 
import com.android.settingslib.spa.widget.chart.PieChartModel

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

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

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

import com.github.mikephil.charting.formatter.IAxisValueFormatter

import java.text.NumberFormat
@@ -47,9 +46,13 @@ private const val TITLE = "Sample Chart" 


object ChartPageProvider : SettingsPageProvider {

    override val name = "Chart"

    val owner = createSettingsPage()



    override fun getTitle(arguments: Bundle?): String {

        return TITLE

    }



    override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {

        val owner = SettingsPage.create(name)

        val entryList = mutableListOf<SettingsEntry>()

        entryList.add(

            SettingsEntryBuilder.create("Line Chart", owner)
@@ -133,7 +136,7 @@ object ChartPageProvider : SettingsPageProvider { 
    }



    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))

        return SettingsEntryBuilder.createInject(owner)

            .setUiLayoutFn {

                Preference(object : PreferenceModel {

                    override val title = TITLE
@@ -141,15 +144,6 @@ object ChartPageProvider : SettingsPageProvider { 
                })

            }

    }



    @Composable

    override fun Page(arguments: Bundle?) {

        RegularScaffold(title = TITLE) {

            for (entry in buildEntry(arguments)) {

                entry.UiLayout(arguments)

            }

        }

    }

}



@Preview(showBackground = true)

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

+3 −3
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import androidx.compose.ui.tooling.preview.Preview 
import com.android.settingslib.spa.framework.common.EntrySearchData

import com.android.settingslib.spa.framework.common.SettingsEntry

import com.android.settingslib.spa.framework.common.SettingsEntryBuilder

import com.android.settingslib.spa.framework.common.SettingsPage

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.compose.stateOf

import com.android.settingslib.spa.framework.theme.SettingsTheme
@@ -37,9 +37,9 @@ private const val TITLE = "Sample Footer" 


object FooterPageProvider : SettingsPageProvider {

    override val name = "Footer"

    val owner = createSettingsPage()



    override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {

        val owner = SettingsPage.create(name)

        val entryList = mutableListOf<SettingsEntry>()

        entryList.add(

            SettingsEntryBuilder.create( "Some Preference", owner)
@@ -58,7 +58,7 @@ object FooterPageProvider : SettingsPageProvider { 
    }



    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))

        return SettingsEntryBuilder.createInject(owner)

            .setUiLayoutFn {

                Preference(object : PreferenceModel {

                    override val title = TITLE

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

+3 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.tooling.preview.Preview

import com.android.settingslib.spa.framework.common.SettingsEntry

import com.android.settingslib.spa.framework.common.SettingsEntryBuilder

import com.android.settingslib.spa.framework.common.SettingsPage

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.SettingsTheme

import com.android.settingslib.spa.gallery.R
@@ -36,9 +36,9 @@ private const val TITLE = "Sample Illustration" 


object IllustrationPageProvider : SettingsPageProvider {

    override val name = "Illustration"

    val owner = createSettingsPage()



    override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {

        val owner = SettingsPage.create(name)

        val entryList = mutableListOf<SettingsEntry>()

        entryList.add(

            SettingsEntryBuilder.create( "Lottie Illustration", owner)
@@ -71,7 +71,7 @@ object IllustrationPageProvider : SettingsPageProvider { 
    }



     fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))

        return SettingsEntryBuilder.createInject(owner)

            .setUiLayoutFn {

                Preference(object : PreferenceModel {

                    override val title = TITLE

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

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import androidx.compose.ui.Modifier 
import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp

import com.android.settingslib.spa.framework.common.SettingsEntryBuilder

import com.android.settingslib.spa.framework.common.SettingsPage

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.SettingsTheme

import com.android.settingslib.spa.widget.preference.Preference
@@ -45,7 +45,7 @@ object LoadingBarPageProvider : SettingsPageProvider { 
    override val name = "LoadingBar"



    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))

        return SettingsEntryBuilder.createInject(owner = createSettingsPage())

            .setUiLayoutFn {

                Preference(object : PreferenceModel {

                    override val title = TITLE