nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Migrates to vico charts 3.0

Browse Source
This commit is contained in:
Vitor Pamplona
2026-03-16 12:53:54 -04:00
parent 714afdc2a8
commit 81ecaa82ff
7 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/build.gradle
-2
View File
@@ -336,9 +336,7 @@ dependencies {
fdroidImplementation libs.unifiedpush fdroidImplementation libs.unifiedpush
// Charts // Charts
implementation libs.vico.charts.core
implementation libs.vico.charts.compose implementation libs.vico.charts.compose
implementation libs.vico.charts.views
implementation libs.vico.charts.m3 implementation libs.vico.charts.m3
// GeoHash // GeoHash
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt
+4 -4
View File
@@ -21,10 +21,10 @@
package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications
import androidx.compose.runtime.Stable import androidx.compose.runtime.Stable
import com.patrykandpatrick.vico.core.cartesian.data.CartesianChartModel import com.patrykandpatrick.vico.compose.cartesian.data.CartesianChartModel
import com.patrykandpatrick.vico.core.cartesian.data.LineCartesianLayerModel import com.patrykandpatrick.vico.compose.cartesian.data.LineCartesianLayerModel
import com.patrykandpatrick.vico.core.common.data.ExtraStore import com.patrykandpatrick.vico.compose.common.data.ExtraStore
import com.patrykandpatrick.vico.core.common.data.MutableExtraStore import com.patrykandpatrick.vico.compose.common.data.MutableExtraStore
import com.vitorpamplona.amethyst.model.Account import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.LocalCache import com.vitorpamplona.amethyst.model.LocalCache
import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.Note
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/chart/AmountValueFormatter.kt
+3 -3
View File
@@ -21,9 +21,9 @@
package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.chart package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.chart
import androidx.compose.runtime.Stable import androidx.compose.runtime.Stable
import com.patrykandpatrick.vico.core.cartesian.CartesianMeasuringContext import com.patrykandpatrick.vico.compose.cartesian.CartesianMeasuringContext
import com.patrykandpatrick.vico.core.cartesian.axis.Axis import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.core.cartesian.data.CartesianValueFormatter import com.patrykandpatrick.vico.compose.cartesian.data.CartesianValueFormatter
import com.vitorpamplona.amethyst.ui.note.showAmountIntegerWithZero import com.vitorpamplona.amethyst.ui.note.showAmountIntegerWithZero
import com.vitorpamplona.amethyst.ui.note.showAmountWithZero import com.vitorpamplona.amethyst.ui.note.showAmountWithZero
import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.ShowDecimals import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.ShowDecimals
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/chart/CountAxisValueFormatter.kt
+3 -3
View File
@@ -21,9 +21,9 @@
package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.chart package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.chart
import androidx.compose.runtime.Stable import androidx.compose.runtime.Stable
import com.patrykandpatrick.vico.core.cartesian.CartesianMeasuringContext import com.patrykandpatrick.vico.compose.cartesian.CartesianMeasuringContext
import com.patrykandpatrick.vico.core.cartesian.axis.Axis import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.core.cartesian.data.CartesianValueFormatter import com.patrykandpatrick.vico.compose.cartesian.data.CartesianValueFormatter
import kotlin.math.roundToInt import kotlin.math.roundToInt
@Stable @Stable
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/chart/LastWeekLabelFormatter.kt
+3 -3
View File
@@ -22,9 +22,9 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.chart
import android.util.LruCache import android.util.LruCache
import androidx.compose.runtime.Stable import androidx.compose.runtime.Stable
import com.patrykandpatrick.vico.core.cartesian.CartesianMeasuringContext import com.patrykandpatrick.vico.compose.cartesian.CartesianMeasuringContext
import com.patrykandpatrick.vico.core.cartesian.axis.Axis import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.core.cartesian.data.CartesianValueFormatter import com.patrykandpatrick.vico.compose.cartesian.data.CartesianValueFormatter
import java.time.LocalDateTime import java.time.LocalDateTime
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter
import kotlin.math.roundToInt import kotlin.math.roundToInt
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/chart/ShowChart.kt
+24 -21
View File
@@ -21,34 +21,34 @@
package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.chart package com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.chart
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.sp
import com.patrykandpatrick.vico.compose.cartesian.CartesianChartHost import com.patrykandpatrick.vico.compose.cartesian.CartesianChartHost
import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.compose.cartesian.axis.HorizontalAxis
import com.patrykandpatrick.vico.compose.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.compose.cartesian.axis.rememberAxisLabelComponent import com.patrykandpatrick.vico.compose.cartesian.axis.rememberAxisLabelComponent
import com.patrykandpatrick.vico.compose.cartesian.axis.rememberBottom import com.patrykandpatrick.vico.compose.cartesian.data.CartesianChartModel
import com.patrykandpatrick.vico.compose.cartesian.axis.rememberEnd import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer
import com.patrykandpatrick.vico.compose.cartesian.axis.rememberStart import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer.AreaFill.Companion.single
import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer.Line
import com.patrykandpatrick.vico.compose.cartesian.rememberCartesianChart import com.patrykandpatrick.vico.compose.cartesian.rememberCartesianChart
import com.patrykandpatrick.vico.compose.common.fill import com.patrykandpatrick.vico.compose.common.Fill
import com.patrykandpatrick.vico.core.cartesian.axis.Axis
import com.patrykandpatrick.vico.core.cartesian.axis.HorizontalAxis
import com.patrykandpatrick.vico.core.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.core.cartesian.data.CartesianChartModel
import com.patrykandpatrick.vico.core.cartesian.layer.LineCartesianLayer
import com.patrykandpatrick.vico.core.common.shader.ShaderProvider
import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
import com.vitorpamplona.amethyst.ui.theme.RoyalBlue import com.vitorpamplona.amethyst.ui.theme.RoyalBlue
fun makeLine(color: Color): LineCartesianLayer.Line = fun makeLine(color: Color): Line =
LineCartesianLayer.Line( Line(
fill = LineCartesianLayer.LineFill.single(fill(color)), fill = LineCartesianLayer.LineFill.single(Fill(color)),
areaFill = areaFill =
LineCartesianLayer.AreaFill.single( single(
fill( Fill(
ShaderProvider.verticalGradient( brush =
color.copy(alpha = 0.4f).toArgb(), Brush.verticalGradient(
Color.Transparent.toArgb(), colors = listOf(color.copy(alpha = 0.4f), Color.Transparent),
), ),
), ),
), ),
pointConnector = LineCartesianLayer.PointConnector.cubic(), pointConnector = LineCartesianLayer.PointConnector.cubic(),
@@ -84,7 +84,10 @@ fun ShowChart(model: CartesianChartModel) {
), ),
endAxis = endAxis =
VerticalAxis.rememberEnd( VerticalAxis.rememberEnd(
label = rememberAxisLabelComponent(color = BitcoinOrange), label =
rememberAxisLabelComponent(
style = TextStyle(color = BitcoinOrange, fontSize = 12.sp),
),
valueFormatter = AmountValueFormatter(), valueFormatter = AmountValueFormatter(),
itemPlacer = VerticalAxis.ItemPlacer.count({ 7 }), itemPlacer = VerticalAxis.ItemPlacer.count({ 7 }),
), ),
gradle/libs.versions.toml
+4 -5
View File
@@ -57,7 +57,7 @@ torAndroid = "0.4.9.5.1"
translate = "17.0.3" translate = "17.0.3"
jetbrainsCompose = "1.10.2" jetbrainsCompose = "1.10.2"
unifiedpush = "3.0.10" unifiedpush = "3.0.10"
vico-charts = "2.4.3" vico-charts-compose = "3.0.3"
zelory = "3.0.1" zelory = "3.0.1"
zoomable = "2.11.1" zoomable = "2.11.1"
zxing = "3.5.4" zxing = "3.5.4"
@@ -164,10 +164,9 @@ secp256k1-kmp-jni-jvm = { group = "fr.acinq.secp256k1", name = "secp256k1-kmp-jn
tarsosdsp = { group = "be.tarsos.dsp", name = "core", version.ref = "tarsosdsp" } tarsosdsp = { group = "be.tarsos.dsp", name = "core", version.ref = "tarsosdsp" }
tor-android = { module = "info.guardianproject:tor-android", version.ref = "torAndroid" } tor-android = { module = "info.guardianproject:tor-android", version.ref = "torAndroid" }
unifiedpush = { group = "com.github.UnifiedPush", name = "android-connector", version.ref = "unifiedpush" } unifiedpush = { group = "com.github.UnifiedPush", name = "android-connector", version.ref = "unifiedpush" }
vico-charts-compose = { group = "com.patrykandpatrick.vico", name = "compose", version.ref = "vico-charts" } vico-charts-compose = { group = "com.patrykandpatrick.vico", name = "compose", version.ref = "vico-charts-compose" }
vico-charts-core = { group = "com.patrykandpatrick.vico", name = "core", version.ref = "vico-charts" } vico-charts-m3 = { group = "com.patrykandpatrick.vico", name = "compose-m3", version.ref = "vico-charts-compose" }
vico-charts-m3 = { group = "com.patrykandpatrick.vico", name = "compose-m3", version.ref = "vico-charts" } vico-charts-views = { group = "com.patrykandpatrick.vico", name = "views", version.ref = "vico-charts-compose" }
vico-charts-views = { group = "com.patrykandpatrick.vico", name = "views", version.ref = "vico-charts" }
zelory-image-compressor = { group = "id.zelory", name = "compressor", version.ref = "zelory" } zelory-image-compressor = { group = "id.zelory", name = "compressor", version.ref = "zelory" }
zoomable = { group = "net.engawapg.lib", name = "zoomable", version.ref = "zoomable" } zoomable = { group = "net.engawapg.lib", name = "zoomable", version.ref = "zoomable" }
zxing = { group = "com.google.zxing", name = "core", version.ref = "zxing" } zxing = { group = "com.google.zxing", name = "core", version.ref = "zxing" }