Merge branch 'feat/transactions' into 'dev' (b6ca56a8) · Commits · Sozy Enjoyer / IF3210-2024-Android-SOZ

Commit b6ca56a8 authored 1 year ago by

Johanes Lee

Merge branch 'feat/transactions' into 'dev'

Feat/transactions

See merge request !26

parents f087984c e0984b5a

2 merge requests!46Dev,!26Feat/transactions

Hide whitespace changes

Inline Side-by-side

Showing

app/src/androidTest/java/com/example/bondoman/databases/TransactionDatabaseTest.kt 1 addition, 1 deletion

...com/example/bondoman/databases/TransactionDatabaseTest.kt
app/src/main/java/com/example/bondoman/data/dataaccess/TransactionDao.kt 9 additions, 3 deletions

...va/com/example/bondoman/data/dataaccess/TransactionDao.kt
app/src/main/java/com/example/bondoman/data/models/Transaction.kt 13 additions, 6 deletions

...main/java/com/example/bondoman/data/models/Transaction.kt
app/src/main/java/com/example/bondoman/data/repositories/TransactionRepository.kt 9 additions, 3 deletions

...ample/bondoman/data/repositories/TransactionRepository.kt
app/src/main/java/com/example/bondoman/data/utils/TransactionParser.kt 44 additions, 0 deletions

...java/com/example/bondoman/data/utils/TransactionParser.kt
app/src/main/java/com/example/bondoman/data/viewmodels/transaction/TransactionViewModel.kt 66 additions, 25 deletions

...doman/data/viewmodels/transaction/TransactionViewModel.kt
app/src/main/java/com/example/bondoman/data/viewmodels/transaction/TransactionViewModelFactory.kt 1 addition, 2 deletions

...ata/viewmodels/transaction/TransactionViewModelFactory.kt
app/src/main/java/com/example/bondoman/views/activities/MainActivity.kt 81 additions, 37 deletions

...ava/com/example/bondoman/views/activities/MainActivity.kt
app/src/main/java/com/example/bondoman/views/adapters/TransactionListAdapter.kt 33 additions, 8 deletions

...example/bondoman/views/adapters/TransactionListAdapter.kt
app/src/main/java/com/example/bondoman/views/components/DateInputComponent.kt 36 additions, 36 deletions

...m/example/bondoman/views/components/DateInputComponent.kt
app/src/main/java/com/example/bondoman/views/components/DialogComponent.kt 106 additions, 104 deletions

.../com/example/bondoman/views/components/DialogComponent.kt
app/src/main/java/com/example/bondoman/views/components/SettingButtonComponent.kt 45 additions, 45 deletions

...ample/bondoman/views/components/SettingButtonComponent.kt
app/src/main/java/com/example/bondoman/views/components/TextInputComponent.kt 98 additions, 86 deletions

...m/example/bondoman/views/components/TextInputComponent.kt
app/src/main/java/com/example/bondoman/views/components/TransactionDetailComponent.kt 158 additions, 0 deletions

...e/bondoman/views/components/TransactionDetailComponent.kt
app/src/main/java/com/example/bondoman/views/fragments/DatePickerFragment.kt 2 additions, 2 deletions

...om/example/bondoman/views/fragments/DatePickerFragment.kt
app/src/main/java/com/example/bondoman/views/fragments/TransactionAddFragment.kt 13 additions, 1 deletion

...xample/bondoman/views/fragments/TransactionAddFragment.kt
app/src/main/java/com/example/bondoman/views/fragments/TransactionFormFragment.kt 101 additions, 12 deletions

...ample/bondoman/views/fragments/TransactionFormFragment.kt
app/src/main/java/com/example/bondoman/views/fragments/TransactionListFragment.kt 121 additions, 104 deletions

...ample/bondoman/views/fragments/TransactionListFragment.kt
app/src/main/java/com/example/bondoman/views/fragments/TransactionUpdateFragment.kt 23 additions, 0 deletions

...ple/bondoman/views/fragments/TransactionUpdateFragment.kt
app/src/main/java/com/example/bondoman/views/utils/interfaces/ParentActivityService.kt 6 additions, 0 deletions

.../bondoman/views/utils/interfaces/ParentActivityService.kt

with 966 additions and 475 deletions

Please register or to comment

Admin message

Merge branch 'feat/transactions' into 'dev'