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

fix(stats): some improvements

Browse Source
This commit is contained in:
Nishant Mishra
2025-12-19 09:25:51 +05:30
parent 9b5c878561
commit 78dc966f97
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/components/FocusHistoryCalendar.kt
View File

@@ -125,7 +125,7 @@ fun FocusHistoryCalendar(
verticalArrangement = Arrangement.spacedBy(verticalGap),
modifier = modifier
.fillMaxWidth()
.background(colorScheme.surfaceContainer, shapes.largeIncreased)
.background(colorScheme.surfaceContainerLow, shapes.largeIncreased)
.horizontalScroll(rememberScrollState())
.padding(internalPadding)
) {
@@ -153,11 +153,12 @@ fun FocusHistoryCalendar(
items.fastForEachIndexed { index, it ->
val sum = remember(it) { it?.totalFocusTime() ?: 0L }
val background = sum > 0
val currentMonth =
remember(it, last) { it?.date?.month == last?.date?.month }
val flatIndex = baseIndex * 7 + index // Calculate flat index
val flatIndex = baseIndex * 7 + index
val shape = remember(data, background) {
val shape = remember(data) {
if (background) {
val next =
(data.getOrNull(flatIndex + 1)?.totalFocusTime() ?: 0) > 0

6
app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/components/HeatmapWithWeekLabels.kt
View File

@@ -29,8 +29,10 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid
import androidx.compose.foundation.lazy.grid.itemsIndexed
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -83,12 +85,13 @@ fun HeatmapWithWeekLabels(
data: List<Stat?>,
averageRankList: List<Int>,
modifier: Modifier = Modifier,
state: LazyGridState = rememberLazyGridState(Int.MAX_VALUE),
size: Dp = HEATMAP_CELL_SIZE,
gap: Dp = HEATMAP_CELL_GAP,
contentPadding: PaddingValues = PaddingValues(),
maxValue: Long = remember {
data.fastMaxBy { it?.totalFocusTime() ?: 0 }?.totalFocusTime() ?: 0
},
}
) {
val locale = Locale.getDefault()
val shapes = shapes
@@ -125,6 +128,7 @@ fun HeatmapWithWeekLabels(
}
}
LazyHorizontalGrid(
state = state,
rows = GridCells.Fixed(7),
modifier = Modifier
.height(size * 7 + gap * 6)