Skip to content
This repository was archived by the owner on Jun 28, 2020. It is now read-only.

Commit 1bcef3f

Browse files
committed
Convert layouts to AndroidX
1 parent ff1215f commit 1bcef3f

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.core.widget.DrawerLayout
2+
<androidx.drawerlayout.widget.DrawerLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -41,4 +41,4 @@
4141
app:headerLayout="@layout/nav_header_main"
4242
app:menu="@menu/activity_main_drawer"/>
4343

44-
</androidx.core.widget.DrawerLayout>
44+
</androidx.drawerlayout.widget.DrawerLayout>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -8,28 +8,28 @@
88
android:fitsSystemWindows="true"
99
tools:context="com.rom4ek.sample.arcnavigationview.MainActivity">
1010

11-
<android.support.design.widget.AppBarLayout
11+
<com.google.android.material.appbar.AppBarLayout
1212
android:layout_height="wrap_content"
1313
android:layout_width="match_parent"
1414
android:theme="@style/AppTheme.AppBarOverlay">
1515

16-
<android.support.v7.widget.Toolbar
16+
<androidx.appcompat.widget.Toolbar
1717
android:id="@+id/toolbar"
1818
android:layout_width="match_parent"
1919
android:layout_height="?attr/actionBarSize"
2020
android:background="?attr/colorPrimary"
2121
app:popupTheme="@style/AppTheme.PopupOverlay"/>
2222

23-
</android.support.design.widget.AppBarLayout>
23+
</com.google.android.material.appbar.AppBarLayout>
2424

2525
<include layout="@layout/content_main"/>
2626

27-
<android.support.design.widget.FloatingActionButton
27+
<com.google.android.material.floatingactionbutton.FloatingActionButton
2828
android:id="@+id/fab"
2929
android:layout_width="wrap_content"
3030
android:layout_height="wrap_content"
3131
android:layout_gravity="bottom|end"
3232
android:layout_margin="@dimen/fab_margin"
3333
app:srcCompat="@android:drawable/ic_dialog_email"/>
3434

35-
</android.support.design.widget.CoordinatorLayout>
35+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/content_main.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
android:paddingTop="@dimen/activity_vertical_margin"
1212
android:paddingBottom="@dimen/activity_vertical_margin"
1313
app:layout_behavior="@string/appbar_scrolling_view_behavior"
14-
tools:showIn="@layout/app_bar_main"
15-
tools:context="com.rom4ek.MainActivity">
14+
tools:showIn="@layout/app_bar_main">
1615

1716
<TextView
1817
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)