optimize Fragment Animation

lib_base/src/main/java/com/android/base/app/fragment/AnimatorHelper.java

@@ -1,102 +0,0 @@
-package com.android.base.app.fragment;
-
-import android.content.Context;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-
-import com.android.base.R;
-
-import androidx.fragment.app.FragmentTransaction;
-
-public final class AnimatorHelper {
-
-    private Animation noneAnim, noneAnimFixed;
-    private Animation enterAnim, exitAnim, popEnterAnim, popExitAnim;
-
-    private Context context;
-    private FragmentAnimator fragmentAnimator;
-
-    AnimatorHelper(Context context, FragmentAnimator fragmentAnimator) {
-        this.context = context;
-        notifyChanged(fragmentAnimator);
-    }
-
-    void notifyChanged(FragmentAnimator fragmentAnimator) {
-        this.fragmentAnimator = fragmentAnimator;
-        if (fragmentAnimator != null) {
-            initEnterAnim();
-            initExitAnim();
-            initPopEnterAnim();
-            initPopExitAnim();
-        }
-    }
-
-    public Animation getNoneAnim() {
-        if (noneAnim == null) {
-            noneAnim = AnimationUtils.loadAnimation(context, R.anim.no_anim);
-        }
-        return noneAnim;
-    }
-
-    public Animation getNoneAnimFixed() {
-        if (noneAnimFixed == null) {
-            noneAnimFixed = new Animation() {
-            };
-        }
-        return noneAnimFixed;
-    }
-
-    private Animation initEnterAnim() {
-        if (fragmentAnimator.getEnter() == 0) {
-            enterAnim = AnimationUtils.loadAnimation(context, R.anim.no_anim);
-        } else {
-            enterAnim = AnimationUtils.loadAnimation(context, fragmentAnimator.getEnter());
-        }
-        return enterAnim;
-    }
-
-    private Animation initExitAnim() {
-        if (fragmentAnimator.getExit() == 0) {
-            exitAnim = AnimationUtils.loadAnimation(context, R.anim.no_anim);
-        } else {
-            exitAnim = AnimationUtils.loadAnimation(context, fragmentAnimator.getExit());
-        }
-        return exitAnim;
-    }
-
-    private Animation initPopEnterAnim() {
-        if (fragmentAnimator.getPopEnter() == 0) {
-            popEnterAnim = AnimationUtils.loadAnimation(context, R.anim.no_anim);
-        } else {
-            popEnterAnim = AnimationUtils.loadAnimation(context, fragmentAnimator.getPopEnter());
-        }
-        return popEnterAnim;
-    }
-
-    private Animation initPopExitAnim() {
-        if (fragmentAnimator.getPopExit() == 0) {
-            popExitAnim = AnimationUtils.loadAnimation(context, R.anim.no_anim);
-        } else {
-            popExitAnim = AnimationUtils.loadAnimation(context, fragmentAnimator.getPopExit());
-        }
-        return popExitAnim;
-    }
-
-    Animation onCreateAnimation(BaseFragment baseFragment, int transit, boolean enter, int nextAnim) {
-        if (transit == FragmentTransaction.TRANSIT_FRAGMENT_OPEN) {
-            if (enter) {
-                return enterAnim;
-            } else {
-                return popExitAnim;
-            }
-        } else if (transit == FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) {
-            if (enter) {
-                return popEnterAnim;
-            } else {
-                return exitAnim;
-            }
-        }
-        return null;
-    }
-
-}

lib_base/src/main/java/com/android/base/app/fragment/BaseFragment.java

@@ -46,7 +46,7 @@ public class BaseFragment extends Fragment implements LoadingView, OnBackPressLi
     /* just for cache*/
     private View mCachedView;
 
-    private AnimatorHelper mAnimatorHelper;
+    private FragmentAnimatorHelper mFragmentAnimatorHelper;
 
     private final FragmentDelegates mFragmentDelegates = new FragmentDelegates(this);
 
@@ -301,10 +301,10 @@ public class BaseFragment extends Fragment implements LoadingView, OnBackPressLi
     @Nullable
     @Override
     public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
-        if (mAnimatorHelper == null) {
+        if (mFragmentAnimatorHelper == null) {
-            mAnimatorHelper = new AnimatorHelper(getContext(), FragmentConfig.defaultFragmentAnimator());
+            mFragmentAnimatorHelper = new FragmentAnimatorHelper(getContext(), FragmentConfig.defaultFragmentAnimator());
         }
-        return mAnimatorHelper.onCreateAnimation(this, transit, enter, nextAnim);
+        return mFragmentAnimatorHelper.onCreateAnimation(transit, enter);
     }
 
 }

lib_base/src/main/java/com/android/base/app/fragment/DefaultHorizontalAnimator.java

@@ -1,44 +1,32 @@
 package com.android.base.app.fragment;
 
-import android.os.Parcel;
+import android.view.animation.Animation;
-import android.os.Parcelable;
+import android.view.animation.AnimationUtils;
 
 import com.android.base.R;
+import com.android.base.utils.BaseUtils;
 
 
-public class DefaultHorizontalAnimator extends FragmentAnimator implements Parcelable {
+public class DefaultHorizontalAnimator implements FragmentAnimator {
-
-    public DefaultHorizontalAnimator() {
-        enter = R.anim.h_fragment_enter;
-        exit = R.anim.h_fragment_exit;
-        popEnter = R.anim.h_fragment_pop_enter;
-        popExit = R.anim.h_fragment_pop_exit;
-    }
-
-    protected DefaultHorizontalAnimator(Parcel in) {
-        super(in);
-    }
 
     @Override
-    public void writeToParcel(Parcel dest, int flags) {
+    public Animation makeOpenEnter() {
-        super.writeToParcel(dest, flags);
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.h_fragment_open_enter);
     }
 
     @Override
-    public int describeContents() {
+    public Animation makeOpenExit() {
-        return 0;
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.h_fragment_open_exit);
     }
 
-    public static final Creator<DefaultHorizontalAnimator> CREATOR = new Creator<DefaultHorizontalAnimator>() {
     @Override
-        public DefaultHorizontalAnimator createFromParcel(Parcel in) {
+    public Animation makeCloseEnter() {
-            return new DefaultHorizontalAnimator(in);
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.h_fragment_close_enter);
     }
 
     @Override
-        public DefaultHorizontalAnimator[] newArray(int size) {
+    public Animation makeCloseExit() {
-            return new DefaultHorizontalAnimator[size];
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.h_fragment_close_exit);
     }
-    };
 
 }

lib_base/src/main/java/com/android/base/app/fragment/DefaultNoAnimator.java

@@ -1,42 +1,32 @@
 package com.android.base.app.fragment;
 
 
-import android.os.Parcel;
+import android.view.animation.Animation;
-import android.os.Parcelable;
+import android.view.animation.AnimationUtils;
 
-public class DefaultNoAnimator extends FragmentAnimator implements Parcelable {
+import com.android.base.R;
+import com.android.base.utils.BaseUtils;
 
-    public DefaultNoAnimator() {
+public class DefaultNoAnimator implements FragmentAnimator {
-        enter = 0;
-        exit = 0;
-        popEnter = 0;
-        popExit = 0;
-    }
-
-    protected DefaultNoAnimator(Parcel in) {
-        super(in);
-    }
 
     @Override
-    public void writeToParcel(Parcel dest, int flags) {
+    public Animation makeOpenEnter() {
-        super.writeToParcel(dest, flags);
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.base_no_anim);
     }
 
     @Override
-    public int describeContents() {
+    public Animation makeOpenExit() {
-        return 0;
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.base_no_anim);
     }
 
-    public static final Creator<DefaultNoAnimator> CREATOR = new Creator<DefaultNoAnimator>() {
     @Override
-        public DefaultNoAnimator createFromParcel(Parcel in) {
+    public Animation makeCloseEnter() {
-            return new DefaultNoAnimator(in);
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.base_no_anim);
     }
 
     @Override
-        public DefaultNoAnimator[] newArray(int size) {
+    public Animation makeCloseExit() {
-            return new DefaultNoAnimator[size];
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.base_no_anim);
     }
-    };
 
 }

lib_base/src/main/java/com/android/base/app/fragment/DefaultScaleAnimator.java

@@ -0,0 +1,56 @@
+package com.android.base.app.fragment;
+
+
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.Interpolator;
+import android.view.animation.ScaleAnimation;
+
+
+public class DefaultScaleAnimator implements FragmentAnimator {
+
+    private static final Interpolator DECELERATE_QUINT = new DecelerateInterpolator(2.5f);
+    private static final Interpolator DECELERATE_CUBIC = new DecelerateInterpolator(1.5f);
+
+    private static final int ANIM_DUR = 220;
+
+    @Override
+    public Animation makeOpenEnter() {
+        return makeOpenCloseAnimation(1.125f, 1.0f, 0, 1);
+    }
+
+    @Override
+    public Animation makeOpenExit() {
+        return makeOpenCloseAnimation(1.0f, .975f, 1, 0);
+    }
+
+    @Override
+    public Animation makeCloseEnter() {
+        return makeOpenCloseAnimation(.975f, 1.0f, 0, 1);
+    }
+
+    @Override
+    public Animation makeCloseExit() {
+        return makeOpenCloseAnimation(1.0f, 1.075f, 1, 0);
+    }
+
+    private static Animation makeOpenCloseAnimation(float startScale, float endScale, float startAlpha, float endAlpha) {
+        AnimationSet set = new AnimationSet(false);
+
+        ScaleAnimation scale = new ScaleAnimation(startScale, endScale, startScale, endScale,
+                Animation.RELATIVE_TO_SELF, .5f, Animation.RELATIVE_TO_SELF, .5f);
+        scale.setInterpolator(DECELERATE_QUINT);
+        scale.setDuration(ANIM_DUR);
+        set.addAnimation(scale);
+
+        AlphaAnimation alpha = new AlphaAnimation(startAlpha, endAlpha);
+        alpha.setInterpolator(DECELERATE_CUBIC);
+        alpha.setDuration(ANIM_DUR);
+        set.addAnimation(alpha);
+
+        return set;
+    }
+
+}

lib_base/src/main/java/com/android/base/app/fragment/DefaultVerticalAnimator.java

@@ -1,43 +1,31 @@
 package com.android.base.app.fragment;
 
-import android.os.Parcel;
+import android.view.animation.Animation;
-import android.os.Parcelable;
+import android.view.animation.AnimationUtils;
 
 import com.android.base.R;
+import com.android.base.utils.BaseUtils;
 
-public class DefaultVerticalAnimator extends FragmentAnimator implements Parcelable {
+public class DefaultVerticalAnimator implements FragmentAnimator {
-
-    public DefaultVerticalAnimator() {
-        enter = R.anim.v_fragment_enter;
-        exit = R.anim.v_fragment_exit;
-        popEnter = R.anim.v_fragment_pop_enter;
-        popExit = R.anim.v_fragment_pop_exit;
-    }
-
-    protected DefaultVerticalAnimator(Parcel in) {
-        super(in);
-    }
 
     @Override
-    public void writeToParcel(Parcel dest, int flags) {
+    public Animation makeOpenEnter() {
-        super.writeToParcel(dest, flags);
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.v_fragment_open_enter);
     }
 
     @Override
-    public int describeContents() {
+    public Animation makeOpenExit() {
-        return 0;
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.v_fragment_open_exit);
     }
 
-    public static final Creator<DefaultVerticalAnimator> CREATOR = new Creator<DefaultVerticalAnimator>() {
     @Override
-        public DefaultVerticalAnimator createFromParcel(Parcel in) {
+    public Animation makeCloseEnter() {
-            return new DefaultVerticalAnimator(in);
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.v_fragment_close_enter);
     }
 
     @Override
-        public DefaultVerticalAnimator[] newArray(int size) {
+    public Animation makeCloseExit() {
-            return new DefaultVerticalAnimator[size];
+        return AnimationUtils.loadAnimation(BaseUtils.getAppContext(), R.anim.v_fragment_close_exit);
     }
-    };
 
 }

lib_base/src/main/java/com/android/base/app/fragment/FragmentAnimator.java

@@ -1,105 +1,15 @@
 package com.android.base.app.fragment;
 
-import android.os.Parcel;
+import android.view.animation.Animation;
-import android.os.Parcelable;
 
-import androidx.annotation.AnimRes;
+public interface FragmentAnimator {
 
-public class FragmentAnimator implements Parcelable {
+    Animation makeOpenEnter();
 
-    @AnimRes protected int enter;
+    Animation makeOpenExit();
-    @AnimRes protected int exit;
-    @AnimRes protected int popEnter;
-    @AnimRes protected int popExit;
 
-    public FragmentAnimator() {
+    Animation makeCloseEnter();
-    }
 
-    public FragmentAnimator(int enter, int exit) {
+    Animation makeCloseExit();
-        this.enter = enter;
-        this.exit = exit;
-    }
-
-    public FragmentAnimator(int enter, int exit, int popEnter, int popExit) {
-        this.enter = enter;
-        this.exit = exit;
-        this.popEnter = popEnter;
-        this.popExit = popExit;
-    }
-
-    public FragmentAnimator copy() {
-        return new FragmentAnimator(getEnter(), getExit(), getPopEnter(), getPopExit());
-    }
-
-    protected FragmentAnimator(Parcel in) {
-        enter = in.readInt();
-        exit = in.readInt();
-        popEnter = in.readInt();
-        popExit = in.readInt();
-    }
-
-    public static final Creator<FragmentAnimator> CREATOR = new Creator<FragmentAnimator>() {
-        @Override
-        public FragmentAnimator createFromParcel(Parcel in) {
-            return new FragmentAnimator(in);
-        }
-
-        @Override
-        public FragmentAnimator[] newArray(int size) {
-            return new FragmentAnimator[size];
-        }
-    };
-
-    public int getEnter() {
-        return enter;
-    }
-
-    public FragmentAnimator setEnter(int enter) {
-        this.enter = enter;
-        return this;
-    }
-
-    public int getExit() {
-        return exit;
-    }
-
-    /**
-     * enter animation
-     */
-    public FragmentAnimator setExit(int exit) {
-        this.exit = exit;
-        return this;
-    }
-
-    public int getPopEnter() {
-        return popEnter;
-    }
-
-    public FragmentAnimator setPopEnter(int popEnter) {
-        this.popEnter = popEnter;
-        return this;
-    }
-
-    public int getPopExit() {
-        return popExit;
-    }
-
-    public FragmentAnimator setPopExit(int popExit) {
-        this.popExit = popExit;
-        return this;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(enter);
-        dest.writeInt(exit);
-        dest.writeInt(popEnter);
-        dest.writeInt(popExit);
-    }
 
 }

lib_base/src/main/java/com/android/base/app/fragment/FragmentAnimatorHelper.java

@@ -0,0 +1,103 @@
+package com.android.base.app.fragment;
+
+import android.content.Context;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+
+import com.android.base.R;
+
+import androidx.fragment.app.FragmentTransaction;
+
+public final class FragmentAnimatorHelper {
+
+    private Context context;
+    private FragmentAnimator fragmentAnimator;
+
+    FragmentAnimatorHelper(Context context, FragmentAnimator fragmentAnimator) {
+        this.context = context;
+        this.fragmentAnimator = fragmentAnimator;
+    }
+
+    public void changeAnimation(FragmentAnimator fragmentAnimator) {
+        this.fragmentAnimator = fragmentAnimator;
+    }
+
+    public Animation getNoneAnim() {
+        return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+    }
+
+    public Animation getNoneAnimFixed() {
+        return new Animation() {
+        };
+    }
+
+    private Animation initEnterAnim() {
+        if (fragmentAnimator == null) {
+            return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+        } else {
+            Animation animation = fragmentAnimator.makeOpenEnter();
+            if (animation == null) {
+                return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+            } else {
+                return animation;
+            }
+        }
+    }
+
+    private Animation initExitAnim() {
+        if (fragmentAnimator == null) {
+            return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+        } else {
+            Animation animation = fragmentAnimator.makeOpenExit();
+            if (animation == null) {
+                return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+            } else {
+                return animation;
+            }
+        }
+    }
+
+    private Animation initPopEnterAnim() {
+        if (fragmentAnimator == null) {
+            return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+        } else {
+            Animation animation = fragmentAnimator.makeCloseEnter();
+            if (animation == null) {
+                return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+            } else {
+                return animation;
+            }
+        }
+    }
+
+    private Animation initPopExitAnim() {
+        if (fragmentAnimator == null) {
+            return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+        } else {
+            Animation animation = fragmentAnimator.makeCloseExit();
+            if (animation == null) {
+                return AnimationUtils.loadAnimation(context, R.anim.base_no_anim);
+            } else {
+                return animation;
+            }
+        }
+    }
+
+    Animation onCreateAnimation(int transit, boolean enter) {
+        if (transit == FragmentTransaction.TRANSIT_FRAGMENT_OPEN) {
+            if (enter) {
+                return initEnterAnim();
+            } else {
+                return initExitAnim();
+            }
+        } else if (transit == FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) {
+            if (enter) {
+                return initPopEnterAnim();
+            } else {
+                return initPopExitAnim();
+            }
+        }
+        return null;
+    }
+
+}

lib_base/src/main/java/com/android/base/app/fragment/Fragments.kt

@@ -277,13 +277,13 @@ class EnhanceFragmentTransaction constructor(
      * 如果 [tag] ==null 则使用 fragment 对应 class 的全限定类名。
      */
     fun addWithStack(containerId: Int = 0, fragment: Fragment, tag: String? = null, transition: Boolean = true): EnhanceFragmentTransaction {
-        //hide top
-        hideTopFragment()
         //set add to stack
         val nonnullTag = (tag ?: fragment.javaClassName())
         addToBackStack(nonnullTag)
         //add
         fragmentTransaction.add(confirmLayoutId(containerId), fragment, nonnullTag)
+        //hide top
+        hideTopFragment()
         if (transition) {
             //set a transition
             setOpeningTransition()

lib_base/src/main/java/com/android/base/utils/android/views/ResourceEx.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.res.TypedArray
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.util.TypedValue
 import android.view.View
 import androidx.annotation.*
 
@@ -66,10 +67,24 @@ fun Context.drawableFromId(@DrawableRes id: Int): Drawable? {
  *
  * 返回资源 id
  */
-fun getResource(name: String, defType: String, defPackage: String): Int {
+fun getResourceId(name: String, defType: String, defPackage: String): Int {
     return BaseUtils.getResources().getIdentifier(name, defType, defPackage)
 }
 
+/**
+ * - attr, like [android.R.attr.selectableItemBackground] or other attr id.
+ */
+fun getResourceId(context: Context, attr: Int): Int {
+    return try {
+        val outValue = TypedValue()
+        context.theme.resolveAttribute(attr, outValue, true)
+        outValue.resourceId
+    } catch (e: Exception) {
+        e.printStackTrace()
+        0
+    }
+}
+
 fun getText(@StringRes id: Int): CharSequence {
     return BaseUtils.getResources().getText(id)
 }

lib_base/src/main/res/anim/h_fragment_close_exit.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="300"
+        android:fromXDelta="0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toXDelta="100%p" />
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.9"
+        android:fillEnabled="true"
+        android:fillBefore="false"
+        android:fillAfter="true"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="300" />
+
+</set>

lib_base/src/main/res/anim/h_fragment_exit.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <translate
-        android:duration="300"
-        android:fromXDelta="0"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:toXDelta="100%p" />
-
-</set>

lib_base/src/main/res/anim/h_fragment_open_exit.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300">
+
+    <translate
+        android:fromXDelta="0%p"
+        android:toXDelta="-26%p" />
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.3"
+        android:fillEnabled="true"
+        android:fillBefore="false"
+        android:fillAfter="true"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="300" />
+
+</set>

lib_base/src/main/res/anim/h_fragment_pop_exit.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300">
-
-    <translate
-        android:fromXDelta="0%p"
-        android:toXDelta="-26%p" />
-
-</set>

lib_base/src/main/res/anim/pop_exit_no_anim.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300">
-
-    <alpha
-        android:fromAlpha="1.0"
-        android:toAlpha="1.0" />
-
-</set>