Fix KoalaPlot deprecations

Author: jarroyoesp

app/versions/mergedManifests/debug/processDebugManifest/AndroidManifest.xml

@@ -35,7 +35,6 @@
         <activity
             android:name="com.jarroyo.composeapp.MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.ComposeApp" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/versions/mergedManifests/release/processReleaseManifest/AndroidManifest.xml

@@ -36,7 +36,6 @@
         <activity
             android:name="com.jarroyo.composeapp.MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.ComposeApp" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

build-conventions/build/libs/build-conventions.jar

@@ -12,7 +12,6 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.plugin.compose")
     id("composeapp.android-conventions")
-    //id("kotlin-parcelize")
     id("com.mikepenz.aboutlibraries.plugin")
     id("composeapp.merged-manifests-conventions")
     id("composeapp.dependencies-conventions")

build-conventions/src/main/kotlin/composeapp.android-app-conventions.gradle.kts

@@ -3,6 +3,7 @@ import com.jarroyo.composeapp.ext.android
 import com.jarroyo.composeapp.ext.config
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.the
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
@@ -16,7 +17,7 @@ val libs = the<LibrariesForLibs>()
 
 kotlin {
     android {
-        namespace = "com.jarroyo.composeapp"
+        namespace = config.android.applicationId.get()
         compileSdk = project.config.android.compileSdk.get()
         minSdk = project.config.android.minSdk.get()
 

build-conventions/src/main/kotlin/composeapp.multiplatform-library-conventions.gradle.kts

@@ -22,6 +22,7 @@ kotlin = "2.3.10"
 kotlinpoet = "2.2.0"
 kotlin-multiplatform = "1.10.1"
 kotlin-result = "2.1.0"
+kotlinx-datetime = "0.6.1"
 ksp = "2.3.5"
 ktlint = "0.43.0"
 ktor = "3.4.0"
@@ -76,7 +77,7 @@ jetbrains-compose-material3 = { module = "org.jetbrains.compose.material3:materi
 jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "kotlin-multiplatform" }
 jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "kotlin-multiplatform" }
 jetbrains-compose-ui-graphics = { module = "org.jetbrains.compose.ui:ui-graphics", version.ref = "kotlin-multiplatform" }
-## jetbrains-kotlin-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
+jetbrains-kotlin-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
 jetbrains-kotlin-extensions = { module = "org.jetbrains.kotlin:kotlin-android-extensions", version.ref = "kotlin" }
 jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 jetbrains-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }

gradle/libs.versions.toml

@@ -47,11 +47,17 @@ import com.jarroyo.library.ui.shared.theme.Spacing
 import com.kizitonwose.calendar.core.minusDays
 import com.kizitonwose.calendar.core.now
 import io.github.koalaplot.core.ChartLayout
-import io.github.koalaplot.core.line.LinePlot
+import io.github.koalaplot.core.line.LinePlot2
 import io.github.koalaplot.core.style.LineStyle
 import io.github.koalaplot.core.util.ExperimentalKoalaPlotApi
+import io.github.koalaplot.core.xygraph.AxisContent
+import io.github.koalaplot.core.xygraph.AxisStyle
+import io.github.koalaplot.core.xygraph.CategoryAxisModel
 import io.github.koalaplot.core.xygraph.DefaultPoint
+import io.github.koalaplot.core.xygraph.XYGraph
 import io.github.koalaplot.core.xygraph.XYGraphScope
+import io.github.koalaplot.core.xygraph.rememberFloatLinearAxisModel
+import io.github.koalaplot.core.xygraph.rememberGridStyle
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
@@ -140,51 +146,37 @@ private fun ColumnScope.XYSamplePlot(state: State) {
         val minGraph = minValue.toFloat() - 20
         val maxGraph = maxValue.toFloat() + 20
 
+        val points = mapIndexed { index, value ->
+            if (value.value == minValue) {
+                hourMin = hourList[index]
+            }
+            if (value.value == maxValue) {
+                hourMax = hourList[index]
+            }
+            Logger.d("JAE ${hourList[index]} - $value")
+            DefaultPoint(hourList[index], value.value.toFloat())
+        }
         ChartLayout(modifier = Modifier.fillMaxSize()) {
-            val points = mapIndexed { index, value ->
-                if (value.value == minValue) {
-                    hourMin = hourList[index]
-                }
-                if (value.value == maxValue) {
-                    hourMax = hourList[index]
-                }
-                Logger.d("JAE ${hourList[index]} - $value")
-                DefaultPoint(hourList[index], value.value.toFloat())
+            XYGraph(
+                xAxisModel = CategoryAxisModel(hourList),
+                yAxisModel = rememberFloatLinearAxisModel(range = minGraph..maxGraph),
+                xAxisContent = AxisContent(
+                    labels = { Text(it) },
+                    title = { Text("Hour") },
+                    style = AxisStyle(),
+                ),
+                yAxisContent = AxisContent(
+                    labels = { Text(it.toString()) },
+                    title = { Text("Price") },
+                    style = AxisStyle(),
+                ),
+                gridStyle = rememberGridStyle(),
+            ) {
+                Chart(
+                    data = points,
+                    modifier = Modifier.fillMaxWidth(),
+                )
             }
-          // XYGraph(
-          // xAxisModel = CategoryAxisModel(hourList),
-          // yAxisModel = FloatLinearAxisModel(range = minGraph..maxGraph),
-          // yAxisLabels = {
-          // if (!thumbnail) {
-          // AxisLabel(it.toString())
-          // }
-          // },
-          // xAxisLabels = {
-          // if (!thumbnail) {
-          // AxisLabel(it, Modifier.padding(top = 2.dp))
-          // }
-          // }
-          // )
-// XYGraph<String, Float>(
-// xAxisModel = CategoryAxisModel(hourList),
-// yAxisModel = FloatLinearAxisModel(range = minGraph..maxGraph),
-// ) {
-// val points = mapIndexed { index, value ->
-// if (value.value == minValue) {
-// hourMin = hourList[index]
-// }
-// if (value.value == maxValue) {
-// hourMax = hourList[index]
-// }
-// Logger.d("JAE ${hourList[index]} - $value")
-// DefaultPoint(hourList[index], value.value.toFloat())
-// }
-
-// Chart(
-// data = points,
-// modifier = Modifier.fillMaxWidth(),
-// )
-// }
         }
         Text("Minimun prize: $minValue € at $hourMin")
         Text("Maximum prize: $maxValue € at $hourMax")
@@ -199,7 +191,7 @@ private fun XYGraphScope<String, Float>.Chart(
     data: List<DefaultPoint<String, Float>>,
     modifier: Modifier = Modifier,
 ) {
-    LinePlot(
+    LinePlot2(
         data = data,
         modifier = modifier.fillMaxSize(),
         lineStyle = LineStyle(

modules/feature-electricity/src/commonMain/kotlin/com/jarroyo/feature/electricity/ui/ElectricityScreen.kt

@@ -8,10 +8,6 @@ plugins {
 kotlin {
     android {
         namespace = "com.jarroyo.library.feature"
-        // resourcePrefix = "feature_" // Not supported in KotlinMultiplatformAndroidLibraryTarget
-        // defaultConfig { // Not supported in KotlinMultiplatformAndroidLibraryTarget
-        //     consumerProguardFiles("$projectDir/proguard-feature-consumer-rules.pro")
-        // }
     }
 
     sourceSets {

modules/library-feature/build.gradle.kts

@@ -4,13 +4,9 @@ plugins {
 
 
 kotlin {
-android {
-    namespace = "com.jarroyo.library.navigation.api"
-    // resourcePrefix = "navigation_api_"
-    // defaultConfig {
-    //     consumerProguardFiles("$projectDir/proguard-navigation-api-consumer-rules.pro")
-    // }
-}
+    android {
+        namespace = "com.jarroyo.library.navigation.api"
+    }
     sourceSets {
         commonMain.dependencies {
             implementation(libs.coroutines.core)

modules/library-navigation-api/build.gradle.kts

@@ -5,10 +5,6 @@ plugins {
 kotlin {
     android {
       namespace = "com.jarroyo.library.navigation"
-      // resourcePrefix = "navigation_"
-      // defaultConfig {
-      //   consumerProguardFiles("$projectDir/proguard-navigation-consumer-rules.pro")
-      // }
     }
 
     sourceSets {