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

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

Merge "[gallery] Sample Scrollable SettingsPager" into main

parents a977d129 a10f47be

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

+6 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import com.android.settingslib.spa.gallery.page.FooterPageProvider 
import com.android.settingslib.spa.gallery.page.IllustrationPageProvider

import com.android.settingslib.spa.gallery.page.LoadingBarPageProvider

import com.android.settingslib.spa.gallery.page.ProgressBarPageProvider

import com.android.settingslib.spa.gallery.page.SettingsPagerPageProvider

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

import com.android.settingslib.spa.gallery.page.SliderPageProvider

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

import com.android.settingslib.spa.gallery.preference.MainSwitchPreferencePageProvider
@@ -48,10 +48,12 @@ import com.android.settingslib.spa.gallery.preference.PreferenceMainPageProvider 
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.PagerMainPageProvider

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.scaffold.ScrollablePagerPageProvider

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

import com.android.settingslib.spa.slice.SpaSliceBroadcastReceiver
@@ -84,7 +86,9 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) { 
                ArgumentPageProvider,

                SliderPageProvider,

                SpinnerPageProvider,

                SettingsPagerPageProvider,

                PagerMainPageProvider,

                NonScrollablePagerPageProvider,

                ScrollablePagerPageProvider,

                FooterPageProvider,

                IllustrationPageProvider,

                CategoryPageProvider,

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

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ import com.android.settingslib.spa.gallery.page.FooterPageProvider 
import com.android.settingslib.spa.gallery.page.IllustrationPageProvider

import com.android.settingslib.spa.gallery.page.LoadingBarPageProvider

import com.android.settingslib.spa.gallery.page.ProgressBarPageProvider

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

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

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

import com.android.settingslib.spa.gallery.ui.CategoryPageProvider
@@ -63,7 +63,7 @@ object HomePageProvider : SettingsPageProvider { 
            SuwScaffoldPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

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

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

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

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

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

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

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

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/SettingsPagerPage.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/scaffold/NonScrollablePagerPageProvider.kt

+15 −20
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * Copyright (C) 2024 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settingslib.spa.gallery.page

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



import android.os.Bundle

import androidx.compose.foundation.layout.Box
@@ -33,24 +33,19 @@ import com.android.settingslib.spa.widget.scaffold.SettingsPager 
import com.android.settingslib.spa.widget.scaffold.SettingsScaffold

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



private const val TITLE = "Sample SettingsPager"

object NonScrollablePagerPageProvider : SettingsPageProvider {

    override val name = "NonScrollablePager"

    private const val TITLE = "Sample Non Scrollable SettingsPager"



object SettingsPagerPageProvider : SettingsPageProvider {

    override val name = "SettingsPager"



    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = createSettingsPage())

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

        .setUiLayoutFn {

            Preference(object : PreferenceModel {

                override val title = TITLE

                override val onClick = navigator(name)

            })

        }

    }



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

        return TITLE

    }

    override fun getTitle(arguments: Bundle?) = TITLE



    @Composable

    override fun Page(arguments: Bundle?) {
@@ -66,8 +61,8 @@ object SettingsPagerPageProvider : SettingsPageProvider { 


@Preview(showBackground = true)

@Composable

private fun SettingsPagerPagePreview() {

private fun NonScrollablePagerPageProviderPreview() {

    SettingsTheme {

        SettingsPagerPageProvider.Page(null)

        NonScrollablePagerPageProvider.Page(null)

    }

}

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

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

 * Copyright (C) 2024 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 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.widget.preference.Preference

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



object PagerMainPageProvider : SettingsPageProvider {

    override val name = "PagerMain"

    private val owner = createSettingsPage()

    private const val TITLE = "Category: Pager"



    override fun buildEntry(arguments: Bundle?) = listOf(

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

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

    )



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

        .setUiLayoutFn {

            Preference(object : PreferenceModel {

                override val title = TITLE

                override val onClick = navigator(name)

            })

        }



    override fun getTitle(arguments: Bundle?) = TITLE

}

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

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

 * Copyright (C) 2024 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.Box

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.lazy.LazyColumn

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

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

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

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

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

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

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



object ScrollablePagerPageProvider : SettingsPageProvider {

    override val name = "ScrollablePager"

    private const val TITLE = "Sample Scrollable SettingsPager"



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

        .setUiLayoutFn {

            Preference(object : PreferenceModel {

                override val title = TITLE

                override val onClick = navigator(name)

            })

        }



    override fun getTitle(arguments: Bundle?) = TITLE



    @Composable

    override fun Page(arguments: Bundle?) {

        SettingsScaffold(title = getTitle(arguments)) { paddingValues ->

            Box(Modifier.padding(paddingValues)) {

                SettingsPager(listOf("Personal", "Work")) {

                    LazyColumn {

                        items(30) {

                            Preference(object : PreferenceModel {

                                override val title = it.toString()

                            })

                        }

                    }

                }

            }

        }

    }

}



@Preview(showBackground = true)

@Composable

private fun ScrollablePagerPageProviderPreview() {

    SettingsTheme {

        ScrollablePagerPageProvider.Page(null)

    }

}