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

Commit 1ec0798f authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Create HomeScaffold for SpaLib 

Update the SpaLib Gallery to use the new HomeScaffold.

Bug: 235727273
Test: Manual with Gallery App
Change-Id: I5c5f6065b7192f659874432af55df075ef492e86
parent 748e5470

packages/SettingsLib/Spa/.idea/codeStyles/Project.xml

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
      </option>

      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />

      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />

      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

    </JetCodeStyleSettings>

    <XML>

      <option name="XML_KEEP_LINE_BREAKS" value="true" />
@@ -130,6 +131,7 @@ 
      </arrangement>

    </codeStyleSettings>

    <codeStyleSettings language="kotlin">

      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

      <indentOptions>

        <option name="CONTINUATION_INDENT_SIZE" value="4" />

      </indentOptions>

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

+0 −1
Original line number Diff line number Diff line
@@ -17,6 +17,5 @@ 
package com.android.settingslib.spa.gallery



import com.android.settingslib.spa.framework.SpaActivity

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



class MainActivity : SpaActivity(galleryPageRepository)

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

+8 −1
Original line number Diff line number Diff line
@@ -14,9 +14,16 @@ 
 * limitations under the License.

 */



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

package com.android.settingslib.spa.gallery



import com.android.settingslib.spa.framework.api.SettingsPageRepository

import com.android.settingslib.spa.gallery.home.HomePageProvider

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

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

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

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

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

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



val galleryPageRepository = SettingsPageRepository(

    allPages = listOf(

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/HomePage.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/home/HomePage.kt

+9 −15
Original line number Diff line number Diff line
@@ -14,21 +14,22 @@ 
 * limitations under the License.

 */



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

package com.android.settingslib.spa.gallery.home



import android.os.Bundle

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.padding

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.stringResource

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

import com.android.settingslib.spa.framework.api.SettingsPageProvider

import com.android.settingslib.spa.framework.theme.SettingsDimension

import com.android.settingslib.spa.framework.theme.SettingsTheme

import com.android.settingslib.spa.gallery.R

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

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

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

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

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

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

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



object HomePageProvider : SettingsPageProvider {

    override val name = "Home"
@@ -41,14 +42,7 @@ object HomePageProvider : SettingsPageProvider { 


@Composable

private fun HomePage() {

    Column {

        Text(

            text = stringResource(R.string.app_name),

            modifier = Modifier.padding(SettingsDimension.itemPadding),

            color = MaterialTheme.colorScheme.onSurface,

            style = MaterialTheme.typography.headlineMedium,

        )



    HomeScaffold(title = stringResource(R.string.app_name)) {

        PreferencePageProvider.EntryItem()

        SwitchPreferencePageProvider.EntryItem()

        ArgumentPageProvider.EntryItem(stringParam = "foo", intParam = 0)

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/HomeScaffold.kt

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

 * Copyright (C) 2022 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.widget.scaffold



import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.rememberScrollState

import androidx.compose.foundation.verticalScroll

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import com.android.settingslib.spa.framework.theme.SettingsDimension



@Composable

fun HomeScaffold(title: String, content: @Composable () -> Unit) {

    Column(

        Modifier

            .fillMaxSize()

            .background(color = MaterialTheme.colorScheme.background)

            .verticalScroll(rememberScrollState()),

    ) {

        Text(

            text = title,

            modifier = Modifier.padding(SettingsDimension.itemPadding),

            color = MaterialTheme.colorScheme.onSurface,

            style = MaterialTheme.typography.headlineMedium,

        )



        content()

    }

}