From 19b98f99f5fb302863d96485d592974f00878cc7 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 25 十一月 2019 16:17:04 +0800
Subject: [PATCH] 修复点击设置崩溃；所有support包转成androidx
---
app/src/main/res/layout/layout_base_set.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/layout_base_set.xml b/app/src/main/res/layout/layout_base_set.xml
index 87b41b9..bdd45cd 100644
--- a/app/src/main/res/layout/layout_base_set.xml
+++ b/app/src/main/res/layout/layout_base_set.xml
@@ -3,14 +3,14 @@
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.design.widget.AppBarLayout
+ <com.google.android.material.appbar.AppBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -18,20 +18,20 @@
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay"
app:titleTextAppearance="@style/Toolbar_TextAppearance_White"/>
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tab_base_set"
android:background="@color/profile_bg"
android:layout_below="@+id/toolbar_set">
- </android.support.design.widget.TabLayout>
- </android.support.design.widget.AppBarLayout>
- <android.support.v4.view.ViewPager
+ </com.google.android.material.tabs.TabLayout>
+ </com.google.android.material.appbar.AppBarLayout>
+ <androidx.viewpager.widget.ViewPager
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/train_bg"
android:id="@+id/vp_base_set">
- </android.support.v4.view.ViewPager>
+ </androidx.viewpager.widget.ViewPager>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0