Skip to content

Commit 03e9472

Browse files
AkYMLAkYML
committed
update to material 3
update to material 3 library affected{surface,text}
1 parent 50b8fd9 commit 03e9472

38 files changed

+283
-942
lines changed

‎YChartsLib/build.gradle.kts

+40-44
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
2+
id("ycharts.android.library")
3+
id("ycharts.android.library.compose")
44
id("maven-publish")
55
id("signing")
6-
id("org.jetbrains.dokka")
6+
alias(versionCatalogLibs.plugins.dokka)
77
}
88

99
android {
1010
compileSdk = 33
11-
11+
namespace = "co.yml.charts.components"
1212
defaultConfig {
13-
minSdk = 26
14-
targetSdk = 33
15-
1613
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1714
}
18-
1915
buildTypes {
2016
release {
2117
isMinifyEnabled = false
@@ -25,44 +21,44 @@ android {
2521
)
2622
}
2723
}
28-
compileOptions {
29-
sourceCompatibility = JavaVersion.VERSION_1_8
30-
targetCompatibility = JavaVersion.VERSION_1_8
31-
}
32-
kotlinOptions {
33-
jvmTarget = "1.8"
34-
freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
35-
}
36-
buildFeatures {
37-
compose = true
38-
}
39-
composeOptions {
40-
kotlinCompilerExtensionVersion = co.ycharts.dependency.Version.KOTLIN_COMPILER_EXT
41-
}
42-
packagingOptions {
43-
resources {
44-
exclude("/META-INF/{AL2.0,LGPL2.1}")
45-
}
46-
}
24+
// compileOptions {
25+
// sourceCompatibility = JavaVersion.VERSION_1_8
26+
// targetCompatibility = JavaVersion.VERSION_1_8
27+
// }
28+
// kotlinOptions {
29+
// jvmTarget = "1.8"
30+
// freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
31+
// }
32+
// buildFeatures {
33+
// compose = true
34+
// }
35+
// composeOptions {
36+
// kotlinCompilerExtensionVersion = co.ycharts.dependency.Version.KOTLIN_COMPILER_EXT
37+
// }
38+
// packagingOptions {
39+
// resources {
40+
// exclude("/META-INF/{AL2.0,LGPL2.1}")
41+
// }
42+
// }
4743
}
4844

49-
dependencies {
50-
51-
implementation(co.ycharts.dependency.YChartDependency.CORE_KTX)
52-
implementation(co.ycharts.dependency.YChartDependency.APPCOMPAT)
53-
implementation(co.ycharts.dependency.YChartDependency.MATERIAL)
54-
implementation(co.ycharts.dependency.YChartDependency.MATERIAL_3)
55-
implementation(co.ycharts.dependency.YChartDependency.COMPOSE_UI)
56-
implementation(co.ycharts.dependency.YChartDependency.COMPOSE_ACTIVITY)
57-
implementation(co.ycharts.dependency.YChartDependency.COMPOSE_MATERIAL)
58-
implementation(co.ycharts.dependency.YChartDependency.COMPOSE_TOOLING_PREVIEW)
59-
testImplementation(co.ycharts.dependency.YChartDependency.JUNIT)
60-
testImplementation(co.ycharts.dependency.YChartDependency.MOCKK)
61-
androidTestImplementation(co.ycharts.dependency.YChartDependency.COMPOSE_JUNIT)
62-
debugImplementation(co.ycharts.dependency.YChartDependency.COMPOSE_UI_TEST_MANIFEST)
63-
androidTestImplementation(co.ycharts.dependency.YChartDependency.TEST_EXTN)
64-
androidTestImplementation(co.ycharts.dependency.YChartDependency.ESPRESSO_CORE)
65-
}
45+
//dependencies {
46+
//
47+
// implementation(co.ycharts.dependency.YChartDependency.CORE_KTX)
48+
// implementation(co.ycharts.dependency.YChartDependency.APPCOMPAT)
49+
// implementation(co.ycharts.dependency.YChartDependency.MATERIAL)
50+
// implementation(co.ycharts.dependency.YChartDependency.MATERIAL_3)
51+
// implementation(co.ycharts.dependency.YChartDependency.COMPOSE_UI)
52+
// implementation(co.ycharts.dependency.YChartDependency.COMPOSE_ACTIVITY)
53+
// implementation(co.ycharts.dependency.YChartDependency.COMPOSE_MATERIAL)
54+
// implementation(co.ycharts.dependency.YChartDependency.COMPOSE_TOOLING_PREVIEW)
55+
// testImplementation(co.ycharts.dependency.YChartDependency.JUNIT)
56+
// testImplementation(co.ycharts.dependency.YChartDependency.MOCKK)
57+
// androidTestImplementation(co.ycharts.dependency.YChartDependency.COMPOSE_JUNIT)
58+
// debugImplementation(co.ycharts.dependency.YChartDependency.COMPOSE_UI_TEST_MANIFEST)
59+
// androidTestImplementation(co.ycharts.dependency.YChartDependency.TEST_EXTN)
60+
// androidTestImplementation(co.ycharts.dependency.YChartDependency.ESPRESSO_CORE)
61+
//}
6662
val dokkaOutputDir = "$buildDir/dokka"
6763

6864
tasks.dokkaHtml {

‎YChartsLib/src/main/java/co/yml/charts/axis/XAxis.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import androidx.compose.foundation.background
88
import androidx.compose.foundation.layout.Row
99
import androidx.compose.foundation.layout.fillMaxWidth
1010
import androidx.compose.foundation.layout.height
11-
import androidx.compose.runtime.*
11+
import androidx.compose.runtime.Composable
12+
import androidx.compose.runtime.getValue
13+
import androidx.compose.runtime.mutableStateOf
14+
import androidx.compose.runtime.remember
15+
import androidx.compose.runtime.setValue
1216
import androidx.compose.ui.Modifier
1317
import androidx.compose.ui.draw.clipToBounds
1418
import androidx.compose.ui.geometry.Offset

‎YChartsLib/src/main/java/co/yml/charts/common/components/Legends.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.*
55
import androidx.compose.foundation.lazy.grid.GridCells
66
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
77
import androidx.compose.foundation.lazy.grid.items
8-
import androidx.compose.material.Text
8+
import androidx.compose.material3.Text
99
import androidx.compose.runtime.Composable
1010
import androidx.compose.ui.Alignment
1111
import androidx.compose.ui.Modifier

‎YChartsLib/src/main/java/co/yml/charts/common/components/accessibility/AccessibilityBottomSheetDailog.kt

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
package co.yml.charts.common.components.accessibility
22

33
import androidx.compose.foundation.background
4-
import androidx.compose.foundation.layout.*
5-
import androidx.compose.material.*
4+
import androidx.compose.foundation.layout.Arrangement
5+
import androidx.compose.foundation.layout.Box
6+
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.ColumnScope
8+
import androidx.compose.foundation.layout.Row
9+
import androidx.compose.foundation.layout.fillMaxWidth
10+
import androidx.compose.foundation.layout.padding
11+
import androidx.compose.material.ExperimentalMaterialApi
12+
import androidx.compose.material.ModalBottomSheetLayout
13+
import androidx.compose.material.ModalBottomSheetState
14+
import androidx.compose.material3.Button
15+
import androidx.compose.material3.Text
616
import androidx.compose.runtime.Composable
717
import androidx.compose.runtime.rememberCoroutineScope
818
import androidx.compose.ui.Alignment

‎YChartsLib/src/main/java/co/yml/charts/common/components/accessibility/BarInfo.kt

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@ package co.yml.charts.common.components.accessibility
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.clickable
5-
import androidx.compose.foundation.layout.*
6-
import androidx.compose.material.Text
5+
import androidx.compose.foundation.layout.Box
6+
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.Row
8+
import androidx.compose.foundation.layout.Spacer
9+
import androidx.compose.foundation.layout.padding
10+
import androidx.compose.foundation.layout.size
11+
import androidx.compose.foundation.layout.width
12+
import androidx.compose.material3.Text
713
import androidx.compose.runtime.Composable
814
import androidx.compose.ui.Alignment
915
import androidx.compose.ui.Modifier

‎YChartsLib/src/main/java/co/yml/charts/common/components/accessibility/CombinedChartInfo.kt

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ package co.yml.charts.common.components.accessibility
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.clickable
5-
import androidx.compose.foundation.layout.*
5+
import androidx.compose.foundation.layout.Box
6+
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.Row
8+
import androidx.compose.foundation.layout.Spacer
9+
import androidx.compose.foundation.layout.height
10+
import androidx.compose.foundation.layout.padding
11+
import androidx.compose.foundation.layout.size
12+
import androidx.compose.foundation.layout.width
613
import androidx.compose.foundation.shape.CornerSize
714
import androidx.compose.foundation.shape.RoundedCornerShape
8-
import androidx.compose.material.Text
15+
import androidx.compose.material3.Text
916
import androidx.compose.runtime.Composable
1017
import androidx.compose.ui.Alignment
1118
import androidx.compose.ui.Modifier

‎YChartsLib/src/main/java/co/yml/charts/common/components/accessibility/GroupBarInfo.kt

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@ package co.yml.charts.common.components.accessibility
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.clickable
5-
import androidx.compose.foundation.layout.*
6-
import androidx.compose.material.Text
5+
import androidx.compose.foundation.layout.Box
6+
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.Row
8+
import androidx.compose.foundation.layout.Spacer
9+
import androidx.compose.foundation.layout.height
10+
import androidx.compose.foundation.layout.padding
11+
import androidx.compose.foundation.layout.size
12+
import androidx.compose.foundation.layout.width
13+
import androidx.compose.material3.Text
714
import androidx.compose.runtime.Composable
815
import androidx.compose.ui.Alignment
916
import androidx.compose.ui.Modifier

‎YChartsLib/src/main/java/co/yml/charts/common/components/accessibility/LinePointInfo.kt

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@ package co.yml.charts.common.components.accessibility
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.clickable
5-
import androidx.compose.foundation.layout.*
6-
import androidx.compose.material.Text
5+
import androidx.compose.foundation.layout.Box
6+
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.Row
8+
import androidx.compose.foundation.layout.Spacer
9+
import androidx.compose.foundation.layout.padding
10+
import androidx.compose.foundation.layout.size
11+
import androidx.compose.foundation.layout.width
12+
import androidx.compose.material3.Text
713
import androidx.compose.runtime.Composable
814
import androidx.compose.ui.Alignment
915
import androidx.compose.ui.Modifier

‎YChartsLib/src/main/java/co/yml/charts/common/components/accessibility/SliceInfo.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ package co.yml.charts.common.components.accessibility
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.clickable
5-
import androidx.compose.foundation.layout.*
6-
import androidx.compose.material.Text
5+
import androidx.compose.foundation.layout.Box
6+
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.Row
8+
import androidx.compose.foundation.layout.padding
9+
import androidx.compose.foundation.layout.size
10+
import androidx.compose.material3.Text
711
import androidx.compose.runtime.Composable
812
import androidx.compose.ui.Alignment
913
import androidx.compose.ui.Modifier

‎YChartsLib/src/main/java/co/yml/charts/common/extensions/Extensions.kt

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ import android.graphics.Paint
66
import android.graphics.Rect
77
import android.text.TextPaint
88
import android.view.accessibility.AccessibilityManager
9-
import androidx.compose.runtime.*
9+
import androidx.compose.runtime.Composable
10+
import androidx.compose.runtime.LaunchedEffect
11+
import androidx.compose.runtime.State
12+
import androidx.compose.runtime.getValue
13+
import androidx.compose.runtime.mutableStateOf
14+
import androidx.compose.runtime.remember
15+
import androidx.compose.runtime.setValue
1016
import androidx.compose.ui.geometry.Offset
1117
import androidx.compose.ui.geometry.Size
1218
import androidx.compose.ui.graphics.Outline

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

+18-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,24 @@ package co.yml.charts.ui.barchart
55

66
import androidx.activity.compose.BackHandler
77
import androidx.compose.foundation.clickable
8-
import androidx.compose.foundation.layout.*
8+
import androidx.compose.foundation.layout.Column
9+
import androidx.compose.foundation.layout.fillMaxHeight
10+
import androidx.compose.foundation.layout.fillMaxSize
11+
import androidx.compose.foundation.layout.fillMaxWidth
12+
import androidx.compose.foundation.layout.wrapContentHeight
13+
import androidx.compose.foundation.layout.wrapContentWidth
914
import androidx.compose.foundation.lazy.LazyColumn
10-
import androidx.compose.material.*
11-
import androidx.compose.runtime.*
15+
import androidx.compose.material.ExperimentalMaterialApi
16+
import androidx.compose.material.ModalBottomSheetValue
17+
import androidx.compose.material.rememberModalBottomSheetState
18+
import androidx.compose.material3.MaterialTheme
19+
import androidx.compose.material3.Surface
20+
import androidx.compose.runtime.Composable
21+
import androidx.compose.runtime.getValue
22+
import androidx.compose.runtime.mutableStateOf
23+
import androidx.compose.runtime.remember
24+
import androidx.compose.runtime.rememberCoroutineScope
25+
import androidx.compose.runtime.setValue
1226
import androidx.compose.ui.Alignment
1327
import androidx.compose.ui.Modifier
1428
import androidx.compose.ui.draw.clip
@@ -82,7 +96,7 @@ fun BarChart(modifier: Modifier, barChartData: BarChartData) {
8296
var rowHeight by remember { mutableStateOf(0f) }
8397
val paddingRight = paddingEnd
8498
val points = chartData.map { it.point }
85-
val bgColor = MaterialTheme.colors.surface
99+
val bgColor = MaterialTheme.colorScheme.surface
86100

87101
val (xMin, xMax) = getXMaxAndMinPoints(points)
88102
val (_, yMax) = getYMaxAndMinPoints(points)

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

+19-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,24 @@ package co.yml.charts.ui.barchart
55

66
import androidx.activity.compose.BackHandler
77
import androidx.compose.foundation.clickable
8-
import androidx.compose.foundation.layout.*
8+
import androidx.compose.foundation.layout.Column
9+
import androidx.compose.foundation.layout.fillMaxHeight
10+
import androidx.compose.foundation.layout.fillMaxSize
11+
import androidx.compose.foundation.layout.fillMaxWidth
12+
import androidx.compose.foundation.layout.wrapContentHeight
13+
import androidx.compose.foundation.layout.wrapContentWidth
914
import androidx.compose.foundation.lazy.LazyColumn
10-
import androidx.compose.material.*
11-
import androidx.compose.runtime.*
15+
import androidx.compose.material.ExperimentalMaterialApi
16+
import androidx.compose.material.ModalBottomSheetValue
17+
import androidx.compose.material.rememberModalBottomSheetState
18+
import androidx.compose.material3.MaterialTheme
19+
import androidx.compose.material3.Surface
20+
import androidx.compose.runtime.Composable
21+
import androidx.compose.runtime.getValue
22+
import androidx.compose.runtime.mutableStateOf
23+
import androidx.compose.runtime.remember
24+
import androidx.compose.runtime.rememberCoroutineScope
25+
import androidx.compose.runtime.setValue
1226
import androidx.compose.ui.Alignment
1327
import androidx.compose.ui.Modifier
1428
import androidx.compose.ui.draw.clip
@@ -49,6 +63,7 @@ import kotlinx.coroutines.launch
4963
* @param groupBarChartData : All data needed to group bar chart
5064
* @see [GroupBarChartData] Data class to save all params related to Bar Chart
5165
*/
66+
@OptIn(ExperimentalMaterialApi::class)
5267
@Composable
5368
fun GroupBarChart(modifier: Modifier, groupBarChartData: GroupBarChartData) {
5469
val accessibilitySheetState =
@@ -76,7 +91,7 @@ fun GroupBarChart(modifier: Modifier, groupBarChartData: GroupBarChartData) {
7691
var rowHeight by remember { mutableStateOf(0f) }
7792
val paddingRight = groupBarChartData.paddingEnd
7893
val valueList = groupBarList.map { it.yMax }
79-
val bgColor = MaterialTheme.colors.surface
94+
val bgColor = MaterialTheme.colorScheme.surface
8095

8196
val xMax = groupBarList.size
8297
val yMax = valueList.maxOrNull() ?: 0f

‎YChartsLib/src/main/java/co/yml/charts/ui/combinedchart/CombinedChart.kt

+18-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,24 @@ package co.yml.charts.ui.combinedchart
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
@@ -93,7 +107,7 @@ fun CombinedChart(modifier: Modifier, combinedChartData: CombinedChartData) {
93107
val linePoints: List<Point> =
94108
linePlotData.lines.flatMap { line -> line.dataPoints.map { it } }
95109
val barPoints = barPlotData.groupBarList.flatMap { bar -> bar.barList.map { it } }
96-
val bgColor = MaterialTheme.colors.surface
110+
val bgColor = MaterialTheme.colorScheme.surface
97111
val xMin =
98112
minOf(if(linePoints.isEmpty()) 0.0f else linePoints.minOf { it.x }, (barPlotData.groupBarList.size).toFloat())
99113
val xMax =

0 commit comments

Comments
 (0)