diff options
| author | Allan Wang <me@allanwang.ca> | 2017-11-22 12:49:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 12:49:56 -0500 |
| commit | f619522bd805e0e090fe9d47ed7b23c4210c634d (patch) | |
| tree | 1a1637dc498b7ad16cbabab1716aed343a9db954 /app/src/main/res/layout/activity_main_bottom_tabs.xml | |
| parent | f6499a8741b8234770ba61c003f8065da041cdfe (diff) | |
| download | frost-f619522bd805e0e090fe9d47ed7b23c4210c634d.tar.gz frost-f619522bd805e0e090fe9d47ed7b23c4210c634d.tar.bz2 frost-f619522bd805e0e090fe9d47ed7b23c4210c634d.zip | |
Fix/tab layout (#510)
* Test wrap content width
* Compute badge icon dimensions
* Reuse views
* Remove unnecessary color set
* Change image bound
* Set min
* Change dp
* Snapshot
* Hardcode dimensions
* Add min width
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 | 35 |
1 files changed, 5 insertions, 30 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 09742387..783aa455 100644 --- a/app/src/main/res/layout/activity_main_bottom_tabs.xml +++ b/app/src/main/res/layout/activity_main_bottom_tabs.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -21,40 +19,17 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="@style/AppTheme.PopupOverlay"> - - </android.support.v7.widget.Toolbar> + <include layout="@layout/view_main_toolbar" /> </android.support.design.widget.AppBarLayout> - <com.pitchedapps.frost.views.FrostViewPager - android:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - <android.support.design.widget.FloatingActionButton - android:id="@+id/fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:layout_margin="@dimen/kau_fab_margin" - android:visibility="gone" /> + <include layout="@layout/view_main_viewpager" /> + + <include layout="@layout/view_main_fab" /> </android.support.design.widget.CoordinatorLayout> - <android.support.design.widget.TabLayout - android:id="@+id/tabs" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - app:tabIndicatorHeight="0dp" /> + <include layout="@layout/view_main_tab_layout" /> </LinearLayout> |