Merge "Rename SpaLib Codelab to SpaLib Gallery"
This commit is contained in:
@@ -19,7 +19,7 @@ package {
|
||||
}
|
||||
|
||||
android_app {
|
||||
name: "SpaLibCodelab",
|
||||
name: "SpaLibGallery",
|
||||
|
||||
srcs: ["src/**/*.kt"],
|
||||
|
||||
@@ -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" />
|
||||
@@ -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
|
||||
@@ -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>
|
||||
@@ -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)
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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,
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -30,5 +30,5 @@ dependencyResolutionManagement {
|
||||
}
|
||||
rootProject.name = "SpaLib"
|
||||
include ':spa'
|
||||
include ':codelab'
|
||||
include ':gallery'
|
||||
include ':tests'
|
||||
|
||||
Reference in New Issue
Block a user