From 6c2c5a70db9bad84de542246373553aea2386f1e Mon Sep 17 00:00:00 2001 From: Tamsiree Date: Sat, 23 Nov 2019 12:18:19 +0800 Subject: [PATCH] =?UTF-8?q?RxTool=20=E5=85=A8=E9=9D=A2=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=88=B0=20android=20X.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RxArcGisKit/build.gradle | 13 ++++--- RxCamera/build.gradle | 13 ++++--- .../api14/com/vondear/camera/Camera1.java | 3 +- .../api21/com/vondear/camera/Camera2.java | 3 +- .../vondear/camera/SurfaceViewPreview.java | 2 +- .../base/com/vondear/camera/AspectRatio.java | 6 ++-- .../main/base/com/vondear/camera/Size.java | 3 +- .../main/base/com/vondear/camera/SizeMap.java | 3 +- .../java/com/vondear/camera/RxCameraView.java | 13 +++---- .../com/vondear/camera/tool/RxCameraTool.java | 11 +++--- RxDemo/build.gradle | 34 ++++++++++++++----- .../vondear/rxdemo/ApplicationRxTools.java | 3 +- .../rxdemo/activity/ActivityCardStack.java | 3 +- .../rxdemo/activity/ActivityContact.java | 11 +++--- .../vondear/rxdemo/activity/ActivityELMe.java | 5 +-- .../rxdemo/activity/ActivityLoading.java | 9 ++--- .../activity/ActivityLoadingDetail.java | 7 ++-- .../rxdemo/activity/ActivityLocation.java | 5 +-- .../rxdemo/activity/ActivityLoginAct.java | 2 +- .../vondear/rxdemo/activity/ActivityMain.java | 9 ++--- .../rxdemo/activity/ActivityPopupView.java | 4 +-- .../rxdemo/activity/ActivityRxCaptcha.java | 5 +-- .../rxdemo/activity/ActivityRxExifTool.java | 3 +- .../rxdemo/activity/ActivityRxPhoto.java | 3 +- .../rxdemo/activity/ActivityRxWaveView.java | 3 +- .../rxdemo/adapter/AdapterLeftMenu.java | 3 +- .../rxdemo/adapter/AdapterPopupDish.java | 3 +- .../adapter/AdapterRecyclerViewMain.java | 6 ++-- .../rxdemo/adapter/AdapterRightDish.java | 3 +- .../rxdemo/adapter/AdapterStackTest.java | 2 +- .../rxdemo/fragment/FragmentLoadingDemo.java | 7 ++-- .../rxdemo/fragment/FragmentLoadingWay.java | 11 +++--- .../vondear/rxdemo/view/RxDialogShopCart.java | 5 +-- .../rxdemo/view/RxFakeAddImageView.java | 4 ++- .../src/main/res/layout/activity_ali_pay.xml | 21 ++++++------ .../src/main/res/layout/activity_contact.xml | 2 +- .../main/res/layout/activity_device_info.xml | 4 +-- RxDemo/src/main/res/layout/activity_elme.xml | 8 ++--- .../src/main/res/layout/activity_loading.xml | 4 +-- .../res/layout/activity_loading_detail.xml | 2 +- .../src/main/res/layout/activity_location.xml | 4 +-- .../main/res/layout/activity_login_act.xml | 4 +-- RxDemo/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/activity_popup_view.xml | 6 ++-- .../main/res/layout/activity_progress_bar.xml | 4 +-- .../main/res/layout/activity_rx_captcha.xml | 4 +-- .../res/layout/activity_rx_data_utils.xml | 32 ++++++++--------- .../main/res/layout/activity_rx_exif_tool.xml | 8 ++--- .../src/main/res/layout/activity_vibrate.xml | 31 ++++++++--------- .../res/layout/activity_wheel_horizontal.xml | 4 +-- .../main/res/layout/activity_xml_parse.xml | 21 ++++++------ .../main/res/layout/activity_zip_encrypt.xml | 4 +-- RxDemo/src/main/res/layout/cart_popupview.xml | 4 +-- RxDemo/src/main/res/layout/fragment_page1.xml | 2 +- RxDemo/src/main/res/layout/fragment_page2.xml | 4 +-- RxDemo/src/main/res/layout/item_list.xml | 4 +-- .../res/layout/item_recyclerview_main.xml | 4 +-- RxFeature/build.gradle | 16 ++++++--- .../rxfeature/activity/ActivityCodeTool.java | 2 +- .../activity/ActivityScanerCode.java | 4 +-- .../com/vondear/rxfeature/tool/RxBarCode.java | 3 +- .../com/vondear/rxfeature/tool/RxQRCode.java | 3 +- .../main/res/layout/activity_code_tool.xml | 4 +-- RxKit/build.gradle | 19 +++++++---- RxKit/src/main/AndroidManifest.xml | 2 +- .../java/com/vondear/rxtool/RxCrashTool.java | 3 +- .../java/com/vondear/rxtool/RxDataTool.java | 3 +- .../java/com/vondear/rxtool/RxDeviceTool.java | 4 +-- .../java/com/vondear/rxtool/RxFileTool.java | 2 +- .../com/vondear/rxtool/RxLocationTool.java | 4 +-- .../com/vondear/rxtool/RxMigrationHelper.java | 3 +- .../com/vondear/rxtool/RxPermissionsTool.java | 5 +-- .../java/com/vondear/rxtool/RxPhotoTool.java | 7 ++-- .../rxtool/RxRecyclerViewDividerTool.java | 3 +- .../java/com/vondear/rxtool/RxTextTool.java | 9 ++--- .../rxtool/module/photomagic/RxMagic.java | 7 ++-- .../rxtool/service/RxServiceLocation.java | 4 ++- .../java/com/vondear/rxtool/view/RxToast.java | 9 ++--- RxUI/build.gradle | 20 +++++++---- .../vondear/rxui/activity/ActivityBase.java | 3 +- .../rxui/activity/ActivityBaseLocation.java | 2 +- .../vondear/rxui/fragment/FragmentLazy.java | 5 +-- .../vondear/rxui/fragment/RxFragmentTool.java | 22 ++++++------ .../rxui/view/RxAutoCompleteTextView.java | 4 ++- .../com/vondear/rxui/view/RxCobwebView.java | 3 +- .../vondear/rxui/view/RxRulerWheelView.java | 4 +-- .../com/vondear/rxui/view/RxRunTextView.java | 4 ++- .../java/com/vondear/rxui/view/RxSeekBar.java | 2 +- .../com/vondear/rxui/view/RxShoppingView.java | 2 +- .../com/vondear/rxui/view/RxTextAutoZoom.java | 4 ++- .../colorpicker/ColorPickerPreference.java | 3 +- .../builder/ColorPickerDialogBuilder.java | 3 +- .../colorpicker/slider/AbsCustomSlider.java | 3 +- .../rxui/view/dialog/RxDialogChooseImage.java | 3 +- .../rxui/view/dialog/RxDialogTool.java | 2 +- .../vondear/rxui/view/heart/RxHeartView.java | 4 ++- .../likeview/tools/RxPorterImageView.java | 4 ++- .../tools/ei/RxEasingInterpolator.java | 3 +- .../likeview/tools/ei/RxEasingProvider.java | 3 +- .../view/popupwindows/tools/RxPopupView.java | 3 +- .../tools/RxPopupViewManager.java | 3 +- .../recyclerview/RxLinearLayoutManager.java | 5 +-- .../view/scaleimage/RxScaleImageView.java | 5 +-- .../decoder/CompatDecoderFactory.java | 3 +- .../view/swipecaptcha/RxSwipeCaptcha.java | 6 ++-- .../wavesidebar/PinnedHeaderDecoration.java | 3 +- .../adapter/AbsWaveSideAdapter.java | 7 ++-- .../wavesidebar/adapter/BaseViewHolder.java | 3 +- .../adapter/OnItemClickListener.java | 3 +- .../adapter/OnItemLongClickListener.java | 3 +- .../src/main/res/layout/card_item_picture.xml | 4 +-- build.gradle | 1 + gradle.properties | 3 ++ 113 files changed, 396 insertions(+), 278 deletions(-) diff --git a/RxArcGisKit/build.gradle b/RxArcGisKit/build.gradle index e9531568..c9a97758 100644 --- a/RxArcGisKit/build.gradle +++ b/RxArcGisKit/build.gradle @@ -9,10 +9,15 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + buildTypes { release { minifyEnabled false @@ -23,10 +28,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - compileOnly 'com.android.support:appcompat-v7:28.0.0' + compileOnly 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' compileOnly 'com.esri.arcgisruntime:arcgis-android:100.3.0' compileOnly project(':RxKit') } diff --git a/RxCamera/build.gradle b/RxCamera/build.gradle index 62156397..d9c5e9bf 100644 --- a/RxCamera/build.gradle +++ b/RxCamera/build.gradle @@ -9,10 +9,15 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + buildTypes { release { minifyEnabled false @@ -31,10 +36,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) compileOnly project(':RxKit') - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' compileOnly 'io.reactivex.rxjava2:rxjava:2.1.14' compileOnly 'io.reactivex.rxjava2:rxandroid:2.0.2' } diff --git a/RxCamera/src/main/api14/com/vondear/camera/Camera1.java b/RxCamera/src/main/api14/com/vondear/camera/Camera1.java index 11b00fbb..00566a4b 100644 --- a/RxCamera/src/main/api14/com/vondear/camera/Camera1.java +++ b/RxCamera/src/main/api14/com/vondear/camera/Camera1.java @@ -4,9 +4,10 @@ import android.graphics.SurfaceTexture; import android.hardware.Camera; import android.os.Build; -import android.support.v4.util.SparseArrayCompat; import android.view.SurfaceHolder; +import androidx.collection.SparseArrayCompat; + import java.io.IOException; import java.util.List; import java.util.Set; diff --git a/RxCamera/src/main/api21/com/vondear/camera/Camera2.java b/RxCamera/src/main/api21/com/vondear/camera/Camera2.java index 156b7f99..0f5a3f8e 100644 --- a/RxCamera/src/main/api21/com/vondear/camera/Camera2.java +++ b/RxCamera/src/main/api21/com/vondear/camera/Camera2.java @@ -14,11 +14,12 @@ import android.hardware.camera2.params.StreamConfigurationMap; import android.media.Image; import android.media.ImageReader; -import android.support.annotation.NonNull; import android.util.Log; import android.util.SparseIntArray; import android.view.Surface; +import androidx.annotation.NonNull; + import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Set; diff --git a/RxCamera/src/main/api9/com/vondear/camera/SurfaceViewPreview.java b/RxCamera/src/main/api9/com/vondear/camera/SurfaceViewPreview.java index 3580c2e7..f56f6e57 100644 --- a/RxCamera/src/main/api9/com/vondear/camera/SurfaceViewPreview.java +++ b/RxCamera/src/main/api9/com/vondear/camera/SurfaceViewPreview.java @@ -1,7 +1,7 @@ package com.vondear.camera; import android.content.Context; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; diff --git a/RxCamera/src/main/base/com/vondear/camera/AspectRatio.java b/RxCamera/src/main/base/com/vondear/camera/AspectRatio.java index 46201e66..87bfdc0c 100644 --- a/RxCamera/src/main/base/com/vondear/camera/AspectRatio.java +++ b/RxCamera/src/main/base/com/vondear/camera/AspectRatio.java @@ -2,8 +2,10 @@ import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.v4.util.SparseArrayCompat; + +import androidx.annotation.NonNull; +import androidx.collection.SparseArrayCompat; + /** * Immutable class for describing proportional relationship between width and height. diff --git a/RxCamera/src/main/base/com/vondear/camera/Size.java b/RxCamera/src/main/base/com/vondear/camera/Size.java index f01fb374..6eaba4c8 100644 --- a/RxCamera/src/main/base/com/vondear/camera/Size.java +++ b/RxCamera/src/main/base/com/vondear/camera/Size.java @@ -1,6 +1,7 @@ package com.vondear.camera; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; /** * Immutable class for describing width and height dimensions in pixels. diff --git a/RxCamera/src/main/base/com/vondear/camera/SizeMap.java b/RxCamera/src/main/base/com/vondear/camera/SizeMap.java index 93f87204..2d211d86 100644 --- a/RxCamera/src/main/base/com/vondear/camera/SizeMap.java +++ b/RxCamera/src/main/base/com/vondear/camera/SizeMap.java @@ -1,6 +1,7 @@ package com.vondear.camera; -import android.support.v4.util.ArrayMap; + +import androidx.collection.ArrayMap; import java.util.Set; import java.util.SortedSet; diff --git a/RxCamera/src/main/java/com/vondear/camera/RxCameraView.java b/RxCamera/src/main/java/com/vondear/camera/RxCameraView.java index 9f14eb5f..2e260e60 100644 --- a/RxCamera/src/main/java/com/vondear/camera/RxCameraView.java +++ b/RxCamera/src/main/java/com/vondear/camera/RxCameraView.java @@ -9,17 +9,18 @@ import android.os.Build; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.os.ParcelableCompat; -import android.support.v4.os.ParcelableCompatCreatorCallbacks; -import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; import android.widget.FrameLayout; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.os.ParcelableCompat; +import androidx.core.os.ParcelableCompatCreatorCallbacks; +import androidx.core.view.ViewCompat; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; diff --git a/RxCamera/src/main/java/com/vondear/camera/tool/RxCameraTool.java b/RxCamera/src/main/java/com/vondear/camera/tool/RxCameraTool.java index 56ac4ec0..4adfd81c 100644 --- a/RxCamera/src/main/java/com/vondear/camera/tool/RxCameraTool.java +++ b/RxCamera/src/main/java/com/vondear/camera/tool/RxCameraTool.java @@ -3,7 +3,6 @@ import android.content.Context; import android.hardware.Camera; import android.os.SystemClock; -import android.support.annotation.NonNull; import android.util.Log; import com.vondear.camera.RxCameraView; @@ -26,6 +25,7 @@ import io.reactivex.ObservableOnSubscribe; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; @@ -40,8 +40,6 @@ public class RxCameraTool { /** * 打开闪光灯 - * - * @return */ public static void openFlashLight() { try { @@ -60,7 +58,6 @@ public static void openFlashLight() { /** * 关闭闪光灯 * - * @return */ public static void closeFlashLight() { try { @@ -83,7 +80,11 @@ public static void takePic(Context mContext, final RxCameraView mCameraView) { if (mCameraView.isCameraOpened()) { RxVibrateTool.vibrateOnce(mContext, 150); RxToast.normal("正在拍照.."); - mCameraView.takePicture(); + try { + mCameraView.takePicture(); + } catch (Exception var2) { + RxToast.normal("你碰到问题咯"); + } } else { mCameraView.start(); RxVibrateTool.vibrateOnce(mContext, 150); diff --git a/RxDemo/build.gradle b/RxDemo/build.gradle index 5c5b3c23..b5ef5f9d 100644 --- a/RxDemo/build.gradle +++ b/RxDemo/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply plugin: 'com.jakewharton.butterknife' android { @@ -11,6 +12,12 @@ android { versionName "1.0.0" multiDexEnabled true } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + buildTypes { release { minifyEnabled false @@ -34,16 +41,16 @@ dependencies { //流式布局 //动画向下版本兼容 nineold包 //noinspection GradleCompatible - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:cardview-v7:28.0.0' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support:support-annotations:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.google.android:flexbox:0.3.2' - implementation 'com.google.code.gson:gson:2.8.2' + implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.nineoldandroids:library:2.4.0' - implementation 'com.jakewharton:butterknife:8.8.1' + implementation 'com.github.bumptech.glide:glide:4.7.1' annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1' implementation 'jp.wasabeef:glide-transformations:3.3.0' @@ -54,7 +61,16 @@ dependencies { implementation 'com.afollestad.material-dialogs:core:0.9.3.0' // implementation 'com.github.google:cameraview:3eaeac09a7' implementation 'com.orhanobut:logger:2.2.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + + implementation 'com.jakewharton:butterknife:10.2.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' + + implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' +// Because RxAndroid releases are few and far between, it is recommended you also +// explicitly depend on RxJava's latest version for bug fixes and new features. +// (see https://github.com/ReactiveX/RxJava/releases for latest 2.x.x version) + implementation 'io.reactivex.rxjava2:rxjava:2.2.14' + configurations.all { exclude group: 'com.android.support', module: 'support-v13' } diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/ApplicationRxTools.java b/RxDemo/src/main/java/com/vondear/rxdemo/ApplicationRxTools.java index af33d47c..d5a41049 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/ApplicationRxTools.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/ApplicationRxTools.java @@ -2,7 +2,8 @@ import android.app.Application; import android.content.Context; -import android.support.multidex.MultiDex; + +import androidx.multidex.MultiDex; import com.vondear.rxtool.RxTool; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityCardStack.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityCardStack.java index 92015957..d9f419c9 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityCardStack.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityCardStack.java @@ -1,12 +1,13 @@ package com.vondear.rxdemo.activity; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.LinearLayout; +import androidx.appcompat.app.AppCompatActivity; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.adapter.AdapterStackTest; import com.vondear.rxtool.RxTool; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityContact.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityContact.java index 12261782..86a8d298 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityContact.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityContact.java @@ -1,19 +1,20 @@ package com.vondear.rxdemo.activity; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.vondear.rxdemo.R; -import com.vondear.rxui.view.wavesidebar.adapter.AdapterContactCity; -import com.vondear.rxui.model.ModelContactCity; -import com.vondear.rxui.view.wavesidebar.ComparatorLetter; import com.vondear.rxui.activity.ActivityBase; +import com.vondear.rxui.model.ModelContactCity; import com.vondear.rxui.view.RxTitle; +import com.vondear.rxui.view.wavesidebar.ComparatorLetter; import com.vondear.rxui.view.wavesidebar.PinnedHeaderDecoration; import com.vondear.rxui.view.wavesidebar.WaveSideBarView; +import com.vondear.rxui.view.wavesidebar.adapter.AdapterContactCity; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityELMe.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityELMe.java index d24aa8c2..d7245003 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityELMe.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityELMe.java @@ -5,8 +5,6 @@ import android.animation.ObjectAnimator; import android.graphics.PointF; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.Gravity; import android.view.View; @@ -19,6 +17,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.adapter.AdapterLeftMenu; import com.vondear.rxdemo.adapter.AdapterRightDish; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoading.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoading.java index 3bb2f200..eeea290e 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoading.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoading.java @@ -1,11 +1,12 @@ package com.vondear.rxdemo.activity; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; import com.vondear.rxdemo.R; import com.vondear.rxdemo.fragment.FragmentLoadingDemo; import com.vondear.rxdemo.fragment.FragmentLoadingWay; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoadingDetail.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoadingDetail.java index 99f1bf17..5092d8b4 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoadingDetail.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoadingDetail.java @@ -4,14 +4,15 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.tools.EvaluatorARGB; import com.vondear.rxui.view.progressing.SpinKitView; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLocation.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLocation.java index 82cc36c1..d1ff90dd 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLocation.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLocation.java @@ -8,12 +8,13 @@ import android.location.LocationListener; import android.location.LocationManager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; + import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.vondear.rxdemo.R; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoginAct.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoginAct.java index 14c2d89b..edc6e821 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoginAct.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoginAct.java @@ -3,7 +3,7 @@ import android.animation.ObjectAnimator; import android.app.Activity; import android.os.Bundle; -import android.support.v4.widget.NestedScrollView; +import androidx.core.widget.NestedScrollView; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityMain.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityMain.java index 400d65cd..1b6a8ea1 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityMain.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityMain.java @@ -2,12 +2,13 @@ import android.Manifest; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.adapter.AdapterRecyclerViewMain; import com.vondear.rxdemo.model.ModelMainItem; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityPopupView.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityPopupView.java index 9da40640..a37c14b2 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityPopupView.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityPopupView.java @@ -1,8 +1,6 @@ package com.vondear.rxdemo.activity; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -14,6 +12,8 @@ import android.widget.RelativeLayout; import android.widget.TextView; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; import com.vondear.rxdemo.R; import com.vondear.rxtool.model.ActionItem; import com.vondear.rxtool.view.RxToast; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxCaptcha.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxCaptcha.java index fcf41c2d..fd6ad4a5 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxCaptcha.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxCaptcha.java @@ -2,8 +2,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.Log; import android.view.View; import android.widget.Button; @@ -13,6 +11,9 @@ import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxExifTool.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxExifTool.java index c445030f..dfa71449 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxExifTool.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxExifTool.java @@ -3,12 +3,13 @@ import android.Manifest; import android.location.Location; import android.os.Bundle; -import android.support.annotation.NonNull; import android.view.View; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; + import com.vondear.camera.RxCameraView; import com.vondear.camera.tool.RxCameraTool; import com.vondear.rxdemo.R; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxPhoto.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxPhoto.java index 984d9c76..5d4ee636 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxPhoto.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxPhoto.java @@ -5,7 +5,6 @@ import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; import android.view.View; import android.widget.Button; import android.widget.ImageView; @@ -13,6 +12,8 @@ import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.core.app.ActivityCompat; + import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.resource.bitmap.CircleCrop; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxWaveView.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxWaveView.java index 583417bb..a3f558da 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxWaveView.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxWaveView.java @@ -2,13 +2,14 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.SeekBar; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import com.vondear.rxdemo.R; import com.vondear.rxtool.RxImageTool; import com.vondear.rxui.view.colorpicker.ColorPickerView; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterLeftMenu.java b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterLeftMenu.java index 6e6912c7..1175b8a8 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterLeftMenu.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterLeftMenu.java @@ -1,13 +1,14 @@ package com.vondear.rxdemo.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.model.ModelDishMenu; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterPopupDish.java b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterPopupDish.java index 3ab05110..67d09328 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterPopupDish.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterPopupDish.java @@ -1,7 +1,6 @@ package com.vondear.rxdemo.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -10,6 +9,8 @@ import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.interfaces.ShopCartInterface; import com.vondear.rxdemo.model.ModelDish; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterRecyclerViewMain.java b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterRecyclerViewMain.java index 0e8dcb80..1afdefbc 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterRecyclerViewMain.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterRecyclerViewMain.java @@ -1,13 +1,14 @@ package com.vondear.rxdemo.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.bumptech.glide.Glide; import com.vondear.rxdemo.R; import com.vondear.rxdemo.model.ModelMainItem; @@ -23,8 +24,9 @@ * @date 2016/11/13 */ -public class AdapterRecyclerViewMain extends RecyclerView.Adapter { + +public class AdapterRecyclerViewMain extends RecyclerView.Adapter { private int mScreenWidth, mItemWidth, mItemHeight; private Context context; private List mValues; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterRightDish.java b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterRightDish.java index 860fe391..65951391 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterRightDish.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterRightDish.java @@ -1,7 +1,6 @@ package com.vondear.rxdemo.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -9,6 +8,8 @@ import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.interfaces.ShopCartInterface; import com.vondear.rxdemo.model.ModelDish; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterStackTest.java b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterStackTest.java index a323337d..616da42a 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterStackTest.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/adapter/AdapterStackTest.java @@ -2,7 +2,7 @@ import android.content.Context; import android.graphics.PorterDuff; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/fragment/FragmentLoadingDemo.java b/RxDemo/src/main/java/com/vondear/rxdemo/fragment/FragmentLoadingDemo.java index 98facdd3..43bd9394 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/fragment/FragmentLoadingDemo.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/fragment/FragmentLoadingDemo.java @@ -2,8 +2,6 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,6 +10,9 @@ import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.vondear.rxdemo.R; import com.vondear.rxui.view.progressing.style.Circle; import com.vondear.rxui.view.progressing.style.CubeGrid; @@ -22,7 +23,7 @@ * Created by Vondear. * @author vondear */ -public class FragmentLoadingDemo extends Fragment{ +public class FragmentLoadingDemo extends Fragment { int[] colors = new int[]{ android.graphics.Color.parseColor("#89CFF0"), diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/fragment/FragmentLoadingWay.java b/RxDemo/src/main/java/com/vondear/rxdemo/fragment/FragmentLoadingWay.java index 1978f7d6..e4ee5c0e 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/fragment/FragmentLoadingWay.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/fragment/FragmentLoadingWay.java @@ -2,14 +2,15 @@ import android.annotation.SuppressLint; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.activity.ActivityLoadingDetail; import com.vondear.rxtool.RxImageTool; @@ -24,7 +25,7 @@ * Created by Vondear. * @author vondear */ -public class FragmentLoadingWay extends Fragment { +public class FragmentLoadingWay extends Fragment { int[] colors = new int[]{ android.graphics.Color.parseColor("#99CCFF"), diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/view/RxDialogShopCart.java b/RxDemo/src/main/java/com/vondear/rxdemo/view/RxDialogShopCart.java index 2038b08f..9034eb8e 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/view/RxDialogShopCart.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/view/RxDialogShopCart.java @@ -6,13 +6,14 @@ import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.vondear.rxdemo.R; import com.vondear.rxdemo.adapter.AdapterPopupDish; import com.vondear.rxdemo.interfaces.ShopCartInterface; diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/view/RxFakeAddImageView.java b/RxDemo/src/main/java/com/vondear/rxdemo/view/RxFakeAddImageView.java index 3712f053..f61331fb 100644 --- a/RxDemo/src/main/java/com/vondear/rxdemo/view/RxFakeAddImageView.java +++ b/RxDemo/src/main/java/com/vondear/rxdemo/view/RxFakeAddImageView.java @@ -4,10 +4,12 @@ import android.graphics.PointF; import android.util.AttributeSet; +import androidx.appcompat.widget.AppCompatImageView; + /** * @author vondear */ -public class RxFakeAddImageView extends android.support.v7.widget.AppCompatImageView { +public class RxFakeAddImageView extends AppCompatImageView { private PointF mPointF; public RxFakeAddImageView(Context context) { diff --git a/RxDemo/src/main/res/layout/activity_ali_pay.xml b/RxDemo/src/main/res/layout/activity_ali_pay.xml index 1616e321..d6c6d0de 100644 --- a/RxDemo/src/main/res/layout/activity_ali_pay.xml +++ b/RxDemo/src/main/res/layout/activity_ali_pay.xml @@ -1,6 +1,5 @@ - + tools:ignore="ContentDescription" /> @@ -42,7 +41,7 @@ android:layout_margin="10dp" android:onClick="payV2" android:text="支付宝支付Demo" - tools:ignore="HardcodedText"/> + tools:ignore="HardcodedText" />