Merge branch 'main' into 'feature/save-transaction'
# Conflicts: # app/src/main/res/values/strings.xml
Showing
- app/build.gradle.kts 8 additions, 2 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 4 additions, 0 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/nerbos/data/TransactionDao.kt 5 additions, 0 deletionsapp/src/main/java/com/example/nerbos/data/TransactionDao.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/statistic/StatisticFragment.kt 119 additions, 21 deletions...m/example/nerbos/fragments/statistic/StatisticFragment.kt
- app/src/main/java/com/example/nerbos/repository/TransactionRepository.kt 5 additions, 0 deletions...va/com/example/nerbos/repository/TransactionRepository.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/viewmodel/TransactionViewModel.kt 5 additions, 0 deletions...java/com/example/nerbos/viewmodel/TransactionViewModel.kt
- app/src/main/res/layout-land/activity_main.xml 1 addition, 5 deletionsapp/src/main/res/layout-land/activity_main.xml
- app/src/main/res/layout-land/fragment_statistic.xml 126 additions, 0 deletionsapp/src/main/res/layout-land/fragment_statistic.xml
- app/src/main/res/layout-land/fragment_user.xml 141 additions, 0 deletionsapp/src/main/res/layout-land/fragment_user.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/layout/fragment_statistic.xml 43 additions, 5 deletionsapp/src/main/res/layout/fragment_statistic.xml
- app/src/main/res/values/colors.xml 1 addition, 1 deletionapp/src/main/res/values/colors.xml
- app/src/main/res/values/strings.xml 7 additions, 0 deletionsapp/src/main/res/values/strings.xml
- gradle.properties 2 additions, 1 deletiongradle.properties