From dae0212cf97487efec9aa599e0e6a7b9a3a3d1f5 Mon Sep 17 00:00:00 2001
From: Rafal Wisniewski <2krafal.wisniewski@gmail.com>
Date: Wed, 6 May 2026 13:03:17 +0200
Subject: [PATCH] fix: sort stats per day

---
 .../tripmoney/screens/statistics/StatisticsScreen.kt      | 3 +--
 .../tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt    | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/statistics/StatisticsScreen.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/statistics/StatisticsScreen.kt
index 49fb190..d5a54b9 100644
--- a/app/src/main/java/cc/n0th1ng/tripmoney/screens/statistics/StatisticsScreen.kt
+++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/statistics/StatisticsScreen.kt
@@ -88,7 +88,6 @@ fun StatisticsScreen(navController: NavController) {
     )
 }
 
-@RequiresApi(Build.VERSION_CODES.O)
 @Composable
 fun StatisticsScreen(
     summaryPerCategoryList: List<SummaryPerCategory>,
@@ -124,7 +123,7 @@ fun StatisticsScreen(
             modifier = Modifier.heightIn(max = 300.dp),
             summaryPerCategoryList = summaryPerCategoryList
         )
-        SummaryPerDayCard(modifier = Modifier.height(300.dp), summaryPerDayList = summaryPerDayList, onDayClicked = onDayClicked)
+        SummaryPerDayCard(modifier = Modifier.height(300.dp), summaryPerDayList = summaryPerDayList.sortedBy { it.day }, onDayClicked = onDayClicked)
     }
 }
 
diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt b/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt
index 9a680e6..ade69e3 100644
--- a/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt
+++ b/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt
@@ -98,7 +98,6 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
     ): Flow<List<ExpenseDto>> =
         expenseRepo.getExpensesDto(tripId, search, filter)
 
-    @RequiresApi(Build.VERSION_CODES.O)
     fun save(expense: Expense, trip: Trip, onComplete: (Int) -> Unit) {
         viewModelScope.launch {
             val rate = exchangeRateRepository.getRate(
@@ -133,7 +132,6 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     suspend fun generateCSVToFile(tripId: Int, file: File) {
         file.writer().use { writer ->
             CSVPrinter(
@@ -153,7 +151,6 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     fun getDailySums(tripId: Int, search: String, filter: Filter): Flow<Map<LocalDate, Double>> {
         return getExpensesDto(tripId, search, filter)
             .map { expenses ->
@@ -164,14 +161,12 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
             }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     fun getSummaryAmount(tripId: Int): Flow<Double> {
         return getExpensesDto(tripId).map { list ->
             list.sumOf { it.expense.amount * it.expense.rate }
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     fun getSummaryPerCategory(tripId: Int): Flow<List<SummaryPerCategory>> {
         val tripFlow = tripRepo.getTrip(tripId)
         val expensesFlow = getExpensesDto(tripId)
@@ -194,7 +189,6 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     fun getSummaryPerDay(tripId: Int): Flow<List<SummaryPerDay>> {
         val tripFlow = tripRepo.getTrip(tripId)
         val expensesFlow = getExpensesDto(tripId)
@@ -220,14 +214,12 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     fun clearOldRates() {
         viewModelScope.launch {
             exchangeRateRepository.clearOldRates()
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     sealed class ExpenseListItemUi {
         data class Item(val expenseDto: ExpenseDto) : ExpenseListItemUi()
         data class Header(val date: LocalDate, val sum: Double, val currency: String) :