Merge branch 'dev' into 'transaction'
# Conflicts: # app/src/main/AndroidManifest.xml
Showing
- app/build.gradle.kts 19 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 30 additions, 6 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/onionsquad/bondoman/InternetActivity.kt 44 additions, 0 deletions...src/main/java/com/onionsquad/bondoman/InternetActivity.kt
- app/src/main/java/com/onionsquad/bondoman/MainActivity.kt 11 additions, 2 deletionsapp/src/main/java/com/onionsquad/bondoman/MainActivity.kt
- app/src/main/java/com/onionsquad/bondoman/NoInternetActivity.kt 17 additions, 0 deletions...c/main/java/com/onionsquad/bondoman/NoInternetActivity.kt
- app/src/main/java/com/onionsquad/bondoman/auth/AutoLogoutWorker.kt 58 additions, 0 deletions...ain/java/com/onionsquad/bondoman/auth/AutoLogoutWorker.kt
- app/src/main/java/com/onionsquad/bondoman/auth/SessionManager.kt 41 additions, 0 deletions.../main/java/com/onionsquad/bondoman/auth/SessionManager.kt
- app/src/main/java/com/onionsquad/bondoman/auth/Token.kt 3 additions, 0 deletionsapp/src/main/java/com/onionsquad/bondoman/auth/Token.kt
- app/src/main/java/com/onionsquad/bondoman/network/BondomanApiService.kt 36 additions, 0 deletions...ava/com/onionsquad/bondoman/network/BondomanApiService.kt
- app/src/main/java/com/onionsquad/bondoman/network/LoginRequest.kt 3 additions, 0 deletions...main/java/com/onionsquad/bondoman/network/LoginRequest.kt
- app/src/main/java/com/onionsquad/bondoman/network/LoginResponse.kt 5 additions, 0 deletions...ain/java/com/onionsquad/bondoman/network/LoginResponse.kt
- app/src/main/java/com/onionsquad/bondoman/network/TokenResponse.kt 3 additions, 0 deletions...ain/java/com/onionsquad/bondoman/network/TokenResponse.kt
- app/src/main/java/com/onionsquad/bondoman/ui/login/LoginActivity.kt 149 additions, 0 deletions...in/java/com/onionsquad/bondoman/ui/login/LoginActivity.kt
- app/src/main/java/com/onionsquad/bondoman/ui/login/LoginFormState.kt 6 additions, 0 deletions...n/java/com/onionsquad/bondoman/ui/login/LoginFormState.kt
- app/src/main/java/com/onionsquad/bondoman/ui/login/LoginResult.kt 8 additions, 0 deletions...main/java/com/onionsquad/bondoman/ui/login/LoginResult.kt
- app/src/main/java/com/onionsquad/bondoman/ui/login/LoginViewModel.kt 87 additions, 0 deletions...n/java/com/onionsquad/bondoman/ui/login/LoginViewModel.kt
- app/src/main/java/com/onionsquad/bondoman/ui/settings/SettingsFragment.kt 191 additions, 6 deletions...a/com/onionsquad/bondoman/ui/settings/SettingsFragment.kt
- app/src/main/java/com/onionsquad/bondoman/ui/settings/SettingsViewModel.kt 0 additions, 12 deletions.../com/onionsquad/bondoman/ui/settings/SettingsViewModel.kt
- app/src/main/res/drawable/ic_baseline_email_24.xml 5 additions, 0 deletionsapp/src/main/res/drawable/ic_baseline_email_24.xml
- app/src/main/res/drawable/ic_baseline_logout_24.xml 5 additions, 0 deletionsapp/src/main/res/drawable/ic_baseline_logout_24.xml
Please register or sign in to comment