Merge branch 'main' into 'feat/broadcast'
# Conflicts: # app/src/main/java/com/example/bondoman/MainActivity.kt
Showing
- .idea/deploymentTargetDropDown.xml 1 addition, 14 deletions.idea/deploymentTargetDropDown.xml
- .idea/misc.xml 0 additions, 1 deletion.idea/misc.xml
- .idea/render.experimental.xml 6 additions, 0 deletions.idea/render.experimental.xml
- app/src/main/java/com/example/bondoman/AppActivity.kt 21 additions, 11 deletionsapp/src/main/java/com/example/bondoman/AppActivity.kt
- app/src/main/java/com/example/bondoman/LoginActivity.kt 1 addition, 0 deletionsapp/src/main/java/com/example/bondoman/LoginActivity.kt
- app/src/main/java/com/example/bondoman/MainActivity.kt 29 additions, 30 deletionsapp/src/main/java/com/example/bondoman/MainActivity.kt
- app/src/main/java/com/example/bondoman/service/TokenCheck.kt 17 additions, 48 deletionsapp/src/main/java/com/example/bondoman/service/TokenCheck.kt
- app/src/main/java/com/example/bondoman/storage/TokenManager.kt 33 additions, 36 deletions...rc/main/java/com/example/bondoman/storage/TokenManager.kt
- app/src/main/java/com/example/bondoman/ui/setting/SettingViewModel.kt 2 additions, 1 deletion.../java/com/example/bondoman/ui/setting/SettingViewModel.kt
- app/src/main/java/com/example/bondoman/ui/transaction/TransactionAdapter.kt 12 additions, 0 deletions...com/example/bondoman/ui/transaction/TransactionAdapter.kt
- app/src/main/java/com/example/bondoman/ui/transaction/TransactionFragment.kt 1 addition, 1 deletion...om/example/bondoman/ui/transaction/TransactionFragment.kt
- app/src/main/java/com/example/bondoman/ui/twibbon/TwibbonFragment.kt 6 additions, 0 deletions...n/java/com/example/bondoman/ui/twibbon/TwibbonFragment.kt
- app/src/main/java/com/example/bondoman/ui/update_transaction/UpdateTransactionFragment.kt 4 additions, 4 deletions...ndoman/ui/update_transaction/UpdateTransactionFragment.kt
- app/src/main/res/anim/fade_in_from_bottom.xml 12 additions, 0 deletionsapp/src/main/res/anim/fade_in_from_bottom.xml
- app/src/main/res/drawable-v24/bg_splash.jpg 0 additions, 0 deletionsapp/src/main/res/drawable-v24/bg_splash.jpg
- app/src/main/res/drawable-v24/logo.webp 0 additions, 0 deletionsapp/src/main/res/drawable-v24/logo.webp
- app/src/main/res/drawable/baseline_camera_24.xml 5 additions, 0 deletionsapp/src/main/res/drawable/baseline_camera_24.xml
- app/src/main/res/drawable/transaction_card.xml 5 additions, 1 deletionapp/src/main/res/drawable/transaction_card.xml
- app/src/main/res/drawable/transaction_card_2.xml 5 additions, 1 deletionapp/src/main/res/drawable/transaction_card_2.xml
- app/src/main/res/layout/activity_app.xml 41 additions, 0 deletionsapp/src/main/res/layout/activity_app.xml
Please register or sign in to comment