Merge pull request #29 from xuexiangjys/dev/1.0.5

Dev/1.0.5
xuexiangjys · Jun 6, 2019 · 5f32dfb · 5f32dfb
2 parents a34f7a1 + 0d982a4
commit 5f32dfb
Show file tree

Hide file tree

Showing 353 changed files with 1,409 additions and 1,132 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ allprojects {
 ```
 dependencies {
   ...
-  implementation 'com.github.xuexiangjys:XUI:1.0.4'
+  implementation 'com.github.xuexiangjys:XUI:1.0.5'
 
   implementation 'com.android.support:appcompat-v7:28.0.0'
   implementation 'com.android.support:recyclerview-v7:28.0.0'
@@ -171,7 +171,7 @@ protected void attachBaseContext(Context newBase) {
 
 ![](https://github.com/xuexiangjys/XPage/blob/master/img/qq_group.jpg)
 
-[xuisvg]: https://img.shields.io/badge/XUI-v1.0.4-brightgreen.svg
+[xuisvg]: https://img.shields.io/badge/XUI-v1.0.5-brightgreen.svg
 [xui]: https://github.com/xuexiangjys/XUI
 [apisvg]: https://img.shields.io/badge/API-17+-brightgreen.svg
 [api]: https://android-arsenal.com/api?level=17
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,9 +10,9 @@ android {
         applicationId "com.xuexiang.xuidemo"
         minSdkVersion 17
         targetSdkVersion build_versions.target_sdk
-        versionCode 5
-        versionName "1.0.4"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        versionCode 6
+        versionName "1.0.5"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -67,6 +67,11 @@ android {
             jniLibs.srcDirs = ['libs']
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -75,21 +80,20 @@ dependencies {
     androidTestImplementation deps.runner
     androidTestImplementation deps.espresso.core
 
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation deps.androidx.multidex
 
     //下拉刷新、CityPicker、XUI框架需要
-    implementation deps.support.app_compat
-    implementation deps.support.recyclerview
-    implementation deps.support.design
+    implementation deps.androidx.appcompat
+    implementation deps.androidx.recyclerview
+    implementation deps.androidx.design
 
     //悬浮按钮
     implementation 'com.github.clans:fab:1.6.4'
 
     //XUI框架
-//    implementation project(':xui_lib')
-    implementation 'com.github.xuexiangjys:XUI:1.0.4'
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
-
+    implementation project(':xui_lib')
+    implementation deps.glide
+//    implementation 'com.github.xuexiangjys:XUI:1.0.4'
 //    implementation 'com.qmuiteam:qmui:1.2.0'
 
     //工具类

diff --git a/app/libs/BaiduLBS_Android.jar b/app/libs/BaiduLBS_Android.jar
diff --git a/app/src/main/java/com/xuexiang/xuidemo/DemoDataProvider.java b/app/src/main/java/com/xuexiang/xuidemo/DemoDataProvider.java
@@ -1,6 +1,6 @@
 package com.xuexiang.xuidemo;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 import com.xuexiang.xaop.annotation.MemoryCache;
 import com.xuexiang.xui.adapter.simple.AdapterItem;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/MyApp.java b/app/src/main/java/com/xuexiang/xuidemo/MyApp.java
@@ -2,7 +2,8 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.multidex.MultiDex;
+
+import androidx.multidex.MultiDex;
 
 import com.xuexiang.xaop.XAOP;
 import com.xuexiang.xaop.util.PermissionUtils;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/activity/EasyIndicatorActivity.java b/app/src/main/java/com/xuexiang/xuidemo/activity/EasyIndicatorActivity.java
@@ -17,9 +17,10 @@
 package com.xuexiang.xuidemo.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
 
 import com.xuexiang.xui.adapter.FragmentAdapter;
 import com.xuexiang.xui.widget.tabbar.EasyIndicator;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/activity/MainActivity.java b/app/src/main/java/com/xuexiang/xuidemo/activity/MainActivity.java
@@ -4,16 +4,16 @@
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.tabs.TabLayout;
 import com.xuexiang.xui.utils.ResUtils;
 import com.xuexiang.xui.utils.ThemeUtils;
-import com.xuexiang.xui.utils.ViewUtils;
 import com.xuexiang.xui.widget.dialog.DialogLoader;
 import com.xuexiang.xuidemo.R;
 import com.xuexiang.xuidemo.adapter.menu.DrawerAdapter;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/activity/SearchViewActivity.java b/app/src/main/java/com/xuexiang/xuidemo/activity/SearchViewActivity.java
@@ -19,8 +19,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+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/xuexiang/xuidemo/activity/SettingsActivity.java b/app/src/main/java/com/xuexiang/xuidemo/activity/SettingsActivity.java
@@ -25,10 +25,11 @@
 import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.preference.RingtonePreference;
-import android.support.v7.app.ActionBar;
 import android.text.TextUtils;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.ActionBar;
+
 import com.xuexiang.xuidemo.R;
 import com.xuexiang.xuidemo.base.AppCompatPreferenceActivity;
 import com.xuexiang.xutil.tip.ToastUtils;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/activity/TranslucentActivity.java b/app/src/main/java/com/xuexiang/xuidemo/activity/TranslucentActivity.java
@@ -1,8 +1,8 @@
 package com.xuexiang.xuidemo.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.xuexiang.xui.utils.StatusBarUtils;
 import com.xuexiang.xui.widget.banner.widget.banner.SimpleImageBanner;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/adapter/CommonRecyclerViewAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/CommonRecyclerViewAdapter.java
@@ -16,7 +16,7 @@
 
 package com.xuexiang.xuidemo.adapter;
 
-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/xuexiang/xuidemo/adapter/NineGridRecycleAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/NineGridRecycleAdapter.java
@@ -19,8 +19,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/adapter/base/BaseRecyclerAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/base/BaseRecyclerAdapter.java
@@ -1,7 +1,7 @@
 package com.xuexiang.xuidemo.adapter.base;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+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/xuexiang/xuidemo/adapter/base/BroccoliRecyclerAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/base/BroccoliRecyclerAdapter.java
@@ -1,6 +1,6 @@
 package com.xuexiang.xuidemo.adapter.base;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.View;
 
 import com.scwang.smartrefresh.layout.adapter.SmartRecyclerAdapter;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/adapter/base/RecyclerViewHolder.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/base/RecyclerViewHolder.java
@@ -1,10 +1,10 @@
 package com.xuexiang.xuidemo.adapter.base;
 
-import android.support.annotation.ColorRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextWatcher;
 import android.util.SparseArray;
 import android.view.View;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/adapter/menu/DrawerAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/menu/DrawerAdapter.java
@@ -16,7 +16,7 @@
 
 package com.xuexiang.xuidemo.adapter.menu;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/adapter/swipe/SwipeDragTouchListAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/swipe/SwipeDragTouchListAdapter.java
@@ -1,6 +1,6 @@
 package com.xuexiang.xuidemo.adapter.swipe;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.MotionEvent;
 import android.view.View;
 

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/AppCompatPreferenceActivity.java b/app/src/main/java/com/xuexiang/xuidemo/base/AppCompatPreferenceActivity.java
@@ -20,16 +20,17 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * A {@link PreferenceActivity} which implements and proxies the necessary calls
  * to be used with AppCompat.

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/BaseFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/BaseFragment.java
@@ -1,11 +1,11 @@
 package com.xuexiang.xuidemo.base;
 
 import android.content.res.Configuration;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+
 import com.xuexiang.xpage.base.XPageFragment;
 import com.xuexiang.xpage.core.PageOption;
 import com.xuexiang.xpage.enums.CoreAnim;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/BaseHomeFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/BaseHomeFragment.java
@@ -17,8 +17,8 @@
 package com.xuexiang.xuidemo.base;
 
 import android.content.res.Configuration;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/ComponentContainerFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/ComponentContainerFragment.java
@@ -1,7 +1,7 @@
 package com.xuexiang.xuidemo.base;
 
 import android.content.res.Configuration;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/decorator/DividerItemDecoration.java b/app/src/main/java/com/xuexiang/xuidemo/base/decorator/DividerItemDecoration.java
@@ -6,10 +6,10 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/decorator/GridDividerItemDecoration.java b/app/src/main/java/com/xuexiang/xuidemo/base/decorator/GridDividerItemDecoration.java
@@ -5,8 +5,8 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/webview/AgentWebActivity.java b/app/src/main/java/com/xuexiang/xuidemo/base/webview/AgentWebActivity.java
@@ -19,9 +19,9 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 
 import com.xuexiang.xuidemo.R;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/webview/AgentWebFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/webview/AgentWebFragment.java
@@ -27,10 +27,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.PopupMenu;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -51,6 +47,11 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.fragment.app.Fragment;
+
 import com.google.gson.Gson;
 import com.just.agentweb.action.PermissionInterceptor;
 import com.just.agentweb.core.AgentWeb;
@@ -148,7 +149,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 //                .openParallelDownload()// 4.0.0删除该API 打开并行下载 , 默认串行下载。 请通过AgentWebDownloader#Extra实现并行下载
 //                .setNotifyIcon(R.drawable.ic_file_download_black_24dp) 4.0.0删除该api //下载通知图标。4.0.0后的版本请通过AgentWebDownloader#Extra修改icon
                 //打开其他页面时，弹窗质询用户前往其他应用 AgentWeb 3.0.0 加入。
-                .setOpenOtherPageWays(DefaultWebClient.OpenOtherPageWays.DISALLOW)
+//                .setOpenOtherPageWays(DefaultWebClient.OpenOtherPageWays.DISALLOW)
                 //拦截找不到相关页面的Url AgentWeb 3.0.0 加入。
                 .interceptUnkownUrl()
                 //创建AgentWeb。

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/webview/MiddlewareWebViewClient.java b/app/src/main/java/com/xuexiang/xuidemo/base/webview/MiddlewareWebViewClient.java
@@ -19,7 +19,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/webview/WebLayout.java b/app/src/main/java/com/xuexiang/xuidemo/base/webview/WebLayout.java
@@ -17,8 +17,8 @@
 package com.xuexiang.xuidemo.base.webview;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.webkit.WebView;