From 6779b1118d9fd2f1e659679d9f2cad3127d0c822 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 26 Dec 2019 16:49:06 -0800
Subject: Switch to viewbinding and styles and prepare layout wrapper

---
 app/src/main/res/layout/activity_main.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'app/src/main/res/layout/activity_main.xml')

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>
-- 
cgit v1.2.3