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

Commit 2d49d63c authored 1 year ago by

Johanes Lee

Merge branch 'feat/transactions' into 'dev'

Feat/transactions

See merge request !35

parents a0e9d86b f36a9f4a

Branches

Tags

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

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 6 additions, 2 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/bondoman/data/dataaccess/TransactionDao.kt 13 additions, 0 deletions

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

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

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

...java/com/example/bondoman/data/utils/TransactionParser.kt
app/src/main/java/com/example/bondoman/data/viewmodels/transaction/TransactionViewModel.kt 19 additions, 1 deletion

...doman/data/viewmodels/transaction/TransactionViewModel.kt
app/src/main/java/com/example/bondoman/views/activities/MainActivity.kt 99 additions, 16 deletions

...ava/com/example/bondoman/views/activities/MainActivity.kt
app/src/main/java/com/example/bondoman/views/adapters/TransactionListAdapter.kt 1 addition, 1 deletion

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

...m/example/bondoman/views/components/DateInputComponent.kt
app/src/main/java/com/example/bondoman/views/components/TextInputComponent.kt 180 additions, 114 deletions

...m/example/bondoman/views/components/TextInputComponent.kt
app/src/main/java/com/example/bondoman/views/fragments/ConnectionLostFragment.kt 31 additions, 0 deletions

...xample/bondoman/views/fragments/ConnectionLostFragment.kt
app/src/main/java/com/example/bondoman/views/fragments/GraphFragment.kt 156 additions, 12 deletions

...ava/com/example/bondoman/views/fragments/GraphFragment.kt
app/src/main/java/com/example/bondoman/views/fragments/TransactionFormFragment.kt 33 additions, 16 deletions

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

...ample/bondoman/views/fragments/TransactionListFragment.kt
app/src/main/java/com/example/bondoman/views/utils/filters/CustomInputFilter.kt 29 additions, 0 deletions

...example/bondoman/views/utils/filters/CustomInputFilter.kt
app/src/main/res/layout/component_dropdown_item.xml 5 additions, 6 deletions

app/src/main/res/layout/component_dropdown_item.xml
app/src/main/res/layout/fragment_connection_lost.xml 8 additions, 0 deletions

app/src/main/res/layout/fragment_connection_lost.xml
app/src/main/res/layout/fragment_graph.xml 18 additions, 6 deletions

app/src/main/res/layout/fragment_graph.xml
app/src/main/res/layout/fragment_transaction_form.xml 5 additions, 1 deletion

app/src/main/res/layout/fragment_transaction_form.xml
app/src/main/res/navigation/nav_graph.xml 8 additions, 0 deletions

app/src/main/res/navigation/nav_graph.xml

with 656 additions and 183 deletions

Please register or to comment

Admin message

Merge branch 'feat/transactions' into 'dev'