There was an error fetching the commit references. Please try again later.
Merge branch 'main' into 'feat/auth'
# Conflicts: # app/build.gradle # app/src/main/java/com/example/bondoman/MainActivity.kt # app/src/main/res/drawable/baseline_camera_24.xml # app/src/main/res/values/strings.xml
Showing
- .idea/deploymentTargetDropDown.xml 1 addition, 14 deletions.idea/deploymentTargetDropDown.xml
- .idea/render.experimental.xml 6 additions, 0 deletions.idea/render.experimental.xml
- app/build.gradle 30 additions, 11 deletionsapp/build.gradle
- app/src/main/AndroidManifest.xml 12 additions, 0 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/bondoman/AddTransactionFragment.kt 137 additions, 0 deletions.../main/java/com/example/bondoman/AddTransactionFragment.kt
- app/src/main/java/com/example/bondoman/Constants.kt 1 addition, 0 deletionsapp/src/main/java/com/example/bondoman/Constants.kt
- app/src/main/java/com/example/bondoman/ListTransactionAdapter.kt 87 additions, 0 deletions.../main/java/com/example/bondoman/ListTransactionAdapter.kt
- app/src/main/java/com/example/bondoman/ListTransactionFragment.kt 59 additions, 0 deletions...main/java/com/example/bondoman/ListTransactionFragment.kt
- app/src/main/java/com/example/bondoman/MainActivity.kt 48 additions, 12 deletionsapp/src/main/java/com/example/bondoman/MainActivity.kt
- app/src/main/java/com/example/bondoman/ScannerFragment.kt 28 additions, 9 deletionsapp/src/main/java/com/example/bondoman/ScannerFragment.kt
- app/src/main/java/com/example/bondoman/SettingFragment.kt 186 additions, 40 deletionsapp/src/main/java/com/example/bondoman/SettingFragment.kt
- app/src/main/java/com/example/bondoman/UpdateTransactionFragment.kt 118 additions, 0 deletions...in/java/com/example/bondoman/UpdateTransactionFragment.kt
- app/src/main/java/com/example/bondoman/UploadBillActivity.kt 105 additions, 22 deletionsapp/src/main/java/com/example/bondoman/UploadBillActivity.kt
- app/src/main/java/com/example/bondoman/api/APIService.kt 9 additions, 1 deletionapp/src/main/java/com/example/bondoman/api/APIService.kt
- app/src/main/java/com/example/bondoman/api/ServiceBuilder.kt 0 additions, 2 deletionsapp/src/main/java/com/example/bondoman/api/ServiceBuilder.kt
- app/src/main/java/com/example/bondoman/data/Transaction.kt 6 additions, 3 deletionsapp/src/main/java/com/example/bondoman/data/Transaction.kt
- app/src/main/java/com/example/bondoman/data/TransactionDao.kt 3 additions, 3 deletions...src/main/java/com/example/bondoman/data/TransactionDao.kt
- app/src/main/java/com/example/bondoman/data/TransactionRepository.kt 3 additions, 5 deletions...n/java/com/example/bondoman/data/TransactionRepository.kt
- app/src/main/java/com/example/bondoman/data/TransactionViewModel.kt 42 additions, 0 deletions...in/java/com/example/bondoman/data/TransactionViewModel.kt
- app/src/main/res/drawable/baseline_add_24.xml 5 additions, 0 deletionsapp/src/main/res/drawable/baseline_add_24.xml
Please register or sign in to comment