Skip to content

Commit 083f929

Browse files
AkYMLAkYML
committed
update to material3
1 parent eb00405 commit 083f929

File tree

6 files changed

+90
-22
lines changed

6 files changed

+90
-22
lines changed

‎YChartsLib/src/main/java/co/yml/charts/ui/barchart/BarChart.kt‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,25 @@ package co.yml.charts.ui.barchart
66
import androidx.activity.compose.BackHandler
77
import androidx.compose.foundation.clickable
88
import androidx.compose.foundation.gestures.Orientation
9-
import androidx.compose.foundation.layout.*
9+
import androidx.compose.foundation.layout.Column
10+
import androidx.compose.foundation.layout.fillMaxHeight
11+
import androidx.compose.foundation.layout.fillMaxSize
12+
import androidx.compose.foundation.layout.fillMaxWidth
13+
import androidx.compose.foundation.layout.wrapContentHeight
14+
import androidx.compose.foundation.layout.wrapContentWidth
1015
import androidx.compose.foundation.lazy.LazyColumn
11-
import androidx.compose.material.*
12-
import androidx.compose.runtime.*
16+
import androidx.compose.material.ExperimentalMaterialApi
17+
import androidx.compose.material.ModalBottomSheetState
18+
import androidx.compose.material.ModalBottomSheetValue
19+
import androidx.compose.material.rememberModalBottomSheetState
20+
import androidx.compose.material3.MaterialTheme
21+
import androidx.compose.material3.Surface
22+
import androidx.compose.runtime.Composable
23+
import androidx.compose.runtime.getValue
24+
import androidx.compose.runtime.mutableStateOf
25+
import androidx.compose.runtime.remember
26+
import androidx.compose.runtime.rememberCoroutineScope
27+
import androidx.compose.runtime.setValue
1328
import androidx.compose.ui.Alignment
1429
import androidx.compose.ui.Modifier
1530
import androidx.compose.ui.draw.clip
@@ -31,10 +46,22 @@ import co.yml.charts.chartcontainer.container.ScrollableCanvasContainer
3146
import co.yml.charts.common.components.ItemDivider
3247
import co.yml.charts.common.components.accessibility.AccessibilityBottomSheetDialog
3348
import co.yml.charts.common.components.accessibility.BarInfo
34-
import co.yml.charts.common.extensions.*
49+
import co.yml.charts.common.extensions.ColumnClip
50+
import co.yml.charts.common.extensions.RowClip
51+
import co.yml.charts.common.extensions.collectIsTalkbackEnabledAsState
52+
import co.yml.charts.common.extensions.getMaxElementInXAxis
53+
import co.yml.charts.common.extensions.getMaxElementInYAxis
54+
import co.yml.charts.common.extensions.getXMaxAndMinPoints
55+
import co.yml.charts.common.extensions.getYMaxAndMinPoints
56+
import co.yml.charts.common.extensions.isTapped
57+
import co.yml.charts.common.extensions.isYAxisTapped
3558
import co.yml.charts.common.model.Point
3659
import co.yml.charts.common.utils.ChartConstants.DEFAULT_YAXIS_BOTTOM_PADDING
37-
import co.yml.charts.ui.barchart.models.*
60+
import co.yml.charts.ui.barchart.models.BarChartData
61+
import co.yml.charts.ui.barchart.models.BarChartType
62+
import co.yml.charts.ui.barchart.models.BarData
63+
import co.yml.charts.ui.barchart.models.BarStyle
64+
import co.yml.charts.ui.barchart.models.SelectionHighlightData
3865
import kotlinx.coroutines.CoroutineScope
3966
import kotlinx.coroutines.launch
4067

@@ -145,7 +172,7 @@ fun VerticalBarChart(
145172
var rowHeight by remember { mutableStateOf(0f) }
146173
val paddingRight = paddingEnd
147174
val points = chartData.map { it.point }
148-
val bgColor = MaterialTheme.colors.surface
175+
val bgColor = MaterialTheme.colorScheme.surface
149176

150177
val (xMin, xMax) = getXMaxAndMinPoints(points)
151178
val (_, yMax) = getYMaxAndMinPoints(points)
@@ -315,7 +342,7 @@ fun HorizontalBarChart(
315342
var horizontalGap by remember { mutableStateOf(0f) }
316343
var rowHeight by remember { mutableStateOf(0f) }
317344
val points = chartData.map { it.point }
318-
val bgColor = MaterialTheme.colors.surface
345+
val bgColor = MaterialTheme.colorScheme.surface
319346

320347
val (_, xMax) = getXMaxAndMinPoints(points)
321348
val (yMin, yMax) = getYMaxAndMinPoints(points)

‎YChartsLib/src/main/java/co/yml/charts/ui/barchart/Barchart.kt‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,25 @@ package co.yml.charts.ui.barchart
66
import androidx.activity.compose.BackHandler
77
import androidx.compose.foundation.clickable
88
import androidx.compose.foundation.gestures.Orientation
9-
import androidx.compose.foundation.layout.*
9+
import androidx.compose.foundation.layout.Column
10+
import androidx.compose.foundation.layout.fillMaxHeight
11+
import androidx.compose.foundation.layout.fillMaxSize
12+
import androidx.compose.foundation.layout.fillMaxWidth
13+
import androidx.compose.foundation.layout.wrapContentHeight
14+
import androidx.compose.foundation.layout.wrapContentWidth
1015
import androidx.compose.foundation.lazy.LazyColumn
11-
import androidx.compose.material.*
12-
import androidx.compose.runtime.*
16+
import androidx.compose.material.ExperimentalMaterialApi
17+
import androidx.compose.material.ModalBottomSheetState
18+
import androidx.compose.material.ModalBottomSheetValue
19+
import androidx.compose.material.rememberModalBottomSheetState
20+
import androidx.compose.material3.MaterialTheme
21+
import androidx.compose.material3.Surface
22+
import androidx.compose.runtime.Composable
23+
import androidx.compose.runtime.getValue
24+
import androidx.compose.runtime.mutableStateOf
25+
import androidx.compose.runtime.remember
26+
import androidx.compose.runtime.rememberCoroutineScope
27+
import androidx.compose.runtime.setValue
1328
import androidx.compose.ui.Alignment
1429
import androidx.compose.ui.Modifier
1530
import androidx.compose.ui.draw.clip
@@ -31,10 +46,22 @@ import co.yml.charts.chartcontainer.container.ScrollableCanvasContainer
3146
import co.yml.charts.common.components.ItemDivider
3247
import co.yml.charts.common.components.accessibility.AccessibilityBottomSheetDialog
3348
import co.yml.charts.common.components.accessibility.BarInfo
34-
import co.yml.charts.common.extensions.*
49+
import co.yml.charts.common.extensions.ColumnClip
50+
import co.yml.charts.common.extensions.RowClip
51+
import co.yml.charts.common.extensions.collectIsTalkbackEnabledAsState
52+
import co.yml.charts.common.extensions.getMaxElementInXAxis
53+
import co.yml.charts.common.extensions.getMaxElementInYAxis
54+
import co.yml.charts.common.extensions.getXMaxAndMinPoints
55+
import co.yml.charts.common.extensions.getYMaxAndMinPoints
56+
import co.yml.charts.common.extensions.isTapped
57+
import co.yml.charts.common.extensions.isYAxisTapped
3558
import co.yml.charts.common.model.Point
3659
import co.yml.charts.common.utils.ChartConstants.DEFAULT_YAXIS_BOTTOM_PADDING
37-
import co.yml.charts.ui.barchart.models.*
60+
import co.yml.charts.ui.barchart.models.BarChartData
61+
import co.yml.charts.ui.barchart.models.BarChartType
62+
import co.yml.charts.ui.barchart.models.BarData
63+
import co.yml.charts.ui.barchart.models.BarStyle
64+
import co.yml.charts.ui.barchart.models.SelectionHighlightData
3865
import kotlinx.coroutines.CoroutineScope
3966
import kotlinx.coroutines.launch
4067

@@ -145,7 +172,7 @@ fun VerticalBarChart(
145172
var rowHeight by remember { mutableStateOf(0f) }
146173
val paddingRight = paddingEnd
147174
val points = chartData.map { it.point }
148-
val bgColor = MaterialTheme.colors.surface
175+
val bgColor = MaterialTheme.colorScheme.surface
149176

150177
val (xMin, xMax) = getXMaxAndMinPoints(points)
151178
val (_, yMax) = getYMaxAndMinPoints(points)
@@ -315,7 +342,7 @@ fun HorizontalBarChart(
315342
var horizontalGap by remember { mutableStateOf(0f) }
316343
var rowHeight by remember { mutableStateOf(0f) }
317344
val points = chartData.map { it.point }
318-
val bgColor = MaterialTheme.colors.surface
345+
val bgColor = MaterialTheme.colorScheme.surface
319346

320347
val (_, xMax) = getXMaxAndMinPoints(points)
321348
val (yMin, yMax) = getYMaxAndMinPoints(points)

‎YChartsLib/src/main/java/co/yml/charts/ui/barchart/StackedBarChart.kt‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,24 @@ package co.yml.charts.ui.barchart
44

55
import androidx.activity.compose.BackHandler
66
import androidx.compose.foundation.clickable
7-
import androidx.compose.foundation.layout.*
7+
import androidx.compose.foundation.layout.Column
8+
import androidx.compose.foundation.layout.fillMaxHeight
9+
import androidx.compose.foundation.layout.fillMaxSize
10+
import androidx.compose.foundation.layout.fillMaxWidth
11+
import androidx.compose.foundation.layout.wrapContentHeight
12+
import androidx.compose.foundation.layout.wrapContentWidth
813
import androidx.compose.foundation.lazy.LazyColumn
9-
import androidx.compose.material.*
10-
import androidx.compose.runtime.*
14+
import androidx.compose.material.ExperimentalMaterialApi
15+
import androidx.compose.material.ModalBottomSheetValue
16+
import androidx.compose.material.rememberModalBottomSheetState
17+
import androidx.compose.material3.MaterialTheme
18+
import androidx.compose.material3.Surface
19+
import androidx.compose.runtime.Composable
20+
import androidx.compose.runtime.getValue
21+
import androidx.compose.runtime.mutableStateOf
22+
import androidx.compose.runtime.remember
23+
import androidx.compose.runtime.rememberCoroutineScope
24+
import androidx.compose.runtime.setValue
1125
import androidx.compose.ui.Alignment
1226
import androidx.compose.ui.Modifier
1327
import androidx.compose.ui.draw.clip
@@ -44,6 +58,7 @@ import kotlinx.coroutines.launch
4458
* @param groupBarChartData : All data needed to stacked bar chart
4559
* @see [GroupBarChartData] Data class to save all params related to stacked bar chart
4660
*/
61+
@OptIn(ExperimentalMaterialApi::class)
4762
@Composable
4863
fun StackedBarChart(
4964
modifier: Modifier,
@@ -84,7 +99,7 @@ fun StackedBarChart(
8499
}
85100
valueList.add(yMax)
86101
}
87-
val bgColor = MaterialTheme.colors.surface
102+
val bgColor = MaterialTheme.colorScheme.surface
88103

89104
val xMax = groupBarList.size
90105
val yMax = valueList.maxOrNull() ?: 0f

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="co.yml.ycharts.app">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<application
76
android:allowBackup="true"

‎experiments/chartcontainer/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.app.chartcontainer">
3+
>
44

55
<application
66
android:allowBackup="true"

‎experiments/piechartcontainer/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.example.piechartcontainer">
3+
>
44

55
<application
66
android:allowBackup="true"

0 commit comments

Comments
 (0)