There was an error fetching the commit references. Please try again later.
fix: conflict
Showing
- .idea/deploymentTargetDropDown.xml 1 addition, 13 deletions.idea/deploymentTargetDropDown.xml
- app/src/main/java/com/example/pbd_jwr/LoginActivity.kt 2 additions, 2 deletionsapp/src/main/java/com/example/pbd_jwr/LoginActivity.kt
- app/src/main/java/com/example/pbd_jwr/MainActivity.kt 1 addition, 47 deletionsapp/src/main/java/com/example/pbd_jwr/MainActivity.kt
- app/src/main/java/com/example/pbd_jwr/ui/dashboard/DashboardFragment.kt 6 additions, 1 deletion...ava/com/example/pbd_jwr/ui/dashboard/DashboardFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/scan/ScanFragment.kt 0 additions, 15 deletions...src/main/java/com/example/pbd_jwr/ui/scan/ScanFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/settings/SettingsFragment.kt 10 additions, 8 deletions.../java/com/example/pbd_jwr/ui/settings/SettingsFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionAddFragment.kt 1 addition, 9 deletions.../example/pbd_jwr/ui/transaction/TransactionAddFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionDetailFragment.kt 5 additions, 3 deletions...ample/pbd_jwr/ui/transaction/TransactionDetailFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionFragment.kt 9 additions, 6 deletions...com/example/pbd_jwr/ui/transaction/TransactionFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionViewModel.kt 0 additions, 2 deletions...om/example/pbd_jwr/ui/transaction/TransactionViewModel.kt
- app/src/main/java/com/example/pbd_jwr/ui/twibbon/TwibbonFragment.kt 0 additions, 8 deletions...in/java/com/example/pbd_jwr/ui/twibbon/TwibbonFragment.kt
Please register or sign in to comment