wip

meikpiep · Mar 6, 2025 · fff803c · fff803c
1 parent 3720353
commit fff803c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsActivity.kt
@@ -137,13 +137,12 @@ class StatisticsActivity : AppCompatActivity() {
         ) {
             val wrappedChartData = dublicateIfSingleItem(chartData)
 
-            chartView.setModel(
+            chartView.model =
                 CartesianChartModel(
                     LineCartesianLayerModel.build {
                         series(wrappedChartData)
                     },
-                ),
-            )
+                )
 
             addColorToLine(
                 chartView,
@@ -157,7 +156,7 @@ class StatisticsActivity : AppCompatActivity() {
                         label = { _ -> getString(chartView.context, R.string.statistics_diagram_threshold_average_value) },
                         line =
                             LineComponent(
-                                color = MaterialColors.getColor(chartView.rootView, R.attr.colorCustomColor1),
+                                fill = Fill(MaterialColors.getColor(chartView.rootView, R.attr.colorCustomColor1)),
                                 thicknessDp = 2f,
                             ),
                         labelComponent =

diff --git a/.../src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsDurationDiagramFragment.kt b/.../src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsDurationDiagramFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.patrykandpatrick.vico.core.cartesian.axis.VerticalAxis
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.piepmeyer.gauguin.R
@@ -43,7 +42,7 @@ class StatisticsDurationDiagramFragment :
                 com.google.android.material.R.attr.colorSecondary,
             )
 
-            val axis =
+            /*val axis =
                 binding.overallDuration.chart!!.startAxis as VerticalAxis
 
             binding.overallDuration.chart =
@@ -56,7 +55,7 @@ class StatisticsDurationDiagramFragment :
                                     Utils.displayableGameDuration(value.toInt().seconds)
                                 },
                             ),
-                    )
+                    )*/
 
             binding.overallDurationMinimum.text =
                 Utils.displayableGameDuration(overall.solvedDurationMinimum.seconds)

diff --git a/...p/src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsStreaksDiagramFragment.kt b/...p/src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsStreaksDiagramFragment.kt
@@ -43,13 +43,12 @@ class StatisticsStreaksDiagramFragment :
                 streakSequence + List(8 - streakSequence.size) { 0F }
             }
 
-        binding.overallStreaks.setModel(
+        binding.overallStreaks.model =
             CartesianChartModel(
                 ColumnCartesianLayerModel.build {
                     series(filledUpStreakSequence)
                 },
-            ),
-        )
+            )
 
         return binding.root
     }

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -65,7 +65,7 @@ thirdparty-konfetti = { group = "nl.dionsegijn", name = "konfetti-xml", version
 thirdparty-ferriswheel = { group = "com.github.meikpiep", name = "Ferris-Wheel", version = "1.3.2" }
 thirdparty-navigationdrawer = { group = "com.mikepenz", name = "materialdrawer", version = "9.0.2" }
 thirdparty-balloon = { group = "com.github.skydoves", name = "balloon", version = "1.6.12" }
-thirdparty-vico = { group = "com.patrykandpatrick.vico", name = "views", version = "2.0.0-beta.2" }
+thirdparty-vico = { group = "com.patrykandpatrick.vico", name = "views", version = "2.0.2" }
 thirdparty-androidplot = { group = "com.androidplot", name = "androidplot-core", version = "1.5.11" }
 thirdparty-leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version = "2.14" }