Merge "Add a Chart Widget for Settings for in SPA. The chart widget supports... (50627b15) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/gallery/build.gradle

+1 −0

Original line number	Diff line number	Diff line
		@@ -58,4 +58,5 @@ android {

		dependencies {
		implementation(project(":spa"))
		implementation "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha"
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import com.android.settingslib.spa.framework.common.createSettingsPage
		import com.android.settingslib.spa.gallery.button.ActionButtonPageProvider
		import com.android.settingslib.spa.gallery.home.HomePageProvider
		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.ProgressBarPageProvider
		@@ -69,6 +70,7 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) {
		CategoryPageProvider,
		ActionButtonPageProvider,
		ProgressBarPageProvider,
		ChartPageProvider,
		),
		rootPages = listOf(
		HomePageProvider.createSettingsPage(),

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import com.android.settingslib.spa.gallery.SettingsPageProviderEnum
		import com.android.settingslib.spa.gallery.button.ActionButtonPageProvider
		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.ProgressBarPageProvider
		@@ -56,6 +57,7 @@ object HomePageProvider : SettingsPageProvider {
		CategoryPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
		ActionButtonPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
		ProgressBarPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
		ChartPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
		)
		}

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

0 → 100644

+162 −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.runtime.Composable
		import androidx.compose.ui.tooling.preview.Preview
		import com.android.settingslib.spa.framework.common.SettingsEntry
		import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
		import com.android.settingslib.spa.framework.common.SettingsPage
		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.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
		import com.android.settingslib.spa.widget.chart.PieChart
		import com.android.settingslib.spa.widget.chart.PieChartData
		import com.android.settingslib.spa.widget.chart.PieChartModel
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		import com.android.settingslib.spa.widget.scaffold.RegularScaffold
		import com.github.mikephil.charting.formatter.IAxisValueFormatter
		import java.text.NumberFormat

		private enum class WeekDay(val num: Int) {
		Sun(0), Mon(1), Tue(2), Wed(3), Thu(4), Fri(5), Sat(6),
		}
		private const val TITLE = "Sample Chart"

		object ChartPageProvider : SettingsPageProvider {
		override val name = "Chart"

		override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
		val owner = SettingsPage.create(name)
		val entryList = mutableListOf<SettingsEntry>()
		entryList.add(
		SettingsEntryBuilder.create("Line Chart", owner)
		.setUiLayoutFn {
		Preference(object : PreferenceModel {
		override val title = "Line Chart"
		})
		LineChart(
		lineChartModel = object : LineChartModel {
		override val chartDataList = listOf(
		LineChartData(x = 0f, y = 0f),
		LineChartData(x = 1f, y = 0.1f),
		LineChartData(x = 2f, y = 0.2f),
		LineChartData(x = 3f, y = 0.6f),
		LineChartData(x = 4f, y = 0.9f),
		LineChartData(x = 5f, y = 1.0f),
		LineChartData(x = 6f, y = 0.8f),
		)
		override val xValueFormatter =
		IAxisValueFormatter { value, _ ->
		"${WeekDay.values()[value.toInt()]}"
		}
		override val yValueFormatter =
		IAxisValueFormatter { value, _ ->
		NumberFormat.getPercentInstance().format(value)
		}
		}
		)
		}.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(
		SettingsEntryBuilder.create("Pie Chart", owner)
		.setUiLayoutFn {
		Preference(object : PreferenceModel {
		override val title = "Pie Chart"
		})
		PieChart(
		pieChartModel = object : PieChartModel {
		override val chartDataList = listOf(
		PieChartData(label = "Settings", value = 20f),
		PieChartData(label = "Chrome", value = 5f),
		PieChartData(label = "Gmail", value = 3f),
		)
		override val centerText = "Today"
		}
		)
		}.build()
		)

		return entryList
		}

		fun buildInjectEntry(): SettingsEntryBuilder {
		return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))
		.setIsAllowSearch(true)
		.setUiLayoutFn {
		Preference(object : PreferenceModel {
		override val title = TITLE
		override val onClick = navigator(name)
		})
		}
		}

		@Composable
		override fun Page(arguments: Bundle?) {
		RegularScaffold(title = TITLE) {
		for (entry in buildEntry(arguments)) {
		entry.UiLayout(arguments)
		}
		}
		}
		}

		@Preview(showBackground = true)
		@Composable
		private fun ChartPagePreview() {
		SettingsTheme {
		ChartPageProvider.Page(null)
		}
		}

packages/SettingsLib/Spa/settings.gradle

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ dependencyResolutionManagement {
		repositories {
		google()
		mavenCentral()
		maven { url "https://jitpack.io"}
		}
		}
		rootProject.name = "SpaLib"