Merge "Rename SpaLib Codelab to SpaLib Gallery"

This commit is contained in:
Chaohui Wang
2022-08-17 15:39:48 +00:00
committed by Android (Google) Code Review
13 changed files with 20 additions and 20 deletions

View File

@@ -19,7 +19,7 @@ package {
}
android_app {
name: "SpaLibCodelab",
name: "SpaLibGallery",
srcs: ["src/**/*.kt"],

View File

@@ -15,14 +15,14 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.settingslib.spa.codelab">
package="com.android.settingslib.spa.gallery">
<application
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.SpaLib.DayNight">
<activity
android:name="com.android.settingslib.spa.codelab.MainActivity"
android:name="com.android.settingslib.spa.gallery.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

View File

@@ -20,11 +20,11 @@ plugins {
}
android {
namespace 'com.android.settingslib.spa.codelab'
namespace 'com.android.settingslib.spa.gallery'
compileSdk 33
defaultConfig {
applicationId "com.android.settingslib.spa.codelab"
applicationId "com.android.settingslib.spa.gallery"
minSdk spa_min_sdk
targetSdk 33
versionCode 1

View File

@@ -14,6 +14,6 @@
limitations under the License.
-->
<resources>
<!-- Codelab App name. [DO NOT TRANSLATE] -->
<string name="app_name" translatable="false">SpaLib Codelab</string>
<!-- Gallery App name. [DO NOT TRANSLATE] -->
<string name="app_name" translatable="false">SpaLib Gallery</string>
</resources>

View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.android.settingslib.spa.codelab
package com.android.settingslib.spa.gallery
import com.android.settingslib.spa.codelab.page.codelabPageRepository
import com.android.settingslib.spa.framework.SpaActivity
import com.android.settingslib.spa.gallery.page.galleryPageRepository
class MainActivity : SpaActivity(codelabPageRepository)
class MainActivity : SpaActivity(galleryPageRepository)

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.codelab.page
package com.android.settingslib.spa.gallery.page
import android.os.Bundle
import androidx.compose.foundation.layout.Column

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.codelab.page
package com.android.settingslib.spa.gallery.page
import android.os.Bundle
import androidx.compose.foundation.layout.Column

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.codelab.page
package com.android.settingslib.spa.gallery.page
import android.os.Bundle
import androidx.compose.foundation.layout.Column
@@ -25,10 +25,10 @@ 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.codelab.R
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
object HomePageProvider : SettingsPageProvider {
override val name = Destinations.Home

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.codelab.page
package com.android.settingslib.spa.gallery.page
import com.android.settingslib.spa.framework.api.SettingsPageRepository
@@ -26,7 +26,7 @@ object Destinations {
const val Slider = "Slider"
}
val codelabPageRepository = SettingsPageRepository(
val galleryPageRepository = SettingsPageRepository(
allPages = listOf(
HomePageProvider,
PreferencePageProvider,

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.codelab.page
package com.android.settingslib.spa.gallery.page
import android.os.Bundle
import androidx.compose.foundation.layout.Column

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.codelab.page
package com.android.settingslib.spa.gallery.page
import android.os.Bundle
import androidx.compose.foundation.layout.Column

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.codelab.page
package com.android.settingslib.spa.gallery.page
import android.os.Bundle
import androidx.compose.foundation.layout.Column

View File

@@ -30,5 +30,5 @@ dependencyResolutionManagement {
}
rootProject.name = "SpaLib"
include ':spa'
include ':codelab'
include ':gallery'
include ':tests'