fix: conflict
Showing
- app/build.gradle.kts 3 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 3 additions, 0 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/bondoman/activities/AddTransaction.kt 71 additions, 19 deletions...in/java/com/example/bondoman/activities/AddTransaction.kt
- app/src/main/java/com/example/bondoman/activities/EditTransaction.kt 15 additions, 12 deletions...n/java/com/example/bondoman/activities/EditTransaction.kt
- app/src/main/java/com/example/bondoman/activities/LoginActivity.kt 1 addition, 4 deletions...ain/java/com/example/bondoman/activities/LoginActivity.kt
- app/src/main/java/com/example/bondoman/activities/MainActivity.kt 16 additions, 3 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 0 additions, 2 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/SettingsFragment.kt 38 additions, 0 deletions...n/java/com/example/bondoman/fragments/SettingsFragment.kt
- app/src/main/java/com/example/bondoman/fragments/TransaksiFragment.kt 0 additions, 7 deletions.../java/com/example/bondoman/fragments/TransaksiFragment.kt
- app/src/main/java/com/example/bondoman/fragments/TwibbonFragment.kt 0 additions, 4 deletions...in/java/com/example/bondoman/fragments/TwibbonFragment.kt
- app/src/main/java/com/example/bondoman/receivers/RandomizeReceiver.kt 14 additions, 0 deletions.../java/com/example/bondoman/receivers/RandomizeReceiver.kt
- app/src/main/java/com/example/bondoman/repositories/AuthRepository.kt 0 additions, 1 deletion.../java/com/example/bondoman/repositories/AuthRepository.kt
- app/src/main/res/drawable-hdpi/ic_randomize.png 0 additions, 0 deletionsapp/src/main/res/drawable-hdpi/ic_randomize.png
- app/src/main/res/drawable-mdpi/ic_randomize.png 0 additions, 0 deletionsapp/src/main/res/drawable-mdpi/ic_randomize.png
- app/src/main/res/drawable-xhdpi/ic_randomize.png 0 additions, 0 deletionsapp/src/main/res/drawable-xhdpi/ic_randomize.png
- app/src/main/res/drawable-xxhdpi/ic_randomize.png 0 additions, 0 deletionsapp/src/main/res/drawable-xxhdpi/ic_randomize.png
- app/src/main/res/drawable-xxxhdpi/ic_randomize.png 0 additions, 0 deletionsapp/src/main/res/drawable-xxxhdpi/ic_randomize.png
- app/src/main/res/drawable/ic_search.xml 9 additions, 0 deletionsapp/src/main/res/drawable/ic_search.xml
Please register or sign in to comment