fix: conflict
Showing
- .idea/codeStyles/Project.xml 123 additions, 0 deletions.idea/codeStyles/Project.xml
- .idea/codeStyles/codeStyleConfig.xml 5 additions, 0 deletions.idea/codeStyles/codeStyleConfig.xml
- .idea/deploymentTargetDropDown.xml 0 additions, 15 deletions.idea/deploymentTargetDropDown.xml
- app/build.gradle.kts 3 additions, 2 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 5 additions, 3 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/pbd_jwr/LoginActivity.kt 19 additions, 7 deletionsapp/src/main/java/com/example/pbd_jwr/LoginActivity.kt
- app/src/main/java/com/example/pbd_jwr/MainActivity.kt 62 additions, 9 deletionsapp/src/main/java/com/example/pbd_jwr/MainActivity.kt
- app/src/main/java/com/example/pbd_jwr/ScanActivity.kt 122 additions, 33 deletionsapp/src/main/java/com/example/pbd_jwr/ScanActivity.kt
- app/src/main/java/com/example/pbd_jwr/ui/dashboard/DashboardFragment.kt 60 additions, 22 deletions...ava/com/example/pbd_jwr/ui/dashboard/DashboardFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/settings/SettingsFragment.kt 6 additions, 0 deletions.../java/com/example/pbd_jwr/ui/settings/SettingsFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionDummyAdapter.kt 40 additions, 0 deletions...example/pbd_jwr/ui/transaction/TransactionDummyAdapter.kt
- app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionViewModel.kt 2 additions, 11 deletions...om/example/pbd_jwr/ui/transaction/TransactionViewModel.kt
- app/src/main/java/com/example/pbd_jwr/ui/twibbon/TwibbonFragment.kt 296 additions, 0 deletions...in/java/com/example/pbd_jwr/ui/twibbon/TwibbonFragment.kt
- app/src/main/java/com/example/pbd_jwr/ui/twibbon/TwibbonViewModel.kt 13 additions, 0 deletions...n/java/com/example/pbd_jwr/ui/twibbon/TwibbonViewModel.kt
- app/src/main/res/drawable/baseline_autorenew_24.xml 5 additions, 0 deletionsapp/src/main/res/drawable/baseline_autorenew_24.xml
- app/src/main/res/drawable/baseline_insert_photo_24.xml 5 additions, 0 deletionsapp/src/main/res/drawable/baseline_insert_photo_24.xml
- app/src/main/res/drawable/bondo_man_24.xml 14 additions, 0 deletionsapp/src/main/res/drawable/bondo_man_24.xml
- app/src/main/res/drawable/bondo_man_24_2.xml 14 additions, 0 deletionsapp/src/main/res/drawable/bondo_man_24_2.xml
- app/src/main/res/drawable/bondo_man_icon.xml 7 additions, 0 deletionsapp/src/main/res/drawable/bondo_man_icon.xml
- app/src/main/res/drawable/twibbon_layover.xml 891 additions, 0 deletionsapp/src/main/res/drawable/twibbon_layover.xml
Please register or sign in to comment