diff --git a/Android-components/.idea/caches/build_file_checksums.ser b/Android-components/.idea/caches/build_file_checksums.ser index c159e6c..f5e7c03 100644 Binary files a/Android-components/.idea/caches/build_file_checksums.ser and b/Android-components/.idea/caches/build_file_checksums.ser differ diff --git a/Android-components/.idea/gradle.xml b/Android-components/.idea/gradle.xml index 2996d53..222f04d 100644 --- a/Android-components/.idea/gradle.xml +++ b/Android-components/.idea/gradle.xml @@ -3,11 +3,15 @@ diff --git a/Android-components/.idea/misc.xml b/Android-components/.idea/misc.xml index dfd2c79..7bfef59 100644 --- a/Android-components/.idea/misc.xml +++ b/Android-components/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/Android-components/android-app-components/build.gradle b/Android-components/android-app-components/build.gradle index 99b37ff..f7df29b 100644 --- a/Android-components/android-app-components/build.gradle +++ b/Android-components/android-app-components/build.gradle @@ -1,16 +1,17 @@ apply plugin: 'com.android.library' //apply plugin: 'com.novoda.bintray-release' apply plugin: 'com.github.dcendents.android-maven' +apply from: '../androidx_compat.gradle' group='com.github.LightSun' android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 110 versionName "1.1.0" @@ -27,18 +28,11 @@ android { dependencies { //compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation "com.android.support:recyclerview-v7:26.1.0" - implementation 'com.heaven7.java.base:Java-base:1.1.0' - - //compile 'com.heaven7.java.base:Java-base:1.0.9' - //compile 'com.heaven7.core.util:util-v1:1.1.2' - //compile 'com.heaven7.android.util2:android-util2:1.0.5' - - testImplementation 'junit:junit:4.12' + + // implementation 'com.android.support:appcompat-v7:26.1.0' + // implementation "com.android.support:recyclerview-v7:26.1.0" + implementation 'com.heaven7.java.base:Java-base:1.2.0' + } /*ext { diff --git a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AbstractLifeCycleComponentOwner.java b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AbstractLifeCycleComponentOwner.java index d1b9a99..1401447 100644 --- a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AbstractLifeCycleComponentOwner.java +++ b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AbstractLifeCycleComponentOwner.java @@ -1,10 +1,10 @@ package com.heaven7.android.component; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleObserver; -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.OnLifecycleEvent; -import android.support.annotation.CallSuper; +import androidx.annotation.CallSuper; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.OnLifecycleEvent; import com.heaven7.java.base.util.SmartReference; diff --git a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AppComponentOwner.java b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AppComponentOwner.java index e292cd0..31eb233 100644 --- a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AppComponentOwner.java +++ b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AppComponentOwner.java @@ -1,10 +1,11 @@ package com.heaven7.android.component; -import android.arch.lifecycle.LifecycleOwner; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LifecycleOwner; import com.heaven7.android.component.guide.AppGuideComponent; import com.heaven7.android.component.image.AppImageComponent; diff --git a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AppComponentOwner2.java b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AppComponentOwner2.java index e8c7107..be44365 100644 --- a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AppComponentOwner2.java +++ b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/AppComponentOwner2.java @@ -1,11 +1,11 @@ package com.heaven7.android.component; -import android.arch.lifecycle.LifecycleObserver; -import android.arch.lifecycle.LifecycleOwner; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.LifecycleOwner; import com.heaven7.android.component.guide.AppGuideComponent; import com.heaven7.android.component.image.AppImageComponent; diff --git a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/SmartReference0.java b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/SmartReference0.java index 4259e57..85ebb02 100644 --- a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/SmartReference0.java +++ b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/SmartReference0.java @@ -4,10 +4,11 @@ import android.app.Dialog; import android.content.Context; import android.os.Build; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.View; +import androidx.fragment.app.Fragment; + import com.heaven7.java.base.util.SmartReference; /** @@ -31,7 +32,7 @@ protected boolean shouldWeakReference(T t) { return t instanceof AppComponentContext || t instanceof Context || t instanceof Fragment - || t instanceof android.support.v4.app.Fragment + || t instanceof android.app.Fragment || t instanceof View || t instanceof Dialog; } @@ -51,15 +52,15 @@ protected boolean shouldDestroyReference(T t) { return true; } } - if (t instanceof android.support.v4.app.Fragment) { - final android.support.v4.app.Fragment frag = (android.support.v4.app.Fragment) t; + if (t instanceof Fragment) { + final Fragment frag = (Fragment) t; if (frag.isDetached() || frag.isRemoving()) { Log.w(TAG, "shouldDestroyReference>>> fragment is detached or removing. fragment = " + name); return true; } } - if (t instanceof Fragment) { + if (t instanceof android.app.Fragment) { final Fragment frag = (Fragment) t; if (frag.isDetached() || frag.isRemoving()) { Log.w(TAG, "shouldDestroyReference>>> fragment is detached or removing. fragment = " diff --git a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/image/AppImageComponent.java b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/image/AppImageComponent.java index 9e795ac..72cb977 100644 --- a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/image/AppImageComponent.java +++ b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/image/AppImageComponent.java @@ -2,7 +2,6 @@ import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.IdRes; import com.heaven7.android.component.AppComponentContext; diff --git a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/lifecycle/LifeCycleComponent2.java b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/lifecycle/LifeCycleComponent2.java index e16be27..2e7f5c7 100644 --- a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/lifecycle/LifeCycleComponent2.java +++ b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/lifecycle/LifeCycleComponent2.java @@ -1,6 +1,6 @@ package com.heaven7.android.component.lifecycle; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; /** * the lifecycle context diff --git a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/loading/AppLoadingComponent.java b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/loading/AppLoadingComponent.java index 3ba2a9e..c593d83 100644 --- a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/loading/AppLoadingComponent.java +++ b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/loading/AppLoadingComponent.java @@ -1,9 +1,10 @@ package com.heaven7.android.component.loading; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + import com.heaven7.android.component.AppComponentContext; /** diff --git a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/toast/IWindow.java b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/toast/IWindow.java index ffbe48e..e49d7b0 100644 --- a/Android-components/android-app-components/src/main/java/com/heaven7/android/component/toast/IWindow.java +++ b/Android-components/android-app-components/src/main/java/com/heaven7/android/component/toast/IWindow.java @@ -1,15 +1,15 @@ package com.heaven7.android.component.toast; import android.content.Context; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; + /** * the mini window delegate. * @author heaven7 diff --git a/Android-components/androidx_compat.gradle b/Android-components/androidx_compat.gradle new file mode 100644 index 0000000..6298e72 --- /dev/null +++ b/Android-components/androidx_compat.gradle @@ -0,0 +1,16 @@ + +def useAndroidX = true + +dependencies { + def androidX_ver = "1.0.0" + def androidSupport_ver = '28.0.0' + if(useAndroidX){ + implementation "androidx.appcompat:appcompat:$androidX_ver" + implementation "androidx.recyclerview:recyclerview:$androidX_ver" + //implementation "androidx.exifinterface:exifinterface:$androidX_ver" + }else { + implementation "com.android.support:recyclerview-v7:$androidSupport_ver" + implementation "com.android.support:appcompat-v7:$androidSupport_ver" + //implementation "com.android.support:exifinterface:$androidSupport_ver" + } +} \ No newline at end of file diff --git a/Android-components/app/build.gradle b/Android-components/app/build.gradle index cec5624..3e703b5 100644 --- a/Android-components/app/build.gradle +++ b/Android-components/app/build.gradle @@ -1,14 +1,15 @@ apply plugin: 'com.android.application' //apply plugin: 'com.neenbedankt.android-apt' +apply from: '../androidx_compat.gradle' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.heaven7.android.components.demo" - minSdkVersion 14 - targetSdkVersion 26 + minSdkVersion 19 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -37,47 +38,25 @@ android { } } -//fix compat of com.android.support. -configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - def requested = details.requested - if (requested.group == 'com.heaven7.android.component') { - if (!requested.name.startsWith("multidex")) { - details.useVersion '26.1.0' - } - } - /*if (requested.group == 'com.android.support') { - if (!requested.name.startsWith("multidex")) { - details.useVersion '26.1.0' - } - }*/ - } -} - dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) // compile 'com.android.support:multidex:1.0.2' - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation "com.android.support:recyclerview-v7:26.1.0" - //compile "com.android.support:design:${SUPPORT_VERSION}" - // compile "com.android.support:cardview-v7:${SUPPORT_VERSION}" - testImplementation 'junit:junit:4.12' + implementation 'com.github.LightSun:SuperAdapter:2.0.9-x' + implementation 'com.heaven7.java.base:Java-base:1.2.0' - implementation 'com.heaven7.core.adapter:adapter:1.8.8' - implementation 'com.heaven7.java.base:Java-base:1.1.0' - implementation 'com.heaven7.core.util:util-v1:1.1.2' - implementation('com.heaven7.android.util2:android-util2:1.2.0', { + implementation('com.github.LightSun:util-v1:1.1.7-beta-x') { + exclude group: 'com.android.support' + exclude group: 'com.heaven7.android.component' + } + /* implementation('com.heaven7.android.util2:android-util2:1.2.0', { exclude group: 'com.heaven7.android.component', module: 'android-app-components' - }) - implementation 'com.heaven7.android.pullrefresh2:android-pullrefreshview2:1.0' + })*/ + implementation 'com.github.LightSun:android-PullRefreshView:1.1.1-x' implementation 'com.jakewharton:butterknife:8.4.0' annotationProcessor "com.jakewharton:butterknife-compiler:8.4.0" - implementation 'com.github.bumptech.glide:glide:3.7.0' + implementation 'com.github.bumptech.glide:glide:4.10.0' //compile 'com.squareup.picasso:picasso:2.5.2' implementation project(':android-app-components') diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/BaseActivity.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/BaseActivity.java index 3131fc1..896464f 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/BaseActivity.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/BaseActivity.java @@ -2,7 +2,8 @@ import android.app.Activity; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import com.heaven7.android.component.AppComponentFactory; import com.heaven7.android.component.AppComponentOwner; @@ -10,10 +11,7 @@ import com.heaven7.android.component.image.AppImageComponent; import com.heaven7.android.component.loading.AppLoadingComponent; import com.heaven7.android.component.toast.AppToastComponent; -import com.heaven7.android.components.demo.imageimpl.GlideAppImageComponent; -import com.heaven7.android.components.demo.toastimpl.AppToastComponentImpl; -import com.heaven7.android.util2.BackKeyListener; -import com.heaven7.android.util2.GuideHelper; +//import com.heaven7.android.components.demo.imageimpl.GlideAppImageComponent; import butterknife.ButterKnife; @@ -30,7 +28,8 @@ public void onCreate(Bundle savedInstanceState) { mAppComponentOwner = new AppComponentOwner(this, new AppComponentFactory() { @Override public AppImageComponent onCreateAppImageComponent(Activity activity) { - return new GlideAppImageComponent(); + // return new GlideAppImageComponent(); + return null; } @Override public AppLoadingComponent onCreateAppLoadingComponent(Activity activity) { @@ -38,19 +37,21 @@ public AppLoadingComponent onCreateAppLoadingComponent(Activity activity) { } @Override public AppGuideComponent onCreateAppGuideComponent(Activity activity) { - final GuideHelper helper = new GuideHelper(activity, getLayoutId()); + // final GuideHelper helper = new GuideHelper(activity, getLayoutId()); //register back key listener of guide. - helper.setOnKeyListener(new BackKeyListener() { + /* helper.setOnKeyListener(new BackKeyListener() { @Override protected void onBackPressed() { getAppGuideComponent().dismiss(); } }); - return helper; + return helper;*/ + return null; } @Override public AppToastComponent onCreateAppToastComponent(Activity activity) { - return AppToastComponentImpl.create(activity); + //return AppToastComponentImpl.create(activity); + return null; } }); diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/SampleApplication.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/SampleApplication.java index c880423..d987f56 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/SampleApplication.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/SampleApplication.java @@ -2,7 +2,7 @@ import android.app.Application; -import com.heaven7.android.components.demo.imageimpl.GlideAppImageComponent; +//import com.heaven7.android.components.demo.imageimpl.GlideAppImageComponent; /** * Created by heaven7 on 2017/8/22 0022. @@ -13,12 +13,12 @@ public class SampleApplication extends Application{ @Override public void onLowMemory() { super.onLowMemory(); - new GlideAppImageComponent().getBitmapPool(this).clearMemory(); + // new GlideAppImageComponent().getBitmapPool(this).clearMemory(); } @Override public void onTrimMemory(int level) { super.onTrimMemory(level); - new GlideAppImageComponent().getBitmapPool(this).trimMemory(level); + // new GlideAppImageComponent().getBitmapPool(this).trimMemory(level); } } diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/CenterCropTransformer.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/CenterCropTransformer.java index 12ac6f3..1605511 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/CenterCropTransformer.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/CenterCropTransformer.java @@ -10,7 +10,7 @@ * Created by heaven7 on 2017/8/15 0015. */ -public class CenterCropTransformer implements BitmapTransformer{ +/*public class CenterCropTransformer implements BitmapTransformer{ @Override public Bitmap transform(String key, ImageCachePool pool, Bitmap source, int outWidth, int outHeight) { @@ -27,4 +27,4 @@ public Bitmap transform(String key, ImageCachePool pool, Bitmap source, int outW public String getId() { return null; } -} +}*/ diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideAppImageComponent.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideAppImageComponent.java index 0c654f2..d619160 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideAppImageComponent.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideAppImageComponent.java @@ -12,6 +12,7 @@ * Created by heaven7 on 2017/8/15 0015. */ +/* public class GlideAppImageComponent implements AppImageComponent { @Override @@ -40,3 +41,4 @@ public void setLoadingImage(Bitmap bitmap) { } } +*/ diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideCachePool.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideCachePool.java index adc818d..d43a966 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideCachePool.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideCachePool.java @@ -10,6 +10,7 @@ * Created by heaven7 on 2017/8/15 0015. */ +/* public class GlideCachePool implements ImageCachePool { private final com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool mImpl; @@ -49,3 +50,4 @@ public void run() { }).start(); } } +*/ diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideRequestEditor.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideRequestEditor.java index 41ab3c3..34b0acb 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideRequestEditor.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/GlideRequestEditor.java @@ -5,15 +5,15 @@ import android.net.Uri; import android.widget.ImageView; -import com.bumptech.glide.DrawableTypeRequest; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; +/*import com.bumptech.glide.DrawableTypeRequest; import com.bumptech.glide.load.resource.bitmap.GlideBitmapDrawable; import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.SimpleTarget; -import com.bumptech.glide.request.target.Target; +import com.bumptech.glide.request.target.Target;*/ import com.heaven7.android.component.image.BitmapTransformer; import com.heaven7.android.component.image.ImageLoadCallback; import com.heaven7.android.component.image.ImageRequestEditor; @@ -29,7 +29,7 @@ * Created by Administrator on 2017/8/15 0015. */ -public class GlideRequestEditor implements ImageRequestEditor { +/*public class GlideRequestEditor implements ImageRequestEditor { private static final String KEY_PREFIX = "Android://res/"; private static final SimpleTarget sDefault_Target = new SimpleTarget() { @@ -274,4 +274,4 @@ public void onStart(String key, Drawable placeHolder){ mCallback.onLoadStarted(key, placeHolder); } } -} +}*/ diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/RoundTransformer.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/RoundTransformer.java index d11fcb5..240d2f3 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/RoundTransformer.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/RoundTransformer.java @@ -13,6 +13,7 @@ * Created by heaven7 on 2017/8/15 0015. */ +/* public class RoundTransformer implements BitmapTransformer { private final float radius; @@ -44,3 +45,4 @@ public String getId() { return "com.heaven7.android.RoundTransformer"; } } +*/ diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/WrappedBitmapTransformation.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/WrappedBitmapTransformation.java index 08246de..3b2d0a6 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/WrappedBitmapTransformation.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/imageimpl/WrappedBitmapTransformation.java @@ -12,6 +12,7 @@ /** * @author heaven7 */ +/* public class WrappedBitmapTransformation extends BitmapTransformation { private List mTransformers; @@ -56,4 +57,4 @@ public String getId() { } return id; } -} \ No newline at end of file +}*/ diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/loadingimpl/AppLoadingComponentImpl.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/loadingimpl/AppLoadingComponentImpl.java index e480f4d..5a19edc 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/loadingimpl/AppLoadingComponentImpl.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/loadingimpl/AppLoadingComponentImpl.java @@ -1,11 +1,12 @@ package com.heaven7.android.components.demo.loadingimpl; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.view.ViewStub; import android.widget.LinearLayout; +import androidx.recyclerview.widget.RecyclerView; + import com.heaven7.adapter.QuickRecycleViewAdapter; import com.heaven7.android.component.loading.AppLoadingComponent; import com.heaven7.android.pullrefresh.LoadingFooterView; diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/sample/TestGuideActivity.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/sample/TestGuideActivity.java index 7aa9f02..26d79dd 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/sample/TestGuideActivity.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/sample/TestGuideActivity.java @@ -13,7 +13,6 @@ import com.heaven7.android.component.guide.RelativeLocation; import com.heaven7.android.components.demo.BaseActivity; import com.heaven7.android.components.demo.R; -import com.heaven7.android.util2.GuideHelper; import com.heaven7.core.util.Logger; import com.heaven7.core.util.MainWorker; @@ -48,7 +47,7 @@ public void onInitialize(Context context, @Nullable Bundle savedInstanceState) { private void showTip() { mIndex ++ ; - final GuideComponent gc = new GuideComponent.Builder() + /*final GuideComponent gc = new GuideComponent.Builder() .anchor(mTb_1) .tip(mTip) .location(new RelativeLocation( @@ -86,7 +85,7 @@ public void onDismiss() { } }); } - }); + });*/ } @OnClick(R.id.tb) diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/sample/TestLoadingComponentActivity.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/sample/TestLoadingComponentActivity.java index 310f486..c38c69c 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/sample/TestLoadingComponentActivity.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/sample/TestLoadingComponentActivity.java @@ -3,9 +3,10 @@ import android.content.Context; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; import android.view.View; +import androidx.recyclerview.widget.LinearLayoutManager; + import com.heaven7.adapter.BaseSelector; import com.heaven7.adapter.QuickRecycleViewAdapter; import com.heaven7.android.component.loading.AppLoadingComponent; diff --git a/Android-components/app/src/main/java/com/heaven7/android/components/demo/toastimpl/AppToastComponentImpl.java b/Android-components/app/src/main/java/com/heaven7/android/components/demo/toastimpl/AppToastComponentImpl.java index 40b940f..1ea4bdd 100644 --- a/Android-components/app/src/main/java/com/heaven7/android/components/demo/toastimpl/AppToastComponentImpl.java +++ b/Android-components/app/src/main/java/com/heaven7/android/components/demo/toastimpl/AppToastComponentImpl.java @@ -6,7 +6,6 @@ import android.view.View; import com.heaven7.android.components.demo.R; -import com.heaven7.android.util2.BaseWindow; import com.heaven7.core.util.ViewHelper; import com.heaven7.core.util.viewhelper.action.Getters; @@ -14,6 +13,7 @@ * Created by heaven7 on 2017/7/12 0012. */ +/* public class AppToastComponentImpl extends BaseWindow { protected AppToastComponentImpl(Context context) { @@ -59,4 +59,4 @@ public void onGotBackground(GradientDrawable gd, View view, ViewHelper vp) { }); show(); } -} \ No newline at end of file +}*/ diff --git a/Android-components/app/src/main/res/layout/test_toggle_button.xml b/Android-components/app/src/main/res/layout/test_toggle_button.xml index 9e32e8a..9d9d854 100644 --- a/Android-components/app/src/main/res/layout/test_toggle_button.xml +++ b/Android-components/app/src/main/res/layout/test_toggle_button.xml @@ -7,7 +7,7 @@ android:padding="10dp" android:fitsSystemWindows="true"> -