Merge branch 'feat/navbar,scan,email' into 'transaksi'
# Conflicts: # app/build.gradle.kts # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml
Branches transaksi
Tags
Showing
- app/build.gradle.kts 1 addition, 1 deletionapp/build.gradle.kts
- app/src/main/AndroidManifest.xml 0 additions, 5 deletionsapp/src/main/AndroidManifest.xml
- 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/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/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
- app/src/main/res/layout/activity_main.xml 25 additions, 10 deletionsapp/src/main/res/layout/activity_main.xml
- app/src/main/res/layout/fragment_scan.xml 11 additions, 2 deletionsapp/src/main/res/layout/fragment_scan.xml
- app/src/main/res/layout/navbar_layout.xml 1 addition, 0 deletionsapp/src/main/res/layout/navbar_layout.xml
- app/src/main/res/layout/toolbar.xml 22 additions, 0 deletionsapp/src/main/res/layout/toolbar.xml
- app/src/main/res/navigation/nav_graph.xml 8 additions, 1 deletionapp/src/main/res/navigation/nav_graph.xml
- app/src/main/res/values/strings.xml 4 additions, 1 deletionapp/src/main/res/values/strings.xml
Please register or sign in to comment