diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 31 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main_bottom_tabs.xml | 35 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_badged_icon.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_main_fab.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_main_tab_layout.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_main_toolbar.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_main_viewpager.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 1 |
8 files changed, 47 insertions, 60 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 440cbba3..883221d9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <android.support.design.widget.CoordinatorLayout 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:id="@+id/main_content" android:layout_width="match_parent" @@ -14,36 +13,14 @@ 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"> + <include layout="@layout/view_main_toolbar" /> - </android.support.v7.widget.Toolbar> - - <android.support.design.widget.TabLayout - android:id="@+id/tabs" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:tabIndicatorHeight="0dp" /> + <include layout="@layout/view_main_tab_layout" /> </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" /> + <include layout="@layout/view_main_viewpager" /> - <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_fab" /> </android.support.design.widget.CoordinatorLayout> 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> diff --git a/app/src/main/res/layout/view_badged_icon.xml b/app/src/main/res/layout/view_badged_icon.xml index cc6b16cc..c64e7809 100644 --- a/app/src/main/res/layout/view_badged_icon.xml +++ b/app/src/main/res/layout/view_badged_icon.xml @@ -3,11 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="50dp"> + android:layout_height="@dimen/tab_bar_height" + android:minWidth="@dimen/tab_bar_height"> <android.support.constraint.Guideline android:id="@+id/g_v_c" - android:layout_width="1dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintGuide_percent="0.5" @@ -17,7 +18,7 @@ <android.support.constraint.Guideline android:id="@+id/g_h_c" android:layout_width="wrap_content" - android:layout_height="1dp" + android:layout_height="wrap_content" android:orientation="horizontal" app:layout_constraintGuide_percent="0.5" tools:layout_editor_absoluteX="0dp" diff --git a/app/src/main/res/layout/view_main_fab.xml b/app/src/main/res/layout/view_main_fab.xml new file mode 100644 index 00000000..5e1fed77 --- /dev/null +++ b/app/src/main/res/layout/view_main_fab.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.design.widget.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android" + 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" />
\ No newline at end of file diff --git a/app/src/main/res/layout/view_main_tab_layout.xml b/app/src/main/res/layout/view_main_tab_layout.xml new file mode 100644 index 00000000..ed4f5d60 --- /dev/null +++ b/app/src/main/res/layout/view_main_tab_layout.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/tabs" + style="@style/Widget.Design.TabLayout" + android:layout_width="match_parent" + android:layout_height="@dimen/tab_bar_height" + app:tabGravity="fill" + app:tabIndicatorHeight="0dp" + app:tabMode="fixed" /> diff --git a/app/src/main/res/layout/view_main_toolbar.xml b/app/src/main/res/layout/view_main_toolbar.xml new file mode 100644 index 00000000..b0a4de7c --- /dev/null +++ b/app/src/main/res/layout/view_main_toolbar.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:layout_scrollFlags="scroll|enterAlways" + app:popupTheme="@style/AppTheme.PopupOverlay" />
\ No newline at end of file diff --git a/app/src/main/res/layout/view_main_viewpager.xml b/app/src/main/res/layout/view_main_viewpager.xml new file mode 100644 index 00000000..0c3f314c --- /dev/null +++ b/app/src/main/res/layout/view_main_viewpager.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<com.pitchedapps.frost.views.FrostViewPager xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" />
\ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index f7855b5b..888340e9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,5 +5,6 @@ <dimen name="context_menu_height">60dp</dimen> + <dimen name="tab_bar_height">50dp</dimen> <dimen name="intro_bar_height">64dp</dimen> </resources> |