Merge "Creating an interface to provide a custom XAxisRenderer object to the... (a8aa4eca) · Commits · e / os / android_frameworks_base

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@ import androidx.compose.ui.viewinterop.AndroidView
		import com.android.settingslib.spa.framework.theme.divider
		import com.github.mikephil.charting.charts.BarChart
		import com.github.mikephil.charting.components.XAxis
		import com.github.mikephil.charting.components.YAxis
		import com.github.mikephil.charting.components.YAxis.AxisDependency
		import com.github.mikephil.charting.data.BarData
		import com.github.mikephil.charting.data.BarDataSet
		import com.github.mikephil.charting.data.BarEntry
		@@ -90,6 +92,10 @@ interface BarChartModel {
		/** If set to true, touch gestures are enabled on the [BarChart]. */
		val enableBarchartTouch: Boolean
		get() = true

		/** The renderer provider for x-axis. */
		val xAxisRendererProvider: XAxisRendererProvider?
		get() = null
		}

		data class BarChartData(
		@@ -143,6 +149,16 @@ fun BarChart(barChartModel: BarChartModel) {
		yOffset = 10f
		}

		barChartModel.xAxisRendererProvider?.let {
		setXAxisRenderer(
		it.provideXAxisRenderer(
		getViewPortHandler(),
		getXAxis(),
		getTransformer(YAxis.AxisDependency.LEFT)
		)
		)
		}

		axisLeft.apply {
		axisMaximum = barChartModel.yAxisMaxValue
		axisMinimum = barChartModel.yAxisMinValue

0 → 100644

+33 −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.widget.chart

		import com.github.mikephil.charting.components.XAxis
		import com.github.mikephil.charting.renderer.XAxisRenderer
		import com.github.mikephil.charting.utils.Transformer
		import com.github.mikephil.charting.utils.ViewPortHandler

		/** A provider for [XAxisRenderer] objects. */
		fun interface XAxisRendererProvider {

		/** Provides an object of [XAxisRenderer] type. */
		fun provideXAxisRenderer(
		viewPortHandler: ViewPortHandler,
		xAxis: XAxis,
		transformer: Transformer
		): XAxisRenderer
		}
		No newline at end of file