Merge branch 'twibbon' into 'dev'
Twibbon See merge request !5
Showing
- app/build.gradle.kts 5 additions, 0 deletionsapp/build.gradle.kts
- app/src/main/java/com/example/android_hit/FragmentTwibbon.kt 145 additions, 0 deletionsapp/src/main/java/com/example/android_hit/FragmentTwibbon.kt
- app/src/main/java/com/example/android_hit/HeaderTwibbon.kt 59 additions, 0 deletionsapp/src/main/java/com/example/android_hit/HeaderTwibbon.kt
- app/src/main/java/com/example/android_hit/MainActivity.kt 4 additions, 0 deletionsapp/src/main/java/com/example/android_hit/MainActivity.kt
- app/src/main/res/drawable/baseline_photo_camera_24.xml 6 additions, 0 deletionsapp/src/main/res/drawable/baseline_photo_camera_24.xml
- app/src/main/res/drawable/baseline_refresh_24.xml 5 additions, 0 deletionsapp/src/main/res/drawable/baseline_refresh_24.xml
- app/src/main/res/drawable/twibbon.png 0 additions, 0 deletionsapp/src/main/res/drawable/twibbon.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/fragment_header_twibbon.xml 51 additions, 0 deletionsapp/src/main/res/layout/fragment_header_twibbon.xml
- app/src/main/res/layout/fragment_twibbon.xml 65 additions, 0 deletionsapp/src/main/res/layout/fragment_twibbon.xml
- app/src/main/res/menu/bottom_nav_menu.xml 8 additions, 4 deletionsapp/src/main/res/menu/bottom_nav_menu.xml
- app/src/main/res/menu/side_nav_menu.xml 6 additions, 3 deletionsapp/src/main/res/menu/side_nav_menu.xml
Please register or sign in to comment