lostecho/Tomato
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(graphs): use M3 tooltip spec for graph markers

Browse Source 
#118
This commit is contained in:
Nishant Mishra
2025-11-16 11:35:22 +05:30
parent b7d44a279c
commit 05fe475abf
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/TimeColumnChart.kt
View File

@@ -122,13 +122,13 @@ fun TimeColumnChart(
), ),
marker = DefaultCartesianMarker( marker = DefaultCartesianMarker(
TextComponent( TextComponent(
color = colorScheme.surface.toArgb(), color = colorScheme.inverseOnSurface.toArgb(),
background = ShapeComponent( background = ShapeComponent(
fill = fill(colorScheme.onSurface), fill = fill(colorScheme.inverseSurface),
shape = CorneredShape.Pill shape = CorneredShape.rounded(8f)
), ),
textSizeSp = typography.labelSmall.fontSize.value, textSizeSp = typography.bodySmall.fontSize.value,
lineHeightSp = typography.labelSmall.fontSize.value, lineHeightSp = typography.bodySmall.lineHeight.value,
padding = Insets(verticalDp = 4f, horizontalDp = 8f), padding = Insets(verticalDp = 4f, horizontalDp = 8f),
margins = Insets(bottomDp = 2f) margins = Insets(bottomDp = 2f)
), ),
@@ -143,7 +143,7 @@ fun TimeColumnChart(
minZoom = Zoom.min(Zoom.Content, Zoom.fixed()) minZoom = Zoom.min(Zoom.Content, Zoom.fixed())
), ),
animationSpec = animationSpec, animationSpec = animationSpec,
modifier = modifier.height(224.dp), modifier = modifier.height(226.dp),
) )
} }
} }

10
app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/TimeLineChart.kt
View File

@@ -136,13 +136,13 @@ fun TimeLineChart(
), ),
marker = DefaultCartesianMarker( marker = DefaultCartesianMarker(
TextComponent( TextComponent(
color = colorScheme.surface.toArgb(), color = colorScheme.inverseOnSurface.toArgb(),
background = ShapeComponent( background = ShapeComponent(
fill = fill(colorScheme.onSurface), fill = fill(colorScheme.inverseSurface),
shape = CorneredShape.Pill shape = CorneredShape.rounded(8f)
), ),
textSizeSp = typography.labelSmall.fontSize.value, textSizeSp = typography.bodySmall.fontSize.value,
lineHeightSp = typography.labelSmall.fontSize.value, lineHeightSp = typography.bodySmall.lineHeight.value,
padding = Insets(verticalDp = 4f, horizontalDp = 8f), padding = Insets(verticalDp = 4f, horizontalDp = 8f),
margins = Insets(bottomDp = 2f) margins = Insets(bottomDp = 2f)
), ),