Skip to content

Commit ce606a0

Browse files
dkk009dkk009
authored
Merge pull request #94 from AkYML/cm-1131
update libraries, implement version catalogs
2 parents 552480a + 62b6915 commit ce606a0

38 files changed

+796
-253
lines changed

‎YChartsLib/build.gradle.kts‎

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
2+
id("ycharts.android.library")
3+
id("ycharts.android.library.compose")
4+
id("ycharts.android.test")
45
id("maven-publish")
56
id("signing")
6-
id("org.jetbrains.dokka")
7+
alias(versionCatalogLibs.plugins.dokka)
78
}
89

910
android {
1011
compileSdk = 33
11-
12+
namespace = "co.yml.charts.components"
1213
defaultConfig {
13-
minSdk = 26
14-
targetSdk = 33
15-
1614
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1715
}
18-
1916
buildTypes {
2017
release {
2118
isMinifyEnabled = false
@@ -25,43 +22,6 @@ android {
2522
)
2623
}
2724
}
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-
}
47-
}
48-
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)
6525
}
6626
val dokkaOutputDir = "$buildDir/dokka"
6727

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

Lines changed: 5 additions & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 12 additions & 2 deletions
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‎

Lines changed: 8 additions & 2 deletions
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‎

Lines changed: 9 additions & 2 deletions
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‎

Lines changed: 9 additions & 2 deletions
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‎

Lines changed: 8 additions & 2 deletions
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‎

Lines changed: 6 additions & 2 deletions
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‎

Lines changed: 7 additions & 1 deletion
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

0 commit comments

Comments
 (0)