适配 androidX

This commit is contained in:
laoyuyu
2019-07-30 21:26:19 +08:00
parent 43915ad204
commit ac43c9b93b
107 changed files with 234 additions and 285 deletions

View File

@@ -11,7 +11,7 @@
<include layout="@layout/layout_bar"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -42,7 +42,7 @@
android:background="@android:color/darker_gray"
/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -9,7 +9,7 @@
<include layout="@layout/layout_bar"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
>
<RelativeLayout
@@ -11,7 +10,7 @@
>
<include layout="@layout/layout_bar"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -11,7 +11,7 @@
<include layout="@layout/layout_bar"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -6,7 +6,7 @@
android:orientation="vertical"
>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@@ -56,7 +56,7 @@
android:textStyle="bold"
/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@@ -25,7 +25,7 @@
android:paddingRight="8dp"
>
<android.support.v7.widget.AppCompatImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/control_bt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

View File

@@ -7,7 +7,7 @@
android:orientation="vertical"
>
<android.support.v7.widget.AppCompatImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
>
<android.support.v7.widget.AppCompatImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="140dp"
@@ -36,6 +36,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/image"
android:layout_centerHorizontal="true"
android:layout_marginBottom="16dp"
android:layout_marginTop="8dp"
android:ellipsize="marquee"
android:marqueeRepeatLimit="2"
@@ -44,9 +45,8 @@
android:textColor="@color/text_black"
android:textSize="@dimen/text_size_normal"
android:textStyle="bold"
android:layout_marginBottom="16dp"
/>
</RelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

View File

@@ -8,7 +8,7 @@
android:orientation="vertical"
>
<android.support.v7.widget.AppCompatImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
@@ -36,10 +36,10 @@
/>
<TextView
android:layout_marginTop="4dp"
android:id="@+id/desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="@color/text_black"
android:textSize="@dimen/text_size_smallest"
/>

View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
/>

View File

@@ -23,7 +23,7 @@
android:textSize="@dimen/text_size_normal"
android:textStyle="bold"
/>
<android.support.v7.widget.AppCompatImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/full_screen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

View File

@@ -16,7 +16,7 @@
android:textSize="@dimen/text_size_normal"
/>
<android.support.v7.widget.AppCompatImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="20dp"
android:layout_height="20dp"