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

Commit ed31aae1 authored by Kelly's avatar Kelly
Browse files

Add illustration widget to SPA and create a gallary sample page for it. 

The widget now supports image resources.

Bug: 242951784
Test: unit test and manually test on device
Change-Id: Ie2bbdb4c887d9d1947c872ef62d56f98c4357f5b
parent 9c51e97c

packages/SettingsLib/Spa/gallery/res/drawable/accessibility_captioning_banner.xml

0 → 100644
+52 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 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.

-->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="412dp"

    android:height="300dp"

    android:viewportWidth="412"

    android:viewportHeight="300">

  <path

      android:pathData="M383.9,300H28.1C12.6,300 0,287.4 0,271.9V28.1C0,12.6 12.6,0 28.1,0h355.8C399.4,0 412,12.6 412,28.1v243.8C412,287.4 399.4,300 383.9,300z"

      android:fillColor="#FFFFFF"/>

  <path

      android:pathData="M79.2,179.6h53.6v8.5h-53.6z"

      android:fillColor="#1A73E8"/>

  <path

      android:pathData="M142.5,179.6h30.4v8.5h-30.4z"

      android:fillColor="#1A73E8"/>

  <path

      android:pathData="M79.2,195.5h79.2v8.5h-79.2z"

      android:fillColor="#1A73E8"/>

  <path

      android:pathData="M168.1,195.5h34.1v8.5h-34.1z"

      android:fillColor="#1A73E8"/>

  <path

      android:pathData="M211.9,195.5h34.1v8.5h-34.1z"

      android:fillColor="#1A73E8"/>

  <path

      android:pathData="M182.7,179.6h73.1v8.5h-73.1z"

      android:fillColor="#1A73E8"/>

  <path

      android:pathData="M265.5,179.6h26.8v8.5h-26.8z"

      android:fillColor="#1A73E8"/>

  <path

      android:pathData="M302.1,179.6h26.8v8.5h-26.8z"

      android:fillColor="#1A73E8"/>

  <path

      android:pathData="M142.7,67.9h-11.5c-1.6,0 -2.9,1.3 -2.9,2.9H67.8c-7.9,0 -14.4,6.5 -14.4,14.4v132.4c0,7.9 6.5,14.4 14.4,14.4h276.4c7.9,0 14.4,-6.5 14.4,-14.4V85.2c0,-7.9 -6.5,-14.4 -14.4,-14.4H203.1c0,-1.6 -1.3,-2.9 -2.9,-2.9h-28.8c-1.6,0 -2.9,1.3 -2.9,2.9h-23C145.5,69.2 144.3,67.9 142.7,67.9zM344.2,73.7c6.4,0 11.5,5.2 11.5,11.5v132.4c0,6.3 -5.2,11.5 -11.5,11.5H67.8c-6.4,0 -11.5,-5.2 -11.5,-11.5V85.2c0,-6.3 5.2,-11.5 11.5,-11.5H344.2z"

      android:fillColor="#DADCE0"/>

</vector>

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.settingslib.spa.framework.common.SettingsPageProviderReposito 
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.IllustrationPageProvider

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

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

import com.android.settingslib.spa.gallery.preference.PreferenceMainPageProvider
@@ -45,6 +46,7 @@ object SpaEnvironment { 
                SpinnerPageProvider,

                SettingsPagerPageProvider,

                FooterPageProvider,

                IllustrationPageProvider,

            ),

            rootPageData = listOf(

                SettingsPage(HomePageProvider.name),

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.settingslib.spa.gallery.R 
import com.android.settingslib.spa.gallery.SpaEnvironment

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

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

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

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

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

import com.android.settingslib.spa.gallery.preference.PreferenceMainPageProvider
@@ -53,6 +54,7 @@ private fun HomePage() { 
        SpinnerPageProvider.EntryItem()

        SettingsPagerPageProvider.EntryItem()

        FooterPageProvider.EntryItem()

        IllustrationPageProvider.EntryItem()



        /**

         * A test button to generate hierarchy.

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

0 → 100644
+73 −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.gallery.page



import android.os.Bundle

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.rememberScrollState

import androidx.compose.foundation.verticalScroll

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

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

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

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

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

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

import com.android.settingslib.spa.widget.Illustration

import com.android.settingslib.spa.widget.IllustrationModel

import com.android.settingslib.spa.widget.ResourceType

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

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



object IllustrationPageProvider : SettingsPageProvider {

    override val name = "Illustration"



    @Composable

    override fun Page(arguments: Bundle?) {

        IllustrationPage()

    }



    @Composable

    fun EntryItem() {

        Preference(object : PreferenceModel {

            override val title = "Sample Illustration"

            override val onClick = navigator(name)

        })

    }

}



@Composable

private fun IllustrationPage() {

    Column(Modifier.verticalScroll(rememberScrollState())) {

        Preference(object : PreferenceModel {

            override val title = "Image Illustration"

        })



        Illustration(object : IllustrationModel {

            override val resId = R.drawable.accessibility_captioning_banner

            override val resourceType = ResourceType.IMAGE

        })

    }

}



@Preview(showBackground = true)

@Composable

private fun IllustrationPagePreview() {

    SettingsTheme {

        IllustrationPage()

    }

}

packages/SettingsLib/Spa/spa/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -66,4 +66,5 @@ dependencies { 
    api 'androidx.navigation:navigation-compose:2.5.0'

    api 'com.google.android.material:material:1.6.1'

    debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version"

    implementation 'com.airbnb.android:lottie-compose:5.2.0'

}