diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main_bottom_tabs.xml | 23 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main_drawer_wrapper.xml | 18 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 31 |
4 files changed, 77 insertions, 11 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8fa9283f..f46175d1 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,14 +13,22 @@ 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" /> - <include layout="@layout/view_main_tab_layout" /> + <com.google.android.material.tabs.TabLayout + android:id="@+id/tabs" + style="@style/Main.TabLayout" /> </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> 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> diff --git a/app/src/main/res/layout/activity_main_drawer_wrapper.xml b/app/src/main/res/layout/activity_main_drawer_wrapper.xml new file mode 100644 index 00000000..4eebf56a --- /dev/null +++ b/app/src/main/res/layout/activity_main_drawer_wrapper.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + + <FrameLayout + android:id="@+id/main_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" /> + + <com.google.android.material.navigation.NavigationView + android:id="@+id/navigation" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:visibility="gone" /> +</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4d22ee79..c5179bb1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -98,4 +98,35 @@ <item name="android:padding">@dimen/kau_padding_large</item> </style> + <!-- Main Activity Styles --> + + <style name="Main.Toolbar" parent=""> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">?actionBarSize</item> + <item name="layout_scrollFlags">scroll|enterAlways|snap</item> + <item name="popupTheme">@style/AppTheme.PopupOverlay</item> + </style> + + <style name="Main.ViewPager" parent="" > + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">match_parent</item> + <item name="layout_behavior">@string/appbar_scrolling_view_behavior</item> + </style> + + <style name="Main.Fab" parent="" > + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_gravity">end|bottom</item> + <item name="android:layout_margin">16dp</item> + </style> + + <style name="Main.TabLayout" parent="Widget.Design.TabLayout"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">@dimen/tab_bar_height</item> + <item name="tabGravity">fill</item> + <item name="tabIndicatorHeight">0dp</item> + <item name="tabMode">fixed</item> + </style> + + </resources> |