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

Commit 7e7d9a68 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Support stack bar chart" into main

parents 8d2b2229 c09b8cfa

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

+1 −1
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.framework.common.SpaEnvironment

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

import com.android.settingslib.spa.gallery.button.ActionButtonPageProvider

import com.android.settingslib.spa.gallery.chart.ChartPageProvider

import com.android.settingslib.spa.gallery.dialog.AlertDialogPageProvider

import com.android.settingslib.spa.gallery.editor.EditorMainPageProvider

import com.android.settingslib.spa.gallery.editor.SettingsExposedDropdownMenuBoxPageProvider
@@ -32,7 +33,6 @@ import com.android.settingslib.spa.gallery.itemList.ItemOperatePageProvider 
import com.android.settingslib.spa.gallery.itemList.OperateListPageProvider

import com.android.settingslib.spa.gallery.editor.SettingsOutlinedTextFieldPageProvider

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

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

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

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

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

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

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

 * Copyright (C) 2023 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.chart



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

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

import com.android.settingslib.spa.widget.chart.BarChart

import com.android.settingslib.spa.widget.chart.BarChartData

import com.android.settingslib.spa.widget.chart.BarChartModel

import com.android.settingslib.spa.widget.chart.ColorPalette

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

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

import com.github.mikephil.charting.formatter.IAxisValueFormatter



fun createBarChartEntry(owner: SettingsPage) = SettingsEntryBuilder.create("Bar Chart", owner)

    .setUiLayoutFn {

        Preference(object : PreferenceModel {

            override val title = "Bar Chart"

        })

        BarChart(

            barChartModel = object : BarChartModel {

                override val chartDataList = listOf(

                    BarChartData(x = 0f, y = listOf(12f, 2f)),

                    BarChartData(x = 1f, y = listOf(5f, 1f)),

                    BarChartData(x = 2f, y = listOf(21f, 2f)),

                    BarChartData(x = 3f, y = listOf(5f, 1f)),

                    BarChartData(x = 4f, y = listOf(10f, 0f)),

                    BarChartData(x = 5f, y = listOf(9f, 1f)),

                    BarChartData(x = 6f, y = listOf(1f, 1f)),

                )

                override val colors = listOf(ColorPalette.green, ColorPalette.yellow)

                override val xValueFormatter = IAxisValueFormatter { value, _ ->

                    "4/${value.toInt() + 1}"

                }

                override val yValueFormatter = IAxisValueFormatter { value, _ ->

                    "${value.toInt()}m"

                }

                override val yAxisMaxValue = 30f

            }

        )

    }.build()

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/ChartPage.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/chart/ChartPageProvider.kt

+3 −35
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * Copyright (C) 2023 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



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

package com.android.settingslib.spa.gallery.chart



import android.os.Bundle

import androidx.compose.runtime.Composable
@@ -25,9 +25,6 @@ import com.android.settingslib.spa.framework.common.SettingsPageProvider 
import com.android.settingslib.spa.framework.common.createSettingsPage

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

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

import com.android.settingslib.spa.widget.chart.BarChart

import com.android.settingslib.spa.widget.chart.BarChartData

import com.android.settingslib.spa.widget.chart.BarChartModel

import com.android.settingslib.spa.widget.chart.LineChart

import com.android.settingslib.spa.widget.chart.LineChartData

import com.android.settingslib.spa.widget.chart.LineChartModel
@@ -83,36 +80,7 @@ object ChartPageProvider : SettingsPageProvider { 
                    )

                }.build()

        )

        entryList.add(

            SettingsEntryBuilder.create("Bar Chart", owner)

                .setUiLayoutFn {

                    Preference(object : PreferenceModel {

                        override val title = "Bar Chart"

                    })

                    BarChart(

                        barChartModel = object : BarChartModel {

                            override val chartDataList = listOf(

                                BarChartData(x = 0f, y = 12f),

                                BarChartData(x = 1f, y = 5f),

                                BarChartData(x = 2f, y = 21f),

                                BarChartData(x = 3f, y = 5f),

                                BarChartData(x = 4f, y = 10f),

                                BarChartData(x = 5f, y = 9f),

                                BarChartData(x = 6f, y = 1f),

                            )

                            override val xValueFormatter =

                                IAxisValueFormatter { value, _ ->

                                    "${WeekDay.values()[value.toInt()]}"

                                }

                            override val yValueFormatter =

                                IAxisValueFormatter { value, _ ->

                                    "${value.toInt()}m"

                                }

                            override val yAxisMaxValue = 30f

                        }

                    )

                }.build()

        )

        entryList.add(createBarChartEntry(owner))

        entryList.add(

            SettingsEntryBuilder.create("Pie Chart", owner)

                .setUiLayoutFn {

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

+1 −1
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ import com.android.settingslib.spa.framework.theme.SettingsTheme 
import com.android.settingslib.spa.gallery.R

import com.android.settingslib.spa.gallery.SettingsPageProviderEnum

import com.android.settingslib.spa.gallery.button.ActionButtonPageProvider

import com.android.settingslib.spa.gallery.chart.ChartPageProvider

import com.android.settingslib.spa.gallery.dialog.AlertDialogPageProvider

import com.android.settingslib.spa.gallery.editor.EditorMainPageProvider

import com.android.settingslib.spa.gallery.itemList.OperateListPageProvider

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

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

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

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

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

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

packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/BarChartScreenshotTest.kt

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


package com.android.settingslib.spa.screenshot



import androidx.compose.material3.MaterialTheme

import com.android.settingslib.spa.widget.chart.BarChart

import com.android.settingslib.spa.widget.chart.BarChartData

import com.android.settingslib.spa.widget.chart.BarChartModel
@@ -45,17 +46,19 @@ class BarChartScreenshotTest(emulationSpec: DeviceEmulationSpec) { 
    @Test

    fun test() {

        screenshotRule.screenshotTest("barChart") {

            val color = MaterialTheme.colorScheme.surfaceVariant

            BarChart(

                barChartModel = object : BarChartModel {

                    override val chartDataList = listOf(

                        BarChartData(x = 0f, y = 12f),

                        BarChartData(x = 1f, y = 5f),

                        BarChartData(x = 2f, y = 21f),

                        BarChartData(x = 3f, y = 5f),

                        BarChartData(x = 4f, y = 10f),

                        BarChartData(x = 5f, y = 9f),

                        BarChartData(x = 6f, y = 1f),

                        BarChartData(x = 0f, y = listOf(12f)),

                        BarChartData(x = 1f, y = listOf(5f)),

                        BarChartData(x = 2f, y = listOf(21f)),

                        BarChartData(x = 3f, y = listOf(5f)),

                        BarChartData(x = 4f, y = listOf(10f)),

                        BarChartData(x = 5f, y = listOf(9f)),

                        BarChartData(x = 6f, y = listOf(1f)),

                    )

                    override val colors = listOf(color)

                    override val xValueFormatter =

                        IAxisValueFormatter { value, _ ->

                            "${WeekDay.values()[value.toInt()]}"