This commit is contained in:
Rafal Wisniewski
2026-03-31 15:31:01 +02:00
parent 9b19b100e9
commit c4c9868698
37 changed files with 1539 additions and 475 deletions

View File

@@ -40,15 +40,28 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
private val tripRepo: TripRepository
) : ViewModel() {
fun getExpensesDtoPaged(tripId: Int): Flow<PagingData<ExpenseDto>> =
expenseRepo.getExpensesDtoPaged(tripId).cachedIn(viewModelScope)
fun archiveCategory(category: Category) {
viewModelScope.launch {
categoryRepo.save(category.copy(archived = true))
}
}
fun deArchiveCategory(category: Category) {
viewModelScope.launch {
categoryRepo.save(category.copy(archived = false))
}
}
fun getExpensesDtoPaged(tripId: Int, filter: String = ""): Flow<PagingData<ExpenseDto>> =
expenseRepo.getExpensesDtoPaged(tripId, filter).cachedIn(viewModelScope)
@RequiresApi(Build.VERSION_CODES.O)
fun getExpensesWithHeadersPaged(
tripId: Int
tripId: Int,
filter: String = ""
): Flow<PagingData<ExpenseListItemUi>> {
val pagingFlow = getExpensesDtoPaged(tripId)
val sumsFlow = getDailySums(tripId)
val pagingFlow = getExpensesDtoPaged(tripId, filter)
val sumsFlow = getDailySums(tripId, filter)
val tripFlow = tripRepo.getTrip(tripId)
return combine(pagingFlow, sumsFlow, tripFlow) { pagingData, sums, trip ->
val currency = trip?.currency ?: ""
@@ -80,8 +93,8 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
}.cachedIn(viewModelScope)
}
fun getExpensesDto(tripId: Int): Flow<List<ExpenseDto>> =
expenseRepo.getExpensesDto(tripId)
fun getExpensesDto(tripId: Int, filter: String = ""): Flow<List<ExpenseDto>> =
expenseRepo.getExpensesDto(tripId, filter)
@RequiresApi(Build.VERSION_CODES.O)
fun save(expense: Expense, trip: Trip) {
@@ -96,14 +109,20 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
}
fun delete(expense: Expense) {
viewModelScope.launch {
expenseRepo.delete(expense)
}
}
fun delete(category: Category) {
viewModelScope.launch {
categoryRepo.delete(category)
}
}
fun getCategories(): Flow<List<Category>> = categoryRepo.getCategories()
fun getArchivedCategories(): Flow<List<Category>> = categoryRepo.getArchivedCategories()
fun save(category: Category) {
viewModelScope.launch {
@@ -132,8 +151,8 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
}
@RequiresApi(Build.VERSION_CODES.O)
fun getDailySums(tripId: Int): Flow<Map<LocalDate, Double>> {
return getExpensesDto(tripId)
fun getDailySums(tripId: Int, filter: String): Flow<Map<LocalDate, Double>> {
return getExpensesDto(tripId, filter)
.map { expenses ->
expenses.groupBy { it.expense.datetime.toLocalDate() }
.mapValues { (_, list) ->
@@ -182,7 +201,8 @@ open class ExpenseAndCategoryViewModel @Inject constructor(
@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) : ExpenseListItemUi()
data class Header(val date: LocalDate, val sum: Double, val currency: String) :
ExpenseListItemUi()
}
}

View File

@@ -1,21 +1,30 @@
package cc.n0th1ng.tripmoney.viewmodel
import android.os.Build
import androidx.annotation.RequiresApi
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import androidx.paging.PagingData
import androidx.paging.cachedIn
import cc.n0th1ng.tripmoney.data.entity.Expense
import cc.n0th1ng.tripmoney.data.entity.Trip
import cc.n0th1ng.tripmoney.data.repository.ExpenseRepository
import cc.n0th1ng.tripmoney.data.repository.TripRepository
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject
@HiltViewModel
class TripViewModel @Inject constructor(private val repository: TripRepository) : ViewModel() {
class TripViewModel @Inject constructor(
private val repository: TripRepository,
private val expenseRepository: ExpenseRepository
) : ViewModel() {
private val _isRecalculating = MutableStateFlow(false)
val isRecalculating: StateFlow<Boolean> = _isRecalculating
fun getTrips(): Flow<PagingData<Trip>> = repository.getTrips().cachedIn(viewModelScope)
fun getTrip(tripId: Int): Flow<Trip?> = repository.getTrip(tripId)
@@ -26,9 +35,15 @@ class TripViewModel @Inject constructor(private val repository: TripRepository)
}
}
@RequiresApi(Build.VERSION_CODES.O)
fun save(trip: Trip) {
viewModelScope.launch {
repository.save(trip)
_isRecalculating.value = true
withContext(Dispatchers.IO) {
expenseRepository.recalculateTripExpenses(trip.id)
}
_isRecalculating.value = false
}
}