Merge branch 'dev' into 'charts'
# Conflicts: # app/build.gradle.kts # app/src/main/java/com/onionsquad/bondoman/MainActivity.kt # app/src/main/java/com/onionsquad/bondoman/room/TransactionDao.kt # app/src/main/res/values/dimens.xml # app/src/main/res/values/strings.xml # gradle/libs.versions.toml
Showing
- app/build.gradle.kts 19 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 32 additions, 5 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/onionsquad/bondoman/AddTransactionActivity.kt 15 additions, 18 deletions...in/java/com/onionsquad/bondoman/AddTransactionActivity.kt
- app/src/main/java/com/onionsquad/bondoman/EditTransactionActivity.kt 79 additions, 0 deletions...n/java/com/onionsquad/bondoman/EditTransactionActivity.kt
- 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 10 additions, 1 deletionapp/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/repository/TransactionRepository.kt 4 additions, 0 deletions...m/onionsquad/bondoman/repository/TransactionRepository.kt
- app/src/main/java/com/onionsquad/bondoman/room/TransactionCategory.kt 7 additions, 0 deletions.../java/com/onionsquad/bondoman/room/TransactionCategory.kt
- app/src/main/java/com/onionsquad/bondoman/room/TransactionDao.kt 3 additions, 0 deletions.../main/java/com/onionsquad/bondoman/room/TransactionDao.kt
- app/src/main/java/com/onionsquad/bondoman/room/TransactionEntity.kt 3 additions, 3 deletions...in/java/com/onionsquad/bondoman/room/TransactionEntity.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
Please register or sign in to comment