Merge branch 'dev' into 'feat/update-transaction'
# Conflicts: # .idea/deploymentTargetDropDown.xml # app/build.gradle.kts
Showing
- .idea/compiler.xml 1 addition, 1 deletion.idea/compiler.xml
- .idea/deploymentTargetDropDown.xml 14 additions, 1 deletion.idea/deploymentTargetDropDown.xml
- .idea/misc.xml 1 addition, 1 deletion.idea/misc.xml
- app/build.gradle.kts 3 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 5 additions, 2 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/pbd/psi/LoginActivity.kt 18 additions, 1 deletionapp/src/main/java/com/pbd/psi/LoginActivity.kt
- app/src/main/java/com/pbd/psi/LoginViewModel.kt 21 additions, 0 deletionsapp/src/main/java/com/pbd/psi/LoginViewModel.kt
- app/src/main/java/com/pbd/psi/repository/GraphRepository.kt 19 additions, 0 deletionsapp/src/main/java/com/pbd/psi/repository/GraphRepository.kt
- app/src/main/java/com/pbd/psi/repository/SettingsRepository.kt 21 additions, 0 deletions...rc/main/java/com/pbd/psi/repository/SettingsRepository.kt
- app/src/main/java/com/pbd/psi/repository/UserRepository.kt 5 additions, 1 deletionapp/src/main/java/com/pbd/psi/repository/UserRepository.kt
- app/src/main/java/com/pbd/psi/room/TransactionDao.kt 6 additions, 0 deletionsapp/src/main/java/com/pbd/psi/room/TransactionDao.kt
- app/src/main/java/com/pbd/psi/room/TransactionEntity.kt 1 addition, 1 deletionapp/src/main/java/com/pbd/psi/room/TransactionEntity.kt
- app/src/main/java/com/pbd/psi/ui/graph/GraphFragment.kt 62 additions, 60 deletionsapp/src/main/java/com/pbd/psi/ui/graph/GraphFragment.kt
- app/src/main/java/com/pbd/psi/ui/graph/GraphViewModel.kt 37 additions, 0 deletionsapp/src/main/java/com/pbd/psi/ui/graph/GraphViewModel.kt
- app/src/main/java/com/pbd/psi/ui/scan/ScanFragment.kt 26 additions, 27 deletionsapp/src/main/java/com/pbd/psi/ui/scan/ScanFragment.kt
- app/src/main/java/com/pbd/psi/ui/settings/SettingsFragment.kt 114 additions, 6 deletions...src/main/java/com/pbd/psi/ui/settings/SettingsFragment.kt
- app/src/main/java/com/pbd/psi/ui/settings/SettingsViewModel.kt 31 additions, 0 deletions...rc/main/java/com/pbd/psi/ui/settings/SettingsViewModel.kt
- app/src/main/res/drawable/background_login.png 0 additions, 0 deletionsapp/src/main/res/drawable/background_login.png
- app/src/main/res/drawable/edit_text_border.xml 8 additions, 0 deletionsapp/src/main/res/drawable/edit_text_border.xml
- app/src/main/res/drawable/keluar.png 0 additions, 0 deletionsapp/src/main/res/drawable/keluar.png
Please register or sign in to comment