Develop

README.md

@@ -9,6 +9,11 @@ This is a simple chart library built with Jetpack Compose.
 
 Inspired by: https://github.com/AppPear/ChartView
 
+![Screenshot 2024-02-03 at 21 21 37](https://github.com/dautovicharis/Charts/assets/7049715/9ae209dd-5334-4436-9a80-febb6439abab)
+
+# Documentation
+Public API: https://dautovicharis.github.io/Charts/
+
 # Features
 - Animations
 - M3 theme support
@@ -40,64 +45,23 @@ Add it in your *settings.gradle.kts* at the end of repositories:
 
 # Supported charts
 ### Pie
-```kotlin
-@Composable
-private fun AddPieChart () {
-    PieChartView(
-        chartData = ChartData.fromDoubleList(listOf(
-            8.0, 23.0, 54.0, 32.0, 12.0, 37.0
-        ), postfix = " °C"),
-        title = stringResource(id = R.string.pie_chart),
-        chartStyle = PieChartDefaults.pieChartStyle()
-    )
-}
-```
-![Untitled design](https://github.com/dautovicharis/Charts/assets/7049715/7147b4ba-d16a-42bb-ac63-6a868f76813d)
-
+![ezgif com-optimize (1)](https://github.com/dautovicharis/Charts/assets/7049715/09e988bc-f0d8-4026-bce7-192fbbccbecc)
 
 ### Line
-```kotlin
-@Composable
-private fun AddLineChart (bezier: Boolean = false, showPoints: Boolean = false) {
-    LineChartView(
-        data = ChartData.fromIntList(listOf(
-            8, 23, 54, 32, 12, 37, 7, 23, 43
-        )),
-        chartStyle = lineChartStyle(
-            bezier = bezier,
-            showPoints = showPoints
-        ),
-        title = stringResource(id = R.string.line_chart)
-    )
-}
-```
-
-![Untitled design-2](https://github.com/dautovicharis/Charts/assets/7049715/f87d7e38-b097-43c5-87cb-8a9102f57e07)
-
-
+![line-curve-merged](https://github.com/dautovicharis/Charts/assets/7049715/f48a96be-955c-4c3a-bf3e-ca6ec7357c03)
+![line-merged](https://github.com/dautovicharis/Charts/assets/7049715/07fc5cce-1f3d-43b0-a12a-f9ef20b36878)
 
 ### Bar
-```kotlin
-@Composable
-private fun AddBarChart() {
-    BarChartView(
-        chartData = ChartData.fromFloatList(listOf(
-            -8.0f, 23.0f, 54.0f, 12.0f, 37.0f, -100f
-        )),
-        title = stringResource(id = R.string.bar_chart),
-        chartStyle = BarChartDefaults.barChartStyle()
-    )
-}
-```
-![Untitled design-5](https://github.com/dautovicharis/Charts/assets/7049715/ad4a597c-ebe0-42df-9168-a08cbf3fb994)
-
-# App demo
-Code: https://github.com/dautovicharis/Charts/blob/main/app/src/main/java/com/hd/charts/app/MainActivity.kt
-
+![bar-chart](https://github.com/dautovicharis/Charts/assets/7049715/86a490f5-613f-4fba-b62a-b3106c31cf17)
 
-https://github.com/dautovicharis/Charts/assets/7049715/a5d5f337-6c83-4853-8dd1-caf7c498bc13
 
-https://github.com/dautovicharis/Charts/assets/7049715/1677bbfe-77ff-4af7-ae8e-bf8ea8e836c3
+### Stacked Bar
+![stacked-bar-merged](https://github.com/dautovicharis/Charts/assets/7049715/09161564-88de-479f-9be8-aa7c134faffa)
 
+# Examples
+[Code Examples](https://github.com/dautovicharis/Charts/tree/main/app/src/main/java/com/hd/charts/app/demo)
 
 
+# Contributions
+Feel free to create an issue for any suggestions, improvement ideas, feature requests, or bug fixes. 
+If you have any questions, please DM me: https://www.linkedin.com/in/dautovicharis/

app/build.gradle.kts

@@ -64,6 +64,7 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.navigation.compose)
 
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))

app/charts/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsKotlinAndroid)
     `maven-publish`
+    alias(libs.plugins.dokka)
 }
 
 android {
@@ -58,8 +59,23 @@ dependencies {
     testImplementation(libs.google.tuth)
     testImplementation(libs.mockk)
 
+    // Documentation
+    dokkaPlugin(libs.dokkaAndroid)
 }
 
+// https://kotlin.github.io/dokka/1.6.0/user_guide/gradle/usage/
+tasks.dokkaHtml.configure {
+    outputDirectory.set(project.rootDir.resolve("docs"))
+    dokkaSourceSets {
+        configureEach {
+            includeNonPublic.set(false)
+            skipEmptyPackages.set(true)
+            skipDeprecated.set(false)
+        }
+    }
+}
+
+
 publishing {
     publications {
         register<MavenPublication>("release") {

app/charts/src/main/java/com/hd/charts/barchart/BarChartView.kt → app/charts/src/main/java/com/hd/charts/BarChartView.kt

@@ -1,9 +1,9 @@
-package com.hd.charts.barchart
+package com.hd.charts
 
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -14,26 +14,31 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.hd.charts.R
-import com.hd.charts.common.NO_SELECTION
+import com.hd.charts.internal.common.NO_SELECTION
+import com.hd.charts.internal.common.composable.ChartView
 import com.hd.charts.common.model.ChartData
-import com.hd.charts.common.style.ChartViewDefaults
-import com.hd.charts.common.style.ChartViewStyle
-import com.hd.charts.common.theme.ChartsDefaultTheme
+import com.hd.charts.internal.common.style.ChartViewDefaults
+import com.hd.charts.internal.common.style.ChartViewStyleInternal
+import com.hd.charts.internal.common.theme.ChartsDefaultTheme
+import com.hd.charts.internal.barchart.BarChart
+import com.hd.charts.internal.barchart.BarChartDefaults
+import com.hd.charts.internal.barchart.BarChartStyleInternal
+import com.hd.charts.style.BarChartViewStyle
 
 @Composable
 fun BarChartView(
     chartData: ChartData,
     title: String,
-    chartViewsStyle: ChartViewStyle = ChartViewDefaults.chartViewStyle(),
-    chartStyle: BarChartStyle = BarChartDefaults.barChartStyle()
+    style: BarChartViewStyle
 ) {
     var currentTitle by remember { mutableStateOf(title) }
+    val chartViewsStyle: ChartViewStyleInternal =
+        ChartViewDefaults.chartViewStyle(style = style.chartViewStyle)
+    val chartStyle: BarChartStyleInternal =
+        BarChartDefaults.barChartStyle(style = style)
 
     ChartsDefaultTheme {
-        Column(
-            modifier = chartViewsStyle.modifierMain
-        ) {
+        ChartView(chartViewsStyle = chartViewsStyle) {
             Text(
                 modifier = chartViewsStyle.modifierTopTitle,
                 text = currentTitle,
@@ -52,14 +57,26 @@ fun BarChartView(
 
 @Composable
 private fun BarChartViewPreview() {
+    val barColor = MaterialTheme.colorScheme.primary
+
+    val style = BarChartViewStyle.BarChartStyleBuilder().apply {
+        barChartStyle {
+            this.barColor = barColor
+            this.space = 8.dp
+        }
+    }.build()
+
     Row(
         modifier = Modifier
             .size(400.dp)
             .wrapContentHeight(),
     ) {
         BarChartView(
-            chartData = ChartData.fromFloatList(listOf(-300f, 50f, 20f, 1f, 15f, -30f, 50f, 35f, 25f, 40f, 500f)),
-            title = stringResource(id = R.string.bar_chart)
+            chartData = ChartData.fromFloatList(
+                listOf(-300f, 50f, 20f, 1f, 15f, -30f, 50f, 35f, 25f, 40f, 500f)
+            ),
+            title = stringResource(id = R.string.bar_chart),
+            style = style
         )
     }
 }

app/charts/src/main/java/com/hd/charts/BarStackedChartView.kt

@@ -0,0 +1,166 @@
+package com.hd.charts
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.hd.charts.internal.barstackedchart.LegendItem
+import com.hd.charts.internal.barstackedchart.StackedBarChart
+import com.hd.charts.internal.barstackedchart.StackedBarChartDefaults
+import com.hd.charts.internal.barstackedchart.StackedBarChartStyleInternal
+import com.hd.charts.internal.barstackedchart.generateColorShades
+import com.hd.charts.internal.common.NO_SELECTION
+import com.hd.charts.internal.common.composable.ChartView
+import com.hd.charts.internal.common.style.ChartViewDefaults
+import com.hd.charts.internal.common.style.ChartViewStyleInternal
+import com.hd.charts.internal.common.theme.ChartsDefaultTheme
+import com.hd.charts.common.model.ChartData
+import com.hd.charts.style.StackedBarChartViewStyle
+
+data class StackedChartData(
+    val label: String,
+    val data: ChartData
+)
+
+@Composable
+fun StackedBarChartView(
+    chartData: List<StackedChartData>,
+    title: String,
+    legend: List<String>,
+    style: StackedBarChartViewStyle
+) {
+
+    val chartViewStyle: ChartViewStyleInternal =
+        ChartViewDefaults.chartViewStyle(style = style.chartViewStyle)
+    val chartStyle: StackedBarChartStyleInternal =
+        StackedBarChartDefaults.barChartStyle(style = style)
+
+    var currentTitle by remember { mutableStateOf(title) }
+    var labels by remember { mutableStateOf(listOf<String>()) }
+
+    val colors = when (chartStyle.colors.isEmpty()) {
+        true -> {
+            generateColorShades(chartStyle.barColor, chartData.first().data.points.size)
+        }
+
+        else -> {
+            chartStyle.colors
+        }
+    }
+
+    ChartsDefaultTheme {
+        ChartView(chartViewsStyle = chartViewStyle) {
+            Text(
+                modifier = chartViewStyle.modifierTopTitle,
+                text = currentTitle,
+                style = chartViewStyle.styleTitle
+            )
+
+            StackedBarChart(chartData = chartData, style = chartStyle, colors = colors) {
+                currentTitle = when (it) {
+                    NO_SELECTION -> title
+                    else -> chartData[it].label
+                }
+
+                labels = when (it) {
+                    NO_SELECTION -> emptyList()
+                    else -> chartData[it].data.labels
+                }
+            }
+
+            LegendItem(
+                chartViewsStyle = chartViewStyle,
+                colors = colors,
+                legend = legend,
+                labels = labels
+            )
+        }
+    }
+}
+
+@Composable
+private fun StackedBarChartViewPreview() {
+    val barColor = MaterialTheme.colorScheme.primary
+
+    val style = StackedBarChartViewStyle.StackedBarChartStyleBuilder().apply {
+        stackedBarChartStyle {
+            this.barColor = barColor
+            this.space = 8.dp
+        }
+    }.build()
+
+    val legendLabels = listOf(
+        "Jan", "Feb", "Mar"
+    )
+
+    val chartData = listOf(
+        StackedChartData(
+            label = "Cherry St.", data = ChartData.fromFloatList(
+                listOf(8261.68f, 4810.34f, 1536.57f)
+            )
+        ), StackedChartData(
+            label = "Strawberry Mall", data = ChartData.fromFloatList(
+                listOf(7875.87f, 3126.58f, 2019.81f)
+            )
+        ), StackedChartData(
+            label = "Peach St.", data = ChartData.fromFloatList(
+                listOf(4990.23f, 4923.48f, 1472.59f)
+            )
+        ), StackedChartData(
+            label = "Lime Av.", data = ChartData.fromFloatList(
+                listOf(4658.42f, 2955.55f, 1390.55f)
+            )
+        ), StackedChartData(
+            label = "Apple Rd.", data = ChartData.fromFloatList(
+                listOf(3952f, 1858.46f, 917.9f)
+            )
+        )
+    )
+
+    Row(
+        modifier = Modifier
+            .width(400.dp)
+            .wrapContentHeight(),
+    ) {
+        StackedBarChartView(
+            chartData = chartData,
+            legend = legendLabels,
+            title = stringResource(id = R.string.bar_stacked_chart),
+            style = style
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun StackedBarChartViewDefault() {
+    ChartsDefaultTheme(darkTheme = false, dynamicColor = false) {
+        StackedBarChartViewPreview()
+    }
+}
+
+@Preview
+@Composable
+private fun StackedBarChartViewDark() {
+    ChartsDefaultTheme(darkTheme = true, dynamicColor = false) {
+        StackedBarChartViewPreview()
+    }
+}
+
+@Preview
+@Composable
+private fun StackedBarChartViewDynamic() {
+    ChartsDefaultTheme(darkTheme = false, dynamicColor = true) {
+        StackedBarChartViewPreview()
+    }
+}