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

Commit 92e7c989 authored by Zekan Qian's avatar Zekan Qian
Browse files

Refactor SPA framework code: 

1. rename framework/api folder to framework/common
2. rename SettingsPageRepository to SettingsPageProviderRepository
3. rename spa/MainActivity to spa/BrowseActivity
4. Add SpaEnvironment for all environment related setup for gallery

Bug: 244122804
Test: manual - build Spa gallery
Test: refactoring CL. Existing unit tests still pass.

Change-Id: I81fb60e46ef19b5176a4c2fa6e67a4f2bf0e328c
parent 77689d19

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

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


package com.android.settingslib.spa.gallery



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

import com.android.settingslib.spa.framework.BrowseActivity



class MainActivity : SpaActivity(galleryPageRepository)
 
class MainActivity : BrowseActivity(galleryPageProviders)

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

+6 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settingslib.spa.gallery



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

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

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

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

import com.android.settingslib.spa.gallery.page.FooterPageProvider
@@ -25,8 +25,8 @@ 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(

val galleryPageProviders = SettingsPageProviderRepository(

    allPagesList = listOf(

        HomePageProvider,

        PreferencePageProvider,

        SwitchPreferencePageProvider,
@@ -35,5 +35,7 @@ val galleryPageRepository = SettingsPageRepository( 
        SettingsPagerPageProvider,

        FooterPageProvider,

    ),

    startDestination = HomePageProvider.name,

    rootPages = listOf(HomePageProvider.name)

)



// TODO: add other environment setup here.

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.os.Bundle 
import androidx.compose.runtime.Composable

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.common.SettingsPageProvider

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

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

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

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

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

import androidx.navigation.NavType

import androidx.navigation.navArgument

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

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

import com.android.settingslib.spa.framework.compose.navigator

import com.android.settingslib.spa.framework.compose.toState

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

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.os.Bundle 
import androidx.compose.runtime.Composable

import androidx.compose.runtime.remember

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

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

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

import com.android.settingslib.spa.framework.compose.navigator

import com.android.settingslib.spa.framework.compose.stateOf

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