新增support分支

xuexiangjys · Sep 14, 2019 · 42ce688 · 42ce688
1 parent 6b6c790
commit 42ce688
Show file tree

Hide file tree

Showing 370 changed files with 845 additions and 916 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ dependencies {
   //1.0.5版本后只支持androidx
   implementation 'com.github.xuexiangjys:XUI:1.0.9'
 
-  implementation 'androidx.appcompat:appcompat:1.1.0'
+  implementation 'android.support.v7:appcompat:1.1.0'
   implementation 'androidx.recyclerview:recyclerview:1.0.0'
   implementation 'com.google.android.material:material:1.1.0-alpha10'
   implementation 'com.github.bumptech.glide:glide:4.8.0'

diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,6 @@ android {
         targetSdkVersion build_versions.target_sdk
         versionCode 10
         versionName "1.0.9"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -89,32 +88,24 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation deps.junit
-    androidTestImplementation deps.runner
-    androidTestImplementation deps.espresso.core
-
-    implementation deps.androidx.multidex
 
+    implementation deps.support.multidex
     //下拉刷新、CityPicker、XUI框架需要
-//    implementation deps.androidx.appcompat
-//    implementation deps.androidx.recyclerview
-//    implementation deps.androidx.design
-//    implementation deps.glide
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
+    implementation deps.support.app_compat
+    implementation deps.support.recyclerview
+    implementation deps.support.design
+    implementation deps.glide
 
     //XUI框架
-//    implementation project(':xui_lib')
-    implementation 'com.github.xuexiangjys:XUI:1.0.9'
+    implementation project(':xui_lib')
+//    implementation 'com.github.xuexiangjys:XUI:1.0.9'
 //    implementation 'com.qmuiteam:qmui:1.2.0'
 
     //工具类
     implementation 'com.github.xuexiangjys.XUtil:xutil-core:1.1.6'
     implementation 'com.github.xuexiangjys.XUtil:xutil-sub:1.1.6'
     //切片
-    implementation 'com.github.xuexiangjys.XAOP:xaop-runtime:1.0.5x'
+    implementation 'com.github.xuexiangjys.XAOP:xaop-runtime:1.0.5'
     //页面路由
     implementation 'com.github.xuexiangjys.XRouter:xrouter-runtime:1.0.1'
     annotationProcessor 'com.github.xuexiangjys.XRouter:xrouter-compiler:1.0.1'

diff --git a/app/src/androidTest/java/com/xuexiang/templateproject/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/xuexiang/templateproject/ExampleInstrumentedTest.java
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 androidx.viewpager.widget.ViewPager;
+import android.support.v4.view.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,8 +2,7 @@
 
 import android.app.Application;
 import android.content.Context;
-
-import androidx.multidex.MultiDex;
+import android.support.multidex.MultiDex;
 
 import com.luck.picture.lib.tools.PictureFileUtils;
 import com.xuexiang.xui.XUI;

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,10 +17,9 @@
 package com.xuexiang.xuidemo.activity;
 
 import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.viewpager.widget.ViewPager;
+import android.support.annotation.Nullable;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
 
 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,15 +4,14 @@
 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.KeyEvent;
 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.umeng.analytics.MobclickAgent;
 import com.xuexiang.xui.utils.ResUtils;
 import com.xuexiang.xui.utils.ThemeUtils;

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 androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.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
@@ -28,7 +28,7 @@
 import android.text.TextUtils;
 import android.view.MenuItem;
 
-import androidx.appcompat.app.ActionBar;
+import android.support.v7.app.ActionBar;
 
 import com.xuexiang.xuidemo.R;
 import com.xuexiang.xuidemo.base.AppCompatPreferenceActivity;

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 androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.annotation.Nullable;
+import android.support.v7.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 androidx.recyclerview.widget.RecyclerView;
+import android.support.v7.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/NewsCardViewListAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/NewsCardViewListAdapter.java
@@ -1,6 +1,6 @@
 package com.xuexiang.xuidemo.adapter;
 
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 import com.xuexiang.xui.adapter.recyclerview.BaseRecyclerAdapter;
 import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/adapter/NineGridRecycleAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/NineGridRecycleAdapter.java
@@ -24,8 +24,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 import com.xuexiang.xui.adapter.recyclerview.XRecyclerAdapter;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/adapter/RecyclerViewBannerAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/RecyclerViewBannerAdapter.java
@@ -23,7 +23,7 @@
 import android.view.View;
 import android.widget.ImageView;
 
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.xuexiang.xui.adapter.recyclerview.BaseRecyclerAdapter;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/adapter/WidgetItemAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/adapter/WidgetItemAdapter.java
@@ -1,6 +1,6 @@
 package com.xuexiang.xuidemo.adapter;
 
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 import com.xuexiang.xpage.model.PageInfo;
 import com.xuexiang.xui.adapter.recyclerview.BaseRecyclerAdapter;

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 androidx.annotation.LayoutRes;
+import android.support.annotation.LayoutRes;
 import android.view.View;
 
 import com.scwang.smartrefresh.layout.adapter.SmartRecyclerAdapter;

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 androidx.recyclerview.widget.RecyclerView;
+import android.support.v7.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
@@ -3,8 +3,8 @@
 import android.view.MotionEvent;
 import android.view.View;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
 
 import com.xuexiang.xui.adapter.recyclerview.BaseRecyclerAdapter;
 import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/AppCompatPreferenceActivity.java b/app/src/main/java/com/xuexiang/xuidemo/base/AppCompatPreferenceActivity.java
@@ -24,12 +24,12 @@
 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;
+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 com.xuexiang.xui.widget.slideback.SlideBack;
 

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/BaseFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/BaseFragment.java
@@ -5,8 +5,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
 
 import com.umeng.analytics.MobclickAgent;
 import com.xuexiang.xpage.base.XPageActivity;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/BaseHomeFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/BaseHomeFragment.java
@@ -20,7 +20,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView;
 
 import com.xuexiang.xaop.annotation.SingleClick;
 import com.xuexiang.xpage.model.PageInfo;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/BaseSimpleListFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/BaseSimpleListFragment.java
@@ -21,8 +21,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
 
 import com.umeng.analytics.MobclickAgent;
 import com.xuexiang.xpage.base.XPageActivity;

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

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
@@ -20,9 +20,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
 
 import android.view.KeyEvent;
 

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
@@ -47,10 +47,10 @@
 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 android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v7.widget.PopupMenu;
+import android.support.v4.app.Fragment;
 
 import com.google.gson.Gson;
 import com.just.agentweb.action.PermissionInterceptor;

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
@@ -26,7 +26,7 @@
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 
-import androidx.annotation.RequiresApi;
+import android.support.annotation.RequiresApi;
 
 import com.just.agentweb.core.client.MiddlewareWebClientBase;
 import com.xuexiang.xui.utils.ResUtils;

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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.webkit.WebView;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/webview/XPageWebViewFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/webview/XPageWebViewFragment.java
@@ -43,11 +43,11 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.fragment.app.Fragment;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v7.widget.AppCompatImageView;
+import android.support.v7.widget.PopupMenu;
+import android.support.v4.app.Fragment;
 
 import com.just.agentweb.action.PermissionInterceptor;
 import com.just.agentweb.core.AgentWeb;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/webview/x5/FileReaderView.java b/app/src/main/java/com/xuexiang/xuidemo/base/webview/x5/FileReaderView.java
@@ -27,7 +27,7 @@
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import com.tencent.smtt.sdk.TbsReaderView;
 import com.xuexiang.xutil.app.PathUtils;

diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/QRCodeFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/QRCodeFragment.java
@@ -19,7 +19,7 @@
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.view.View;
 import android.widget.ImageView;
 

diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/banner/UserGuideFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/banner/UserGuideFragment.java
@@ -1,6 +1,6 @@
 package com.xuexiang.xuidemo.fragment.components.banner;
 
-import androidx.viewpager.widget.ViewPager;
+import android.support.v4.view.ViewPager;
 
 import com.xuexiang.xpage.annotation.Page;
 import com.xuexiang.xrouter.annotation.AutoWired;

diff --git a/...src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/DialogStrategyFragment.java b/...src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/DialogStrategyFragment.java
@@ -18,7 +18,7 @@
 package com.xuexiang.xuidemo.fragment.components.dialog;
 
 import android.content.DialogInterface;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.text.InputType;
 
 import com.xuexiang.xpage.annotation.Page;