Merge branch 'main' into 'feature/graph'
# Conflicts: # app/src/main/res/values/strings.xml
Showing
- app/build.gradle.kts 11 additions, 2 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 19 additions, 2 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/nerbos/MainActivity.kt 16 additions, 12 deletionsapp/src/main/java/com/example/nerbos/MainActivity.kt
- app/src/main/java/com/example/nerbos/MapsActivity.kt 73 additions, 0 deletionsapp/src/main/java/com/example/nerbos/MapsActivity.kt
- app/src/main/java/com/example/nerbos/fragments/network/NoInternetFragment.kt 1 addition, 1 deletion...om/example/nerbos/fragments/network/NoInternetFragment.kt
- app/src/main/java/com/example/nerbos/fragments/scan/ScanFragment.kt 436 additions, 39 deletions...in/java/com/example/nerbos/fragments/scan/ScanFragment.kt
- app/src/main/java/com/example/nerbos/fragments/transaction/TransactionAdapter.kt 5 additions, 0 deletions...xample/nerbos/fragments/transaction/TransactionAdapter.kt
- app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt 64 additions, 0 deletions...ample/nerbos/fragments/transaction/TransactionFragment.kt
- app/src/main/java/com/example/nerbos/service/Authentication.kt 1 addition, 1 deletion...rc/main/java/com/example/nerbos/service/Authentication.kt
- app/src/main/java/com/example/nerbos/service/NetworkManager.kt 0 additions, 84 deletions...rc/main/java/com/example/nerbos/service/NetworkManager.kt
- app/src/main/java/com/example/nerbos/service/NetworkManagerService.kt 121 additions, 0 deletions.../java/com/example/nerbos/service/NetworkManagerService.kt
- app/src/main/res/drawable/ic_back.xml 5 additions, 0 deletionsapp/src/main/res/drawable/ic_back.xml
- app/src/main/res/layout/activity_maps.xml 46 additions, 0 deletionsapp/src/main/res/layout/activity_maps.xml
- app/src/main/res/layout/add_scan_transaction.xml 67 additions, 0 deletionsapp/src/main/res/layout/add_scan_transaction.xml
- app/src/main/res/layout/fragment_scan.xml 59 additions, 7 deletionsapp/src/main/res/layout/fragment_scan.xml
- app/src/main/res/values/strings.xml 7 additions, 0 deletionsapp/src/main/res/values/strings.xml
- build.gradle.kts 1 addition, 0 deletionsbuild.gradle.kts
- gradle.properties 2 additions, 1 deletiongradle.properties