Skip to content

Commit 748aeed

Browse files
soloPisoloPi
committed
migrate to androidX
1 parent 9d6fa65 commit 748aeed

111 files changed

Lines changed: 231 additions & 302 deletions

File tree

Some content is hidden

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

‎src/app/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ android {
3636
}
3737

3838
dependencies {
39-
implementation "com.android.support:support-v4:${SUPPORT_LIBRARY_VERSION}"
40-
implementation "com.android.support:support-core-utils:${SUPPORT_LIBRARY_VERSION}"
41-
implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
42-
implementation "com.android.support:recyclerview-v7:${SUPPORT_LIBRARY_VERSION}"
43-
implementation "com.android.support:design:${SUPPORT_LIBRARY_VERSION}"
39+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
40+
implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
41+
implementation 'androidx.appcompat:appcompat:1.0.0'
42+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
43+
implementation 'com.google.android.material:material:1.0.0'
4444
implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'
45-
implementation 'com.alibaba:fastjson:1.2.68'
46-
implementation 'org.greenrobot:greendao:3.2.2'
45+
implementation 'com.alibaba:fastjson:1.2.73'
46+
implementation 'org.greenrobot:greendao:3.3.0'
4747
implementation 'com.squareup.okhttp3:okhttp:3.12.3'
4848
implementation 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.3'
4949
implementation 'com.liulishuo.filedownloader:library:1.7.7'
@@ -55,13 +55,13 @@ dependencies {
5555
implementation('com.theartofdev.edmodo:android-image-cropper:2.5.1') {
5656
exclude group: "com.android.support"
5757
}
58-
implementation('com.github.bumptech.glide:glide:4.9.0') {
58+
implementation('com.github.bumptech.glide:glide:4.11.0') {
5959
exclude group: "com.android.support"
6060
}
6161
implementation 'commons-io:commons-io:2.6'
6262
implementation ('com.orhanobut:logger:2.2.0') {
6363
exclude group: "com.android.support"
6464
}
65-
compileOnly 'com.android.support:multidex:1.0.3'
65+
compileOnly 'androidx.multidex:multidex:2.0.0'
6666
implementation project(':shared')
6767
}

‎src/app/proguard-rules.pro‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ native <methods>;
8585
-keep public class * extends android.preference.Preference
8686
-keep public class * extends android.view.View
8787
-keep public class * extends android.database.sqlite.SQLiteOpenHelper{*;}
88-
# 如果有引用android-support-v4.jar包，可以添加下面这行
89-
-keep public class com.null.test.ui.fragment.** {*;}
90-
#如果引用了v4或者v7包
91-
-dontwarn android.support.**
9288
# 保留Activity中的方法参数是view的方法，
9389
-keepclassmembers class * extends android.app.Activity {
9490
public void * (android.view.View);
@@ -246,8 +242,6 @@ public com.alipay.hulu.common.utils.patch.PatchContext getContext();
246242

247243
-keep interface ** extends com.alipay.hulu.common.service.base.ExportService { *; }
248244

249-
-dontwarn android.support.v4.**
250-
-keep class android.support.** {*;}
251245
-keepattributes Exceptions,InnerClasses,Signature
252246

253247
#fastjson
@@ -269,16 +263,4 @@ public void setUserVisibleHint(boolean);
269263
public void onHiddenChanged(boolean);
270264
public void onResume();
271265
public void onPause();
272-
}
273-
-keep class android.support.v4.app.Fragment {
274-
public void setUserVisibleHint(boolean);
275-
public void onHiddenChanged(boolean);
276-
public void onResume();
277-
public void onPause();
278-
}
279-
-keep class * extends android.support.v4.app.Fragment {
280-
public void setUserVisibleHint(boolean);
281-
public void onHiddenChanged(boolean);
282-
public void onResume();
283-
public void onPause();
284266
}

‎src/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
</receiver>
159159

160160
<provider
161-
android:name="android.support.v4.content.FileProvider"
161+
android:name="androidx.core.content.FileProvider"
162162
android:authorities="com.alipay.hulu.myProvider"
163163
android:exported="false"
164164
android:grantUriPermissions="true">

‎src/app/src/main/java/com/alipay/hulu/activity/BaseActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import android.os.Build;
2727
import android.os.Bundle;
2828
import android.os.LocaleList;
29-
import android.support.annotation.IdRes;
30-
import android.support.annotation.Nullable;
31-
import android.support.annotation.StringRes;
32-
import android.support.v4.app.Fragment;
33-
import android.support.v4.app.FragmentManager;
34-
import android.support.v7.app.AppCompatActivity;
29+
import androidx.annotation.IdRes;
30+
import androidx.annotation.Nullable;
31+
import androidx.annotation.StringRes;
32+
import androidx.fragment.app.Fragment;
33+
import androidx.fragment.app.FragmentManager;
34+
import androidx.appcompat.app.AppCompatActivity;
3535
import android.text.TextUtils;
3636
import android.view.View;
3737
import android.view.inputmethod.InputMethodManager;

‎src/app/src/main/java/com/alipay/hulu/activity/BatchExecutionActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import android.os.Bundle;
1919
import android.provider.Settings;
20-
import android.support.annotation.Nullable;
21-
import android.support.design.widget.TabLayout;
22-
import android.support.v4.app.Fragment;
23-
import android.support.v4.app.FragmentManager;
24-
import android.support.v4.app.FragmentPagerAdapter;
25-
import android.support.v4.view.ViewPager;
20+
import androidx.annotation.Nullable;
21+
import com.google.android.material.tabs.TabLayout;
22+
import androidx.fragment.app.Fragment;
23+
import androidx.fragment.app.FragmentManager;
24+
import androidx.fragment.app.FragmentPagerAdapter;
25+
import androidx.viewpager.widget.ViewPager;
2626
import android.view.LayoutInflater;
2727
import android.view.View;
2828
import android.widget.Button;

‎src/app/src/main/java/com/alipay/hulu/activity/BatchReplayResultActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import android.content.Context;
1919
import android.content.Intent;
2020
import android.os.Bundle;
21-
import android.support.annotation.Nullable;
21+
import androidx.annotation.Nullable;
2222
import android.text.TextUtils;
2323
import android.view.LayoutInflater;
2424
import android.view.View;

‎src/app/src/main/java/com/alipay/hulu/activity/CaseEditActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import android.content.Intent;
1919
import android.os.Bundle;
20-
import android.support.annotation.Nullable;
21-
import android.support.design.widget.TabLayout;
22-
import android.support.v4.app.Fragment;
23-
import android.support.v4.app.FragmentManager;
24-
import android.support.v4.app.FragmentPagerAdapter;
25-
import android.support.v4.view.ViewPager;
20+
import androidx.annotation.Nullable;
21+
import com.google.android.material.tabs.TabLayout;
22+
import androidx.fragment.app.Fragment;
23+
import androidx.fragment.app.FragmentManager;
24+
import androidx.fragment.app.FragmentPagerAdapter;
25+
import androidx.viewpager.widget.ViewPager;
2626
import android.view.View;
2727

2828
import com.alipay.hulu.R;

‎src/app/src/main/java/com/alipay/hulu/activity/CaseParamEditActivity.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package com.alipay.hulu.activity;
1717

1818
import android.os.Bundle;
19-
import android.support.annotation.NonNull;
20-
import android.support.annotation.Nullable;
21-
import android.support.design.widget.TabLayout;
22-
import android.support.v4.app.Fragment;
23-
import android.support.v4.app.FragmentManager;
24-
import android.support.v4.app.FragmentPagerAdapter;
25-
import android.support.v4.view.ViewPager;
19+
import androidx.annotation.NonNull;
20+
import androidx.annotation.Nullable;
21+
import com.google.android.material.tabs.TabLayout;
22+
import androidx.fragment.app.Fragment;
23+
import androidx.fragment.app.FragmentManager;
24+
import androidx.fragment.app.FragmentPagerAdapter;
25+
import androidx.viewpager.widget.ViewPager;
2626
import android.view.View;
2727
import android.view.ViewGroup;
2828
import android.widget.TextView;

‎src/app/src/main/java/com/alipay/hulu/activity/CaseReplayResultActivity.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import android.content.Intent;
1919
import android.content.res.Resources;
2020
import android.os.Bundle;
21-
import android.support.annotation.Nullable;
22-
import android.support.design.widget.TabLayout;
23-
import android.support.v4.app.Fragment;
24-
import android.support.v4.app.FragmentManager;
25-
import android.support.v4.app.FragmentPagerAdapter;
26-
import android.support.v4.view.ViewPager;
21+
import androidx.annotation.Nullable;
22+
import com.google.android.material.tabs.TabLayout;
23+
import androidx.fragment.app.Fragment;
24+
import androidx.fragment.app.FragmentManager;
25+
import androidx.fragment.app.FragmentPagerAdapter;
26+
import androidx.viewpager.widget.ViewPager;
2727
import android.text.SpannableString;
2828
import android.text.Spanned;
2929
import android.text.style.ForegroundColorSpan;
@@ -47,7 +47,6 @@
4747
import com.alipay.hulu.fragment.ReplayScreenShotFragment;
4848
import com.alipay.hulu.fragment.ReplayStepFragment;
4949
import com.alipay.hulu.ui.HeadControlPanel;
50-
import com.alipay.hulu.util.DialogUtils;
5150

5251
import java.io.File;
5352
import java.io.FileWriter;

‎src/app/src/main/java/com/alipay/hulu/activity/IndexActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import android.content.Intent;
2424
import android.net.Uri;
2525
import android.os.Bundle;
26-
import android.support.annotation.Nullable;
27-
import android.support.v4.content.FileProvider;
26+
import androidx.annotation.Nullable;
27+
import androidx.core.content.FileProvider;
2828
import android.view.LayoutInflater;
2929
import android.view.View;
3030
import android.view.ViewGroup;

0 commit comments

Comments
 (0)