Merge branch 'dev' into 'navbar_header' (895c0c67) · Commits · Afnan Ramadhan / IF3210-2024-Android-HIT

Commit 895c0c67 authored 1 year ago by

Jauza Lathifah Annassalafi

Merge branch 'dev' into 'navbar_header'

# Conflicts:
#   app/src/main/AndroidManifest.xml

parents 45024876 c7c8ab68

Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle.kts 7 additions, 0 deletions

app/build.gradle.kts
app/src/main/AndroidManifest.xml 19 additions, 1 deletion

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/android_hit/BondoManSplashScreen.kt 22 additions, 0 deletions

...main/java/com/example/android_hit/BondoManSplashScreen.kt
app/src/main/java/com/example/android_hit/CheckJWTBackground.kt 65 additions, 0 deletions

...c/main/java/com/example/android_hit/CheckJWTBackground.kt
app/src/main/java/com/example/android_hit/LoginActivity.kt 48 additions, 0 deletions

app/src/main/java/com/example/android_hit/LoginActivity.kt
app/src/main/java/com/example/android_hit/LoginFragment.kt 138 additions, 0 deletions

app/src/main/java/com/example/android_hit/LoginFragment.kt
app/src/main/java/com/example/android_hit/MainActivity.kt 113 additions, 0 deletions

app/src/main/java/com/example/android_hit/MainActivity.kt
app/src/main/java/com/example/android_hit/Scan.kt 96 additions, 5 deletions

app/src/main/java/com/example/android_hit/Scan.kt
app/src/main/java/com/example/android_hit/Settings.kt 52 additions, 19 deletions

app/src/main/java/com/example/android_hit/Settings.kt
app/src/main/java/com/example/android_hit/api/ApiService.kt 21 additions, 0 deletions

app/src/main/java/com/example/android_hit/api/ApiService.kt
app/src/main/java/com/example/android_hit/api/RetrofitClient.kt 17 additions, 0 deletions

...c/main/java/com/example/android_hit/api/RetrofitClient.kt
app/src/main/java/com/example/android_hit/data/LoginPayload.kt 6 additions, 0 deletions

...rc/main/java/com/example/android_hit/data/LoginPayload.kt
app/src/main/java/com/example/android_hit/data/LoginResponse.kt 5 additions, 0 deletions

...c/main/java/com/example/android_hit/data/LoginResponse.kt
app/src/main/java/com/example/android_hit/data/TokenResponse.kt 7 additions, 0 deletions

...c/main/java/com/example/android_hit/data/TokenResponse.kt
app/src/main/java/com/example/android_hit/data/model/LoggedInUser.kt 9 additions, 0 deletions

...n/java/com/example/android_hit/data/model/LoggedInUser.kt
app/src/main/java/com/example/android_hit/utils/Constant.kt 8 additions, 0 deletions

app/src/main/java/com/example/android_hit/utils/Constant.kt
app/src/main/java/com/example/android_hit/utils/CryptoManager.kt 84 additions, 0 deletions

.../main/java/com/example/android_hit/utils/CryptoManager.kt
app/src/main/java/com/example/android_hit/utils/TokenManager.kt 59 additions, 0 deletions

...c/main/java/com/example/android_hit/utils/TokenManager.kt
app/src/main/java/com/example/android_hit/utils/UserManager.kt 35 additions, 0 deletions

...rc/main/java/com/example/android_hit/utils/UserManager.kt
app/src/main/res/drawable/background_gradient_splashscreen.xml 9 additions, 0 deletions

...rc/main/res/drawable/background_gradient_splashscreen.xml

with 820 additions and 25 deletions

Please register or to comment

Admin message

Merge branch 'dev' into 'navbar_header'