Merge branch 'feat/chart' into 'feat/navbar,scan,email'
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/bondoman/MainActivity.kt # app/src/main/res/values/strings.xml
Showing
- app/build.gradle.kts 2 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 10 additions, 4 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/bondoman/GraphFragment.kt 43 additions, 6 deletionsapp/src/main/java/com/example/bondoman/GraphFragment.kt
- app/src/main/java/com/example/bondoman/LoginActivity.kt 3 additions, 7 deletionsapp/src/main/java/com/example/bondoman/LoginActivity.kt
- app/src/main/java/com/example/bondoman/LogoutFragment.kt 16 additions, 0 deletionsapp/src/main/java/com/example/bondoman/LogoutFragment.kt
- app/src/main/java/com/example/bondoman/MainActivity.kt 30 additions, 3 deletionsapp/src/main/java/com/example/bondoman/MainActivity.kt
- app/src/main/java/com/example/bondoman/services/ConnectivityObserver.kt 11 additions, 0 deletions...ava/com/example/bondoman/services/ConnectivityObserver.kt
- app/src/main/java/com/example/bondoman/services/JWTExpiry.kt 0 additions, 4 deletionsapp/src/main/java/com/example/bondoman/services/JWTExpiry.kt
- app/src/main/java/com/example/bondoman/services/NetworkSensing.kt 30 additions, 0 deletions...main/java/com/example/bondoman/services/NetworkSensing.kt
- app/src/main/java/com/example/bondoman/services/RandomizeTransaction.kt 27 additions, 0 deletions...ava/com/example/bondoman/services/RandomizeTransaction.kt
- app/src/main/res/layout-land/fragment_grafik.xml 13 additions, 0 deletionsapp/src/main/res/layout-land/fragment_grafik.xml
- app/src/main/res/layout/fragment_grafik.xml 8 additions, 11 deletionsapp/src/main/res/layout/fragment_grafik.xml
- app/src/main/res/layout/fragment_logout.xml 21 additions, 3 deletionsapp/src/main/res/layout/fragment_logout.xml
- app/src/main/res/values/colors.xml 3 additions, 0 deletionsapp/src/main/res/values/colors.xml
- app/src/main/res/values/strings.xml 2 additions, 0 deletionsapp/src/main/res/values/strings.xml
- settings.gradle.kts 2 additions, 0 deletionssettings.gradle.kts
Please register or sign in to comment