Merge pull request #46 from massivedisaster/feature/update

feature/update

Author: Jorge Costa

activity-fragment-manager/src/main/java/com/massivedisaster/activitymanager/AddFragmentTransaction.java

@@ -47,6 +47,16 @@ class AddFragmentTransaction extends FragmentTransaction {
 
     @Override
     public void commit() {
+        // Apply the default activity animation if the FragmentTransaction is null.
+        if (mTransactionAnimation == null) {
+            mTransactionAnimation = mActivity;
+        }
+
+        // Set the custom transaction animation.
+        mFrgTransaction.setCustomAnimations(mTransactionAnimation.getAnimationEnter(), mTransactionAnimation.getAnimationExit(),
+                mTransactionAnimation.getAnimationPopEnter(),
+                mTransactionAnimation.getAnimationPopExit());
+
         // Add the new fragment to the stack.
         mFrgTransaction.add(mActivity.getContainerViewId(), mFragment, mTag);
         // Hide the first fragment in the container.

activity-fragment-manager/src/main/java/com/massivedisaster/activitymanager/FragmentTransaction.java

@@ -45,6 +45,7 @@ public abstract class FragmentTransaction implements ITransaction<FragmentTransa
     protected Fragment mFragment;
     protected android.support.v4.app.FragmentTransaction mFrgTransaction;
     protected String mTag;
+    protected TransactionAnimation mTransactionAnimation;
 
     /**
      * FragmentTransaction constructor, created to be used by an activity.
@@ -129,15 +130,7 @@ public Fragment getFragment() {
      * @return Return the Transaction instance.
      */
     public FragmentTransaction setTransactionAnimation(TransactionAnimation transactionAnimation) {
-        // Apply the default activity animation if the FragmentTransaction is null.
-        if (transactionAnimation == null) {
-            transactionAnimation = mActivity;
-        }
-
-        // Set the custom transaction animation.
-        mFrgTransaction.setCustomAnimations(transactionAnimation.getAnimationEnter(), transactionAnimation.getAnimationExit(),
-                transactionAnimation.getAnimationPopEnter(),
-                transactionAnimation.getAnimationPopExit());
+        mTransactionAnimation = transactionAnimation;
 
         return this;
     }

activity-fragment-manager/src/main/java/com/massivedisaster/activitymanager/ReplaceFragmentTransaction.java

@@ -47,6 +47,16 @@ class ReplaceFragmentTransaction extends FragmentTransaction {
 
     @Override
     public void commit() {
+        // Apply the default activity animation if the FragmentTransaction is null.
+        if (mTransactionAnimation == null) {
+            mTransactionAnimation = mActivity;
+        }
+
+        // Set the custom transaction animation.
+        mFrgTransaction.setCustomAnimations(mTransactionAnimation.getAnimationEnter(), mTransactionAnimation.getAnimationExit(),
+                mTransactionAnimation.getAnimationPopEnter(),
+                mTransactionAnimation.getAnimationPopExit());
+
         // Hide the first fragment in the container.
         if (mActivity.getSupportFragmentManager().findFragmentById(mActivity.getContainerViewId()) != null) {
             mFrgTransaction.hide(mActivity.getSupportFragmentManager().findFragmentById(mActivity.getContainerViewId()));