diff options
author | Allan Wang <me@allanwang.ca> | 2018-12-24 01:49:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-24 01:49:57 -0500 |
commit | 2c02356c498b3db6f13bd7a3af8689c24ca224ea (patch) | |
tree | 726ad142a8a373715493cf602786361226f624ee /app/src/main/res/layout/activity_main.xml | |
parent | fce0bf0a6df09de78a804dc874f48f67336d9d9c (diff) | |
parent | 697d01882ba8b1dbb85484ba3bf6e810e32448fc (diff) | |
download | frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.tar.gz frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.tar.bz2 frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.zip |
Merge branch 'dev' into update/coroutines
Diffstat (limited to 'app/src/main/res/layout/activity_main.xml')
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 883221d9..8fa9283f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/main_content" android:layout_width="match_parent" @@ -7,7 +7,7 @@ android:fitsSystemWindows="true" tools:context=".activities.MainActivity"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -17,10 +17,10 @@ <include layout="@layout/view_main_tab_layout" /> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <include layout="@layout/view_main_viewpager" /> <include layout="@layout/view_main_fab" /> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> |