Skip to content

Commit 7dc681e

Browse files
880634880634
committed
适配AndroidX
1 parent 9256ddd commit 7dc681e

File tree

73 files changed

+192
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+192
-190
lines changed

‎app/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
targetSdkVersion rootProject.ext.targetSdkVersion
1818
versionCode 10
1919
versionName "1.0"
20-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
20+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2121

2222
// 混淆配置
2323
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-app.pro'
@@ -139,14 +139,14 @@ dependencies {
139139
// 友盟隔离
140140
implementation project(':umeng')
141141

142-
implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
143-
implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
144-
implementation "com.android.support:support-v4:$rootProject.ext.supportLibraryVersion"
145-
implementation "com.android.support:cardview-v7:$rootProject.ext.supportLibraryVersion"
146-
implementation "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
142+
implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
143+
implementation 'com.google.android.material:material:1.1.0-alpha06'
144+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
145+
implementation 'androidx.cardview:cardview:1.0.0'
146+
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
147147

148148
// Dex分包，解决 64k 问题
149-
implementation 'com.android.support:multidex:1.0.3'
149+
implementation 'androidx.multidex:multidex:2.0.1'
150150

151151
// ButterKnife 注解库：https://github.com/JakeWharton/butterknife
152152
implementation 'com.jakewharton:butterknife:9.0.0-rc1'

‎app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<!-- 适配Android 7.0文件意图 -->
3232
<provider
33-
android:name="android.support.v4.content.FileProvider"
33+
android:name="androidx.core.content.FileProvider"
3434
android:authorities="${applicationId}.provider"
3535
android:exported="false"
3636
android:grantUriPermissions="true">

‎app/src/main/java/com/hjq/demo/common/MyActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.content.pm.ActivityInfo;
44
import android.graphics.drawable.Drawable;
5-
import android.support.annotation.DrawableRes;
6-
import android.support.annotation.Nullable;
7-
import android.support.annotation.StringRes;
5+
import androidx.annotation.DrawableRes;
6+
import androidx.annotation.Nullable;
7+
import androidx.annotation.StringRes;
88
import android.util.Log;
99
import android.view.View;
1010

‎app/src/main/java/com/hjq/demo/common/MyApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.app.Application;
44
import android.content.Context;
5-
import android.support.multidex.MultiDex;
5+
import androidx.multidex.MultiDex;
66

77
import com.hjq.demo.other.EventBusManager;
88
import com.hjq.image.ImageLoader;

‎app/src/main/java/com/hjq/demo/common/MyLazyFragment.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import android.graphics.drawable.Drawable;
44
import android.os.Bundle;
5-
import android.support.annotation.DrawableRes;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.Nullable;
8-
import android.support.annotation.StringRes;
5+
import androidx.annotation.DrawableRes;
6+
import androidx.annotation.NonNull;
7+
import androidx.annotation.Nullable;
8+
import androidx.annotation.StringRes;
99
import android.util.Log;
1010
import android.view.LayoutInflater;
1111
import android.view.View;

‎app/src/main/java/com/hjq/demo/common/MyListViewAdapter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.hjq.demo.common;
22

33
import android.content.Context;
4-
import android.support.annotation.ColorInt;
5-
import android.support.annotation.DrawableRes;
6-
import android.support.annotation.IdRes;
7-
import android.support.annotation.StringRes;
4+
import androidx.annotation.ColorInt;
5+
import androidx.annotation.DrawableRes;
6+
import androidx.annotation.IdRes;
7+
import androidx.annotation.StringRes;
88
import android.view.View;
99
import android.view.ViewGroup;
1010
import android.widget.CompoundButton;

‎app/src/main/java/com/hjq/demo/common/MyRecyclerViewAdapter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.hjq.demo.common;
22

33
import android.content.Context;
4-
import android.support.annotation.ColorInt;
5-
import android.support.annotation.DrawableRes;
6-
import android.support.annotation.IdRes;
7-
import android.support.annotation.StringRes;
4+
import androidx.annotation.ColorInt;
5+
import androidx.annotation.DrawableRes;
6+
import androidx.annotation.IdRes;
7+
import androidx.annotation.StringRes;
88
import android.view.View;
99
import android.view.ViewGroup;
1010
import android.widget.CompoundButton;

‎app/src/main/java/com/hjq/demo/helper/ActivityStackManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.hjq.demo.helper;
22

33
import android.app.Activity;
4-
import android.support.v4.util.ArrayMap;
4+
import androidx.collection.ArrayMap;
55

66
/**
77
* author : Android 轮子哥

‎app/src/main/java/com/hjq/demo/helper/IntentExtraUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public IntentExtraUtils startActivity(Fragment fragment, int requestCode) {
8282
return this;
8383
}
8484

85-
public IntentExtraUtils startActivity(android.support.v4.app.Fragment fragment, int requestCode) {
85+
public IntentExtraUtils startActivity(androidx.fragment.app.Fragment fragment, int requestCode) {
8686
fragment.startActivityForResult(new Intent(fragment.getActivity(), sCurrentClass), requestCode);
8787
return this;
8888
}

‎app/src/main/java/com/hjq/demo/helper/PopupWindowHelper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.content.Context;
44
import android.graphics.Color;
55
import android.graphics.drawable.ColorDrawable;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.Nullable;
6+
import androidx.annotation.NonNull;
7+
import androidx.annotation.Nullable;
88
import android.view.View;
99
import android.view.ViewGroup;
1010
import android.view.animation.Animation;

‎app/src/main/java/com/hjq/demo/helper/RadioButtonGroupHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.hjq.demo.helper;
22

3-
import android.support.annotation.IdRes;
3+
import androidx.annotation.IdRes;
44
import android.view.View;
55
import android.widget.CompoundButton;
66
import android.widget.RadioButton;

‎app/src/main/java/com/hjq/demo/other/EventBusManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.hjq.demo.other;
22

3-
import android.support.v4.util.ArrayMap;
3+
import androidx.collection.ArrayMap;
44

55
import com.hjq.demo.MyEventBusIndex;
66

‎app/src/main/java/com/hjq/demo/other/StatusManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import android.graphics.drawable.Drawable;
55
import android.net.ConnectivityManager;
66
import android.net.NetworkInfo;
7-
import android.support.annotation.DrawableRes;
8-
import android.support.annotation.RequiresPermission;
9-
import android.support.annotation.StringRes;
10-
import android.support.v4.app.FragmentActivity;
7+
import androidx.annotation.DrawableRes;
8+
import androidx.annotation.RequiresPermission;
9+
import androidx.annotation.StringRes;
10+
import androidx.fragment.app.FragmentActivity;
1111
import android.view.View;
1212
import android.view.ViewGroup;
1313

‎app/src/main/java/com/hjq/demo/ui/activity/DialogActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.app.Dialog;
44
import android.content.Intent;
55
import android.content.pm.PackageManager;
6-
import android.support.annotation.Nullable;
6+
import androidx.annotation.Nullable;
77
import android.view.Gravity;
88
import android.view.View;
99
import android.widget.ImageView;

‎app/src/main/java/com/hjq/demo/ui/activity/HomeActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.hjq.demo.ui.activity;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.design.widget.BottomNavigationView;
5-
import android.support.v4.view.ViewPager;
3+
import androidx.annotation.NonNull;
4+
import com.google.android.material.bottomnavigation.BottomNavigationView;
5+
import androidx.viewpager.widget.ViewPager;
66
import android.view.KeyEvent;
77
import android.view.MenuItem;
88

‎app/src/main/java/com/hjq/demo/ui/activity/LoginActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.hjq.demo.ui.activity;
22

33
import android.content.Intent;
4-
import android.support.annotation.Nullable;
4+
import androidx.annotation.Nullable;
55
import android.view.View;
66
import android.widget.Button;
77
import android.widget.EditText;

‎app/src/main/java/com/hjq/demo/ui/activity/PhotoActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.hjq.demo.ui.activity;
22

3-
import android.support.v4.view.ViewPager;
3+
import androidx.viewpager.widget.ViewPager;
44

55
import com.hjq.demo.R;
66
import com.hjq.demo.common.MyActivity;

‎app/src/main/java/com/hjq/demo/ui/adapter/CopyAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.hjq.demo.ui.adapter;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
4+
import androidx.annotation.NonNull;
55
import android.view.ViewGroup;
66

77
import com.hjq.demo.R;

‎app/src/main/java/com/hjq/demo/ui/adapter/PhotoPagerAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.hjq.demo.ui.adapter;
22

33
import android.app.Activity;
4-
import android.support.annotation.NonNull;
5-
import android.support.v4.view.PagerAdapter;
4+
import androidx.annotation.NonNull;
5+
import androidx.viewpager.widget.PagerAdapter;
66
import android.view.View;
77
import android.view.ViewGroup;
88

‎app/src/main/java/com/hjq/demo/ui/dialog/CopyDialog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.hjq.demo.ui.dialog;
22

3-
import android.support.v4.app.FragmentActivity;
3+
import androidx.fragment.app.FragmentActivity;
44
import android.view.Gravity;
55

66
import com.hjq.base.BaseDialog;

‎app/src/main/java/com/hjq/demo/ui/dialog/ShareDialog.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import android.content.Context;
44
import android.graphics.drawable.Drawable;
55
import android.os.Build;
6-
import android.support.annotation.DrawableRes;
7-
import android.support.annotation.NonNull;
8-
import android.support.v4.app.FragmentActivity;
9-
import android.support.v7.widget.GridLayoutManager;
10-
import android.support.v7.widget.RecyclerView;
6+
import androidx.annotation.DrawableRes;
7+
import androidx.annotation.NonNull;
8+
import androidx.fragment.app.FragmentActivity;
9+
import androidx.recyclerview.widget.GridLayoutManager;
10+
import androidx.recyclerview.widget.RecyclerView;
1111
import android.util.TypedValue;
1212
import android.view.Gravity;
1313
import android.view.View;

‎app/src/main/java/com/hjq/demo/ui/dialog/UpdateDialog.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import android.os.Handler;
1212
import android.os.Looper;
1313
import android.os.Message;
14-
import android.support.v4.app.FragmentActivity;
15-
import android.support.v4.content.FileProvider;
14+
import androidx.fragment.app.FragmentActivity;
15+
import androidx.core.content.FileProvider;
1616
import android.text.format.Formatter;
1717
import android.view.Gravity;
1818
import android.view.View;

‎app/src/main/java/com/hjq/demo/ui/fragment/TestFragmentA.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.hjq.demo.ui.fragment;
22

3-
import android.support.design.widget.AppBarLayout;
4-
import android.support.v7.widget.Toolbar;
3+
import com.google.android.material.appbar.AppBarLayout;
4+
import androidx.appcompat.widget.Toolbar;
55
import android.widget.TextView;
66

77
import com.gyf.barlibrary.ImmersionBar;

‎app/src/main/java/com/hjq/demo/widget/PhotoViewPager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.hjq.demo.widget;
22

33
import android.content.Context;
4-
import android.support.v4.view.ViewPager;
4+
import androidx.viewpager.widget.ViewPager;
55
import android.util.AttributeSet;
66
import android.view.MotionEvent;
77

‎app/src/main/java/com/hjq/demo/widget/XCollapsingToolbarLayout.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.hjq.demo.widget;
22

33
import android.content.Context;
4-
import android.support.design.widget.CollapsingToolbarLayout;
4+
import com.google.android.material.appbar.CollapsingToolbarLayout;
55
import android.util.AttributeSet;
66

77
/**

‎app/src/main/res/layout/activity_dialog.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
android:layout_height="wrap_content"
1414
app:title="对话框案例" />
1515

16-
<android.support.v4.widget.NestedScrollView
16+
<androidx.core.widget.NestedScrollView
1717
android:layout_width="match_parent"
1818
android:layout_height="match_parent">
1919

@@ -139,6 +139,6 @@
139139

140140
</LinearLayout>
141141

142-
</android.support.v4.widget.NestedScrollView>
142+
</androidx.core.widget.NestedScrollView>
143143

144144
</LinearLayout>

‎app/src/main/res/layout/activity_home.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:layout_weight="1"
1515
android:fitsSystemWindows="false" />
1616

17-
<android.support.design.widget.BottomNavigationView
17+
<com.google.android.material.bottomnavigation.BottomNavigationView
1818
android:id="@+id/bv_home_navigation"
1919
android:layout_width="match_parent"
2020
android:layout_height="wrap_content"

‎app/src/main/res/layout/activity_register.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
app:leftTitle="@string/register_login"
1919
app:title="" />
2020

21-
<android.support.v4.widget.NestedScrollView
21+
<androidx.core.widget.NestedScrollView
2222
android:layout_width="match_parent"
2323
android:layout_height="match_parent">
2424

@@ -122,6 +122,6 @@
122122

123123
</LinearLayout>
124124

125-
</android.support.v4.widget.NestedScrollView>
125+
</androidx.core.widget.NestedScrollView>
126126

127127
</LinearLayout>

‎app/src/main/res/layout/activity_status.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:layout_width="match_parent"
1818
android:layout_height="match_parent">
1919

20-
<android.support.v7.widget.RecyclerView
20+
<androidx.recyclerview.widget.RecyclerView
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
2323
tools:listCount="10"

‎app/src/main/res/layout/dialog_update.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</LinearLayout>
5252

5353
<!--这个地方需要设置可以滚动-->
54-
<android.support.v4.widget.NestedScrollView
54+
<androidx.core.widget.NestedScrollView
5555
android:layout_width="match_parent"
5656
android:layout_height="wrap_content"
5757
android:overScrollMode="never"
@@ -73,7 +73,7 @@
7373
android:textSize="13sp"
7474
tools:text="更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n更新内容\n" />
7575

76-
</android.support.v4.widget.NestedScrollView>
76+
</androidx.core.widget.NestedScrollView>
7777

7878
<com.hjq.widget.NumberProgressBar
7979
android:id="@+id/pb_dialog_update_progress"

0 commit comments

Comments
 (0)