resolve conflicts
Showing
- app/build.gradle.kts 2 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 6 additions, 0 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/myapplication/LoginActivity.kt 13 additions, 4 deletionsapp/src/main/java/com/example/myapplication/LoginActivity.kt
- app/src/main/java/com/example/myapplication/MainActivity.kt 29 additions, 16 deletionsapp/src/main/java/com/example/myapplication/MainActivity.kt
- app/src/main/java/com/example/myapplication/backendconnect/BackendService.kt 10 additions, 4 deletions...om/example/myapplication/backendconnect/BackendService.kt
- app/src/main/java/com/example/myapplication/model/auth/UserCred.kt 6 additions, 4 deletions...ain/java/com/example/myapplication/model/auth/UserCred.kt
- app/src/main/java/com/example/myapplication/model/bill/BillResponse.kt 22 additions, 0 deletions...java/com/example/myapplication/model/bill/BillResponse.kt
- app/src/main/java/com/example/myapplication/repository/AuthRepository.kt 76 additions, 6 deletions...va/com/example/myapplication/repository/AuthRepository.kt
- app/src/main/java/com/example/myapplication/service/TokenExpiryWorker.kt 23 additions, 0 deletions...va/com/example/myapplication/service/TokenExpiryWorker.kt
- app/src/main/java/com/example/myapplication/ui/dashboard/DashboardFragment.kt 287 additions, 9 deletions...m/example/myapplication/ui/dashboard/DashboardFragment.kt
- app/src/main/java/com/example/myapplication/util/EventBus.kt 28 additions, 0 deletionsapp/src/main/java/com/example/myapplication/util/EventBus.kt
- app/src/main/java/com/example/myapplication/util/SecretPreference.kt 5 additions, 0 deletions...n/java/com/example/myapplication/util/SecretPreference.kt
- app/src/main/res/layout/fragment_scan.xml 40 additions, 0 deletionsapp/src/main/res/layout/fragment_scan.xml
- gradle/libs.versions.toml 2 additions, 0 deletionsgradle/libs.versions.toml
Please register or sign in to comment