Merge branch 'transaction' into excel
# Conflicts: # app/build.gradle.kts # gradle/libs.versions.toml
Showing
- .idea/kotlinc.xml 1 addition, 1 deletion.idea/kotlinc.xml
- .idea/misc.xml 0 additions, 1 deletion.idea/misc.xml
- app/build.gradle.kts 9 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 5 additions, 3 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/onionsquad/bondoman/AddTransactionActivity.kt 57 additions, 0 deletions...in/java/com/onionsquad/bondoman/AddTransactionActivity.kt
- app/src/main/java/com/onionsquad/bondoman/repository/TransactionRepository.kt 20 additions, 0 deletions...m/onionsquad/bondoman/repository/TransactionRepository.kt
- app/src/main/java/com/onionsquad/bondoman/room/TransactionCategory.kt 6 additions, 0 deletions.../java/com/onionsquad/bondoman/room/TransactionCategory.kt
- app/src/main/java/com/onionsquad/bondoman/room/TransactionDao.kt 19 additions, 0 deletions.../main/java/com/onionsquad/bondoman/room/TransactionDao.kt
- app/src/main/java/com/onionsquad/bondoman/room/TransactionDatabase.kt 29 additions, 0 deletions.../java/com/onionsquad/bondoman/room/TransactionDatabase.kt
- app/src/main/java/com/onionsquad/bondoman/room/TransactionEntity.kt 30 additions, 0 deletions...in/java/com/onionsquad/bondoman/room/TransactionEntity.kt
- app/src/main/java/com/onionsquad/bondoman/ui/transaction/TransactionFragment.kt 14 additions, 2 deletions...onionsquad/bondoman/ui/transaction/TransactionFragment.kt
- app/src/main/java/com/onionsquad/bondoman/ui/transaction/TransactionViewModel.kt 16 additions, 5 deletions...nionsquad/bondoman/ui/transaction/TransactionViewModel.kt
- app/src/main/java/com/onionsquad/bondoman/ui/transaction/TransactionViewModelFactory.kt 17 additions, 0 deletions...ad/bondoman/ui/transaction/TransactionViewModelFactory.kt
- app/src/main/java/com/onionsquad/bondoman/util/Converters.kt 30 additions, 0 deletionsapp/src/main/java/com/onionsquad/bondoman/util/Converters.kt
- app/src/main/res/layout/activity_add_transaction.xml 67 additions, 0 deletionsapp/src/main/res/layout/activity_add_transaction.xml
- app/src/main/res/layout/fragment_transaction.xml 14 additions, 1 deletionapp/src/main/res/layout/fragment_transaction.xml
- build.gradle.kts 1 addition, 0 deletionsbuild.gradle.kts
- gradle.properties 1 addition, 0 deletionsgradle.properties
- gradle/libs.versions.toml 11 additions, 2 deletionsgradle/libs.versions.toml
Please register or sign in to comment