Merge branch 'feature/twibbon' into 'main'
Feature/twibbon See merge request NerbFox/if3210-2024-android-nos!17
Showing
- app/src/main/java/com/example/nerbos/MainActivity.kt 3 additions, 0 deletionsapp/src/main/java/com/example/nerbos/MainActivity.kt
- app/src/main/java/com/example/nerbos/fragments/scan/ScanFragment.kt 0 additions, 13 deletions...in/java/com/example/nerbos/fragments/scan/ScanFragment.kt
- app/src/main/java/com/example/nerbos/fragments/twibbon/TwibbonFragment.kt 349 additions, 0 deletions...a/com/example/nerbos/fragments/twibbon/TwibbonFragment.kt
- app/src/main/res/drawable/ic_camera.xml 8 additions, 0 deletionsapp/src/main/res/drawable/ic_camera.xml
- app/src/main/res/drawable/twibbon_template_1.png 0 additions, 0 deletionsapp/src/main/res/drawable/twibbon_template_1.png
- app/src/main/res/drawable/twibbon_template_2.png 0 additions, 0 deletionsapp/src/main/res/drawable/twibbon_template_2.png
- app/src/main/res/drawable/twibbon_template_3.png 0 additions, 0 deletionsapp/src/main/res/drawable/twibbon_template_3.png
- app/src/main/res/drawable/twibbon_template_4.png 0 additions, 0 deletionsapp/src/main/res/drawable/twibbon_template_4.png
- app/src/main/res/drawable/twibbon_template_5.png 0 additions, 0 deletionsapp/src/main/res/drawable/twibbon_template_5.png
- app/src/main/res/layout-land/activity_main.xml 1 addition, 1 deletionapp/src/main/res/layout-land/activity_main.xml
- app/src/main/res/layout-land/fragment_twibbon.xml 101 additions, 0 deletionsapp/src/main/res/layout-land/fragment_twibbon.xml
- app/src/main/res/layout/fragment_twibbon.xml 100 additions, 0 deletionsapp/src/main/res/layout/fragment_twibbon.xml
- app/src/main/res/layout/twibbon_filename.xml 16 additions, 0 deletionsapp/src/main/res/layout/twibbon_filename.xml
- app/src/main/res/menu/bottom_navbar.xml 3 additions, 0 deletionsapp/src/main/res/menu/bottom_navbar.xml
- app/src/main/res/values/strings.xml 4 additions, 0 deletionsapp/src/main/res/values/strings.xml
Please register or sign in to comment