diff --git a/README.md b/README.md index e21db697..1b3efce8 100644 --- 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 index 99d25fb7..9b606f8d 100644 --- 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 deleted file mode 100644 index a6a9d76e..00000000 --- a/app/src/androidTest/java/com/xuexiang/templateproject/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.xuexiang.templateproject; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("com.xuexiang.templateproject", appContext.getPackageName()); - } -} diff --git a/app/src/main/java/com/xuexiang/xuidemo/DemoDataProvider.java b/app/src/main/java/com/xuexiang/xuidemo/DemoDataProvider.java index b92d9386..3b815d39 100644 --- 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 index 75ca41b6..543b8482 100644 --- 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 index 773eddb7..7fc6f2aa 100644 --- 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 index c4afd81e..7fac91f0 100644 --- 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 index a208ef11..ab5fd253 100644 --- 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 index 2efbdeb2..e7b07075 100644 --- 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 index fc033531..feb16901 100644 --- 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 index eb443297..03b20fac 100755 --- 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 index 765bb08d..2f28e033 100644 --- 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 index a2cdd60a..0fd555f2 100644 --- 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 index 96ae7157..d5f955b0 100644 --- 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 index a0f28059..f6342626 100755 --- 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 index ca7dd94d..dbda5ec4 100644 --- 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 index e2c4e7e9..a45183a0 100644 --- 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 index b5427113..919e9e7a 100644 --- 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 index d2e343b4..7a38b960 100644 --- 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 index f0b77220..d9e9bd7a 100644 --- 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 index c9dd439a..722a4aac 100644 --- 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 index 208dab88..234bb4de 100644 --- 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 index ae7611b6..7d4c67a0 100644 --- 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 index f0c844e5..c9f3065e 100644 --- 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 index 0d2aaa0d..ab991c56 100644 --- 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 index 019faf3c..2eba3411 100644 --- 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 index 0f35f0e4..52080a19 100644 --- 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 index 3b44edd2..e9fb6c68 100644 --- 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 index 07dff230..1079ba1d 100644 --- 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 index 6b657fed..e8b4bd35 100644 --- 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 index 3167f6a4..336e3736 100644 --- 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/app/src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/DialogStrategyFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/DialogStrategyFragment.java index f47a9a05..4983f23e 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/DialogStrategyFragment.java +++ b/app/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; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/MaterialDialogFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/MaterialDialogFragment.java index 8407bbec..60a6c8a0 100755 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/MaterialDialogFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/dialog/MaterialDialogFragment.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 android.view.View; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/RadiusImageViewFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/RadiusImageViewFragment.java index 8b31d84b..d51093e8 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/RadiusImageViewFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/RadiusImageViewFragment.java @@ -1,7 +1,7 @@ package com.xuexiang.xuidemo.fragment.components.imageview; import android.graphics.Color; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import com.xuexiang.xpage.annotation.Page; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/pictureselector/ImageSelectGridAdapter.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/pictureselector/ImageSelectGridAdapter.java index fc444f9f..d22d8cac 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/pictureselector/ImageSelectGridAdapter.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/pictureselector/ImageSelectGridAdapter.java @@ -7,8 +7,8 @@ import android.widget.ImageView; import android.widget.LinearLayout; -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.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/pictureselector/PictureSelectorFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/pictureselector/PictureSelectorFragment.java index 4c403be7..b279972b 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/pictureselector/PictureSelectorFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/pictureselector/PictureSelectorFragment.java @@ -20,8 +20,8 @@ import android.content.Intent; import android.view.View; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/ImageViewInfo.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/ImageViewInfo.java index 85e27fa9..84c530e6 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/ImageViewInfo.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/ImageViewInfo.java @@ -19,7 +19,7 @@ import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.xuexiang.xui.widget.imageview.preview.enitity.IPreviewInfo; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/NineGridImageViewFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/NineGridImageViewFragment.java index 134d1142..28214cec 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/NineGridImageViewFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/NineGridImageViewFragment.java @@ -18,9 +18,9 @@ import android.view.View; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v7.widget.DividerItemDecoration; +import android.support.v7.widget.RecyclerView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -39,7 +39,7 @@ import butterknife.BindView; -import static androidx.recyclerview.widget.RecyclerView.VERTICAL; +import static android.support.v7.widget.RecyclerView.VERTICAL; /** * @author xuexiang diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/PreviewRecycleViewFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/PreviewRecycleViewFragment.java index 24bfbdbb..1fe4c20c 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/PreviewRecycleViewFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/imageview/preview/PreviewRecycleViewFragment.java @@ -20,9 +20,9 @@ import android.view.View; import android.widget.ImageView; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.adapter.SmartViewHolder; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/SnackbarFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/SnackbarFragment.java index 0d81406f..5807d8bb 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/SnackbarFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/SnackbarFragment.java @@ -17,11 +17,11 @@ package com.xuexiang.xuidemo.fragment.components.popupwindow; import android.graphics.Color; +import android.support.design.widget.Snackbar; import android.view.Gravity; import android.view.View; import android.widget.ImageView; -import com.google.android.material.snackbar.Snackbar; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.utils.ResUtils; import com.xuexiang.xui.utils.SnackbarUtils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/XUIPopupFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/XUIPopupFragment.java index a73b6f4f..391604e1 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/XUIPopupFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/XUIPopupFragment.java @@ -1,6 +1,6 @@ package com.xuexiang.xuidemo.fragment.components.popupwindow; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import android.widget.AdapterView; import android.widget.Button; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/RefreshHeadViewFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/RefreshHeadViewFragment.java index 847e3740..6f9ce2e1 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/RefreshHeadViewFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/RefreshHeadViewFragment.java @@ -1,7 +1,7 @@ package com.xuexiang.xuidemo.fragment.components.refresh; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/SwipeRefreshLayoutFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/SwipeRefreshLayoutFragment.java index c8d96472..150cfe60 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/SwipeRefreshLayoutFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/SwipeRefreshLayoutFragment.java @@ -2,8 +2,8 @@ import android.os.Handler; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import android.support.v7.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.utils.WidgetUtils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/broccoli/AnimationPlaceholderFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/broccoli/AnimationPlaceholderFragment.java index 9d15adef..f02731fe 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/broccoli/AnimationPlaceholderFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/broccoli/AnimationPlaceholderFragment.java @@ -2,8 +2,8 @@ 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.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.adapter.SmartViewHolder; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/broccoli/CommonPlaceholderFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/broccoli/CommonPlaceholderFragment.java index 1b8f894e..eeb3bf3f 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/broccoli/CommonPlaceholderFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/broccoli/CommonPlaceholderFragment.java @@ -2,8 +2,8 @@ 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.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.adapter.SmartViewHolder; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/RefreshBasicFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/RefreshBasicFragment.java index bf64f21d..797989b8 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/RefreshBasicFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/RefreshBasicFragment.java @@ -16,7 +16,7 @@ package com.xuexiang.xuidemo.fragment.components.refresh.smartrefresh; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.View; import android.widget.AbsListView; import com.scwang.smartrefresh.layout.adapter.SmartViewHolder; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/RefreshStatusLayoutFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/RefreshStatusLayoutFragment.java index 6cc04cdf..02c59ae5 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/RefreshStatusLayoutFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/RefreshStatusLayoutFragment.java @@ -18,8 +18,8 @@ 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.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshAllStyleFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshAllStyleFragment.java index 2f3d55bc..b89ef15a 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshAllStyleFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshAllStyleFragment.java @@ -19,8 +19,8 @@ import android.content.Context; import android.view.View; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.StringRes; +import android.support.v7.widget.RecyclerView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.adapter.SmartRecyclerAdapter; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshClassicsStyleFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshClassicsStyleFragment.java index 8234c446..8fecaaa2 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshClassicsStyleFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshClassicsStyleFragment.java @@ -22,9 +22,9 @@ import android.view.View; import android.widget.ImageView; -import androidx.annotation.StringRes; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.StringRes; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.RecyclerView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.adapter.SmartRecyclerAdapter; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshCustomStyleFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshCustomStyleFragment.java index 6b4b59f7..f3939785 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshCustomStyleFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshCustomStyleFragment.java @@ -17,9 +17,9 @@ package com.xuexiang.xuidemo.fragment.components.refresh.smartrefresh.style; -import androidx.annotation.MainThread; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.MainThread; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshMaterialStyleFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshMaterialStyleFragment.java index db0387c6..8a5cd07a 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshMaterialStyleFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/smartrefresh/style/RefreshMaterialStyleFragment.java @@ -19,9 +19,9 @@ import android.os.Build; import android.view.View; -import androidx.annotation.StringRes; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.StringRes; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.RecyclerView; import com.scwang.smartrefresh.header.MaterialHeader; import com.scwang.smartrefresh.layout.SmartRefreshLayout; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeDragMoveFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeDragMoveFragment.java index 037e3aeb..b25209a2 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeDragMoveFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeDragMoveFragment.java @@ -1,6 +1,6 @@ package com.xuexiang.xuidemo.fragment.components.refresh.swipe; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.utils.WidgetUtils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeMenuItemFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeMenuItemFragment.java index eeab4ed1..b8a02f64 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeMenuItemFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeMenuItemFragment.java @@ -4,7 +4,7 @@ import android.os.Handler; import android.view.ViewGroup; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import android.support.v4.widget.SwipeRefreshLayout; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.utils.WidgetUtils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeRefreshFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeRefreshFragment.java index e3aa7a5b..f861c149 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeRefreshFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/refresh/swipe/SwipeRefreshFragment.java @@ -2,7 +2,7 @@ import android.os.Handler; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import android.support.v4.widget.SwipeRefreshLayout; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.utils.WidgetUtils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/EasyIndicatorFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/EasyIndicatorFragment.java index 366bcb09..4777f8a5 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/EasyIndicatorFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/EasyIndicatorFragment.java @@ -22,8 +22,8 @@ import android.view.ViewGroup; import android.widget.TextView; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.widget.actionbar.TitleBar; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/JPTabBarFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/JPTabBarFragment.java index 42e7456a..ef31ae95 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/JPTabBarFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/JPTabBarFragment.java @@ -5,8 +5,8 @@ import android.view.ViewGroup; import android.widget.TextView; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import com.jpeng.jptabbar.JPTabBar; import com.jpeng.jptabbar.OnTabSelectListener; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/TabLayoutFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/TabLayoutFragment.java index 0a10bc58..e17dfe0d 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/TabLayoutFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/TabLayoutFragment.java @@ -21,11 +21,11 @@ import android.view.ViewGroup; import android.widget.TextView; -import androidx.annotation.Nullable; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.Nullable; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; -import com.google.android.material.tabs.TabLayout; +import android.support.design.widget.TabLayout; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xuidemo.R; import com.xuexiang.xuidemo.base.BaseFragment; @@ -37,7 +37,7 @@ import butterknife.BindView; -import static com.google.android.material.tabs.TabLayout.MODE_SCROLLABLE; +import static android.support.design.widget.TabLayout.MODE_SCROLLABLE; /** * @author xuexiang diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/TestPageFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/TestPageFragment.java index 2f3ac9eb..1be47573 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/TestPageFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/TestPageFragment.java @@ -18,9 +18,9 @@ import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.view.Gravity; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/VerticalTabLayoutFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/VerticalTabLayoutFragment.java index fc698538..b8b696e2 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/VerticalTabLayoutFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/VerticalTabLayoutFragment.java @@ -22,8 +22,8 @@ import android.view.ViewGroup; import android.widget.TextView; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.utils.DensityUtils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tabsegment/TabSegmentFixModeFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tabsegment/TabSegmentFixModeFragment.java index 66a11570..a262db59 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tabsegment/TabSegmentFixModeFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tabsegment/TabSegmentFixModeFragment.java @@ -18,8 +18,8 @@ import android.view.View; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewPager; import com.xuexiang.xaop.annotation.SingleClick; import com.xuexiang.xpage.annotation.Page; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tabsegment/TabSegmentScrollableModeFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tabsegment/TabSegmentScrollableModeFragment.java index 49c81780..a87e0925 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tabsegment/TabSegmentScrollableModeFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tabsegment/TabSegmentScrollableModeFragment.java @@ -22,9 +22,9 @@ import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import com.xuexiang.xaop.annotation.SingleClick; import com.xuexiang.xpage.annotation.Page; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/GroupListViewFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/GroupListViewFragment.java index bab65826..94c87590 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/GroupListViewFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/GroupListViewFragment.java @@ -16,7 +16,7 @@ package com.xuexiang.xuidemo.fragment.components.textview; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/supertextview/SuperNetPictureLoadingFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/supertextview/SuperNetPictureLoadingFragment.java index 3053b433..9977e47d 100755 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/supertextview/SuperNetPictureLoadingFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/supertextview/SuperNetPictureLoadingFragment.java @@ -1,8 +1,8 @@ package com.xuexiang.xuidemo.fragment.components.textview.supertextview; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/SnapHelperFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/SnapHelperFragment.java index 8427bf98..49729fa3 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/SnapHelperFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/SnapHelperFragment.java @@ -20,10 +20,10 @@ import android.view.View; import android.view.ViewGroup; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.PagerSnapHelper; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.SnapHelper; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.PagerSnapHelper; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.SnapHelper; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.widget.actionbar.TitleBar; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/calendar/ComplexCalendarFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/calendar/ComplexCalendarFragment.java index 80b1ecc8..8176d036 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/calendar/ComplexCalendarFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/calendar/ComplexCalendarFragment.java @@ -20,8 +20,8 @@ import android.view.View; import android.widget.TextView; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.RecyclerView; import com.haibin.calendarview.Calendar; import com.haibin.calendarview.CalendarLayout; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/calendar/SimpleCalendarFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/calendar/SimpleCalendarFragment.java index d9810c87..b1556bea 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/calendar/SimpleCalendarFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/calendar/SimpleCalendarFragment.java @@ -20,10 +20,10 @@ import android.graphics.Color; import android.view.View; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.haibin.calendarview.Calendar; import com.haibin.calendarview.CalendarLayout; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/chart/bar/BasicBarChartFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/chart/bar/BasicBarChartFragment.java index 3525ddaa..ef3eb7dc 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/chart/bar/BasicBarChartFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/chart/bar/BasicBarChartFragment.java @@ -1,6 +1,6 @@ package com.xuexiang.xuidemo.fragment.expands.chart.bar; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import com.github.mikephil.charting.charts.BarChart; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/chart/line/BasicLineChartFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/chart/line/BasicLineChartFragment.java index d648c61e..bf0d3851 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/chart/line/BasicLineChartFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/chart/line/BasicLineChartFragment.java @@ -4,7 +4,7 @@ import android.graphics.DashPathEffect; import android.graphics.drawable.Drawable; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/floatview/service/AppMonitorService.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/floatview/service/AppMonitorService.java index 45b250a9..511b34ce 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/floatview/service/AppMonitorService.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/floatview/service/AppMonitorService.java @@ -9,8 +9,8 @@ import android.content.pm.ApplicationInfo; import android.os.Build; import android.os.IBinder; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; import com.xuexiang.xuidemo.R; import com.xuexiang.xuidemo.fragment.expands.floatview.AppSwitchView; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/BottomSheetDialogFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/BottomSheetDialogFragment.java index a47232dc..342f24ec 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/BottomSheetDialogFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/BottomSheetDialogFragment.java @@ -17,13 +17,13 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign; +import android.support.design.widget.BottomSheetDialog; import android.view.LayoutInflater; import android.view.View; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; -import com.google.android.material.bottomsheet.BottomSheetDialog; import com.xuexiang.xpage.AppPageConfig; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xpage.model.PageInfo; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/DrawerLayoutFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/DrawerLayoutFragment.java index 5dca8ac4..5eaa5b1e 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/DrawerLayoutFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/DrawerLayoutFragment.java @@ -17,19 +17,18 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomNavigationView; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.NavigationView; +import android.support.v4.view.ViewPager; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.LinearLayout; -import androidx.annotation.NonNull; -import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.widget.Toolbar; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.viewpager.widget.ViewPager; - -import com.google.android.material.bottomnavigation.BottomNavigationView; -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.google.android.material.navigation.NavigationView; import com.xuexiang.xaop.annotation.SingleClick; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.adapter.FragmentAdapter; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/ToolBarFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/ToolBarFragment.java index 5c9d7612..e3950d7d 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/ToolBarFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/ToolBarFragment.java @@ -1,6 +1,6 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign; -import androidx.appcompat.widget.Toolbar; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.EditText; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/BottomNavigationViewBehaviorFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/BottomNavigationViewBehaviorFragment.java index 6eb77129..9ac537d2 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/BottomNavigationViewBehaviorFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/BottomNavigationViewBehaviorFragment.java @@ -17,15 +17,14 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign.behavior; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomNavigationView; +import android.support.design.widget.FloatingActionButton; +import android.support.v4.view.ViewPager; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; -import androidx.annotation.NonNull; -import androidx.appcompat.widget.Toolbar; -import androidx.viewpager.widget.ViewPager; - -import com.google.android.material.bottomnavigation.BottomNavigationView; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.adapter.FragmentAdapter; import com.xuexiang.xui.widget.actionbar.TitleBar; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/ComplexDetailsPageFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/ComplexDetailsPageFragment.java index a70b49cb..09948bca 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/ComplexDetailsPageFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/ComplexDetailsPageFragment.java @@ -17,15 +17,14 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign.behavior; +import android.support.design.widget.AppBarLayout; +import android.support.design.widget.CollapsingToolbarLayout; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.TabLayout; +import android.support.v4.view.ViewPager; +import android.support.v7.widget.Toolbar; import android.view.View; -import androidx.appcompat.widget.Toolbar; -import androidx.viewpager.widget.ViewPager; - -import com.google.android.material.appbar.AppBarLayout; -import com.google.android.material.appbar.CollapsingToolbarLayout; -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.google.android.material.tabs.TabLayout; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.adapter.FragmentAdapter; import com.xuexiang.xui.utils.StatusBarUtils; @@ -37,7 +36,7 @@ import butterknife.BindView; -import static com.google.android.material.tabs.TabLayout.MODE_FIXED; +import static android.support.design.widget.TabLayout.MODE_FIXED; /** * @author xuexiang diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/RecyclerViewBehaviorFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/RecyclerViewBehaviorFragment.java index 8d71b23e..8b6811ec 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/RecyclerViewBehaviorFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/RecyclerViewBehaviorFragment.java @@ -1,13 +1,12 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign.behavior; import android.os.Handler; +import android.support.design.widget.FloatingActionButton; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.Toolbar; import android.view.View; -import androidx.appcompat.widget.Toolbar; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder; import com.xuexiang.xui.adapter.recyclerview.XLinearLayoutManager; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/SimpleListFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/SimpleListFragment.java index cf9d942b..72e378c2 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/SimpleListFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/SimpleListFragment.java @@ -1,11 +1,10 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign.behavior; +import android.support.v4.widget.SwipeRefreshLayout; import android.view.View; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.LinearLayoutManager; import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder; import com.xuexiang.xui.widget.actionbar.TitleBar; import com.xuexiang.xuidemo.DemoDataProvider; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/TabLayoutBehaviorFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/TabLayoutBehaviorFragment.java index cfa995dc..4cd5f7f0 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/TabLayoutBehaviorFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/TabLayoutBehaviorFragment.java @@ -1,9 +1,9 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign.behavior; -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.google.android.material.tabs.TabLayout; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.widget.Toolbar; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.TabLayout; +import android.support.v4.view.ViewPager; +import android.support.v7.widget.Toolbar; import android.view.View; import com.xuexiang.xpage.annotation.Page; @@ -15,7 +15,7 @@ import butterknife.BindView; -import static com.google.android.material.tabs.TabLayout.MODE_FIXED; +import static android.support.design.widget.TabLayout.MODE_FIXED; /** * @author XUE diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/ToolbarBehaviorFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/ToolbarBehaviorFragment.java index a680eead..5d19d32c 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/ToolbarBehaviorFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/materialdesign/behavior/ToolbarBehaviorFragment.java @@ -1,9 +1,9 @@ package com.xuexiang.xuidemo.fragment.expands.materialdesign.behavior; -import com.google.android.material.appbar.AppBarLayout; -import com.google.android.material.appbar.CollapsingToolbarLayout; -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import androidx.appcompat.widget.Toolbar; +import android.support.design.widget.AppBarLayout; +import android.support.design.widget.CollapsingToolbarLayout; +import android.support.design.widget.FloatingActionButton; +import android.support.v7.widget.Toolbar; import android.view.View; import com.xuexiang.xpage.annotation.Page; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/qrcode/CustomCaptureActivity.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/qrcode/CustomCaptureActivity.java index 3528ba94..b07e5649 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/qrcode/CustomCaptureActivity.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/qrcode/CustomCaptureActivity.java @@ -25,8 +25,8 @@ import android.os.Bundle; import android.view.View; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.fragment.app.Fragment; +import android.support.v7.widget.AppCompatImageView; +import android.support.v4.app.Fragment; import com.xuexiang.xqrcode.XQRCode; import com.xuexiang.xqrcode.ui.CaptureActivity; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/qrcode/QRCodeProduceFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/qrcode/QRCodeProduceFragment.java index 446e5153..d91445db 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/qrcode/QRCodeProduceFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/expands/qrcode/QRCodeProduceFragment.java @@ -29,7 +29,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; -import androidx.appcompat.widget.SwitchCompat; +import android.support.v7.widget.SwitchCompat; import com.xuexiang.xaop.annotation.IOThread; import com.xuexiang.xaop.annotation.MainThread; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/ColorUtilsFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/ColorUtilsFragment.java index a7ed4c12..e9748aa8 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/ColorUtilsFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/ColorUtilsFragment.java @@ -16,7 +16,7 @@ package com.xuexiang.xuidemo.fragment.utils; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import android.widget.LinearLayout; import android.widget.SeekBar; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/DrawableUtilsFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/DrawableUtilsFragment.java index 3484e0c2..bc9db9e3 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/DrawableUtilsFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/DrawableUtilsFragment.java @@ -19,8 +19,8 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.LayerDrawable; -import androidx.core.content.ContextCompat; -import androidx.core.widget.NestedScrollView; +import android.support.v4.content.ContextCompat; +import android.support.v4.widget.NestedScrollView; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/SnackBarUtilsFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/SnackBarUtilsFragment.java index a81c7a99..131ed587 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/SnackBarUtilsFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/SnackBarUtilsFragment.java @@ -17,11 +17,11 @@ package com.xuexiang.xuidemo.fragment.utils; import android.graphics.Color; +import android.support.design.widget.Snackbar; import android.view.Gravity; import android.view.View; import android.widget.ImageView; -import com.google.android.material.snackbar.Snackbar; import com.xuexiang.xpage.annotation.Page; import com.xuexiang.xui.utils.ResUtils; import com.xuexiang.xui.utils.SnackbarUtils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/view/ViewAnimationFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/view/ViewAnimationFragment.java index 3539f34b..ed0c00c0 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/view/ViewAnimationFragment.java +++ b/app/src/main/java/com/xuexiang/xuidemo/fragment/utils/view/ViewAnimationFragment.java @@ -16,7 +16,7 @@ package com.xuexiang.xuidemo.fragment.utils.view; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/xuexiang/xuidemo/utils/DynamicTimeFormat.java b/app/src/main/java/com/xuexiang/xuidemo/utils/DynamicTimeFormat.java index b7a214c5..4c8a814a 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/utils/DynamicTimeFormat.java +++ b/app/src/main/java/com/xuexiang/xuidemo/utils/DynamicTimeFormat.java @@ -16,7 +16,7 @@ package com.xuexiang.xuidemo.utils; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import java.text.FieldPosition; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/xuexiang/xuidemo/utils/Utils.java b/app/src/main/java/com/xuexiang/xuidemo/utils/Utils.java index f9f3f526..1e3771c5 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/utils/Utils.java +++ b/app/src/main/java/com/xuexiang/xuidemo/utils/Utils.java @@ -13,8 +13,8 @@ import android.widget.FrameLayout; import android.widget.ImageView; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v7.widget.RecyclerView; import com.just.agentweb.core.AgentWeb; import com.just.agentweb.core.client.DefaultWebClient; diff --git a/app/src/main/java/com/xuexiang/xuidemo/utils/XToastUtils.java b/app/src/main/java/com/xuexiang/xuidemo/utils/XToastUtils.java index a1cf18d5..d5d1534a 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/utils/XToastUtils.java +++ b/app/src/main/java/com/xuexiang/xuidemo/utils/XToastUtils.java @@ -17,9 +17,9 @@ package com.xuexiang.xuidemo.utils; -import androidx.annotation.MainThread; -import androidx.annotation.NonNull; -import androidx.annotation.StringRes; +import android.support.annotation.MainThread; +import android.support.annotation.NonNull; +import android.support.annotation.StringRes; import com.xuexiang.xui.XUI; import com.xuexiang.xui.widget.toast.XToast; diff --git a/app/src/main/java/com/xuexiang/xuidemo/utils/update/CustomUpdateDownloader.java b/app/src/main/java/com/xuexiang/xuidemo/utils/update/CustomUpdateDownloader.java index 7a28370c..c91f4ff1 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/utils/update/CustomUpdateDownloader.java +++ b/app/src/main/java/com/xuexiang/xuidemo/utils/update/CustomUpdateDownloader.java @@ -17,8 +17,8 @@ package com.xuexiang.xuidemo.utils.update; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.xuexiang.xupdate.entity.UpdateEntity; import com.xuexiang.xupdate.proxy.impl.DefaultUpdateDownloader; diff --git a/app/src/main/java/com/xuexiang/xuidemo/utils/update/OKHttpUpdateHttpService.java b/app/src/main/java/com/xuexiang/xuidemo/utils/update/OKHttpUpdateHttpService.java index 936df88b..97eb8125 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/utils/update/OKHttpUpdateHttpService.java +++ b/app/src/main/java/com/xuexiang/xuidemo/utils/update/OKHttpUpdateHttpService.java @@ -16,7 +16,7 @@ package com.xuexiang.xuidemo.utils.update; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xupdate.proxy.IUpdateHttpService; import com.zhy.http.okhttp.OkHttpUtils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/utils/update/UpdateTipDialog.java b/app/src/main/java/com/xuexiang/xuidemo/utils/update/UpdateTipDialog.java index 2f94e9fa..713f5959 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/utils/update/UpdateTipDialog.java +++ b/app/src/main/java/com/xuexiang/xuidemo/utils/update/UpdateTipDialog.java @@ -20,8 +20,8 @@ import android.content.DialogInterface; 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.widget.dialog.DialogLoader; import com.xuexiang.xuidemo.utils.Utils; diff --git a/app/src/main/java/com/xuexiang/xuidemo/widget/BottomBarBehavior.java b/app/src/main/java/com/xuexiang/xuidemo/widget/BottomBarBehavior.java index 09b399cf..a58e0924 100755 --- a/app/src/main/java/com/xuexiang/xuidemo/widget/BottomBarBehavior.java +++ b/app/src/main/java/com/xuexiang/xuidemo/widget/BottomBarBehavior.java @@ -18,8 +18,8 @@ package com.xuexiang.xuidemo.widget; import android.content.Context; -import com.google.android.material.appbar.AppBarLayout; -import androidx.coordinatorlayout.widget.CoordinatorLayout; +import android.support.design.widget.AppBarLayout; +import android.support.design.widget.CoordinatorLayout; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/com/xuexiang/xuidemo/widget/ConnectionStatusView.java b/app/src/main/java/com/xuexiang/xuidemo/widget/ConnectionStatusView.java index b78c0b6d..3a4e97d7 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/widget/ConnectionStatusView.java +++ b/app/src/main/java/com/xuexiang/xuidemo/widget/ConnectionStatusView.java @@ -18,7 +18,7 @@ import android.content.Context; import android.os.Build; -import androidx.annotation.RequiresApi; +import android.support.annotation.RequiresApi; import android.util.AttributeSet; import com.xuexiang.xui.widget.popupwindow.status.StatusView; diff --git a/app/src/main/java/com/xuexiang/xuidemo/widget/CustomRefreshFooter.java b/app/src/main/java/com/xuexiang/xuidemo/widget/CustomRefreshFooter.java index bc150a13..11a42c9f 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/widget/CustomRefreshFooter.java +++ b/app/src/main/java/com/xuexiang/xuidemo/widget/CustomRefreshFooter.java @@ -23,7 +23,7 @@ import android.widget.FrameLayout; import android.widget.ProgressBar; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.scwang.smartrefresh.layout.api.RefreshFooter; import com.scwang.smartrefresh.layout.api.RefreshKernel; diff --git a/app/src/main/java/com/xuexiang/xuidemo/widget/CustomRefreshHeader.java b/app/src/main/java/com/xuexiang/xuidemo/widget/CustomRefreshHeader.java index e497e3b3..d0339800 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/widget/CustomRefreshHeader.java +++ b/app/src/main/java/com/xuexiang/xuidemo/widget/CustomRefreshHeader.java @@ -26,7 +26,7 @@ import android.widget.Space; import android.widget.TextView; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.scwang.smartrefresh.layout.api.RefreshHeader; import com.scwang.smartrefresh.layout.api.RefreshKernel; diff --git a/app/src/main/java/com/xuexiang/xuidemo/widget/EditSpinnerDialog.java b/app/src/main/java/com/xuexiang/xuidemo/widget/EditSpinnerDialog.java index 14c00174..43304d31 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/widget/EditSpinnerDialog.java +++ b/app/src/main/java/com/xuexiang/xuidemo/widget/EditSpinnerDialog.java @@ -1,7 +1,7 @@ package com.xuexiang.xuidemo.widget; import android.content.Context; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.UIConsts; import com.xuexiang.xui.XUI; diff --git a/app/src/main/java/com/xuexiang/xuidemo/widget/FabBehavior.java b/app/src/main/java/com/xuexiang/xuidemo/widget/FabBehavior.java index 14a226d6..8365caad 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/widget/FabBehavior.java +++ b/app/src/main/java/com/xuexiang/xuidemo/widget/FabBehavior.java @@ -2,18 +2,16 @@ import android.animation.Animator; import android.content.Context; +import android.support.annotation.NonNull; +import android.support.design.widget.CoordinatorLayout; +import android.support.design.widget.FloatingActionButton; +import android.support.v4.view.ViewCompat; +import android.support.v4.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; import android.view.View; import android.view.ViewPropertyAnimator; import android.view.animation.Interpolator; -import androidx.annotation.NonNull; -import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.core.view.ViewCompat; -import androidx.interpolator.view.animation.FastOutSlowInInterpolator; - -import com.google.android.material.floatingactionbutton.FloatingActionButton; - /** * 悬浮按钮的行为 * diff --git a/app/src/main/java/com/xuexiang/xuidemo/widget/ShadowAdjustLayout.java b/app/src/main/java/com/xuexiang/xuidemo/widget/ShadowAdjustLayout.java index eed76d71..d133de77 100644 --- a/app/src/main/java/com/xuexiang/xuidemo/widget/ShadowAdjustLayout.java +++ b/app/src/main/java/com/xuexiang/xuidemo/widget/ShadowAdjustLayout.java @@ -18,12 +18,11 @@ package com.xuexiang.xuidemo.widget; import android.content.Context; +import android.support.v4.widget.ViewDragHelper; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; -import androidx.customview.widget.ViewDragHelper; - import com.xuexiang.xui.widget.layout.XUIFrameLayout; import com.xuexiang.xuidemo.R; diff --git a/app/src/main/res/layout/activity_custom_capture.xml b/app/src/main/res/layout/activity_custom_capture.xml index 3ecf1dce..9644f678 100644 --- a/app/src/main/res/layout/activity_custom_capture.xml +++ b/app/src/main/res/layout/activity_custom_capture.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="50dp"> - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_news_list_item.xml b/app/src/main/res/layout/adapter_news_list_item.xml index b96c7e77..50e25da8 100644 --- a/app/src/main/res/layout/adapter_news_list_item.xml +++ b/app/src/main/res/layout/adapter_news_list_item.xml @@ -107,7 +107,7 @@ android:gravity="center_vertical" android:orientation="horizontal"> - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_select_image_grid_item.xml b/app/src/main/res/layout/adapter_select_image_grid_item.xml index 10d5a6b1..7bb4bb4c 100644 --- a/app/src/main/res/layout/adapter_select_image_grid_item.xml +++ b/app/src/main/res/layout/adapter_select_image_grid_item.xml @@ -21,7 +21,7 @@ android:layout_width="95dp" android:layout_height="95dp"> - - - - - - - - - - - - + - - + diff --git a/app/src/main/res/layout/fragment_behavior_toolbar.xml b/app/src/main/res/layout/fragment_behavior_toolbar.xml index 6ff6cd61..8ae76128 100644 --- a/app/src/main/res/layout/fragment_behavior_toolbar.xml +++ b/app/src/main/res/layout/fragment_behavior_toolbar.xml @@ -1,19 +1,19 @@ - - - - - - + - + - - @@ -63,5 +63,5 @@ android:layout_margin="18dp" android:text="@string/large_text" /> - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_bottom_navigationview_behavior.xml b/app/src/main/res/layout/fragment_bottom_navigationview_behavior.xml index 9b2e962a..95594855 100644 --- a/app/src/main/res/layout/fragment_bottom_navigationview_behavior.xml +++ b/app/src/main/res/layout/fragment_bottom_navigationview_behavior.xml @@ -15,17 +15,17 @@ ~ --> - - - - + - - - - + diff --git a/app/src/main/res/layout/fragment_broccoli_place_holder.xml b/app/src/main/res/layout/fragment_broccoli_place_holder.xml index 3e5a9f00..19111993 100644 --- a/app/src/main/res/layout/fragment_broccoli_place_holder.xml +++ b/app/src/main/res/layout/fragment_broccoli_place_holder.xml @@ -27,7 +27,7 @@ app:srlTextSizeTitle="16sp" app:srlTextTimeMarginTop="2dp" /> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_city_picker.xml b/app/src/main/res/layout/fragment_city_picker.xml index 09b2f5a8..64037ad6 100644 --- a/app/src/main/res/layout/fragment_city_picker.xml +++ b/app/src/main/res/layout/fragment_city_picker.xml @@ -19,7 +19,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - @@ -84,7 +84,7 @@ android:textSize="16sp" /> - + diff --git a/app/src/main/res/layout/fragment_complex_calendar.xml b/app/src/main/res/layout/fragment_complex_calendar.xml index d5c3799f..62ace8be 100644 --- a/app/src/main/res/layout/fragment_complex_calendar.xml +++ b/app/src/main/res/layout/fragment_complex_calendar.xml @@ -156,7 +156,7 @@ app:year_view_week_text_color="#666666" app:year_view_week_text_size="7sp" /> - - - - - - - + - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_custom_capture.xml b/app/src/main/res/layout/fragment_custom_capture.xml index d0dad431..aa20712b 100644 --- a/app/src/main/res/layout/fragment_custom_capture.xml +++ b/app/src/main/res/layout/fragment_custom_capture.xml @@ -48,7 +48,7 @@ android:gravity="center_horizontal" android:orientation="vertical"> - @@ -68,7 +68,7 @@ android:gravity="center_horizontal" android:orientation="vertical"> - @@ -89,7 +89,7 @@ android:gravity="center_horizontal" android:orientation="vertical"> - @@ -110,7 +110,7 @@ android:gravity="center_horizontal" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/fragment_custom_edittext.xml b/app/src/main/res/layout/fragment_custom_edittext.xml index 1bc420ad..6d6b50c4 100755 --- a/app/src/main/res/layout/fragment_custom_edittext.xml +++ b/app/src/main/res/layout/fragment_custom_edittext.xml @@ -42,7 +42,7 @@ android:layout_margin="5dp" android:text="PasswordEditText:" /> - - + - - - + diff --git a/app/src/main/res/layout/fragment_easy_indicator.xml b/app/src/main/res/layout/fragment_easy_indicator.xml index b49152c3..291dd836 100644 --- a/app/src/main/res/layout/fragment_easy_indicator.xml +++ b/app/src/main/res/layout/fragment_easy_indicator.xml @@ -42,7 +42,7 @@ app:indicator_textSize="14sp" app:indicator_width="0dp" /> - diff --git a/app/src/main/res/layout/fragment_home_container.xml b/app/src/main/res/layout/fragment_home_container.xml index a0080eea..4b7cb262 100755 --- a/app/src/main/res/layout/fragment_home_container.xml +++ b/app/src/main/res/layout/fragment_home_container.xml @@ -6,7 +6,7 @@ android:background="?attr/xui_config_color_background" android:orientation="vertical"> - - - - - @@ -34,7 +34,7 @@ android:text="欢迎长按或扫码关注：" /> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_qrcode_produce.xml b/app/src/main/res/layout/fragment_qrcode_produce.xml index 1a047fb8..21f02489 100644 --- a/app/src/main/res/layout/fragment_qrcode_produce.xml +++ b/app/src/main/res/layout/fragment_qrcode_produce.xml @@ -68,7 +68,7 @@ style="@style/TextStyle.Content" android:text="复杂二维码生成" /> - - - - - - - - @@ -126,7 +126,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_searchview.xml b/app/src/main/res/layout/fragment_searchview.xml index 3bed01b2..1b65434b 100644 --- a/app/src/main/res/layout/fragment_searchview.xml +++ b/app/src/main/res/layout/fragment_searchview.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_supertextview_common_use.xml b/app/src/main/res/layout/fragment_supertextview_common_use.xml index 4d75c783..de1cf600 100755 --- a/app/src/main/res/layout/fragment_supertextview_common_use.xml +++ b/app/src/main/res/layout/fragment_supertextview_common_use.xml @@ -11,7 +11,7 @@ app:srlEnableOverScrollDrag="true" app:srlEnablePureScrollMode="true"> - @@ -68,7 +68,7 @@ app:sRightIconRes="@drawable/icon_arrow_right_red" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_swipe_refresh_layout.xml b/app/src/main/res/layout/fragment_swipe_refresh_layout.xml index 50522dea..adfa549d 100644 --- a/app/src/main/res/layout/fragment_swipe_refresh_layout.xml +++ b/app/src/main/res/layout/fragment_swipe_refresh_layout.xml @@ -5,18 +5,18 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_tablayout.xml b/app/src/main/res/layout/fragment_tablayout.xml index d68c9306..5173fe7a 100644 --- a/app/src/main/res/layout/fragment_tablayout.xml +++ b/app/src/main/res/layout/fragment_tablayout.xml @@ -20,13 +20,13 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - - - + - - - + diff --git a/app/src/main/res/layout/fragment_tabsegment.xml b/app/src/main/res/layout/fragment_tabsegment.xml index 25a5a727..1de1fab9 100644 --- a/app/src/main/res/layout/fragment_tabsegment.xml +++ b/app/src/main/res/layout/fragment_tabsegment.xml @@ -34,7 +34,7 @@ android:layout_height="40dp" android:background="@drawable/bg_tab_panel"/> - - - + - - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_util_color.xml b/app/src/main/res/layout/fragment_util_color.xml index c9ae28e6..1a8681e2 100644 --- a/app/src/main/res/layout/fragment_util_color.xml +++ b/app/src/main/res/layout/fragment_util_color.xml @@ -61,7 +61,7 @@ - - @@ -35,7 +35,7 @@ style="@style/TextStyle.Content.wrap" android:text="@string/drawable_utils_solid_image_title" /> - - - - - - + diff --git a/app/src/main/res/layout/fragment_vertical_tab_layout.xml b/app/src/main/res/layout/fragment_vertical_tab_layout.xml index ca76de40..1a994e04 100644 --- a/app/src/main/res/layout/fragment_vertical_tab_layout.xml +++ b/app/src/main/res/layout/fragment_vertical_tab_layout.xml @@ -78,7 +78,7 @@ - diff --git a/app/src/main/res/layout/fragment_view_padding.xml b/app/src/main/res/layout/fragment_view_padding.xml index 310a01db..4929cdcb 100644 --- a/app/src/main/res/layout/fragment_view_padding.xml +++ b/app/src/main/res/layout/fragment_view_padding.xml @@ -31,7 +31,7 @@ android:gravity="center" android:orientation="horizontal"> - - - - - + diff --git a/app/src/main/res/layout/include_toolbar_web.xml b/app/src/main/res/layout/include_toolbar_web.xml index 9dd11e96..0fe28079 100644 --- a/app/src/main/res/layout/include_toolbar_web.xml +++ b/app/src/main/res/layout/include_toolbar_web.xml @@ -14,7 +14,7 @@ ~ limitations under the License. --> - - - - - + diff --git a/app/src/main/res/layout/layout_custom_guide_case_view.xml b/app/src/main/res/layout/layout_custom_guide_case_view.xml index c2732150..8e90493c 100755 --- a/app/src/main/res/layout/layout_custom_guide_case_view.xml +++ b/app/src/main/res/layout/layout_custom_guide_case_view.xml @@ -13,7 +13,7 @@ android:text="这是我的自定义引导页布局" android:textSize="20sp" /> - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_swipe_recycler_view.xml b/app/src/main/res/layout/layout_swipe_recycler_view.xml index ba8bceac..9c880775 100644 --- a/app/src/main/res/layout/layout_swipe_recycler_view.xml +++ b/app/src/main/res/layout/layout_swipe_recycler_view.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - @@ -17,6 +17,6 @@ android:overScrollMode="never" tools:listitem="@android:layout/simple_list_item_2" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_widget_item.xml b/app/src/main/res/layout/layout_widget_item.xml index 7b4b5310..e08a8931 100755 --- a/app/src/main/res/layout/layout_widget_item.xml +++ b/app/src/main/res/layout/layout_widget_item.xml @@ -8,7 +8,7 @@ android:paddingLeft="8dp" android:paddingRight="8dp"> - - diff --git a/app/src/main/res/layout/menu_left_drawer.xml b/app/src/main/res/layout/menu_left_drawer.xml index 19063d01..e1031f09 100644 --- a/app/src/main/res/layout/menu_left_drawer.xml +++ b/app/src/main/res/layout/menu_left_drawer.xml @@ -26,7 +26,7 @@ android:layout_width="240dp" android:layout_height="50dp"> - - - - - Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index 3f2dd9c7..6a8dfc44 100644 --- a/docs/README.md +++ b/docs/README.md @@ -59,7 +59,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/gradle.properties b/gradle.properties index 04a4f1a4..bc9d4c6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,3 @@ org.gradle.jvmargs=-Xmx1536m # 是否打包APK isNeedPackage=false - -android.useAndroidX=true -android.enableJetifier=true diff --git a/versions.gradle b/versions.gradle index b3154caa..755f2bd9 100644 --- a/versions.gradle +++ b/versions.gradle @@ -31,7 +31,7 @@ versions.atsl_rules = "1.0.1" versions.hamcrest = "1.3" versions.kotlin = "1.2.20" versions.paging = "1.0.0-alpha5" -versions.butterknife = "10.1.0" +versions.butterknife = "8.8.1" versions.runner = "1.0.2" versions.gson = "2.8.5" versions.okhttp3 = "3.13.1" @@ -49,6 +49,7 @@ support.cardview = "com.android.support:cardview-v7:$versions.support" support.design = "com.android.support:design:$versions.support" support.v4 = "com.android.support:support-v4:$versions.support" support.core_utils = "com.android.support:support-core-utils:$versions.support" +support.multidex = 'com.android.support:multidex:1.0.3' deps.support = support def androidx = [:] diff --git a/xui_lib/build.gradle b/xui_lib/build.gradle index 1e3c2774..20e5abbd 100644 --- a/xui_lib/build.gradle +++ b/xui_lib/build.gradle @@ -18,9 +18,9 @@ android { } dependencies { - compileOnly deps.androidx.appcompat - compileOnly deps.androidx.recyclerview - compileOnly deps.androidx.design + compileOnly deps.support.app_compat + compileOnly deps.support.recyclerview + compileOnly deps.support.design compileOnly deps.glide diff --git a/xui_lib/src/main/java/com/xuexiang/xui/XUI.java b/xui_lib/src/main/java/com/xuexiang/xui/XUI.java index 8ffaf9bd..070c680d 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/XUI.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/XUI.java @@ -7,7 +7,7 @@ import android.graphics.Typeface; import android.text.TextUtils; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.xuexiang.xui.logs.UILog; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/adapter/FragmentAdapter.java b/xui_lib/src/main/java/com/xuexiang/xui/adapter/FragmentAdapter.java index 48a58264..e909baf6 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/adapter/FragmentAdapter.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/adapter/FragmentAdapter.java @@ -16,10 +16,10 @@ package com.xuexiang.xui.adapter; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import java.util.ArrayList; import java.util.Arrays; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/BaseRecyclerAdapter.java b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/BaseRecyclerAdapter.java index 550c3e98..811f058b 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/BaseRecyclerAdapter.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/BaseRecyclerAdapter.java @@ -19,7 +19,7 @@ import android.view.ViewGroup; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import java.util.List; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/DividerItemDecoration.java b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/DividerItemDecoration.java index d0bbb01f..8693d4d7 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/DividerItemDecoration.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/DividerItemDecoration.java @@ -25,10 +25,10 @@ import android.graphics.drawable.Drawable; import android.view.View; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.xuexiang.xui.utils.DensityUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/GridDividerItemDecoration.java b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/GridDividerItemDecoration.java index 67f2541f..4e46a373 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/GridDividerItemDecoration.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/GridDividerItemDecoration.java @@ -25,9 +25,9 @@ import android.graphics.drawable.Drawable; import android.view.View; -import androidx.annotation.NonNull; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.RecyclerView; import com.xuexiang.xui.utils.DensityUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/RecyclerViewHolder.java b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/RecyclerViewHolder.java index b965201a..d940747b 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/RecyclerViewHolder.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/RecyclerViewHolder.java @@ -28,12 +28,12 @@ import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.IdRes; -import androidx.annotation.StringRes; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.ColorRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.IdRes; +import android.support.annotation.StringRes; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.RecyclerView; import com.xuexiang.xui.widget.imageview.ImageLoader; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/XLinearLayoutManager.java b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/XLinearLayoutManager.java index 4f812dbc..edb4cfb7 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/XLinearLayoutManager.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/XLinearLayoutManager.java @@ -20,8 +20,8 @@ import android.content.Context; import android.util.AttributeSet; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; /** * 防止数据错位导致数组越界的错误 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/XRecyclerAdapter.java b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/XRecyclerAdapter.java index 828ceece..13348390 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/XRecyclerAdapter.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/adapter/recyclerview/XRecyclerAdapter.java @@ -21,9 +21,9 @@ import android.view.View; import android.view.ViewGroup; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.LayoutRes; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; import java.util.ArrayList; import java.util.Collection; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/logs/LogcatLogger.java b/xui_lib/src/main/java/com/xuexiang/xui/logs/LogcatLogger.java index b0a6a563..ddeec95c 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/logs/LogcatLogger.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/logs/LogcatLogger.java @@ -1,6 +1,6 @@ package com.xuexiang.xui.logs; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.util.Log; import java.io.PrintWriter; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/logs/UILog.java b/xui_lib/src/main/java/com/xuexiang/xui/logs/UILog.java index 69868f14..8bb11870 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/logs/UILog.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/logs/UILog.java @@ -1,6 +1,6 @@ package com.xuexiang.xui.logs; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.Log; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/ColorUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/ColorUtils.java index 2ff547e9..f1404e47 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/ColorUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/ColorUtils.java @@ -17,7 +17,7 @@ package com.xuexiang.xui.utils; import android.graphics.Color; -import androidx.annotation.ColorInt; +import android.support.annotation.ColorInt; import java.util.Random; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/DeviceUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/DeviceUtils.java index d903114b..2b0f7d9a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/DeviceUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/DeviceUtils.java @@ -8,7 +8,7 @@ import android.os.Binder; import android.os.Build; import android.os.Environment; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import java.io.File; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/DrawableUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/DrawableUtils.java index 870fa6b9..f07b8ecb 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/DrawableUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/DrawableUtils.java @@ -37,12 +37,12 @@ import android.widget.ImageView; import android.widget.ScrollView; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.Nullable; -import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.widget.NestedScrollView; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; +import android.support.annotation.FloatRange; +import android.support.annotation.Nullable; +import android.support.v7.content.res.AppCompatResources; +import android.support.v4.widget.NestedScrollView; import com.xuexiang.xui.logs.UILog; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/KeyboardUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/KeyboardUtils.java index c92703b3..54acc2b7 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/KeyboardUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/KeyboardUtils.java @@ -22,7 +22,7 @@ import android.content.Context; import android.graphics.Rect; import android.os.Build; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/ResUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/ResUtils.java index 9334bc99..eb465071 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/ResUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/ResUtils.java @@ -11,14 +11,14 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import androidx.annotation.AnimRes; -import androidx.annotation.ArrayRes; -import androidx.annotation.ColorRes; -import androidx.annotation.DimenRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.StringRes; -import androidx.annotation.StyleableRes; -import androidx.appcompat.content.res.AppCompatResources; +import android.support.annotation.AnimRes; +import android.support.annotation.ArrayRes; +import android.support.annotation.ColorRes; +import android.support.annotation.DimenRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; +import android.support.annotation.StyleableRes; +import android.support.v7.content.res.AppCompatResources; import com.xuexiang.xui.XUI; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/SnackbarUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/SnackbarUtils.java index fb2f5da1..a6886862 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/SnackbarUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/SnackbarUtils.java @@ -21,12 +21,13 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.coordinatorlayout.widget.CoordinatorLayout; - +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; +import android.support.annotation.Nullable; +import android.support.annotation.StringRes; +import android.support.design.widget.CoordinatorLayout; +import android.support.design.widget.Snackbar; +import android.support.design.widget.SnackbarContentLayout; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -37,13 +38,10 @@ import android.widget.Space; import android.widget.TextView; -import com.google.android.material.snackbar.Snackbar; -import com.google.android.material.snackbar.SnackbarContentLayout; import com.xuexiang.xui.R; import com.xuexiang.xui.logs.UILog; import java.lang.ref.WeakReference; -import java.lang.CharSequence; /** * Snackbar工具类 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/SpanUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/SpanUtils.java index 3cbf5fce..b43979c1 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/SpanUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/SpanUtils.java @@ -16,14 +16,14 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.provider.MediaStore; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; +import android.support.annotation.FloatRange; +import android.support.annotation.IntDef; +import android.support.annotation.IntRange; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.text.Layout; import android.text.Layout.Alignment; import android.text.SpannableStringBuilder; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/StatusBarUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/StatusBarUtils.java index 841bd0d9..65ccc68b 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/StatusBarUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/StatusBarUtils.java @@ -5,9 +5,9 @@ import android.content.Context; import android.graphics.Color; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.IntDef; -import androidx.core.view.ViewCompat; +import android.support.annotation.ColorInt; +import android.support.annotation.IntDef; +import android.support.v4.view.ViewCompat; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/ThemeUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/ThemeUtils.java index 86849038..d8db0692 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/ThemeUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/ThemeUtils.java @@ -10,14 +10,14 @@ import android.util.TypedValue; import android.view.View; -import androidx.annotation.ArrayRes; -import androidx.annotation.AttrRes; -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.content.ContextCompat; +import android.support.annotation.ArrayRes; +import android.support.annotation.AttrRes; +import android.support.annotation.ColorInt; +import android.support.annotation.ColorRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.content.res.AppCompatResources; +import android.support.v4.content.ContextCompat; import com.xuexiang.xui.widget.dialog.materialdialog.GravityEnum; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/Utils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/Utils.java index a251d093..6b02cbee 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/Utils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/Utils.java @@ -32,8 +32,8 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.Nullable; +import android.support.annotation.ColorInt; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/ViewUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/ViewUtils.java index b9e6ec32..1cd7833e 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/ViewUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/ViewUtils.java @@ -48,9 +48,9 @@ import android.widget.ImageView; import android.widget.ListView; -import androidx.annotation.ColorInt; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; +import android.support.annotation.ColorInt; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/WidgetUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/WidgetUtils.java index 8bc84f25..7f725936 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/utils/WidgetUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/utils/WidgetUtils.java @@ -21,11 +21,11 @@ import android.content.Context; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.Window; import android.view.WindowManager; @@ -41,7 +41,7 @@ import com.xuexiang.xui.widget.progress.loading.IMessageLoader; import com.xuexiang.xui.widget.progress.loading.LoadingViewLayout; -import static androidx.recyclerview.widget.OrientationHelper.VERTICAL; +import static android.support.v7.widget.OrientationHelper.VERTICAL; /** * 组件工具类 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/actionbar/TitleUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/actionbar/TitleUtils.java index 8bf53f1a..848a60be 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/actionbar/TitleUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/actionbar/TitleUtils.java @@ -2,7 +2,7 @@ import android.app.Activity; import android.content.Context; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/activity/BaseGuideActivity.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/activity/BaseGuideActivity.java index 566be77d..ebb962ca 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/activity/BaseGuideActivity.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/activity/BaseGuideActivity.java @@ -3,8 +3,9 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v4.view.ViewPager; + +import android.support.v7.app.AppCompatActivity; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.WidgetUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/activity/BaseSplashActivity.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/activity/BaseSplashActivity.java index ab76451c..27ac4a82 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/activity/BaseSplashActivity.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/activity/BaseSplashActivity.java @@ -1,7 +1,7 @@ package com.xuexiang.xui.widget.activity; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.widget.LinearLayout; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaButton.java index 5f593281..5ce91c1d 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaButton.java @@ -3,7 +3,7 @@ import android.content.Context; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatButton; +import android.support.v7.widget.AppCompatButton; /** * 在 pressed 和 disabled 时改变 View 的透明度 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaImageButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaImageButton.java index a677e200..db3e0541 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaImageButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaImageButton.java @@ -3,7 +3,7 @@ import android.content.Context; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatImageButton; +import android.support.v7.widget.AppCompatImageButton; /** * 在 pressed 和 disabled 时改变 View 的透明度 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaImageView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaImageView.java index 10f876ed..826faff9 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaImageView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaImageView.java @@ -20,7 +20,7 @@ import android.content.Context; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; /** * @author xuexiang diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaTextView.java index f6d37e96..66735cf0 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaTextView.java @@ -3,7 +3,7 @@ import android.content.Context; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; /** * 在 pressed 和 disabled 时改变 View 的透明度 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaViewHelper.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaViewHelper.java index d2fcc6c8..cc538a9d 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaViewHelper.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/alpha/XUIAlphaViewHelper.java @@ -2,7 +2,7 @@ import android.view.View; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ThemeUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/BannerLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/BannerLayout.java index 52596722..edc85611 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/BannerLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/BannerLayout.java @@ -31,10 +31,10 @@ import android.widget.FrameLayout; import android.widget.ImageView; -import androidx.core.view.GravityCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.OrientationHelper; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.view.GravityCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.OrientationHelper; +import android.support.v7.widget.RecyclerView; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/RecyclerViewBannerBase.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/RecyclerViewBannerBase.java index 3361c4c8..7b3d6486 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/RecyclerViewBannerBase.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/RecyclerViewBannerBase.java @@ -26,13 +26,13 @@ import android.os.Handler; import android.os.Message; -import androidx.annotation.ColorRes; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.core.view.GravityCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.PagerSnapHelper; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.ColorRes; +import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; +import android.support.v4.view.GravityCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.PagerSnapHelper; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/BannerLayoutManager.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/BannerLayoutManager.java index 250d0116..7f2e75ee 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/BannerLayoutManager.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/BannerLayoutManager.java @@ -25,14 +25,14 @@ import android.view.ViewGroup; import android.view.animation.Interpolator; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.OrientationHelper; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.OrientationHelper; +import android.support.v7.widget.RecyclerView; import java.util.ArrayList; -import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; +import static android.support.v7.widget.RecyclerView.NO_POSITION; /** * An implementation of {@link RecyclerView.LayoutManager} which behaves like view pager. @@ -379,8 +379,8 @@ public boolean getReverseLayout() { * laid out at the end of the UI, second item is laid out before it etc. *

* For horizontal layouts, it depends on the layout direction. - * When set to true, If {@link androidx.recyclerview.widget.RecyclerView} is LTR, than it will - * layout from RTL, if {@link androidx.recyclerview.widget.RecyclerView}} is RTL, it will layout + * When set to true, If {@link android.support.v7.widget.RecyclerView} is LTR, than it will + * layout from RTL, if {@link android.support.v7.widget.RecyclerView}} is RTL, it will layout * from LTR. */ public void setReverseLayout(boolean reverseLayout) { diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/CenterScrollListener.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/CenterScrollListener.java index 0e64f2c7..197bb4b5 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/CenterScrollListener.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/CenterScrollListener.java @@ -17,11 +17,11 @@ package com.xuexiang.xui.widget.banner.recycler.layout; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; /** - * A {@link androidx.recyclerview.widget.RecyclerView.OnScrollListener} which helps {@link OverFlyingLayoutManager} + * A {@link android.support.v7.widget.RecyclerView.OnScrollListener} which helps {@link OverFlyingLayoutManager} * to center the current position */ public class CenterScrollListener extends RecyclerView.OnScrollListener { diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/CenterSnapHelper.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/CenterSnapHelper.java index bb78cd14..be023fc7 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/CenterSnapHelper.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/CenterSnapHelper.java @@ -17,9 +17,9 @@ package com.xuexiang.xui.widget.banner.recycler.layout; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.LayoutManager; +import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.RecyclerView.LayoutManager; import android.view.animation.DecelerateInterpolator; import android.widget.Scroller; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/OverFlyingLayoutManager.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/OverFlyingLayoutManager.java index 2c4c2707..311570e5 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/OverFlyingLayoutManager.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/recycler/layout/OverFlyingLayoutManager.java @@ -25,11 +25,11 @@ import android.view.View; import android.view.ViewGroup; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.LinearSmoothScroller; -import androidx.recyclerview.widget.OrientationHelper; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.LinearSmoothScroller; +import android.support.v7.widget.OrientationHelper; +import android.support.v7.widget.RecyclerView; /** * @author xuexiang @@ -375,8 +375,8 @@ public boolean getReverseLayout() { * laid out at the end of the UI, second item is laid out before it etc. *

* For horizontal layouts, it depends on the layout direction. - * When set to true, If {@link androidx.recyclerview.widget.RecyclerView} is LTR, than it will - * layout from RTL, if {@link androidx.recyclerview.widget.RecyclerView}} is RTL, it will layout + * When set to true, If {@link android.support.v7.widget.RecyclerView} is LTR, than it will + * layout from RTL, if {@link android.support.v7.widget.RecyclerView}} is RTL, it will layout * from LTR. */ public void setReverseLayout(boolean reverseLayout) { diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/DepthTransformer.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/DepthTransformer.java index 2939a2d5..74dcb9b4 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/DepthTransformer.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/DepthTransformer.java @@ -2,8 +2,8 @@ import android.view.View; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.v4.view.ViewPager; /** * 3D旋转切换 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/FadeSlideTransformer.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/FadeSlideTransformer.java index 2f6c5bc8..13562f87 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/FadeSlideTransformer.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/FadeSlideTransformer.java @@ -1,7 +1,7 @@ package com.xuexiang.xui.widget.banner.transform; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.v4.view.ViewPager; import android.view.View; /** diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/FlowTransformer.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/FlowTransformer.java index 0f7b6388..9bb5097a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/FlowTransformer.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/FlowTransformer.java @@ -1,7 +1,7 @@ package com.xuexiang.xui.widget.banner.transform; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.v4.view.ViewPager; import android.view.View; /** diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/RotateDownTransformer.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/RotateDownTransformer.java index ce22a09f..99ed0e8e 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/RotateDownTransformer.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/RotateDownTransformer.java @@ -2,7 +2,7 @@ import android.view.View; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; /** * 向下旋转切换 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/RotateUpTransformer.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/RotateUpTransformer.java index 93a114e0..eb604c54 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/RotateUpTransformer.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/RotateUpTransformer.java @@ -1,7 +1,7 @@ package com.xuexiang.xui.widget.banner.transform; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.v4.view.ViewPager; import android.view.View; /** * 向上旋转切换 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/ZoomOutSlideTransformer.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/ZoomOutSlideTransformer.java index a583bd37..b31c3074 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/ZoomOutSlideTransformer.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/transform/ZoomOutSlideTransformer.java @@ -2,8 +2,8 @@ import android.view.View; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.v4.view.ViewPager; /** * 侧滑缩小切换 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/banner/base/BaseBanner.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/banner/base/BaseBanner.java index 2f499422..b6816172 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/banner/base/BaseBanner.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/banner/base/BaseBanner.java @@ -6,10 +6,8 @@ import android.graphics.Typeface; import android.os.Handler; import android.os.Message; - -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.util.AttributeSet; import android.util.DisplayMetrics; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/loopviewpager/LoopPagerAdapterWrapper.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/loopviewpager/LoopPagerAdapterWrapper.java index 76139510..66ae06a9 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/loopviewpager/LoopPagerAdapterWrapper.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/loopviewpager/LoopPagerAdapterWrapper.java @@ -1,14 +1,13 @@ package com.xuexiang.xui.widget.banner.widget.loopviewpager; import android.os.Parcelable; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.app.FragmentStatePagerAdapter; +import android.support.v4.view.PagerAdapter; import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; -import androidx.fragment.app.FragmentPagerAdapter; -import androidx.fragment.app.FragmentStatePagerAdapter; -import androidx.viewpager.widget.PagerAdapter; - /** * A PagerAdapter wrapper responsible for providing a proper page to * LoopViewPager diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/loopviewpager/LoopViewPager.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/loopviewpager/LoopViewPager.java index 0a0daf2a..ee478d8a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/loopviewpager/LoopViewPager.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/banner/widget/loopviewpager/LoopViewPager.java @@ -1,11 +1,10 @@ package com.xuexiang.xui.widget.banner.widget.loopviewpager; import android.content.Context; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import android.util.AttributeSet; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; - import java.util.ArrayList; import java.util.List; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/BaseBehavior.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/BaseBehavior.java index b0150240..a318ef9a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/BaseBehavior.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/BaseBehavior.java @@ -18,8 +18,8 @@ package com.xuexiang.xui.widget.behavior; import android.content.Context; -import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.core.view.ViewCompat; +import android.support.design.widget.CoordinatorLayout; +import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.view.View; import android.view.ViewConfiguration; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/BottomNavigationViewBehavior.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/BottomNavigationViewBehavior.java index 6395c2b6..7a7ded0a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/BottomNavigationViewBehavior.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/BottomNavigationViewBehavior.java @@ -18,7 +18,7 @@ package com.xuexiang.xui.widget.behavior; import android.content.Context; -import androidx.coordinatorlayout.widget.CoordinatorLayout; +import android.support.design.widget.CoordinatorLayout; import android.util.AttributeSet; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/FloatingActionButtonBehavior.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/FloatingActionButtonBehavior.java index b230ab8d..e133bd0f 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/FloatingActionButtonBehavior.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/FloatingActionButtonBehavior.java @@ -18,7 +18,7 @@ package com.xuexiang.xui.widget.behavior; import android.content.Context; -import androidx.coordinatorlayout.widget.CoordinatorLayout; +import android.support.design.widget.CoordinatorLayout; import android.util.AttributeSet; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/ToolBarBehavior.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/ToolBarBehavior.java index ace9dd9b..f29c1188 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/ToolBarBehavior.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/ToolBarBehavior.java @@ -17,7 +17,7 @@ package com.xuexiang.xui.widget.behavior; import android.content.Context; -import androidx.coordinatorlayout.widget.CoordinatorLayout; +import android.support.design.widget.CoordinatorLayout; import android.util.AttributeSet; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/TranslateAnimateHelper.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/TranslateAnimateHelper.java index 29f30b33..8e2af8ab 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/TranslateAnimateHelper.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/behavior/TranslateAnimateHelper.java @@ -18,7 +18,7 @@ package com.xuexiang.xui.widget.behavior; import android.animation.ValueAnimator; -import androidx.coordinatorlayout.widget.CoordinatorLayout; +import android.support.design.widget.CoordinatorLayout; import android.view.View; /** @@ -48,6 +48,7 @@ public static TranslateAnimateHelper get(View target) { return new TranslateAnimateHelper(target); } + @Override public void show() { if (mMode == MODE_TITLE) { showTitle(); diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/ButtonView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/ButtonView.java index 73a973a2..cfacc153 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/ButtonView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/ButtonView.java @@ -9,8 +9,8 @@ import android.util.AttributeSet; import android.view.MotionEvent; -import androidx.annotation.NonNull; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.annotation.NonNull; +import android.support.v7.widget.AppCompatTextView; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/CountDownButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/CountDownButton.java index 3d480336..c236d836 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/CountDownButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/CountDownButton.java @@ -4,7 +4,7 @@ import android.content.res.TypedArray; import android.graphics.Rect; import android.os.CountDownTimer; -import androidx.appcompat.widget.AppCompatButton; +import android.support.v7.widget.AppCompatButton; import android.text.TextUtils; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/RippleView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/RippleView.java index 296ffe0d..a198e76c 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/RippleView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/RippleView.java @@ -28,7 +28,7 @@ import android.graphics.Rect; import android.os.Build; import android.os.Handler; -import androidx.annotation.ColorRes; +import android.support.annotation.ColorRes; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.MotionEvent; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/roundbutton/RoundButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/roundbutton/RoundButton.java index ecb6115a..82996be1 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/roundbutton/RoundButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/roundbutton/RoundButton.java @@ -1,7 +1,7 @@ package com.xuexiang.xui.widget.button.roundbutton; import android.content.Context; -import androidx.appcompat.widget.AppCompatButton; +import android.support.v7.widget.AppCompatButton; import android.util.AttributeSet; /** diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/roundbutton/RoundDrawable.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/roundbutton/RoundDrawable.java index cca1437a..7abf654c 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/roundbutton/RoundDrawable.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/roundbutton/RoundDrawable.java @@ -7,7 +7,7 @@ import android.graphics.Rect; import android.graphics.drawable.GradientDrawable; import android.os.Build; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/shadowbutton/BaseShadowButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/shadowbutton/BaseShadowButton.java index 6f754604..fd5d4f74 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/shadowbutton/BaseShadowButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/shadowbutton/BaseShadowButton.java @@ -6,7 +6,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.RectF; -import androidx.appcompat.widget.AppCompatButton; +import android.support.v7.widget.AppCompatButton; import android.util.AttributeSet; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/shadowbutton/ShadowImageView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/shadowbutton/ShadowImageView.java index 4d832c2b..9500870a 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/shadowbutton/ShadowImageView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/shadowbutton/ShadowImageView.java @@ -5,7 +5,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/switchbutton/SwitchButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/switchbutton/SwitchButton.java index e3da1844..5ce26a2d 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/button/switchbutton/SwitchButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/button/switchbutton/SwitchButton.java @@ -15,7 +15,7 @@ import android.graphics.drawable.StateListDrawable; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/BaseDialog.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/BaseDialog.java index 7db7146c..152e98da 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/BaseDialog.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/BaseDialog.java @@ -23,7 +23,7 @@ import android.view.View; import android.view.WindowManager; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.KeyboardUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/DialogLoader.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/DialogLoader.java index a3d9b3e9..158f55de 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/DialogLoader.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/DialogLoader.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.widget.dialog.strategy.IDialogStrategy; import com.xuexiang.xui.widget.dialog.strategy.InputCallback; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/LoadingDialog.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/LoadingDialog.java index fc106513..41595c17 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/LoadingDialog.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/LoadingDialog.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.Drawable; -import androidx.annotation.StyleRes; +import android.support.annotation.StyleRes; import android.widget.TextView; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/MiniLoadingDialog.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/MiniLoadingDialog.java index c05a0715..50a4c67d 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/MiniLoadingDialog.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/MiniLoadingDialog.java @@ -2,7 +2,7 @@ import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.StyleRes; +import android.support.annotation.StyleRes; import android.widget.TextView; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/bottomsheet/BottomSheet.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/bottomsheet/BottomSheet.java index 1cde5924..8c922b10 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/bottomsheet/BottomSheet.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/bottomsheet/BottomSheet.java @@ -24,11 +24,11 @@ import android.widget.ListView; import android.widget.TextView; -import androidx.annotation.IntDef; -import androidx.annotation.NonNull; -import androidx.appcompat.content.res.AppCompatResources; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.core.content.ContextCompat; +import android.support.annotation.IntDef; +import android.support.annotation.NonNull; +import android.support.v7.content.res.AppCompatResources; +import android.support.v7.widget.AppCompatImageView; +import android.support.v4.content.ContextCompat; import com.xuexiang.xui.R; import com.xuexiang.xui.logs.UILog; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/bottomsheet/BottomSheetItemView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/bottomsheet/BottomSheetItemView.java index 6bd0d2f5..1612de51 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/bottomsheet/BottomSheetItemView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/bottomsheet/BottomSheetItemView.java @@ -1,7 +1,7 @@ package com.xuexiang.xui.widget.dialog.bottomsheet; import android.content.Context; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.ViewStub; import android.widget.TextView; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/CustomMaterialDialog.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/CustomMaterialDialog.java index 5d865a10..f058389c 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/CustomMaterialDialog.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/CustomMaterialDialog.java @@ -20,7 +20,7 @@ import android.content.Context; import android.view.View; -import androidx.annotation.IdRes; +import android.support.annotation.IdRes; /** * 基础抽象的弹窗，可继承后自定义弹窗 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DefaultRvAdapter.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DefaultRvAdapter.java index d370053d..b94c72c9 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DefaultRvAdapter.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DefaultRvAdapter.java @@ -21,8 +21,8 @@ import android.annotation.TargetApi; import android.content.res.Configuration; import android.os.Build; -import androidx.annotation.LayoutRes; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.LayoutRes; +import android.support.v7.widget.RecyclerView; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DialogBase.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DialogBase.java index 6be05fbf..1536c1f2 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DialogBase.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DialogBase.java @@ -20,7 +20,7 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DialogInit.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DialogInit.java index 832e9365..edd22a4a 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DialogInit.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/DialogInit.java @@ -37,11 +37,11 @@ import android.widget.ScrollView; import android.widget.TextView; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.StyleRes; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.LayoutRes; +import android.support.annotation.NonNull; +import android.support.annotation.StyleRes; +import android.support.annotation.UiThread; +import android.support.v7.widget.RecyclerView; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/MaterialDialog.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/MaterialDialog.java index b4cd6fc4..4931e47c 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/MaterialDialog.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/MaterialDialog.java @@ -27,6 +27,8 @@ import android.os.Build; import android.os.Handler; import android.os.IBinder; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; import android.text.Editable; import android.text.Html; import android.text.TextUtils; @@ -46,22 +48,22 @@ import android.widget.RadioButton; import android.widget.TextView; -import androidx.annotation.ArrayRes; -import androidx.annotation.AttrRes; -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DimenRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntRange; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.annotation.UiThread; -import androidx.core.content.res.ResourcesCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.ArrayRes; +import android.support.annotation.AttrRes; +import android.support.annotation.ColorInt; +import android.support.annotation.ColorRes; +import android.support.annotation.DimenRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.IntRange; +import android.support.annotation.LayoutRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.StringRes; +import android.support.annotation.UiThread; +import android.support.v4.content.res.ResourcesCompat; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.xuexiang.xui.R; import com.xuexiang.xui.XUI; @@ -2246,7 +2248,7 @@ public Builder autoDismiss(boolean dismiss) { } /** - * Sets a custom {@link androidx.recyclerview.widget.RecyclerView.Adapter} for the dialog's list + * Sets a custom {@link android.support.v7.widget.RecyclerView.Adapter} for the dialog's list * * @param adapter The adapter to set to the list. * @param layoutManager The layout manager to use in the RecyclerView. Pass null to use the diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/MDRootLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/MDRootLayout.java index b31f6e83..49ea1269 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/MDRootLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/MDRootLayout.java @@ -25,8 +25,8 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.os.Build; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/MDTintHelper.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/MDTintHelper.java index 65f74741..a07f4caa 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/MDTintHelper.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/MDTintHelper.java @@ -23,11 +23,11 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; +import android.support.v4.graphics.drawable.DrawableCompat; +import android.support.v7.widget.AppCompatEditText; import android.util.Log; import android.widget.CheckBox; import android.widget.EditText; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/ThemeSingleton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/ThemeSingleton.java index 9c7a8ced..059f8467 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/ThemeSingleton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/internal/ThemeSingleton.java @@ -19,8 +19,8 @@ import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; import com.xuexiang.xui.widget.dialog.materialdialog.GravityEnum; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/simplelist/MaterialSimpleListAdapter.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/simplelist/MaterialSimpleListAdapter.java index 2b4db4de..1007be9e 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/simplelist/MaterialSimpleListAdapter.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/simplelist/MaterialSimpleListAdapter.java @@ -18,7 +18,7 @@ package com.xuexiang.xui.widget.dialog.materialdialog.simplelist; import android.graphics.PorterDuff; -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/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/simplelist/MaterialSimpleListItem.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/simplelist/MaterialSimpleListItem.java index 061ea05b..0e84ca93 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/simplelist/MaterialSimpleListItem.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/simplelist/MaterialSimpleListItem.java @@ -20,15 +20,15 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import androidx.annotation.AttrRes; -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DimenRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntRange; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.core.content.ContextCompat; +import android.support.annotation.AttrRes; +import android.support.annotation.ColorInt; +import android.support.annotation.ColorRes; +import android.support.annotation.DimenRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.IntRange; +import android.support.annotation.Nullable; +import android.support.annotation.StringRes; +import android.support.v4.content.ContextCompat; import android.util.TypedValue; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ThemeUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/util/RippleHelper.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/util/RippleHelper.java index 7d8b0e17..29cf1fc7 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/util/RippleHelper.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/materialdialog/util/RippleHelper.java @@ -22,7 +22,7 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.os.Build; -import androidx.annotation.ColorInt; +import android.support.annotation.ColorInt; /** @author Aidan Follestad (afollestad) */ @TargetApi(Build.VERSION_CODES.LOLLIPOP) diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/IDialogStrategy.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/IDialogStrategy.java index 20d40407..5a5f2093 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/IDialogStrategy.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/IDialogStrategy.java @@ -20,8 +20,8 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.ArrayRes; -import androidx.annotation.DrawableRes; +import android.support.annotation.ArrayRes; +import android.support.annotation.DrawableRes; /** * 对话框的策略 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/InputCallback.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/InputCallback.java index b8441dde..f77c8dba 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/InputCallback.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/InputCallback.java @@ -18,7 +18,7 @@ package com.xuexiang.xui.widget.dialog.strategy; import android.content.DialogInterface; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; /** * 输入内容回调 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/impl/AlertDialogStrategy.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/impl/AlertDialogStrategy.java index fbe507f8..d5eb87de 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/impl/AlertDialogStrategy.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/impl/AlertDialogStrategy.java @@ -21,8 +21,8 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.ArrayRes; -import androidx.annotation.NonNull; +import android.support.annotation.ArrayRes; +import android.support.annotation.NonNull; import android.widget.EditText; import android.widget.FrameLayout; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/impl/MaterialDialogStrategy.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/impl/MaterialDialogStrategy.java index 84691e96..1e7d237f 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/impl/MaterialDialogStrategy.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/dialog/strategy/impl/MaterialDialogStrategy.java @@ -20,7 +20,7 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.View; import com.xuexiang.xui.widget.dialog.materialdialog.DialogAction; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/ClearEditText.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/ClearEditText.java index b9bb0df5..72bd6cae 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/ClearEditText.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/ClearEditText.java @@ -13,7 +13,7 @@ import android.view.animation.CycleInterpolator; import android.view.animation.TranslateAnimation; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.v7.widget.AppCompatEditText; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/PasswordEditText.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/PasswordEditText.java index c4bcca90..5a6fc215 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/PasswordEditText.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/PasswordEditText.java @@ -15,7 +15,7 @@ import android.view.MotionEvent; import android.view.View; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.v7.widget.AppCompatEditText; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/ValidatorEditText.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/ValidatorEditText.java index abdd69bf..d5433d6f 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/ValidatorEditText.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/ValidatorEditText.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.v7.widget.AppCompatEditText; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/MaterialEditText.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/MaterialEditText.java index d5b44382..06d7fd68 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/MaterialEditText.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/MaterialEditText.java @@ -29,11 +29,11 @@ import android.view.MotionEvent; import android.view.View; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntDef; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.annotation.DrawableRes; +import android.support.annotation.IntDef; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatEditText; import com.xuexiang.xui.R; import com.xuexiang.xui.XUI; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/METValidator.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/METValidator.java index d8ad0260..55ed956c 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/METValidator.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/METValidator.java @@ -1,6 +1,6 @@ package com.xuexiang.xui.widget.edittext.materialedittext.validation; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; /** * 自定义校验器 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/NotAllowEmptyValidator.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/NotAllowEmptyValidator.java index 4bfe93f4..2e83dc2a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/NotAllowEmptyValidator.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/NotAllowEmptyValidator.java @@ -17,7 +17,7 @@ package com.xuexiang.xui.widget.edittext.materialedittext.validation; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; /** * 非空检验 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/RegexpValidator.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/RegexpValidator.java index 85a7c70c..daf8f7a1 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/RegexpValidator.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/materialedittext/validation/RegexpValidator.java @@ -1,6 +1,6 @@ package com.xuexiang.xui.widget.edittext.materialedittext.validation; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import java.util.regex.Pattern; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/verify/PwdEditText.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/verify/PwdEditText.java index 0826399e..31e646ba 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/verify/PwdEditText.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/verify/PwdEditText.java @@ -5,7 +5,7 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.v7.widget.AppCompatEditText; /** * diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/verify/PwdTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/verify/PwdTextView.java index ef64b78e..bad60266 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/verify/PwdTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/edittext/verify/PwdTextView.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; import android.util.AttributeSet; /** diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/flowlayout/FlowTagLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/flowlayout/FlowTagLayout.java index 5d9341d5..b7b36777 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/flowlayout/FlowTagLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/flowlayout/FlowTagLayout.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.database.DataSetObserver; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.util.AttributeSet; import android.util.SparseBooleanArray; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/grouplist/XUICommonListItemView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/grouplist/XUICommonListItemView.java index d11f60f5..aa2993d7 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/grouplist/XUICommonListItemView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/grouplist/XUICommonListItemView.java @@ -34,7 +34,7 @@ import android.widget.Space; import android.widget.TextView; -import androidx.annotation.IntDef; +import android.support.annotation.IntDef; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.DensityUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/grouplist/XUIGroupListView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/grouplist/XUIGroupListView.java index 3c75aaa7..53bb850b 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/grouplist/XUIGroupListView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/grouplist/XUIGroupListView.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import androidx.annotation.IntDef; +import android.support.annotation.IntDef; import android.util.AttributeSet; import android.util.SparseArray; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/guidview/GuideCaseView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/guidview/GuideCaseView.java index 154a428e..1f7db17f 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/guidview/GuideCaseView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/guidview/GuideCaseView.java @@ -21,12 +21,12 @@ import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.AttrRes; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; -import androidx.annotation.StyleRes; +import android.support.annotation.AttrRes; +import android.support.annotation.LayoutRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; +import android.support.annotation.StyleRes; import com.xuexiang.xui.R; import com.xuexiang.xui.XUI; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/guidview/GuideImageView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/guidview/GuideImageView.java index 46ad9633..065bbaa3 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/guidview/GuideImageView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/guidview/GuideImageView.java @@ -10,7 +10,7 @@ import android.graphics.PorterDuffXfermode; import android.graphics.RectF; import android.os.Build; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; /** diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/IconImageView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/IconImageView.java index 69102987..eff0460e 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/IconImageView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/IconImageView.java @@ -24,8 +24,8 @@ import android.graphics.Paint; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.annotation.NonNull; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/ImageLoader.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/ImageLoader.java index 139e5024..201eca86 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/ImageLoader.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/ImageLoader.java @@ -21,7 +21,7 @@ import android.graphics.drawable.Drawable; import android.widget.ImageView; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.xuexiang.xui.widget.imageview.strategy.IImageLoadStrategy; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/RadiusImageView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/RadiusImageView.java index 85f3b645..ba40fde7 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/RadiusImageView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/RadiusImageView.java @@ -17,8 +17,8 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; -import androidx.annotation.ColorInt; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.annotation.ColorInt; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/photoview/PhotoView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/photoview/PhotoView.java index bec926d6..b672a7df 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/photoview/PhotoView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/photoview/PhotoView.java @@ -21,7 +21,7 @@ import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.net.Uri; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.GestureDetector; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/photoview/PhotoViewAttacher.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/photoview/PhotoViewAttacher.java index a734b888..503cfe96 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/photoview/PhotoViewAttacher.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/photoview/PhotoViewAttacher.java @@ -22,8 +22,8 @@ import android.graphics.Matrix.ScaleToFit; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; -import androidx.core.view.MotionEventCompat; +import android.support.annotation.Nullable; +import android.support.v4.view.MotionEventCompat; import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; @@ -825,6 +825,7 @@ private RectF getDisplayRect(Matrix matrix) { return null; } + @Override public Bitmap getVisibleRectangleBitmap() { ImageView imageView = getImageView(); return imageView == null ? null : imageView.getDrawingCache(); @@ -832,8 +833,9 @@ public Bitmap getVisibleRectangleBitmap() { @Override public void setZoomTransitionDuration(int milliseconds) { - if (milliseconds < 0) + if (milliseconds < 0) { milliseconds = DEFAULT_ZOOM_DURATION; + } this.ZOOM_DURATION = milliseconds; } @@ -953,14 +955,16 @@ private void updateBaseMatrix(Drawable d) { } private int getImageViewWidth(ImageView imageView) { - if (null == imageView) + if (null == imageView) { return 0; + } return imageView.getWidth() - imageView.getPaddingLeft() - imageView.getPaddingRight(); } private int getImageViewHeight(ImageView imageView) { - if (null == imageView) + if (null == imageView) { return 0; + } return imageView.getHeight() - imageView.getPaddingTop() - imageView.getPaddingBottom(); } diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/MediaLoader.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/MediaLoader.java index c8e1d77b..f206e6a2 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/MediaLoader.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/MediaLoader.java @@ -19,8 +19,8 @@ import android.content.Context; import android.widget.ImageView; -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; +import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; import com.xuexiang.xui.widget.imageview.preview.loader.GlideMediaLoader; import com.xuexiang.xui.widget.imageview.preview.loader.IMediaLoader; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/PreviewBuilder.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/PreviewBuilder.java index b0c00637..d91b3ecf 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/PreviewBuilder.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/PreviewBuilder.java @@ -20,9 +20,9 @@ import android.content.Intent; import android.os.Parcelable; -import androidx.annotation.ColorRes; -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; +import android.support.annotation.ColorRes; +import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; import com.xuexiang.xui.widget.imageview.preview.enitity.IPreviewInfo; import com.xuexiang.xui.widget.imageview.preview.loader.OnVideoClickListener; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/enitity/IPreviewInfo.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/enitity/IPreviewInfo.java index cbd57eb5..79e2f723 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/enitity/IPreviewInfo.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/enitity/IPreviewInfo.java @@ -18,9 +18,7 @@ import android.graphics.Rect; import android.os.Parcelable; -import androidx.annotation.Nullable; - -import java.io.Serializable; +import android.support.annotation.Nullable; /** * 图片预览接口 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/GlideMediaLoader.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/GlideMediaLoader.java index 71cd03d2..2227d63f 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/GlideMediaLoader.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/GlideMediaLoader.java @@ -18,9 +18,9 @@ import android.content.Context; import android.graphics.Bitmap; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.widget.ImageView; import com.bumptech.glide.Glide; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/IMediaLoader.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/IMediaLoader.java index 497840d2..70b286ea 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/IMediaLoader.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/IMediaLoader.java @@ -17,8 +17,8 @@ package com.xuexiang.xui.widget.imageview.preview.loader; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; +import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; import android.widget.ImageView; /** diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/ISimpleTarget.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/ISimpleTarget.java index 8088f993..4ed526c1 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/ISimpleTarget.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/loader/ISimpleTarget.java @@ -18,7 +18,7 @@ import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; /** * 图片加载回调状态接口 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/BasePhotoFragment.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/BasePhotoFragment.java index 8f55fef6..142cf50e 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/BasePhotoFragment.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/BasePhotoFragment.java @@ -19,15 +19,15 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.view.ViewCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import androidx.annotation.CallSuper; -import androidx.annotation.Nullable; -import androidx.core.view.ViewCompat; -import androidx.fragment.app.Fragment; +import android.support.annotation.CallSuper; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/PreviewActivity.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/PreviewActivity.java index 3c6588fa..001bc2fd 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/PreviewActivity.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/PreviewActivity.java @@ -18,17 +18,17 @@ import android.graphics.Color; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; +import android.support.v4.view.ViewPager; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.TextView; -import androidx.annotation.CallSuper; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.CallSuper; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import com.xuexiang.xui.R; import com.xuexiang.xui.widget.imageview.preview.MediaLoader; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/VideoPlayerActivity.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/VideoPlayerActivity.java index 34ff252d..3333d96f 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/VideoPlayerActivity.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/VideoPlayerActivity.java @@ -20,8 +20,8 @@ import android.media.MediaPlayer; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; import android.text.TextUtils; import android.widget.Toast; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/view/BezierBannerView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/view/BezierBannerView.java index 024c19d8..c0161b51 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/view/BezierBannerView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/view/BezierBannerView.java @@ -21,8 +21,8 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Path; -import androidx.annotation.Nullable; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.Nullable; +import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.util.Log; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/view/PhotoViewPager.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/view/PhotoViewPager.java index 305ee84b..a7aba3ee 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/view/PhotoViewPager.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/view/PhotoViewPager.java @@ -17,7 +17,7 @@ package com.xuexiang.xui.widget.imageview.preview.view; import android.content.Context; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/strategy/IImageLoadStrategy.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/strategy/IImageLoadStrategy.java index 8a4ed11c..efb038d8 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/strategy/IImageLoadStrategy.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/strategy/IImageLoadStrategy.java @@ -21,7 +21,7 @@ import android.graphics.drawable.Drawable; import android.widget.ImageView; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/strategy/impl/GlideImageLoadStrategy.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/strategy/impl/GlideImageLoadStrategy.java index e361064b..fb51185b 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/strategy/impl/GlideImageLoadStrategy.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/strategy/impl/GlideImageLoadStrategy.java @@ -21,7 +21,7 @@ import android.graphics.drawable.Drawable; import android.widget.ImageView; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/IXUILayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/IXUILayout.java index e4eea9f3..f52cb4b1 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/IXUILayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/IXUILayout.java @@ -19,8 +19,8 @@ import android.view.View; -import androidx.annotation.ColorInt; -import androidx.annotation.IntDef; +import android.support.annotation.ColorInt; +import android.support.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIButton.java index 7994e741..5dc5a4c0 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIButton.java @@ -21,7 +21,7 @@ import android.graphics.Canvas; import android.util.AttributeSet; -import androidx.annotation.ColorInt; +import android.support.annotation.ColorInt; import com.xuexiang.xui.widget.alpha.XUIAlphaButton; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIFrameLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIFrameLayout.java index 24e7c309..9fc4cf49 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIFrameLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIFrameLayout.java @@ -21,7 +21,7 @@ import android.graphics.Canvas; import android.util.AttributeSet; -import androidx.annotation.ColorInt; +import android.support.annotation.ColorInt; import com.xuexiang.xui.widget.alpha.XUIAlphaFrameLayout; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUILayoutHelper.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUILayoutHelper.java index dbf202e8..5a7b7137 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUILayoutHelper.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUILayoutHelper.java @@ -33,7 +33,7 @@ import android.view.View; import android.view.ViewOutlineProvider; -import androidx.annotation.ColorInt; +import android.support.annotation.ColorInt; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ThemeUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUILinearLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUILinearLayout.java index 8d31ece5..cc9f5a73 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUILinearLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUILinearLayout.java @@ -21,7 +21,7 @@ import android.graphics.Canvas; import android.util.AttributeSet; -import androidx.annotation.ColorInt; +import android.support.annotation.ColorInt; import com.xuexiang.xui.widget.alpha.XUIAlphaLinearLayout; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIRelativeLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIRelativeLayout.java index 2ffdb4d7..bb8bfee5 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIRelativeLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/layout/XUIRelativeLayout.java @@ -21,7 +21,7 @@ import android.graphics.Canvas; import android.util.AttributeSet; -import androidx.annotation.ColorInt; +import android.support.annotation.ColorInt; import com.xuexiang.xui.widget.alpha.XUIAlphaRelativeLayout; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/picker/RulerView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/picker/RulerView.java index 2d9ed8d6..ceebc509 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/picker/RulerView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/picker/RulerView.java @@ -19,7 +19,7 @@ import android.view.View; import android.view.animation.DecelerateInterpolator; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/picker/widget/OptionsPickerView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/picker/widget/OptionsPickerView.java index 00b9cf37..a3bee528 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/picker/widget/OptionsPickerView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/picker/widget/OptionsPickerView.java @@ -25,7 +25,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.R; import com.xuexiang.xui.XUI; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/bar/Cookie.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/bar/Cookie.java index 56e13f50..13758995 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/bar/Cookie.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/bar/Cookie.java @@ -18,6 +18,7 @@ import android.content.Context; import android.graphics.Color; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.Gravity; @@ -30,10 +31,8 @@ import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; - +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ThemeUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/bar/CookieBar.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/bar/CookieBar.java index 27005d8e..cb3e0c41 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/bar/CookieBar.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/bar/CookieBar.java @@ -17,9 +17,9 @@ package com.xuexiang.xui.widget.popupwindow.bar; import android.app.Activity; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.StringRes; +import android.support.annotation.ColorRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; import android.view.Gravity; import android.view.View.OnClickListener; import android.view.ViewGroup; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/EasyPopup.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/EasyPopup.java index 59a01682..ff4e91f4 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/EasyPopup.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/EasyPopup.java @@ -6,6 +6,7 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build; +import android.support.v4.widget.PopupWindowCompat; import android.transition.Transition; import android.view.Gravity; import android.view.KeyEvent; @@ -17,15 +18,13 @@ import android.view.ViewTreeObserver; import android.widget.PopupWindow; -import androidx.annotation.ColorInt; -import androidx.annotation.FloatRange; -import androidx.annotation.IdRes; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; -import androidx.annotation.StyleRes; -import androidx.core.widget.PopupWindowCompat; - +import android.support.annotation.ColorInt; +import android.support.annotation.FloatRange; +import android.support.annotation.IdRes; +import android.support.annotation.LayoutRes; +import android.support.annotation.NonNull; +import android.support.annotation.RequiresApi; +import android.support.annotation.StyleRes; import com.xuexiang.xui.logs.UILog; /** diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/HorizontalGravity.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/HorizontalGravity.java index cdca81eb..24e5c6e8 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/HorizontalGravity.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/HorizontalGravity.java @@ -1,6 +1,6 @@ package com.xuexiang.xui.widget.popupwindow.easypopup; -import androidx.annotation.IntDef; +import android.support.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/VerticalGravity.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/VerticalGravity.java index 621d59c3..4ecd620d 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/VerticalGravity.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/easypopup/VerticalGravity.java @@ -1,6 +1,6 @@ package com.xuexiang.xui.widget.popupwindow.easypopup; -import androidx.annotation.IntDef; +import android.support.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/status/StatusView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/status/StatusView.java index 3e95b97c..2131972e 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/status/StatusView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/popupwindow/status/StatusView.java @@ -28,7 +28,7 @@ import android.widget.FrameLayout; import android.widget.TextView; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/CircleProgressView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/CircleProgressView.java index 1d9a3c08..a67ac414 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/CircleProgressView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/CircleProgressView.java @@ -39,9 +39,9 @@ import android.view.animation.LinearInterpolator; import android.view.animation.OvershootInterpolator; -import androidx.annotation.ColorInt; -import androidx.annotation.IntDef; -import androidx.annotation.Nullable; +import android.support.annotation.ColorInt; +import android.support.annotation.IntDef; +import android.support.annotation.Nullable; import com.xuexiang.xui.R; import com.xuexiang.xui.XUI; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/HorizontalProgressView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/HorizontalProgressView.java index 6ec471a1..a25c1fd5 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/HorizontalProgressView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/HorizontalProgressView.java @@ -36,9 +36,9 @@ import android.view.animation.LinearInterpolator; import android.view.animation.OvershootInterpolator; -import androidx.annotation.ColorInt; -import androidx.annotation.IntDef; -import androidx.annotation.Nullable; +import android.support.annotation.ColorInt; +import android.support.annotation.IntDef; +import android.support.annotation.Nullable; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.DensityUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/ARCLoadingView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/ARCLoadingView.java index 0402f25f..d0761138 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/ARCLoadingView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/ARCLoadingView.java @@ -30,7 +30,7 @@ import android.util.AttributeSet; import android.view.View; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.R; import com.xuexiang.xui.UIConfig; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/LoadingViewLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/LoadingViewLayout.java index d23bb1cf..c892b790 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/LoadingViewLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/LoadingViewLayout.java @@ -27,8 +27,8 @@ import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/MiniLoadingView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/MiniLoadingView.java index 9316a6f1..8a15f889 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/MiniLoadingView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/loading/MiniLoadingView.java @@ -10,7 +10,7 @@ import android.view.View; import android.view.animation.LinearInterpolator; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.DensityUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/BaseDrawable.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/BaseDrawable.java index 3096bc6a..813a5b60 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/BaseDrawable.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/BaseDrawable.java @@ -27,9 +27,9 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; abstract class BaseDrawable extends Drawable implements TintableDrawable { diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/BaseProgressLayerDrawable.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/BaseProgressLayerDrawable.java index c85d5044..5cae241b 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/BaseProgressLayerDrawable.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/BaseProgressLayerDrawable.java @@ -24,13 +24,13 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.os.Build; +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; +import android.support.v4.graphics.ColorUtils; import android.util.Log; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; - import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ThemeUtils; @@ -110,7 +110,7 @@ public void setUseIntrinsicPadding(boolean useIntrinsicPadding) { @Override public void setTint(@ColorInt int tintColor) { // Modulate alpha of tintColor against mBackgroundAlpha. - int backgroundTintColor = androidx.core.graphics.ColorUtils.setAlphaComponent( + int backgroundTintColor = ColorUtils.setAlphaComponent( tintColor, Math.round(Color.alpha(tintColor) * mBackgroundAlpha)); mBackgroundDrawable.setTint(backgroundTintColor); mSecondaryProgressDrawable.setTint(backgroundTintColor); diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/IndeterminateCircularProgressDrawable.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/IndeterminateCircularProgressDrawable.java index fcd0bf9b..df8d58dd 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/IndeterminateCircularProgressDrawable.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/IndeterminateCircularProgressDrawable.java @@ -23,7 +23,7 @@ import android.graphics.Paint; import android.graphics.RectF; -import androidx.annotation.Keep; +import android.support.annotation.Keep; /** * A backported {@code Drawable} for indeterminate circular {@code ProgressBar}. diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/IndeterminateHorizontalProgressDrawable.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/IndeterminateHorizontalProgressDrawable.java index d50dd10a..db331056 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/IndeterminateHorizontalProgressDrawable.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/IndeterminateHorizontalProgressDrawable.java @@ -23,7 +23,7 @@ import android.graphics.Paint; import android.graphics.RectF; -import androidx.annotation.Keep; +import android.support.annotation.Keep; import com.xuexiang.xui.utils.ThemeUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/Interpolators.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/Interpolators.java index 6a199cac..15daf1f3 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/Interpolators.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/Interpolators.java @@ -18,7 +18,7 @@ package com.xuexiang.xui.widget.progress.materialprogressbar; import android.graphics.Path; -import androidx.core.view.animation.PathInterpolatorCompat; +import android.support.v4.view.animation.PathInterpolatorCompat; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/MaterialProgressBar.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/MaterialProgressBar.java index 5c86df92..3fa39d62 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/MaterialProgressBar.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/MaterialProgressBar.java @@ -29,8 +29,8 @@ import android.util.Log; import android.widget.ProgressBar; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.TintTypedArray; +import android.support.annotation.Nullable; +import android.support.v7.widget.TintTypedArray; import com.xuexiang.xui.R; import com.xuexiang.xui.widget.progress.materialprogressbar.internal.DrawableCompat; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/TintableDrawable.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/TintableDrawable.java index 1ca4c6d2..d89e5e51 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/TintableDrawable.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/TintableDrawable.java @@ -22,9 +22,9 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; /** * A {@code Drawable} that is tintable. diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/internal/ObjectAnimatorCompatBase.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/internal/ObjectAnimatorCompatBase.java index b7ac4fd6..754f110e 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/internal/ObjectAnimatorCompatBase.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/materialprogressbar/internal/ObjectAnimatorCompatBase.java @@ -24,7 +24,7 @@ import android.graphics.PathMeasure; import android.util.Property; -import androidx.annotation.Size; +import android.support.annotation.Size; class ObjectAnimatorCompatBase { diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/AnimationRatingBar.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/AnimationRatingBar.java index dbb740d1..655531c1 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/AnimationRatingBar.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/AnimationRatingBar.java @@ -5,7 +5,7 @@ import android.os.SystemClock; import android.util.AttributeSet; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import java.util.UUID; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/IRatingBar.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/IRatingBar.java index 84d93586..9b10769c 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/IRatingBar.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/IRatingBar.java @@ -2,9 +2,9 @@ import android.graphics.drawable.Drawable; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntRange; +import android.support.annotation.DrawableRes; +import android.support.annotation.FloatRange; +import android.support.annotation.IntRange; /** * 星级评分控件 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/PartialView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/PartialView.java index 447738b2..0c0ac34d 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/PartialView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/PartialView.java @@ -9,7 +9,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; -import androidx.annotation.IntRange; +import android.support.annotation.IntRange; /** * diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/RatingBar.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/RatingBar.java index 8ded325d..3306aae9 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/RatingBar.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/RatingBar.java @@ -9,11 +9,11 @@ import android.view.View; import android.widget.LinearLayout; -import androidx.annotation.DrawableRes; -import androidx.annotation.FloatRange; -import androidx.annotation.IntRange; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; +import android.support.annotation.DrawableRes; +import android.support.annotation.FloatRange; +import android.support.annotation.IntRange; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/RotationRatingBar.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/RotationRatingBar.java index eb7114d8..426d1ca8 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/RotationRatingBar.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/RotationRatingBar.java @@ -5,8 +5,8 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/ScaleRatingBar.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/ScaleRatingBar.java index f8a3731e..4aa98c9e 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/ScaleRatingBar.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/progress/ratingbar/ScaleRatingBar.java @@ -5,8 +5,8 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/searchview/AnimationUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/searchview/AnimationUtils.java index da6b088f..83190bdb 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/searchview/AnimationUtils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/searchview/AnimationUtils.java @@ -20,8 +20,8 @@ import android.animation.AnimatorListenerAdapter; import android.annotation.TargetApi; import android.os.Build; -import androidx.core.view.ViewCompat; -import androidx.core.view.ViewPropertyAnimatorListener; +import android.support.v4.view.ViewCompat; +import android.support.v4.view.ViewPropertyAnimatorListener; import android.util.TypedValue; import android.view.View; import android.view.ViewAnimationUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowButton.java index da6d17ef..b4513aeb 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowButton.java @@ -1,8 +1,8 @@ package com.xuexiang.xui.widget.shadow; import android.content.Context; -import androidx.core.view.ViewCompat; -import androidx.appcompat.widget.AppCompatButton; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.AppCompatButton; import android.util.AttributeSet; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowDrawable.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowDrawable.java index c8a171c0..e25e6663 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowDrawable.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowDrawable.java @@ -13,10 +13,9 @@ import android.graphics.RectF; import android.graphics.Shader; import android.graphics.drawable.Drawable; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.view.ViewCompat; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowTextView.java index 636e7265..edb62084 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/shadow/ShadowTextView.java @@ -4,8 +4,8 @@ import android.util.AttributeSet; import android.view.View; -import androidx.appcompat.widget.AppCompatTextView; -import androidx.core.view.ViewCompat; +import android.support.v7.widget.AppCompatTextView; +import android.support.v4.view.ViewCompat; /** * 可设置阴影的TextView diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/SlideBack.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/SlideBack.java index fd95332a..24c3e7d9 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/SlideBack.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/SlideBack.java @@ -19,7 +19,7 @@ import android.app.Activity; -import androidx.annotation.IntDef; +import android.support.annotation.IntDef; import com.xuexiang.xui.widget.slideback.callback.SlideBackCallBack; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/dispatcher/ISlideTouchEventDispatcher.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/dispatcher/ISlideTouchEventDispatcher.java index 38577fe7..ccc813a6 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/dispatcher/ISlideTouchEventDispatcher.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/dispatcher/ISlideTouchEventDispatcher.java @@ -19,7 +19,7 @@ import android.view.View; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.widget.slideback.SlideInfo; import com.xuexiang.xui.widget.slideback.callback.SlideCallBack; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/dispatcher/impl/DefaultSlideTouchDispatcher.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/dispatcher/impl/DefaultSlideTouchDispatcher.java index da6be14e..ad31706f 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/dispatcher/impl/DefaultSlideTouchDispatcher.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/dispatcher/impl/DefaultSlideTouchDispatcher.java @@ -20,7 +20,7 @@ import android.view.MotionEvent; import android.view.View; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.widget.slideback.SlideInfo; import com.xuexiang.xui.widget.slideback.callback.SlideCallBack; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/widget/SlideBackIconView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/widget/SlideBackIconView.java index d5966447..a66dd6b6 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/widget/SlideBackIconView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/slideback/widget/SlideBackIconView.java @@ -25,8 +25,8 @@ import android.util.AttributeSet; import android.view.View; -import androidx.annotation.ColorInt; -import androidx.annotation.Nullable; +import android.support.annotation.ColorInt; +import android.support.annotation.Nullable; /** * 边缘返回的图标View diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/editspinner/EditSpinner.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/editspinner/EditSpinner.java index c51e7902..faaa540f 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/editspinner/EditSpinner.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/editspinner/EditSpinner.java @@ -24,9 +24,9 @@ import android.widget.ListPopupWindow; import android.widget.PopupWindow; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; +import android.support.annotation.NonNull; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.DensityUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/editspinner/EditSpinnerAdapter.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/editspinner/EditSpinnerAdapter.java index b74c52f9..f1cc774c 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/editspinner/EditSpinnerAdapter.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/editspinner/EditSpinnerAdapter.java @@ -11,8 +11,8 @@ import android.view.ViewGroup; import android.widget.TextView; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; import com.xuexiang.xui.R; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/materialspinner/MaterialSpinner.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/materialspinner/MaterialSpinner.java index d0113320..c8843693 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/materialspinner/MaterialSpinner.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/materialspinner/MaterialSpinner.java @@ -21,11 +21,11 @@ import android.widget.ListView; import android.widget.PopupWindow; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatTextView; import com.xuexiang.xui.R; import com.xuexiang.xui.logs.UILog; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/materialspinner/MaterialSpinnerBaseAdapter.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/materialspinner/MaterialSpinnerBaseAdapter.java index 0c04b374..02868e9e 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/materialspinner/MaterialSpinnerBaseAdapter.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/spinner/materialspinner/MaterialSpinnerBaseAdapter.java @@ -3,8 +3,8 @@ import android.content.Context; import android.content.res.Configuration; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/CustomStateOptions.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/CustomStateOptions.java index 267ce900..df938a30 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/CustomStateOptions.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/CustomStateOptions.java @@ -2,7 +2,7 @@ import android.view.View; -import androidx.annotation.DrawableRes; +import android.support.annotation.DrawableRes; import java.io.Serializable; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/StateLayoutConfig.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/StateLayoutConfig.java index 52ac9581..04e146b2 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/StateLayoutConfig.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/StateLayoutConfig.java @@ -2,8 +2,8 @@ import android.view.animation.Animation; -import androidx.annotation.DrawableRes; -import androidx.annotation.StringRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/StatefulLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/StatefulLayout.java index f3a9b4af..85f1b65c 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/StatefulLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/statelayout/StatefulLayout.java @@ -13,8 +13,8 @@ import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.AnimRes; -import androidx.annotation.StringRes; +import android.support.annotation.AnimRes; +import android.support.annotation.StringRes; import com.xuexiang.xui.R; import com.xuexiang.xui.UIConfig; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/EasyIndicator.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/EasyIndicator.java index 51b9308d..8897917a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/EasyIndicator.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/EasyIndicator.java @@ -23,13 +23,11 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Color; - -import androidx.appcompat.widget.LinearLayoutCompat; -import androidx.interpolator.view.animation.FastOutSlowInInterpolator; -import androidx.viewpager.widget.ViewPager; -import androidx.viewpager.widget.PagerAdapter; - import android.graphics.Typeface; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; +import android.support.v4.view.animation.FastOutSlowInInterpolator; +import android.support.v7.widget.LinearLayoutCompat; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.TypedValue; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/MultiTabControlView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/MultiTabControlView.java index 2c801faa..14a0f8e3 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/MultiTabControlView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/MultiTabControlView.java @@ -32,7 +32,7 @@ import android.widget.CompoundButton; import android.widget.LinearLayout; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.xuexiang.xui.R; import com.xuexiang.xui.XUI; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/TabSegment.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/TabSegment.java index a543c5fd..a157181a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/TabSegment.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/TabSegment.java @@ -41,14 +41,14 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import androidx.annotation.ColorInt; -import androidx.annotation.IntDef; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatTextView; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.ColorInt; +import android.support.annotation.IntDef; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatTextView; +import android.support.v4.content.ContextCompat; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import com.xuexiang.xui.R; import com.xuexiang.xui.XUI; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/VerticalTabLayout.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/VerticalTabLayout.java index 0c333a95..ac11b700 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/VerticalTabLayout.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/VerticalTabLayout.java @@ -30,11 +30,11 @@ import android.widget.LinearLayout; import android.widget.ScrollView; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import com.xuexiang.xui.R; import com.xuexiang.xui.utils.DensityUtils; @@ -47,8 +47,8 @@ import java.util.ArrayList; import java.util.List; -import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_IDLE; -import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_SETTLING; +import static android.support.v4.view.ViewPager.SCROLL_STATE_IDLE; +import static android.support.v4.view.ViewPager.SCROLL_STATE_SETTLING; /** * 垂直方向上的TabLayout diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/XUIItemViewsAdapter.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/XUIItemViewsAdapter.java index 2a42150f..892f01e4 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/XUIItemViewsAdapter.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/XUIItemViewsAdapter.java @@ -16,13 +16,12 @@ package com.xuexiang.xui.widget.tabbar; +import android.support.v4.util.Pools; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.ListView; -import androidx.core.util.Pools; -import androidx.recyclerview.widget.RecyclerView; - import com.xuexiang.xui.R; import java.util.ArrayList; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/vertical/TabFragmentManager.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/vertical/TabFragmentManager.java index 309350db..16cb8e14 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/vertical/TabFragmentManager.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/vertical/TabFragmentManager.java @@ -16,9 +16,9 @@ package com.xuexiang.xui.widget.tabbar.vertical; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import com.xuexiang.xui.widget.tabbar.VerticalTabLayout; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/vertical/XTabView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/vertical/XTabView.java index 25bd5d08..2665e09a 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/vertical/XTabView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/tabbar/vertical/XTabView.java @@ -26,8 +26,8 @@ import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.Px; -import androidx.annotation.RequiresApi; +import android.support.annotation.Px; +import android.support.annotation.RequiresApi; import com.xuexiang.xui.XUI; import com.xuexiang.xui.utils.DensityUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/AutoMoveTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/AutoMoveTextView.java index bcc92a67..dcd71b27 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/AutoMoveTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/AutoMoveTextView.java @@ -1,11 +1,10 @@ package com.xuexiang.xui.widget.textview; import android.content.Context; +import android.support.v7.widget.AppCompatTextView; import android.text.TextUtils; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatTextView; - /** * 自定义跑马灯Textview类 * diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/BadgeView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/BadgeView.java index 8afe3ed7..dac56408 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/BadgeView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/BadgeView.java @@ -35,7 +35,7 @@ import android.widget.FrameLayout.LayoutParams; import android.widget.TabWidget; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; /** * 数字提示 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/ExpandableTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/ExpandableTextView.java index bd9eae14..cf3c7422 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/ExpandableTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/ExpandableTextView.java @@ -6,6 +6,9 @@ import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.os.Build; +import android.support.annotation.DrawableRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.util.SparseBooleanArray; @@ -19,10 +22,6 @@ import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import com.xuexiang.xui.R; import com.xuexiang.xui.utils.ResUtils; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/MarqueeTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/MarqueeTextView.java index fce6869c..6b570e3f 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/MarqueeTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/MarqueeTextView.java @@ -9,7 +9,7 @@ import android.text.TextUtils; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; import com.xuexiang.xui.R; import com.xuexiang.xui.widget.textview.marqueen.DisplayEntity; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/autofit/AutoFitTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/autofit/AutoFitTextView.java index 2bd02795..d92b0ef0 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/autofit/AutoFitTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/autofit/AutoFitTextView.java @@ -21,7 +21,7 @@ import android.util.AttributeSet; import android.util.TypedValue; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; /** * 能够自适应字体大小的TextView diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelButtonView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelButtonView.java index a57d99a6..a9a42990 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelButtonView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelButtonView.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatButton; +import android.support.v7.widget.AppCompatButton; /** * 标签按钮 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelImageView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelImageView.java index e69add2c..38f144be 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelImageView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelImageView.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; /** * 标签图片 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelTextView.java index ddf0f7cf..6794388e 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelTextView.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.util.AttributeSet; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; /** * 标签文字 diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelView.java index 1f1502da..a602c52f 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/label/LabelView.java @@ -32,7 +32,7 @@ import android.widget.FrameLayout.LayoutParams; import android.widget.RelativeLayout; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; import java.util.concurrent.atomic.AtomicInteger; @@ -115,6 +115,7 @@ public void setTargetView(View target, int distance, Gravity gravity) { ViewTreeObserver vto = getViewTreeObserver(); vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + @Override public void onGlobalLayout() { getViewTreeObserver().removeGlobalOnLayoutListener(this); calcOffset(getMeasuredWidth(), d, g, v.getMeasuredWidth(), false); diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/supertextview/SuperButton.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/supertextview/SuperButton.java index 23c88a70..1e9a4511 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/supertextview/SuperButton.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/supertextview/SuperButton.java @@ -8,7 +8,7 @@ import android.util.AttributeSet; import android.view.Gravity; -import androidx.appcompat.widget.AppCompatButton; +import android.support.v7.widget.AppCompatButton; import com.xuexiang.xui.R; import com.xuexiang.xui.widget.alpha.IAlphaViewHelper; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/supertextview/SuperTextView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/supertextview/SuperTextView.java index c32e1876..7e7f3e09 100755 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/supertextview/SuperTextView.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/textview/supertextview/SuperTextView.java @@ -8,8 +8,8 @@ import android.graphics.drawable.StateListDrawable; import android.os.Build; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatEditText; import android.text.TextUtils; import android.text.method.PasswordTransformationMethod; diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/toast/Utils.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/toast/Utils.java index 7a19c6da..3f8ed196 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/toast/Utils.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/toast/Utils.java @@ -7,12 +7,12 @@ import android.os.Build; import android.view.View; -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.content.ContextCompat; +import android.support.annotation.ColorInt; +import android.support.annotation.ColorRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.NonNull; +import android.support.v7.content.res.AppCompatResources; +import android.support.v4.content.ContextCompat; import com.xuexiang.xui.R; @@ -47,10 +47,11 @@ static Drawable tint9PatchDrawableFrame(@NonNull Context context, @ColorInt int } static void setBackground(@NonNull View view, Drawable drawable) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { view.setBackground(drawable); - else + } else { view.setBackgroundDrawable(drawable); + } } static Drawable getDrawable(@NonNull Context context, @DrawableRes int id) { diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/toast/XToast.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/toast/XToast.java index 3fdcd808..bf63a82d 100644 --- a/xui_lib/src/main/java/com/xuexiang/xui/widget/toast/XToast.java +++ b/xui_lib/src/main/java/com/xuexiang/xui/widget/toast/XToast.java @@ -11,13 +11,13 @@ import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.CheckResult; -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.StringRes; +import android.support.annotation.CheckResult; +import android.support.annotation.ColorInt; +import android.support.annotation.ColorRes; +import android.support.annotation.DrawableRes; +import android.support.annotation.IntRange; +import android.support.annotation.NonNull; +import android.support.annotation.StringRes; import com.xuexiang.xui.R; import com.xuexiang.xui.XUI; diff --git a/xui_lib/src/main/res/layout/gcv_layout_image.xml b/xui_lib/src/main/res/layout/gcv_layout_image.xml index ed9e5802..235ec93b 100755 --- a/xui_lib/src/main/res/layout/gcv_layout_image.xml +++ b/xui_lib/src/main/res/layout/gcv_layout_image.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - diff --git a/xui_lib/src/main/res/layout/xui_bottom_sheet_grid_item.xml b/xui_lib/src/main/res/layout/xui_bottom_sheet_grid_item.xml index 7902f199..3b8c704f 100644 --- a/xui_lib/src/main/res/layout/xui_bottom_sheet_grid_item.xml +++ b/xui_lib/src/main/res/layout/xui_bottom_sheet_grid_item.xml @@ -11,7 +11,7 @@ android:layout_height="?attr/xui_bottom_sheet_grid_item_icon_size" android:layout_marginTop="?attr/xui_bottom_sheet_grid_item_icon_marginTop" android:layout_marginBottom="?attr/xui_bottom_sheet_grid_item_icon_marginBottom" > - - - - - - - - \ No newline at end of file diff --git a/xui_lib/src/main/res/layout/xui_layout_cookie.xml b/xui_lib/src/main/res/layout/xui_layout_cookie.xml index 2c70f09a..f9c29b9f 100644 --- a/xui_lib/src/main/res/layout/xui_layout_cookie.xml +++ b/xui_lib/src/main/res/layout/xui_layout_cookie.xml @@ -28,7 +28,7 @@ android:paddingRight="?attr/xui_config_content_spacing_horizontal" android:paddingBottom="?attr/xui_config_content_spacing_horizontal"> - - - - - - - -