diff --git a/app/build.gradle b/app/build.gradle index 63ce25a..08a7f2e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,16 +40,16 @@ android { versionNameSuffix rootProject.ext.app.versionNameSuffix proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } - debug { - minifyEnabled true - //是否清理无用资源 - shrinkResources false - //是否启用zipAlign压缩 - zipAlignEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.myConfig - versionNameSuffix rootProject.ext.app.versionNameSuffix - } +// debug { +// minifyEnabled true +// //是否清理无用资源 +// shrinkResources false +// //是否启用zipAlign压缩 +// zipAlignEnabled false +// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' +// signingConfig signingConfigs.myConfig +// versionNameSuffix rootProject.ext.app.versionNameSuffix +// } } lintOptions { @@ -60,6 +60,6 @@ android { dependencies { implementation rootProject.ext.dependencies.design implementation rootProject.ext.dependencies.appcompatV7 -// implementation project(':rigger') - implementation "com.justkiddingbaby:fragment-rigger:${rigger.publishVersion}" + implementation project(':rigger') +// implementation "com.justkiddingbaby:fragment-rigger:${rigger.publishVersion}" } diff --git a/app/src/main/java/com/yj/app/base/BaseActivity.java b/app/src/main/java/com/yj/app/base/BaseActivity.java index 6653848..405ccfb 100644 --- a/app/src/main/java/com/yj/app/base/BaseActivity.java +++ b/app/src/main/java/com/yj/app/base/BaseActivity.java @@ -1,9 +1,11 @@ package com.yj.app.base; import android.os.Bundle; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; + +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.jkb.fragment.rigger.annotation.Puppet; import com.yj.app.R; diff --git a/app/src/main/java/com/yj/app/base/BaseFragment.java b/app/src/main/java/com/yj/app/base/BaseFragment.java index 79e0fbc..c78231f 100644 --- a/app/src/main/java/com/yj/app/base/BaseFragment.java +++ b/app/src/main/java/com/yj/app/base/BaseFragment.java @@ -1,12 +1,12 @@ package com.yj.app.base; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yj/app/test/ContainerFragment.java b/app/src/main/java/com/yj/app/test/ContainerFragment.java index 4c64656..591b312 100644 --- a/app/src/main/java/com/yj/app/test/ContainerFragment.java +++ b/app/src/main/java/com/yj/app/test/ContainerFragment.java @@ -1,9 +1,11 @@ package com.yj.app.test; import android.os.Bundle; -import android.support.v4.content.ContextCompat; import android.view.animation.Animation; import android.widget.ImageView; + +import androidx.core.content.ContextCompat; + import com.jkb.fragment.rigger.annotation.LazyLoad; import com.jkb.fragment.rigger.utils.Logger; import com.yj.app.R; diff --git a/app/src/main/java/com/yj/app/test/lazyload/LazyLoadAdapter.java b/app/src/main/java/com/yj/app/test/lazyload/LazyLoadAdapter.java index 8b4e65b..8e99560 100644 --- a/app/src/main/java/com/yj/app/test/lazyload/LazyLoadAdapter.java +++ b/app/src/main/java/com/yj/app/test/lazyload/LazyLoadAdapter.java @@ -1,13 +1,15 @@ package com.yj.app.test.lazyload; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.fragment.app.FragmentManager; import android.content.Context; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; + +import androidx.core.content.ContextCompat; + import com.yj.app.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yj/app/test/lazyload/LazyLoadFragment.java b/app/src/main/java/com/yj/app/test/lazyload/LazyLoadFragment.java index 3ff7217..98ad879 100644 --- a/app/src/main/java/com/yj/app/test/lazyload/LazyLoadFragment.java +++ b/app/src/main/java/com/yj/app/test/lazyload/LazyLoadFragment.java @@ -1,9 +1,11 @@ package com.yj.app.test.lazyload; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.view.ViewPager; import android.widget.Toast; + +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; import com.yj.app.R; import com.yj.app.base.BaseFragment; import java.util.Timer; diff --git a/app/src/main/java/com/yj/app/test/replace/ReplaceFragment.java b/app/src/main/java/com/yj/app/test/replace/ReplaceFragment.java index 168e4b1..70ff3e5 100644 --- a/app/src/main/java/com/yj/app/test/replace/ReplaceFragment.java +++ b/app/src/main/java/com/yj/app/test/replace/ReplaceFragment.java @@ -7,9 +7,7 @@ import com.yj.app.R; import com.yj.app.base.BaseFragment; import com.yj.app.test.ContainerFragment; -import com.yj.app.utils.Rotate3d; import java.util.Random; -import java.util.UUID; /** * @author JingYeoh diff --git a/app/src/main/java/com/yj/app/test/show/ShowFragment.java b/app/src/main/java/com/yj/app/test/show/ShowFragment.java index 75f8107..15726a4 100644 --- a/app/src/main/java/com/yj/app/test/show/ShowFragment.java +++ b/app/src/main/java/com/yj/app/test/show/ShowFragment.java @@ -1,7 +1,7 @@ package com.yj.app.test.show; +import androidx.fragment.app.Fragment; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.View; import android.view.View.OnClickListener; import com.jkb.fragment.rigger.rigger.Rigger; diff --git a/app/src/main/java/com/yj/app/test/start/StartFragment.java b/app/src/main/java/com/yj/app/test/start/StartFragment.java index f92a77b..d0ba8eb 100644 --- a/app/src/main/java/com/yj/app/test/start/StartFragment.java +++ b/app/src/main/java/com/yj/app/test/start/StartFragment.java @@ -1,11 +1,13 @@ package com.yj.app.test.start; import android.os.Bundle; -import android.support.annotation.Nullable; + import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.jkb.fragment.rigger.annotation.Animator; import com.jkb.fragment.rigger.annotation.Puppet; import com.jkb.fragment.rigger.rigger.Rigger; diff --git a/app/src/main/java/com/yj/app/utils/Rotate3d.java b/app/src/main/java/com/yj/app/utils/Rotate3d.java index 6b86fe0..1fde927 100644 --- a/app/src/main/java/com/yj/app/utils/Rotate3d.java +++ b/app/src/main/java/com/yj/app/utils/Rotate3d.java @@ -2,11 +2,12 @@ import android.graphics.Camera; import android.graphics.Matrix; -import android.support.annotation.NonNull; import android.view.View; import android.view.animation.Animation; import android.view.animation.Transformation; +import androidx.annotation.NonNull; + /** * @author JingYeoh * Email me diff --git a/app/src/main/res/layout/frg_lazyload.xml b/app/src/main/res/layout/frg_lazyload.xml index a9871f6..cdf81d0 100644 --- a/app/src/main/res/layout/frg_lazyload.xml +++ b/app/src/main/res/layout/frg_lazyload.xml @@ -5,12 +5,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - - Email me diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/annotation/Puppet.java b/rigger/src/main/java/com/jkb/fragment/rigger/annotation/Puppet.java index f5f2acc..2cecdc1 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/annotation/Puppet.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/annotation/Puppet.java @@ -1,8 +1,8 @@ package com.jkb.fragment.rigger.annotation; import android.app.Activity; -import android.support.annotation.IdRes; -import android.support.v4.app.Fragment; + +import androidx.annotation.IdRes; import com.jkb.fragment.rigger.rigger.Rigger; @@ -13,7 +13,7 @@ import java.lang.annotation.Target; /** - * Annotation class that can only be used on {@link Activity} or {@link Fragment}, a + * Annotation class that can only be used on {@link Activity} or {@link androidx.fragment.app.Fragment}, a * Activity/Fragment class that marked by this annotation can be rigged by {@link Rigger}. * * @author JingYeoh @@ -35,7 +35,7 @@ int containerViewId() default 0; /** - * Allow or not exit the host {@link android.app.Activity}/{@link android.support.v4.app.Fragment} as the + * Allow or not exit the host {@link android.app.Activity}/{@link androidx.fragment.app.Fragment} as the * stack size = 1 . *

* If the value is true , the host object(Activity/Fragment) will be exit as the stack size = 1. diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/aop/ActivityInjection.java b/rigger/src/main/java/com/jkb/fragment/rigger/aop/ActivityInjection.java index b14c63c..5ca3d11 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/aop/ActivityInjection.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/aop/ActivityInjection.java @@ -24,35 +24,35 @@ public class ActivityInjection extends RiggerInjection { //****************PointCut*********************************** - @Pointcut("execution(android.support.v4.app.FragmentActivity+.new()) && annotatedWithPuppet()") + @Pointcut("execution(androidx.fragment.app.FragmentActivity+.new()) && annotatedWithPuppet()") public void construct() { } - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onCreate(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onCreate(..)) && annotatedWithPuppet()") public void onCreate() { } - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onResumeFragments(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onResumeFragments(..)) && annotatedWithPuppet()") public void onResumeFragments() { } - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onPause(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onPause(..)) && annotatedWithPuppet()") public void onPause() { } - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onResume(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onResume(..)) && annotatedWithPuppet()") public void onResume() { } - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onSaveInstanceState(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onSaveInstanceState(..)) && annotatedWithPuppet()") public void onSaveInstanceState() { } - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onDestroy(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onDestroy(..)) && annotatedWithPuppet()") public void onDestroy() { } - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onBackPressed(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onBackPressed(..)) && annotatedWithPuppet()") public void onBackPressed() { } diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/aop/FragmentInjection.java b/rigger/src/main/java/com/jkb/fragment/rigger/aop/FragmentInjection.java index d43cde8..81827cd 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/aop/FragmentInjection.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/aop/FragmentInjection.java @@ -30,43 +30,43 @@ public class FragmentInjection extends RiggerInjection { //****************PointCut*********************************** - @Pointcut("execution(android.support.v4.app.Fragment+.new()) && annotatedWithPuppet()") + @Pointcut("execution(androidx.fragment.app.Fragment+.new()) && annotatedWithPuppet()") public void constructor() { } - @Pointcut("execution(* android.support.v4.app.Fragment+.onAttach(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.Fragment+.onAttach(..)) && annotatedWithPuppet()") public void onAttach() { } - @Pointcut("execution(* android.support.v4.app.Fragment+.onCreate(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.Fragment+.onCreate(..)) && annotatedWithPuppet()") public void onCreate() { } - @Pointcut("call(* android.support.v4.app.Fragment+.onViewCreated(..)) && annotatedWithPuppet()") + @Pointcut("call(* androidx.fragment.app.Fragment+.onViewCreated(..)) && annotatedWithPuppet()") public void onViewCreated() { } - @Pointcut("execution(* android.support.v4.app.Fragment+.onCreateView(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.Fragment+.onCreateView(..)) && annotatedWithPuppet()") public void onCreateView() { } - @Pointcut("execution(* android.support.v4.app.Fragment+.onResume(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.Fragment+.onResume(..)) && annotatedWithPuppet()") public void onResume() { } - @Pointcut("execution(* android.support.v4.app.Fragment+.onSaveInstanceState(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.Fragment+.onSaveInstanceState(..)) && annotatedWithPuppet()") public void onSaveInstanceState() { } - @Pointcut("execution(* android.support.v4.app.Fragment+.onDestroy(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.Fragment+.onDestroy(..)) && annotatedWithPuppet()") public void onDestroy() { } - @Pointcut("execution(* android.support.v4.app.Fragment+.onDetach(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.Fragment+.onDetach(..)) && annotatedWithPuppet()") public void onDetach() { } - @Pointcut("execution(* android.support.v4.app.Fragment+.setUserVisibleHint(..)) && annotatedWithPuppet()") + @Pointcut("execution(* androidx.fragment.app.Fragment+.setUserVisibleHint(..)) && annotatedWithPuppet()") public void setUserVisibleHint() { } diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/helper/FragmentStackManager.java b/rigger/src/main/java/com/jkb/fragment/rigger/helper/FragmentStackManager.java index 65ea427..71168ca 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/helper/FragmentStackManager.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/helper/FragmentStackManager.java @@ -1,10 +1,12 @@ package com.jkb.fragment.rigger.helper; +import androidx.fragment.app.FragmentManager; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentManager; import android.text.TextUtils; + +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; + import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/IRigger.java b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/IRigger.java index 5f56e1d..cefd33d 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/IRigger.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/IRigger.java @@ -1,10 +1,10 @@ package com.jkb.fragment.rigger.rigger; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; + +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.jkb.fragment.rigger.annotation.Puppet; import com.jkb.fragment.rigger.exception.AlreadyExistException; diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/Rigger.java b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/Rigger.java index 48a2b6c..ca708e4 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/Rigger.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/Rigger.java @@ -1,15 +1,18 @@ package com.jkb.fragment.rigger.rigger; +import androidx.fragment.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; +import android.os.PersistableBundle; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.jkb.fragment.rigger.annotation.Puppet; import com.jkb.fragment.rigger.exception.RiggerException; import com.jkb.fragment.rigger.utils.Logger; diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/RiggerTransaction.java b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/RiggerTransaction.java index b47a985..33d09ce 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/RiggerTransaction.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/RiggerTransaction.java @@ -1,9 +1,10 @@ package com.jkb.fragment.rigger.rigger; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; + +import androidx.fragment.app.Fragment; + +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; /** * API for performing a set of Fragment operations. @@ -75,8 +76,9 @@ abstract class RiggerTransaction { abstract void commit(); /** - * Set the animations for fragment,the animations will be showed when {@link FragmentTransaction#show(Fragment)} or - * {@link FragmentTransaction#hide(Fragment)} is called. + * Set the animations for fragment,the animations will be showed when + * {@link androidx.fragment.app.FragmentTransaction#show(Fragment)} or + * {@link androidx.fragment.app.FragmentTransaction#hide(Fragment)} is called. * * @param enter the animation when the fragment is showing. * @param exit the animation when the fragment is hiding. diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/RiggerTransactionImpl.java b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/RiggerTransactionImpl.java index 01c4fac..158f0c4 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/RiggerTransactionImpl.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/RiggerTransactionImpl.java @@ -1,12 +1,13 @@ package com.jkb.fragment.rigger.rigger; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.text.TextUtils; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; + import com.jkb.fragment.rigger.utils.Logger; import java.lang.ref.WeakReference; diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_ActivityRigger.java b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_ActivityRigger.java index 8430016..5f0eac8 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_ActivityRigger.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_ActivityRigger.java @@ -2,11 +2,12 @@ import android.content.res.TypedArray; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; + import com.jkb.fragment.rigger.exception.UnSupportException; import com.jkb.fragment.rigger.utils.Logger; import com.jkb.fragment.swiper.SwipeLayout; diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_FragmentRigger.java b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_FragmentRigger.java index dc5db50..2df03c8 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_FragmentRigger.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_FragmentRigger.java @@ -1,17 +1,9 @@ package com.jkb.fragment.rigger.rigger; -import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_GET_FRAGMENT_TAG; -import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_GET_PUPPET_ANIMATIONS; -import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_ON_LAZYLOAD_VIEW_CREATED; -import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_ON_RIGGER_BACKPRESSED; - import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -19,6 +11,10 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.jkb.fragment.rigger.annotation.Animator; import com.jkb.fragment.rigger.annotation.LazyLoad; import com.jkb.fragment.rigger.exception.UnSupportException; @@ -30,6 +26,11 @@ import java.lang.reflect.Method; import java.util.UUID; +import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_GET_FRAGMENT_TAG; +import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_GET_PUPPET_ANIMATIONS; +import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_ON_LAZYLOAD_VIEW_CREATED; +import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_ON_RIGGER_BACKPRESSED; + /** * Fragment Rigger.rig the Fragment puppet. * diff --git a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_Rigger.java b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_Rigger.java index 2d3d2ce..fe3a2ce 100644 --- a/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_Rigger.java +++ b/rigger/src/main/java/com/jkb/fragment/rigger/rigger/_Rigger.java @@ -1,20 +1,10 @@ package com.jkb.fragment.rigger.rigger; -import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_GET_CONTAINERVIEWID; -import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_ON_INTERRUPT_BACKPRESSED; - import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewCompat; -import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -25,6 +15,15 @@ import android.view.animation.Animation; import android.view.animation.Animation.AnimationListener; import android.view.animation.AnimationSet; + +import androidx.annotation.CallSuper; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.ViewCompat; +import androidx.fragment.app.Fragment; + import com.jkb.fragment.rigger.annotation.Puppet; import com.jkb.fragment.rigger.exception.AlreadyExistException; import com.jkb.fragment.rigger.exception.NotExistException; @@ -34,11 +33,15 @@ import com.jkb.fragment.rigger.utils.Logger; import com.jkb.fragment.swiper.SwipeLayout; import com.jkb.fragment.swiper.annotation.Swiper; + import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Stack; +import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_GET_CONTAINERVIEWID; +import static com.jkb.fragment.rigger.utils.RiggerConsts.METHOD_ON_INTERRUPT_BACKPRESSED; + /** * Rigger.Used to repeat different Rigger(Strategy pattern) * diff --git a/rigger/src/main/java/com/jkb/fragment/swiper/SwipeActivityManager.java b/rigger/src/main/java/com/jkb/fragment/swiper/SwipeActivityManager.java index 2bb4ce9..08ee499 100644 --- a/rigger/src/main/java/com/jkb/fragment/swiper/SwipeActivityManager.java +++ b/rigger/src/main/java/com/jkb/fragment/swiper/SwipeActivityManager.java @@ -1,7 +1,8 @@ package com.jkb.fragment.swiper; import android.app.Activity; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import java.util.Stack; diff --git a/rigger/src/main/java/com/jkb/fragment/swiper/SwipeLayout.java b/rigger/src/main/java/com/jkb/fragment/swiper/SwipeLayout.java index c2623a6..1cd8a71 100644 --- a/rigger/src/main/java/com/jkb/fragment/swiper/SwipeLayout.java +++ b/rigger/src/main/java/com/jkb/fragment/swiper/SwipeLayout.java @@ -2,25 +2,26 @@ import android.annotation.SuppressLint; import android.app.Activity; +import androidx.fragment.app.Fragment; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Paint.Style; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.ViewDragHelper; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.view.ViewCompat; +import androidx.customview.widget.ViewDragHelper; + import com.jkb.fragment.rigger.rigger.Rigger; import com.jkb.fragment.swiper.annotation.SwipeEdge; @@ -30,7 +31,7 @@ import java.util.Stack; /** - * The widget support {@link android.app.Activity}/{@link android.support.v4.app.Fragment} to exit by swipe edge. + * The widget support {@link android.app.Activity}/{@link androidx.fragment.app.Fragment} to exit by swipe edge. *

* This widget can only used with Rigger lib. please do not use it in your layout. * diff --git a/rigger/src/main/java/com/jkb/fragment/swiper/annotation/Swiper.java b/rigger/src/main/java/com/jkb/fragment/swiper/annotation/Swiper.java index 2db9f1a..f7d7970 100644 --- a/rigger/src/main/java/com/jkb/fragment/swiper/annotation/Swiper.java +++ b/rigger/src/main/java/com/jkb/fragment/swiper/annotation/Swiper.java @@ -1,9 +1,10 @@ package com.jkb.fragment.swiper.annotation; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; + import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/rigger/src/main/java/com/jkb/fragment/swiper/aop/SwipeInjection.java b/rigger/src/main/java/com/jkb/fragment/swiper/aop/SwipeInjection.java index 586b940..ec80ed6 100644 --- a/rigger/src/main/java/com/jkb/fragment/swiper/aop/SwipeInjection.java +++ b/rigger/src/main/java/com/jkb/fragment/swiper/aop/SwipeInjection.java @@ -43,11 +43,11 @@ public void annotatedWithPuppet() { //****************Helper************************************ && annotatedWithPuppet() && annotatedWithSwiper() - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onCreate(..))") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onCreate(..))") public void onCreate() { } - @Pointcut("execution(* android.support.v4.app.FragmentActivity+.onDestroy(..))") + @Pointcut("execution(* androidx.fragment.app.FragmentActivity+.onDestroy(..))") public void onDestroy() { }