diff --git a/app/build.gradle b/app/build.gradle index 7ca0cb7..49183e3 100644 --- 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 index 409710c..b2849fe 100644 --- 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 index d121453..252bf19 100644 --- 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 index 91cc478..32ef43e 100644 --- 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 index b0ffb6a..45d6764 100644 --- 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 index fad58bc..487c8d8 100644 --- 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 index 9b5b0d7..4b93739 100644 --- 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 index 5f0828c..54810e5 100644 --- 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 index 8c44325..e6d9bfe 100644 --- 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 index a7e336d..fa7e351 100644 --- 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 index a454b23..76b0ab4 100644 --- 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 index 172029b..bbb1743 100644 --- 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 index 94c0fb8..d63a2ef 100644 --- 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 index c676ace..18070b1 100644 --- 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 index c7742f8..8290b52 100644 --- 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 index 53b3848..ecb20f9 100644 --- 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 index af0c5e6..49450e7 100644 --- 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 index 8abe229..1b09398 100644 --- 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 index 142818d..eabdac7 100644 --- 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 index c55fa31..fcafc87 100644 --- 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 index 882a6bb..d8af6e8 100644 --- 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 index e2f3c9b..5bc1701 100644 --- 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 index 994eff5..b8e36a5 100644 --- 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 index cb5786f..762aa89 100644 --- 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 index d7c752b..ce76a32 100644 --- 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 index 32f32ed..2a0ea2a 100644 --- 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 index 56e0f39..544cb06 100644 --- 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; diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/LotteryCategoryActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/LotteryCategoryActivity.java index b76b963..cda1c9e 100644 --- a/app/src/main/java/com/maning/gankmm/ui/activity/tools/LotteryCategoryActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/activity/tools/LotteryCategoryActivity.java @@ -2,10 +2,10 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.GridLayoutManager; +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/LotteryDetailActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/LotteryDetailActivity.java index 1f98118..5abec77 100644 --- a/app/src/main/java/com/maning/gankmm/ui/activity/tools/LotteryDetailActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/activity/tools/LotteryDetailActivity.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.view.MenuItem; import android.widget.TextView; diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/OilPriceActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/OilPriceActivity.java index 194616c..3a74aa1 100644 --- a/app/src/main/java/com/maning/gankmm/ui/activity/tools/OilPriceActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/activity/tools/OilPriceActivity.java @@ -2,7 +2,7 @@ import android.annotation.SuppressLint; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.MenuItem; diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/PhoneAddressActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/PhoneAddressActivity.java index fb1a6dd..02e2235 100644 --- a/app/src/main/java/com/maning/gankmm/ui/activity/tools/PhoneAddressActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/activity/tools/PhoneAddressActivity.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; diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/RubbishActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/RubbishActivity.java index 81860fe..2df9511 100644 --- a/app/src/main/java/com/maning/gankmm/ui/activity/tools/RubbishActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/activity/tools/RubbishActivity.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.text.TextUtils; import android.view.MenuItem; diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/ScanResultActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/ScanResultActivity.java index 270a53f..969c740 100644 --- a/app/src/main/java/com/maning/gankmm/ui/activity/tools/ScanResultActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/activity/tools/ScanResultActivity.java @@ -4,33 +4,28 @@ import android.content.Intent; 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.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; import com.maning.gankmm.R; -import com.maning.gankmm.skin.SkinManager; import com.maning.gankmm.ui.adapter.RecycleScanHistoryAdapter; import com.maning.gankmm.ui.base.BaseActivity; import com.maning.gankmm.utils.CacheManager; import com.maning.gankmm.utils.ClipUtils; import com.maning.gankmm.utils.DialogUtils; -import com.maning.gankmm.utils.MMKVUtils; import com.maning.gankmm.utils.MySnackbar; -import com.maning.gankmm.utils.PermissionUtils; import com.maning.gankmm.utils.ThreadPoolUtils; import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration; import java.util.ArrayList; -import java.util.List; import butterknife.Bind; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/tools/TrainListActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/TrainListActivity.java index 9af81e2..c6eea0e 100644 --- a/app/src/main/java/com/maning/gankmm/ui/activity/tools/TrainListActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/activity/tools/TrainListActivity.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/WorldPhoneCodeActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/tools/WorldPhoneCodeActivity.java index fa37f9e..b052445 100644 --- a/app/src/main/java/com/maning/gankmm/ui/activity/tools/WorldPhoneCodeActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/activity/tools/WorldPhoneCodeActivity.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.view.MenuItem; import com.maning.gankmm.R; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/OilPriceAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/OilPriceAdapter.java index 971ea91..d7b81be 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/OilPriceAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/OilPriceAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCodesContentAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCodesContentAdapter.java index bfa9ec0..da8c6e3 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCodesContentAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCodesContentAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCodesTitleAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCodesTitleAdapter.java index 48f6895..dc2d070 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCodesTitleAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCodesTitleAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCommonQueryAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCommonQueryAdapter.java index 9d17d20..008b93c 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCommonQueryAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCommonQueryAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookCategoryAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookCategoryAdapter.java index 0fdc6bb..68fce5e 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookCategoryAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookCategoryAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookDetailItemAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookDetailItemAdapter.java index 4f0f724..1520ebf 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookDetailItemAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookDetailItemAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookDetailsAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookDetailsAdapter.java index fefb3fe..aaa8460 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookDetailsAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleCookDetailsAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleFlightAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleFlightAdapter.java index 8903c36..9af3aae 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleFlightAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleFlightAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleGankAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleGankAdapter.java index d24122d..4b9648e 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleGankAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleGankAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleHistoryAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleHistoryAdapter.java index a5f27ad..dea3fd1 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleHistoryAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleHistoryAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleHistoryTodayAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleHistoryTodayAdapter.java index da81378..b9466d6 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleHistoryTodayAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleHistoryTodayAdapter.java @@ -1,9 +1,8 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; -import android.util.SparseBooleanArray; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -16,7 +15,6 @@ import com.maning.gankmm.R; import com.maning.gankmm.bean.rolltools.HistoryTodayBean; -import java.text.SimpleDateFormat; import java.util.ArrayList; import butterknife.Bind; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryAdapter.java index c2b2895..9ad14c3 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryDetailsAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryDetailsAdapter.java index a01a01b..0b770e9 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryDetailsAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryDetailsAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryNumberAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryNumberAdapter.java index 89e1b77..2274d90 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryNumberAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleLotteryNumberAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleMoreAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleMoreAdapter.java index 7dee078..8404583 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleMoreAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleMoreAdapter.java @@ -3,9 +3,9 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,14 +15,11 @@ import com.maning.gankmm.listeners.OnItemClickListener; import com.maning.gankmm.ui.activity.tools.ChineseCalendarActivity; import com.maning.gankmm.ui.activity.tools.DictionaryActivity; -import com.maning.gankmm.ui.activity.tools.FlightActivity; import com.maning.gankmm.ui.activity.tools.HistoryTodayActivity; import com.maning.gankmm.ui.activity.tools.IPQueryActivity; -import com.maning.gankmm.ui.activity.tools.LotteryCategoryActivity; import com.maning.gankmm.ui.activity.tools.PhoneAddressActivity; import com.maning.gankmm.ui.activity.tools.RubbishActivity; import com.maning.gankmm.ui.activity.tools.ScanResultActivity; -import com.maning.gankmm.ui.activity.tools.TrainActivity; import com.maning.gankmm.ui.activity.tools.WorldPhoneCodeActivity; import com.maning.gankmm.utils.IntentUtils; import com.maning.gankmm.utils.MySnackbar; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleMoreItemAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleMoreItemAdapter.java index d73832b..64baef2 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleMoreItemAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleMoreItemAdapter.java @@ -1,10 +1,9 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.util.Log; + +import androidx.recyclerview.widget.RecyclerView; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,8 +12,6 @@ import com.maning.gankmm.R; import com.maning.gankmm.listeners.OnItemClickListener; -import com.socks.library.KLog; -import com.socks.library.KLogUtil; import java.util.HashMap; import java.util.List; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleOpenFrameAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleOpenFrameAdapter.java index 5137f54..ac189a8 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleOpenFrameAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleOpenFrameAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecyclePicAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecyclePicAdapter.java index 81d28ab..53727b7 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecyclePicAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecyclePicAdapter.java @@ -2,10 +2,10 @@ import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.Nullable; -import android.support.v4.util.ArrayMap; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.annotation.Nullable; +import androidx.collection.ArrayMap; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecyclePublicAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecyclePublicAdapter.java index c7dc291..fad505f 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecyclePublicAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecyclePublicAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleRubbishAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleRubbishAdapter.java index 5a3f897..57730d7 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleRubbishAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleRubbishAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleScanHistoryAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleScanHistoryAdapter.java index f4caefc..ab982b4 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleScanHistoryAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleScanHistoryAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleSearchAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleSearchAdapter.java index abeebad..ff163b0 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleSearchAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleSearchAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleTrainAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleTrainAdapter.java index c6cb5b1..3cce5b1 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleTrainAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleTrainAdapter.java @@ -1,9 +1,9 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -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.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleTrainDetailsAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleTrainDetailsAdapter.java index 988816a..1acb129 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleTrainDetailsAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleTrainDetailsAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleWxArticleAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleWxArticleAdapter.java index f9a88eb..d1ec1b9 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleWxArticleAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleWxArticleAdapter.java @@ -1,7 +1,7 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleWxCategoryItemAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleWxCategoryItemAdapter.java index 453ebfe..80ca9dc 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleWxCategoryItemAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/RecycleWxCategoryItemAdapter.java @@ -1,11 +1,10 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; import com.maning.gankmm.R; @@ -13,7 +12,6 @@ import com.maning.gankmm.listeners.OnItemClickListener; import java.util.ArrayList; -import java.util.List; import butterknife.Bind; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/Weather2Adapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/Weather2Adapter.java index 387a767..b7ba15f 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/Weather2Adapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/Weather2Adapter.java @@ -1,8 +1,8 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.text.TextUtils; +import androidx.recyclerview.widget.RecyclerView; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,7 +10,6 @@ import android.widget.TextView; import com.maning.gankmm.R; -import com.maning.gankmm.bean.mob.WeatherBeseEntity; import com.maning.gankmm.bean.rolltools.WeatherFuturedaysResultBean; import com.maning.gankmm.utils.SharePreUtil; diff --git a/app/src/main/java/com/maning/gankmm/ui/adapter/WeatherAdapter.java b/app/src/main/java/com/maning/gankmm/ui/adapter/WeatherAdapter.java index cc18d57..2a5f881 100644 --- a/app/src/main/java/com/maning/gankmm/ui/adapter/WeatherAdapter.java +++ b/app/src/main/java/com/maning/gankmm/ui/adapter/WeatherAdapter.java @@ -1,17 +1,15 @@ package com.maning.gankmm.ui.adapter; import android.content.Context; -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.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import com.maning.gankmm.R; -import com.maning.gankmm.bean.mob.CalendarInfoEntity; -import com.maning.gankmm.bean.mob.WeatherBeseEntity; import com.maning.gankmm.bean.rolltools.HolidayBean; import com.maning.gankmm.bean.rolltools.WeatherFuturedaysResultBean; import com.maning.gankmm.bean.weather.WeatherInfoBean; diff --git a/app/src/main/java/com/maning/gankmm/ui/base/BaseActivity.java b/app/src/main/java/com/maning/gankmm/ui/base/BaseActivity.java index 48c6046..12c4dc7 100644 --- a/app/src/main/java/com/maning/gankmm/ui/base/BaseActivity.java +++ b/app/src/main/java/com/maning/gankmm/ui/base/BaseActivity.java @@ -2,9 +2,9 @@ import android.content.Context; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.text.TextUtils; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import android.view.KeyEvent; import com.bumptech.glide.Glide; diff --git a/app/src/main/java/com/maning/gankmm/ui/base/BaseFragment.java b/app/src/main/java/com/maning/gankmm/ui/base/BaseFragment.java index 6dc17c9..76b6470 100644 --- a/app/src/main/java/com/maning/gankmm/ui/base/BaseFragment.java +++ b/app/src/main/java/com/maning/gankmm/ui/base/BaseFragment.java @@ -2,7 +2,7 @@ import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.maning.gankmm.R; import com.maning.mndialoglibrary.MProgressDialog; diff --git a/app/src/main/java/com/maning/gankmm/ui/dialog/ListFragmentDialog.java b/app/src/main/java/com/maning/gankmm/ui/dialog/ListFragmentDialog.java index 2810ca5..623a71a 100644 --- a/app/src/main/java/com/maning/gankmm/ui/dialog/ListFragmentDialog.java +++ b/app/src/main/java/com/maning/gankmm/ui/dialog/ListFragmentDialog.java @@ -2,10 +2,10 @@ import android.content.Context; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/fragment/CategoryFragment.java b/app/src/main/java/com/maning/gankmm/ui/fragment/CategoryFragment.java index b96b2cf..456dd64 100644 --- a/app/src/main/java/com/maning/gankmm/ui/fragment/CategoryFragment.java +++ b/app/src/main/java/com/maning/gankmm/ui/fragment/CategoryFragment.java @@ -1,11 +1,11 @@ package com.maning.gankmm.ui.fragment; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; + +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,7 +20,6 @@ import com.maning.gankmm.utils.MyToast; import com.maning.mndialoglibrary.MProgressDialog; import com.ogaclejapan.smarttablayout.SmartTabLayout; -import com.umeng.analytics.MobclickAgent; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/maning/gankmm/ui/fragment/GirlsFragment.java b/app/src/main/java/com/maning/gankmm/ui/fragment/GirlsFragment.java index f5bfb13..a763a6e 100644 --- a/app/src/main/java/com/maning/gankmm/ui/fragment/GirlsFragment.java +++ b/app/src/main/java/com/maning/gankmm/ui/fragment/GirlsFragment.java @@ -1,9 +1,9 @@ package com.maning.gankmm.ui.fragment; import android.os.Bundle; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/fragment/HistoryFragment.java b/app/src/main/java/com/maning/gankmm/ui/fragment/HistoryFragment.java index 1adec7c..e9eed7f 100644 --- a/app/src/main/java/com/maning/gankmm/ui/fragment/HistoryFragment.java +++ b/app/src/main/java/com/maning/gankmm/ui/fragment/HistoryFragment.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.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,7 +19,6 @@ import com.maning.gankmm.ui.presenter.impl.HistoryPresenterImpl; import com.maning.gankmm.utils.IntentUtils; import com.maning.gankmm.utils.MySnackbar; -import com.umeng.analytics.MobclickAgent; import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration; import java.util.List; diff --git a/app/src/main/java/com/maning/gankmm/ui/fragment/PublicFragment.java b/app/src/main/java/com/maning/gankmm/ui/fragment/PublicFragment.java index 7710a57..3a91f38 100644 --- a/app/src/main/java/com/maning/gankmm/ui/fragment/PublicFragment.java +++ b/app/src/main/java/com/maning/gankmm/ui/fragment/PublicFragment.java @@ -1,9 +1,9 @@ package com.maning.gankmm.ui.fragment; 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.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/ui/imagebrowser/GlideImageEngine.java b/app/src/main/java/com/maning/gankmm/ui/imagebrowser/GlideImageEngine.java index 3165e74..43fe775 100644 --- a/app/src/main/java/com/maning/gankmm/ui/imagebrowser/GlideImageEngine.java +++ b/app/src/main/java/com/maning/gankmm/ui/imagebrowser/GlideImageEngine.java @@ -2,7 +2,7 @@ import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/maning/gankmm/ui/imagebrowser/ImageBrowserUtils.java b/app/src/main/java/com/maning/gankmm/ui/imagebrowser/ImageBrowserUtils.java index ac47b23..b56b5c9 100644 --- a/app/src/main/java/com/maning/gankmm/ui/imagebrowser/ImageBrowserUtils.java +++ b/app/src/main/java/com/maning/gankmm/ui/imagebrowser/ImageBrowserUtils.java @@ -3,7 +3,7 @@ import android.app.WallpaperManager; import android.content.Context; import android.graphics.Bitmap; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/maning/gankmm/ui/view/FullyLinearLayoutManager.java b/app/src/main/java/com/maning/gankmm/ui/view/FullyLinearLayoutManager.java index 65ff4ac..fa58c91 100644 --- a/app/src/main/java/com/maning/gankmm/ui/view/FullyLinearLayoutManager.java +++ b/app/src/main/java/com/maning/gankmm/ui/view/FullyLinearLayoutManager.java @@ -1,8 +1,8 @@ package com.maning.gankmm.ui.view; import android.content.Context; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/maning/gankmm/utils/ColoredSnackbar.java b/app/src/main/java/com/maning/gankmm/utils/ColoredSnackbar.java index c27e3e6..b981fda 100644 --- a/app/src/main/java/com/maning/gankmm/utils/ColoredSnackbar.java +++ b/app/src/main/java/com/maning/gankmm/utils/ColoredSnackbar.java @@ -1,11 +1,8 @@ package com.maning.gankmm.utils; -import android.graphics.Color; -import android.support.design.widget.Snackbar; -import android.view.Gravity; +import com.google.android.material.snackbar.Snackbar; + import android.view.View; -import android.view.ViewGroup; -import android.widget.LinearLayout; import android.widget.TextView; import com.maning.gankmm.R; diff --git a/app/src/main/java/com/maning/gankmm/utils/DialogUtils.java b/app/src/main/java/com/maning/gankmm/utils/DialogUtils.java index f4463f6..7324f5a 100644 --- a/app/src/main/java/com/maning/gankmm/utils/DialogUtils.java +++ b/app/src/main/java/com/maning/gankmm/utils/DialogUtils.java @@ -1,7 +1,7 @@ package com.maning.gankmm.utils; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.afollestad.materialdialogs.DialogAction; diff --git a/app/src/main/java/com/maning/gankmm/utils/IntentUtils.java b/app/src/main/java/com/maning/gankmm/utils/IntentUtils.java index 43f4ed1..4a53829 100644 --- a/app/src/main/java/com/maning/gankmm/utils/IntentUtils.java +++ b/app/src/main/java/com/maning/gankmm/utils/IntentUtils.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.view.View; import com.maning.gankmm.bean.gank2.GankEntity; diff --git a/app/src/main/java/com/maning/gankmm/utils/MyFileProvider.java b/app/src/main/java/com/maning/gankmm/utils/MyFileProvider.java index d05df4b..8e558f6 100644 --- a/app/src/main/java/com/maning/gankmm/utils/MyFileProvider.java +++ b/app/src/main/java/com/maning/gankmm/utils/MyFileProvider.java @@ -1,6 +1,6 @@ package com.maning.gankmm.utils; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; /** * Created by maning on 2017/7/14. diff --git a/app/src/main/java/com/maning/gankmm/utils/MySnackbar.java b/app/src/main/java/com/maning/gankmm/utils/MySnackbar.java index 9153726..d847e98 100644 --- a/app/src/main/java/com/maning/gankmm/utils/MySnackbar.java +++ b/app/src/main/java/com/maning/gankmm/utils/MySnackbar.java @@ -1,9 +1,8 @@ package com.maning.gankmm.utils; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.view.View; -import com.maning.gankmm.R; import com.maning.gankmm.app.MyApplication; import com.maning.gankmm.skin.SkinManager; diff --git a/app/src/main/java/com/maning/gankmm/utils/NotifyUtil.java b/app/src/main/java/com/maning/gankmm/utils/NotifyUtil.java index 1671d57..e1c6b91 100755 --- a/app/src/main/java/com/maning/gankmm/utils/NotifyUtil.java +++ b/app/src/main/java/com/maning/gankmm/utils/NotifyUtil.java @@ -1,6 +1,5 @@ package com.maning.gankmm.utils; -import android.annotation.SuppressLint; import android.app.Activity; import android.app.Notification; import android.app.NotificationManager; @@ -10,7 +9,7 @@ import android.graphics.BitmapFactory; import android.os.Build; import android.os.SystemClock; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.widget.RemoteViews; import android.widget.Toast; diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 1b32126..28660d7 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,5 +1,5 @@ - - - - - + - + - - + - + diff --git a/app/src/main/res/layout/activity_codes.xml b/app/src/main/res/layout/activity_codes.xml index a09878a..ccff58c 100644 --- a/app/src/main/res/layout/activity_codes.xml +++ b/app/src/main/res/layout/activity_codes.xml @@ -1,5 +1,5 @@ - - - - + diff --git a/app/src/main/res/layout/activity_cook_details.xml b/app/src/main/res/layout/activity_cook_details.xml index 3c955e9..b1a333a 100644 --- a/app/src/main/res/layout/activity_cook_details.xml +++ b/app/src/main/res/layout/activity_cook_details.xml @@ -9,7 +9,7 @@ - diff --git a/app/src/main/res/layout/activity_cook_menu.xml b/app/src/main/res/layout/activity_cook_menu.xml index a8c4592..95944a0 100644 --- a/app/src/main/res/layout/activity_cook_menu.xml +++ b/app/src/main/res/layout/activity_cook_menu.xml @@ -15,7 +15,7 @@ android:orientation="horizontal" > - - - - - - - + - + - - - + - + diff --git a/app/src/main/res/layout/activity_dictionary.xml b/app/src/main/res/layout/activity_dictionary.xml index c75f5af..ab0b78e 100644 --- a/app/src/main/res/layout/activity_dictionary.xml +++ b/app/src/main/res/layout/activity_dictionary.xml @@ -47,7 +47,7 @@ - - - diff --git a/app/src/main/res/layout/activity_ip_query.xml b/app/src/main/res/layout/activity_ip_query.xml index dbfe3dd..8d10f56 100644 --- a/app/src/main/res/layout/activity_ip_query.xml +++ b/app/src/main/res/layout/activity_ip_query.xml @@ -59,7 +59,7 @@ - - - - - - - + diff --git a/app/src/main/res/layout/activity_mob_cook_list.xml b/app/src/main/res/layout/activity_mob_cook_list.xml index a136f8a..6b54120 100644 --- a/app/src/main/res/layout/activity_mob_cook_list.xml +++ b/app/src/main/res/layout/activity_mob_cook_list.xml @@ -22,7 +22,7 @@ layout="@layout/layout_cook_header"/> - - diff --git a/app/src/main/res/layout/activity_open_frame.xml b/app/src/main/res/layout/activity_open_frame.xml index a49640b..64852ea 100644 --- a/app/src/main/res/layout/activity_open_frame.xml +++ b/app/src/main/res/layout/activity_open_frame.xml @@ -8,7 +8,7 @@ - - - - diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index b1e0f22..1da59a4 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -79,7 +79,7 @@ android:background="@color/refresh_bg_color" app:swipe_style="classic"> - - - - diff --git a/app/src/main/res/layout/dialog_list.xml b/app/src/main/res/layout/dialog_list.xml index fb480fc..b8f246d 100644 --- a/app/src/main/res/layout/dialog_list.xml +++ b/app/src/main/res/layout/dialog_list.xml @@ -12,7 +12,7 @@ android:layout_alignParentBottom="true" android:orientation="vertical"> - - diff --git a/app/src/main/res/layout/fragment_collect.xml b/app/src/main/res/layout/fragment_collect.xml index 2f9f56c..3624f6c 100644 --- a/app/src/main/res/layout/fragment_collect.xml +++ b/app/src/main/res/layout/fragment_collect.xml @@ -11,7 +11,7 @@ android:layout_height="1px" android:background="?toolbar_line_color" /> - diff --git a/app/src/main/res/layout/fragment_collect_pager.xml b/app/src/main/res/layout/fragment_collect_pager.xml index c98f7ae..5202e5e 100644 --- a/app/src/main/res/layout/fragment_collect_pager.xml +++ b/app/src/main/res/layout/fragment_collect_pager.xml @@ -10,7 +10,7 @@ android:id="@id/swipe_refresh_header" layout="@layout/layout_refresh_header" /> - - - - - diff --git a/app/src/main/res/layout/item_train.xml b/app/src/main/res/layout/item_train.xml index ac80a4e..b62e7bd 100644 --- a/app/src/main/res/layout/item_train.xml +++ b/app/src/main/res/layout/item_train.xml @@ -160,7 +160,7 @@ app:matProg_barWidth="2dp" app:matProg_progressIndeterminate="true" /> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/config.gradle b/config.gradle index 74e4321..7782a83 100644 --- a/config.gradle +++ b/config.gradle @@ -14,13 +14,13 @@ ext { ] dependencies = [ - supportV7 : 'com.android.support:appcompat-v7:28.0.0', - supportV4 : 'com.android.support:support-v4:28.0.0', - multidex : 'com.android.support:multidex:1.0.3', - design : 'com.android.support:design:28.0.0', - recyclerview: 'com.android.support:recyclerview-v7:28.0.0', - cardview : 'com.android.support:cardview-v7:28.0.0', - constraint : 'com.android.support.constraint:constraint-layout:1.1.3' + supportV7 : 'androidx.appcompat:appcompat:1.0.0', + supportV4 : 'androidx.legacy:legacy-support-v4:1.0.0', + multidex : 'androidx.multidex:multidex:2.0.0', + design : 'com.google.android.material:material:1.0.0', + recyclerview: 'androidx.recyclerview:recyclerview:1.0.0', + cardview : 'androidx.cardview:cardview:1.0.0', + constraintlayout : 'androidx.constraintlayout:constraintlayout:1.1.3' ] } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b1510ab..4a63390 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,6 @@ #使用并行编译 org.gradle.parallel=true #就是让你让你编译时使用守护进程 -org.gradle.daemon=true \ No newline at end of file +org.gradle.daemon=true +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file