Merge branch 'feat/navbar,scan,email' into 'crud'
# Conflicts: # .idea/deploymentTargetDropDown.xml # app/build.gradle.kts # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/bondoman/ContainerActivity.kt # app/src/main/java/com/example/bondoman/TransactionFragment.kt # app/src/main/java/com/example/bondoman/retrofit/adapter/TransactionAdapter.kt # app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt # app/src/main/java/com/example/bondoman/retrofit/data/dao/TransactionDao.kt # app/src/main/res/values/strings.xml
Showing
- .idea/deploymentTargetDropDown.xml 12 additions, 0 deletions.idea/deploymentTargetDropDown.xml
- app/build.gradle.kts 1 addition, 0 deletionsapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 0 additions, 5 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/bondoman/ContainerActivity.kt 1 addition, 0 deletionsapp/src/main/java/com/example/bondoman/ContainerActivity.kt
- app/src/main/java/com/example/bondoman/MainActivity.kt 60 additions, 25 deletionsapp/src/main/java/com/example/bondoman/MainActivity.kt
- app/src/main/java/com/example/bondoman/ScanActivity.kt 0 additions, 259 deletionsapp/src/main/java/com/example/bondoman/ScanActivity.kt
- app/src/main/java/com/example/bondoman/ScanFragment.kt 440 additions, 0 deletionsapp/src/main/java/com/example/bondoman/ScanFragment.kt
- app/src/main/java/com/example/bondoman/ScannerFragment.kt 0 additions, 44 deletionsapp/src/main/java/com/example/bondoman/ScannerFragment.kt
- app/src/main/java/com/example/bondoman/TransactionFragment.kt 202 additions, 0 deletions...src/main/java/com/example/bondoman/TransactionFragment.kt
- app/src/main/java/com/example/bondoman/api/ApiInterface.kt 9 additions, 4 deletionsapp/src/main/java/com/example/bondoman/api/ApiInterface.kt
- app/src/main/java/com/example/bondoman/models/ScanRequest.kt 0 additions, 8 deletionsapp/src/main/java/com/example/bondoman/models/ScanRequest.kt
- app/src/main/java/com/example/bondoman/models/ScanResponse.kt 18 additions, 4 deletions...src/main/java/com/example/bondoman/models/ScanResponse.kt
- app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt 4 additions, 0 deletions.../java/com/example/bondoman/retrofit/data/TransactionDB.kt
- app/src/main/java/com/example/bondoman/retrofit/data/dao/TransactionDao.kt 0 additions, 3 deletions.../com/example/bondoman/retrofit/data/dao/TransactionDao.kt
- app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntitiy.kt 20 additions, 0 deletions...ample/bondoman/retrofit/data/entity/TransactionEntitiy.kt
- app/src/main/res/drawable/component_7.xml 30 additions, 0 deletionsapp/src/main/res/drawable/component_7.xml
- app/src/main/res/drawable/ic_arrow_left_black.xml 27 additions, 0 deletionsapp/src/main/res/drawable/ic_arrow_left_black.xml
- app/src/main/res/drawable/ic_arrow_left_white.xml 27 additions, 0 deletionsapp/src/main/res/drawable/ic_arrow_left_white.xml
- app/src/main/res/drawable/navbar_border.xml 6 additions, 0 deletionsapp/src/main/res/drawable/navbar_border.xml
- app/src/main/res/drawable/navbar_bordered_background.xml 5 additions, 0 deletionsapp/src/main/res/drawable/navbar_bordered_background.xml
Please register or sign in to comment