diff options
| author | Allan Wang <me@allanwang.ca> | 2019-12-29 15:50:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-29 15:50:22 -0800 |
| commit | 0828e8fceec86333f81d5b8cf204184ecc58f0ef (patch) | |
| tree | 52c2bef109a430aac85c03494a5fd4515e4455e5 /app/src/main/res/layout/activity_main_bottom_tabs.xml | |
| parent | ee68ef07ca0f0afd00bfe32f7e7dbba8ef6a6ae2 (diff) | |
| parent | 597c884d88b8716d49e0abb00674ce44699df08b (diff) | |
| download | frost-0828e8fceec86333f81d5b8cf204184ecc58f0ef.tar.gz frost-0828e8fceec86333f81d5b8cf204184ecc58f0ef.tar.bz2 frost-0828e8fceec86333f81d5b8cf204184ecc58f0ef.zip | |
Merge pull request #1601 from AllanWang/nav-rewrite
Nav rewrite
Diffstat (limited to 'app/src/main/res/layout/activity_main_bottom_tabs.xml')
| -rw-r--r-- | app/src/main/res/layout/activity_main_bottom_tabs.xml | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/app/src/main/res/layout/activity_main_bottom_tabs.xml b/app/src/main/res/layout/activity_main_bottom_tabs.xml index 2c2527cd..419bbc33 100644 --- a/app/src/main/res/layout/activity_main_bottom_tabs.xml +++ b/app/src/main/res/layout/activity_main_bottom_tabs.xml @@ -3,15 +3,16 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:fitsSystemWindows="true" + android:orientation="vertical" + tools:context=".activities.MainActivity"> <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/main_content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:fitsSystemWindows="true" - tools:context=".activities.MainActivity"> + android:fitsSystemWindows="true"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar" @@ -19,17 +20,25 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <include layout="@layout/view_main_toolbar" /> + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + style="@style/Main.Toolbar" /> </com.google.android.material.appbar.AppBarLayout> - <include layout="@layout/view_main_viewpager" /> + <com.pitchedapps.frost.views.FrostViewPager + android:id="@+id/viewpager" + style="@style/Main.ViewPager" /> - <include layout="@layout/view_main_fab" /> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab" + style="@style/Main.Fab" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> - <include layout="@layout/view_main_tab_layout" /> + <com.google.android.material.tabs.TabLayout + android:id="@+id/tabs" + style="@style/Main.TabLayout" /> </LinearLayout> |