Merge branch 'develop' into 'feat/randomize-transaction'
# Conflicts: # app/src/main/java/com/example/bondoman/activities/AddTransaction.kt # app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt
Showing
- app/build.gradle.kts 3 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 11 additions, 4 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/bondoman/activities/AddTransaction.kt 111 additions, 2 deletions...in/java/com/example/bondoman/activities/AddTransaction.kt
- app/src/main/java/com/example/bondoman/activities/EditTransaction.kt 71 additions, 11 deletions...n/java/com/example/bondoman/activities/EditTransaction.kt
- app/src/main/java/com/example/bondoman/activities/LoginActivity.kt 84 additions, 16 deletions...ain/java/com/example/bondoman/activities/LoginActivity.kt
- app/src/main/java/com/example/bondoman/activities/MainActivity.kt 3 additions, 2 deletions...main/java/com/example/bondoman/activities/MainActivity.kt
- app/src/main/java/com/example/bondoman/adapter/RecyclerViewAdapter.kt 0 additions, 3 deletions.../java/com/example/bondoman/adapter/RecyclerViewAdapter.kt
- app/src/main/java/com/example/bondoman/adapter/TransactionListAdapter.kt 2 additions, 3 deletions...va/com/example/bondoman/adapter/TransactionListAdapter.kt
- app/src/main/java/com/example/bondoman/apiServices/IAuthService.kt 0 additions, 1 deletion...ain/java/com/example/bondoman/apiServices/IAuthService.kt
- app/src/main/java/com/example/bondoman/fragments/GrafFragment.kt 5 additions, 1 deletion.../main/java/com/example/bondoman/fragments/GrafFragment.kt
- app/src/main/java/com/example/bondoman/fragments/LoginFragment.kt 0 additions, 22 deletions...main/java/com/example/bondoman/fragments/LoginFragment.kt
- app/src/main/java/com/example/bondoman/fragments/ScanFragment.kt 2 additions, 7 deletions.../main/java/com/example/bondoman/fragments/ScanFragment.kt
- app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt 40 additions, 4 deletions...n/java/com/example/bondoman/fragments/SettingsFragment.kt
- app/src/main/java/com/example/bondoman/fragments/TransaksiFragment.kt 6 additions, 10 deletions.../java/com/example/bondoman/fragments/TransaksiFragment.kt
- app/src/main/java/com/example/bondoman/fragments/TwibbonFragment.kt 1 addition, 5 deletions...in/java/com/example/bondoman/fragments/TwibbonFragment.kt
- app/src/main/java/com/example/bondoman/interfaces/ITransactionDao.kt 1 addition, 1 deletion...n/java/com/example/bondoman/interfaces/ITransactionDao.kt
- app/src/main/java/com/example/bondoman/repositories/AuthRepository.kt 11 additions, 1 deletion.../java/com/example/bondoman/repositories/AuthRepository.kt
- app/src/main/java/com/example/bondoman/repositories/ScanRepository.kt 2 additions, 4 deletions.../java/com/example/bondoman/repositories/ScanRepository.kt
- app/src/main/java/com/example/bondoman/repositories/TransactionRepository.kt 3 additions, 2 deletions...om/example/bondoman/repositories/TransactionRepository.kt
- app/src/main/res/anim/slide_down.xml 10 additions, 0 deletionsapp/src/main/res/anim/slide_down.xml
Please register or sign in to comment