升级AndroidX

maning0303 · Oct 16, 2020 · bcb2f54 · bcb2f54
1 parent 1b423b8
commit bcb2f54
Show file tree

Hide file tree

Showing 114 changed files with 245 additions and 273 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -110,14 +110,13 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation librarys.constraint
+    implementation librarys.constraintlayout
     implementation librarys.supportV4
     implementation librarys.supportV7
     implementation librarys.design
     implementation librarys.recyclerview
     implementation librarys.cardview
     implementation librarys.multidex
-    implementation 'com.android.support.constraint:constraint-layout:2.0.2'
 
     /*-----------------------------------------*/
 
@@ -191,7 +190,7 @@ dependencies {
     /*-----------------------------------------*/
 
     /*图片浏览*/
-    implementation 'com.github.maning0303:MNImageBrowser:V1.3.5-support'
+    implementation 'com.github.maning0303:MNImageBrowser:V1.3.5'
     /*二维码扫描*/
     implementation 'com.github.maning0303:MNZXingCode:V2.1.4'
     /*翻滚广告条TextView*/
@@ -201,7 +200,7 @@ dependencies {
     /* 日历 */
     implementation 'com.github.maning0303:MNCalendar:V1.0.1'
     /* 日志监听 */
-    implementation 'com.github.maning0303:MNCrashMonitor:V1.0.5'
+    implementation 'com.github.maning0303:MNCrashMonitor:V1.2.0'
     /* 版本升级 */
     implementation 'com.github.maning0303:MNUpdateAPK:V2.0.3'
 

diff --git a/app/src/main/java/com/maning/gankmm/app/MyApplication.java b/app/src/main/java/com/maning/gankmm/app/MyApplication.java
@@ -7,7 +7,7 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.StrictMode;
-import android.support.multidex.MultiDex;
+import androidx.multidex.MultiDex;
 import android.text.TextUtils;
 
 import com.leon.channel.helper.ChannelReaderUtil;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/AboutActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/AboutActivity.java
@@ -4,8 +4,8 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/CodesActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/CodesActivity.java
@@ -2,12 +2,12 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.animation.Animation;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/GankActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/GankActivity.java
@@ -4,11 +4,11 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/MainActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/MainActivity.java
@@ -4,12 +4,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.navigation.NavigationView;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/MoreActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/MoreActivity.java
@@ -2,10 +2,10 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.maning.gankmm.R;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/OpenFrameActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/OpenFrameActivity.java
@@ -1,9 +1,9 @@
 package com.maning.gankmm.ui.activity;
 
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/QRCodeActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/QRCodeActivity.java
@@ -1,7 +1,7 @@
 package com.maning.gankmm.ui.activity;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.maning.gankmm.R;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/SearchActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/SearchActivity.java
@@ -2,9 +2,9 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/SettingActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/SettingActivity.java
@@ -4,8 +4,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.ImageView;
 import android.widget.Toast;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/SupportPayActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/SupportPayActivity.java
@@ -4,7 +4,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/WeatherActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/WeatherActivity.java
@@ -2,9 +2,9 @@
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -18,7 +18,6 @@
 import com.bumptech.glide.request.transition.Transition;
 import com.jaeger.library.StatusBarUtil;
 import com.maning.gankmm.R;
-import com.maning.gankmm.bean.mob.CalendarInfoEntity;
 import com.maning.gankmm.bean.gank2.GankEntity;
 import com.maning.gankmm.bean.rolltools.HolidayBean;
 import com.maning.gankmm.bean.rolltools.WeatherFuturedaysResultBean;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/WebActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/WebActivity.java
@@ -5,7 +5,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -28,7 +28,6 @@
 import com.maning.gankmm.utils.IntentUtils;
 import com.maning.gankmm.utils.MySnackbar;
 import com.maning.gankmm.utils.NetUtils;
-import com.umeng.analytics.MobclickAgent;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/login/EditSignatureActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/login/EditSignatureActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/login/EditUserInfoActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/login/EditUserInfoActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/login/ForgetPsdActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/login/ForgetPsdActivity.java
@@ -2,7 +2,7 @@
 
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/login/LoginActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/login/LoginActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.widget.EditText;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/login/RegisterActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/login/RegisterActivity.java
@@ -1,7 +1,7 @@
 package com.maning.gankmm.ui.activity.login;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.widget.EditText;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/ChineseCalendarActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/ChineseCalendarActivity.java
@@ -1,7 +1,7 @@
 package com.maning.gankmm.ui.activity.tools;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/CookDetailsActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/CookDetailsActivity.java
@@ -1,15 +1,14 @@
 package com.maning.gankmm.ui.activity.tools;
 
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.maning.gankmm.R;
 import com.maning.gankmm.bean.mob.MobCookDetailEntity;
-import com.maning.gankmm.skin.SkinManager;
 import com.maning.gankmm.ui.adapter.RecycleCookDetailsAdapter;
 import com.maning.gankmm.ui.base.BaseActivity;
 

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/CookListActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/CookListActivity.java
@@ -2,10 +2,10 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/CookMenuActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/CookMenuActivity.java
@@ -2,10 +2,10 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/DictionaryActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/DictionaryActivity.java
@@ -1,10 +1,10 @@
 package com.maning.gankmm.ui.activity.tools;
 
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.MenuItem;
 
@@ -13,7 +13,6 @@
 import com.maning.gankmm.bean.rolltools.DictionaryResultBean;
 import com.maning.gankmm.http.callback.CommonHttpCallback;
 import com.maning.gankmm.http.rolltools.RolltoolsApi;
-import com.maning.gankmm.skin.SkinManager;
 import com.maning.gankmm.ui.adapter.RecycleCommonQueryAdapter;
 import com.maning.gankmm.ui.base.BaseActivity;
 import com.maning.gankmm.ui.view.MClearEditText;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/FlightListActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/FlightListActivity.java
@@ -2,10 +2,10 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.maning.gankmm.R;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/HistoryTodayActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/HistoryTodayActivity.java
@@ -2,10 +2,10 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.maning.gankmm.R;

diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/IPQueryActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/IPQueryActivity.java
@@ -1,10 +1,10 @@
 package com.maning.gankmm.ui.activity.tools;
 
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.MenuItem;