Merge pull request #183 from deepueg/add-animation-support

Add animation support

Author: deepueg

android/lib/src/main/java/com/ern/api/impl/core/ElectrodeBaseActivityDelegate.java

@@ -14,6 +14,7 @@
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 
+import com.ern.api.impl.util.AnimUtil;
 import com.walmartlabs.electrode.reactnative.bridge.helpers.Logger;
 import com.walmartlabs.ern.container.ElectrodeReactActivityDelegate;
 
@@ -196,6 +197,11 @@ private void switchToFragment(@NonNull Fragment fragment, @NonNull LaunchConfig
      * @param transaction {@link FragmentTransaction} used for the current fragment transaction
      */
     protected void manageTransition(@NonNull FragmentTransaction transaction) {
+        if(mDefaultLaunchConfig.navigationTransition == LaunchConfig.TRANSITION.FADE) {
+            AnimUtil.fade(transaction);
+        } else if(mDefaultLaunchConfig.navigationTransition == LaunchConfig.TRANSITION.SLIDE) {
+            AnimUtil.slide(transaction);
+        }
     }
 
     private FragmentManager getFragmentManager(@NonNull LaunchConfig launchConfig) {

android/lib/src/main/java/com/ern/api/impl/core/ElectrodeBaseFragmentDelegate.java

@@ -43,6 +43,8 @@ public class ElectrodeBaseFragmentDelegate<T extends ElectrodeBaseFragmentDelega
 
     private String mMiniAppComponentName = NAME_NOT_SET_YET;
 
+    private ViewGroup previousParent;
+
     @SuppressWarnings("unused")
     public ElectrodeBaseFragmentDelegate(@NonNull Fragment fragment) {
         this(fragment, null);
@@ -102,7 +104,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
             } else {
                 Logger.i(TAG, "Missing miniAppComponentName inside arguments, will not create a MiniApp view.");
             }
-        }
+        } else if (previousParent != null && mMiniAppView.getParent() == previousParent) {{
+            previousParent.removeView(mMiniAppView);
+            previousParent = null;
+        }}
 
         View rootView;
         if (mFragmentConfig != null && mFragmentConfig.mFragmentLayoutId != ElectrodeFragmentConfig.NONE) {
@@ -243,14 +248,17 @@ public void onStop() {
     @SuppressWarnings("unused")
     public void onDestroyView() {
         Logger.v(TAG, "onDestroyView(): " + getReactComponentName());
+        storeOldParent();
+    }
+
+    private void storeOldParent() {
         // If the ReactNative view was inflated inside a container make sure to remove the ReactRootView from the parent
         // since we are reusing the same MiniApp view instance when the view is recreated.
         View rootView = mFragment.getView();
         if (rootView != null && mMiniAppView != null && rootView != mMiniAppView && mFragmentConfig != null) {
-            View parentView = rootView.findViewById(mFragmentConfig.mReactViewContainerId);
-            if (parentView != null && mMiniAppView.getParent() == parentView) {
-                ((ViewGroup) parentView).removeView(mMiniAppView);
-                Logger.v(TAG, "Removed MiniApp(%s) view from parent view", getReactComponentName());
+            final View parentView = rootView.findViewById(mFragmentConfig.mReactViewContainerId);
+            if (parentView instanceof ViewGroup) {
+                previousParent = (ViewGroup) parentView;
             }
         }
     }
@@ -267,6 +275,7 @@ public void onDestroy() {
         if (mFragment.getArguments() != null) {
             mFragment.getArguments().remove(KEY_UNIQUE_VIEW_IDENTIFIER);
         }
+        previousParent = null;
     }
 
     @SuppressWarnings("unused")

android/lib/src/main/java/com/ern/api/impl/core/LaunchConfig.java

@@ -4,6 +4,7 @@
 
 import androidx.annotation.IdRes;
 import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
@@ -26,6 +27,12 @@ public class LaunchConfig {
 
     public static final int NONE = 0;
 
+    public enum TRANSITION {
+        DEFAULT,
+        FADE,
+        SLIDE
+    }
+
     /**
      * Pass a fragmentManager that should be used to start the new fragment.
      * If not passed the {@link AppCompatActivity#getSupportFragmentManager()} would be used to start the new fragment.
@@ -91,6 +98,11 @@ public class LaunchConfig {
      */
     boolean mReplace;
 
+    /**
+     * Choose the animation for your page transitions.
+     */
+    TRANSITION navigationTransition = TRANSITION.DEFAULT;
+
     public LaunchConfig() {
     }
 
@@ -252,4 +264,8 @@ public void setReplace(boolean replace) {
     public boolean shouldReplace() {
         return mReplace;
     }
+
+    public void setNavigationTransition(@NonNull TRANSITION transition) {
+        navigationTransition = transition;
+    }
 }

android/lib/src/main/java/com/ern/api/impl/util/AnimUtil.java

@@ -0,0 +1,24 @@
+package com.ern.api.impl.util;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentTransaction;
+import com.walmartlabs.ern.navigation.res.lib.R;
+
+public class AnimUtil {
+
+    public static void fade(@NonNull FragmentTransaction transaction) {
+        transaction.setCustomAnimations(
+                R.anim.fade_in,//enter
+                R.anim.fade_out,//exit
+                R.anim.fade_in,//popEnter
+                R.anim.fade_out);//popExit
+    }
+
+    public static void slide(@NonNull FragmentTransaction transaction) {
+        transaction.setCustomAnimations(
+                R.anim.slide_in,//enter
+                R.anim.fade_out,//exit
+                R.anim.fade_in,//popEnter
+                R.anim.slide_out);//popExit
+    }
+}

android/moviesreloaded/build.gradle

@@ -38,6 +38,8 @@ dependencies {
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     implementation 'com.google.android.material:material:1.3.0'
 
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

android/moviesreloaded/src/main/java/com/walmartlabs/moviesreloaded/demo/customfragment/CustomFragmentActivity.java

@@ -2,6 +2,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.ern.api.impl.core.LaunchConfig;
 import com.ern.api.impl.navigation.ElectrodeBaseActivity;
 import com.ern.api.impl.navigation.NavigationLaunchConfig;
 import com.walmartlabs.moviesreloaded.R;
@@ -28,6 +29,7 @@ protected NavigationLaunchConfig createNavigationLaunchConfig() {
         NavigationLaunchConfig config = super.createNavigationLaunchConfig();
         config.setFragmentClass(CustomFragment.class);
         config.setForceUpEnabled(true);
+        config.setNavigationTransition(LaunchConfig.TRANSITION.FADE);
         return config;
     }
 }

android/moviesreloaded/src/main/java/com/walmartlabs/moviesreloaded/demo/defaultbehavior/DefaultActivity.java

@@ -3,6 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
+import com.ern.api.impl.core.LaunchConfig;
 import com.ern.api.impl.navigation.ElectrodeBaseActivity;
 import com.ern.api.impl.navigation.MiniAppNavigationFragment;
 import com.ern.api.impl.navigation.NavigationLaunchConfig;
@@ -38,6 +39,7 @@ protected Class<? extends Fragment> miniAppFragmentClass() {
     protected NavigationLaunchConfig createNavigationLaunchConfig() {
         NavigationLaunchConfig config = super.createNavigationLaunchConfig();
         config.setForceUpEnabled(true);
+        config.setNavigationTransition(LaunchConfig.TRANSITION.FADE);
         config.useActivityScopeForNavigation(false, (NavigationLaunchConfig.RouteHandlerProvider<MiniAppNavigationFragment>) () -> {
             Logger.v(TAG, "Entering getRouteHandler() implementation");
             Fragment f = getSupportFragmentManager().findFragmentById(getFragmentContainerId());

android/moviesreloaded/src/main/java/com/walmartlabs/moviesreloaded/demo/navmenuhandler/NavMenuActivity.java

@@ -48,6 +48,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     protected LaunchConfig createDefaultLaunchConfig() {
         LaunchConfig config =  super.createDefaultLaunchConfig();
         config.setForceUpEnabled(true);
+        config.setNavigationTransition(LaunchConfig.TRANSITION.SLIDE);
         return config;
     }
 }