wbrawner/twigs-android
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Updates to transaction lists

Browse source
This commit is contained in:
William Brawner 2023-12-08 23:00:20 -07:00
parent 31cf90dec0
commit 455eed0872
3 changed files with 58 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/main/java/com/wbrawner/budget/AppModule.kt
View file

@ -1,9 +1,9 @@
package com.wbrawner.budget
import android.util.Log
import com.wbrawner.pihelper.shared.create
import com.wbrawner.twigs.shared.ErrorHandler
import com.wbrawner.twigs.shared.Store
import com.wbrawner.twigs.shared.create
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn

18
android/src/main/java/com/wbrawner/budget/ui/category/CategoryDetailsScreen.kt
View file

@ -2,9 +2,12 @@ package com.wbrawner.budget.ui.category
import android.content.res.Configuration.UI_MODE_NIGHT_NO
import android.content.res.Configuration.UI_MODE_NIGHT_YES
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Edit
@ -75,6 +78,7 @@ fun CategoryDetailsScreen(store: Store) {
}
}
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun CategoryDetails(
modifier: Modifier = Modifier,
@ -115,12 +119,14 @@ fun CategoryDetails(
fontWeight = FontWeight.Bold
)
}
item(transactions) {
Card {
transactions.forEach { transaction ->
TransactionListItem(transaction, onTransactionClicked)
}
}
itemsIndexed(transactions) { index, transaction ->
TransactionListItem(
modifier = Modifier.animateItemPlacement(),
transaction = transaction,
isFirst = index == 0,
isLast = index == transactions.lastIndex,
onClick = onTransactionClicked
)
}
}
}

66
android/src/main/java/com/wbrawner/budget/ui/transaction/TransactionsScreen.kt
View file

@ -2,14 +2,15 @@ package com.wbrawner.budget.ui.transaction
import android.content.res.Configuration.UI_MODE_NIGHT_NO
import android.content.res.Configuration.UI_MODE_NIGHT_YES
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material3.Card
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@ -33,7 +34,7 @@ import kotlinx.datetime.Clock
import kotlinx.datetime.toInstant
import java.text.NumberFormat
@OptIn(ExperimentalMaterial3Api::class)
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun TransactionsScreen(store: Store) {
val state by store.state.collectAsState()
@ -48,25 +49,29 @@ fun TransactionsScreen(store: Store) {
state.transactions?.let { transactions ->
val transactionGroups =
remember(state.editingTransaction) { transactions.groupByDate() }
Column(
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(it)
.verticalScroll(rememberScrollState())
.padding(start = 8.dp, end = 8.dp, bottom = 8.dp)
) {
transactionGroups.forEach { (timestamp, transactions) ->
Text(
modifier = Modifier.padding(8.dp),
text = timestamp.toInstant().format(LocalContext.current),
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold
)
Card {
transactions.forEach { transaction ->
TransactionListItem(transaction) {
store.dispatch(TransactionAction.SelectTransaction(transaction.id))
}
item {
Text(
modifier = Modifier.padding(8.dp),
text = timestamp.toInstant().format(LocalContext.current),
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold
)
}
itemsIndexed(transactions) { index, transaction ->
TransactionListItem(
modifier = Modifier.animateItemPlacement(),
transaction,
index == 0,
index == transactions.lastIndex
) {
store.dispatch(TransactionAction.SelectTransaction(transaction.id))
}
}
}
@ -81,9 +86,26 @@ fun TransactionsScreen(store: Store) {
}
@Composable
fun TransactionListItem(transaction: Transaction, onClick: (Transaction) -> Unit) {
fun TransactionListItem(
modifier: Modifier = Modifier,
transaction: Transaction,
isFirst: Boolean,
isLast: Boolean,
onClick: (Transaction) -> Unit
) {
val top = if (isFirst) MaterialTheme.shapes.medium.topStart else CornerSize(0.dp)
val bottom = if (isLast) MaterialTheme.shapes.medium.bottomStart else CornerSize(0.dp)
Row(
modifier = Modifier
modifier = modifier
.background(
color = MaterialTheme.colorScheme.surfaceVariant,
shape = MaterialTheme.shapes.medium.copy(
topStart = top,
topEnd = top,
bottomStart = bottom,
bottomEnd = bottom
)
)
.fillMaxWidth()
.clickable { onClick(transaction) }
.padding(8.dp)
@ -124,7 +146,9 @@ fun TransactionListItem_Preview() {
budgetId = "budgetId",
expense = true,
createdBy = "createdBy"
)
),
isFirst = true,
isLast = true
) {}
}
}