fix: rework open/back animation logic on Android

TestsExample/App.js

@@ -34,6 +34,7 @@ import Test817 from './src/Test817';
 import Test831 from './src/Test831';
 import Test844 from './src/Test844';
 import Test861 from './src/Test861';
+import Test865 from './src/Test865';
 
 enableScreens();
 

TestsExample/src/Test865.tsx

@@ -0,0 +1,59 @@
+import React from 'react';
+import { View, Text, Button } from 'react-native';
+
+import { NavigationContainer } from '@react-navigation/native';
+import { createNativeStackNavigator } from 'react-native-screens/native-stack';
+
+const Stack = createNativeStackNavigator();
+
+const First = ({ navigation }: any) => (
+  <View style={{ flex: 1, justifyContent: 'center' }}>
+    <Text style={{ paddingBottom: 24, textAlign: 'center' }}>Screen 1</Text>
+    <Button
+      title="PUSH TO SCREEN 2"
+      onPress={() => navigation.push('Screen2')}
+    />
+  </View>
+);
+
+const Second = ({ navigation }: any) => (
+  <View style={{ flex: 1, justifyContent: 'center' }}>
+    <Text style={{ paddingBottom: 24, textAlign: 'center' }}>Screen 2</Text>
+    <Button
+      title="PUSH TO SCREEN 3"
+      onPress={() => navigation.push('Screen3')}
+    />
+  </View>
+);
+
+const Third = ({ navigation }: any) => (
+  <View style={{ flex: 1, justifyContent: 'center' }}>
+    <Text style={{ paddingBottom: 24, textAlign: 'center' }}>Screen 3</Text>
+    <Button
+      title="RESET TO SCREEN 1 WITH INDEX OF 0"
+      onPress={() =>
+        navigation.reset({
+          routes: [{ name: 'Screen1' }],
+          index: 0,
+        })
+      }
+    />
+  </View>
+);
+
+const App = () => {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator
+        screenOptions={{
+          stackAnimation: 'slide_from_right',
+        }}>
+        <Stack.Screen name="Screen1" component={First} />
+        <Stack.Screen name="Screen2" component={Second} />
+        <Stack.Screen name="Screen3" component={Third} />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+};
+
+export default App;

android/src/main/java/com/swmansion/rnscreens/ScreenStack.java

@@ -169,65 +169,63 @@ protected void performUpdate() {
       }
     }
 
-    boolean customAnimation = false;
+    // variables used for "open/back animation" logic
+    boolean shouldPlayOpenAnimation = true;
+    boolean isCustomAnimation = false;
+    int transition;
+    Screen.StackAnimation stackAnimation = Screen.StackAnimation.DEFAULT;
 
     if (!mStack.contains(newTop)) {
       // if new top screen wasn't on stack we do "open animation" so long it is not the very first screen on stack
       if (mTopScreen != null && newTop != null) {
         // there was some other screen attached before
-        int transition = FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
-        if (!mScreenFragments.contains(mTopScreen) && newTop.getScreen().getReplaceAnimation() == Screen.ReplaceAnimation.POP) {
-          // if the previous top screen does not exist anymore and the new top was not on the stack before,
-          // probably replace was called, so we check the animation
-          transition = FragmentTransaction.TRANSIT_FRAGMENT_CLOSE;
-        }
-        switch (newTop.getScreen().getStackAnimation()) {
-          case NONE:
-            transition = FragmentTransaction.TRANSIT_NONE;
-            break;
-          case FADE:
-            transition = FragmentTransaction.TRANSIT_FRAGMENT_FADE;
-            break;
-          case SLIDE_FROM_RIGHT:
-            customAnimation = true;
-            getOrCreateTransaction().setCustomAnimations(R.anim.rns_slide_in_from_right, R.anim.rns_slide_out_to_left);
-            break;
-          case SLIDE_FROM_LEFT:
-            customAnimation = true;
-            getOrCreateTransaction().setCustomAnimations(R.anim.rns_slide_in_from_left, R.anim.rns_slide_out_to_right);
-            break;
-        }
-
-        if (!customAnimation) {
-          getOrCreateTransaction().setTransition(transition);
-        }
+        // if the previous top screen does not exist anymore and the new top was not on the stack before,
+        // probably replace or reset was called, so we play the "back animation"
+        // otherwise it's open animation
+        shouldPlayOpenAnimation = mScreenFragments.contains(mTopScreen) || newTop.getScreen().getReplaceAnimation() != Screen.ReplaceAnimation.POP;
+        // and check if it is a custom animation
+        isCustomAnimation = isCustomAnimation(newTop);
+        stackAnimation = newTop.getScreen().getStackAnimation();
       }
     } else if (mTopScreen != null && !mTopScreen.equals(newTop)) {
       // otherwise if we are performing top screen change we do "back animation"
-      int transition = FragmentTransaction.TRANSIT_FRAGMENT_CLOSE;
-
-      switch (mTopScreen.getScreen().getStackAnimation()) {
-        case NONE:
-          transition = FragmentTransaction.TRANSIT_NONE;
-          break;
-        case FADE:
-          transition = FragmentTransaction.TRANSIT_FRAGMENT_FADE;
-          break;
-        case SLIDE_FROM_RIGHT:
-          customAnimation = true;
-          getOrCreateTransaction().setCustomAnimations(R.anim.rns_slide_in_from_left, R.anim.rns_slide_out_to_right);
-          break;
-        case SLIDE_FROM_LEFT:
-          customAnimation = true;
-          getOrCreateTransaction().setCustomAnimations(R.anim.rns_slide_in_from_right, R.anim.rns_slide_out_to_left);
-          break;
+      shouldPlayOpenAnimation = false;
+      // and check if it is a custom animation
+      isCustomAnimation = isCustomAnimation(mTopScreen);
+      stackAnimation = mTopScreen.getScreen().getStackAnimation();
+    }
+
+    // animation logic start
+    if (shouldPlayOpenAnimation) {
+      transition = FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
+
+      if (stackAnimation == Screen.StackAnimation.SLIDE_FROM_RIGHT) {
+        getOrCreateTransaction().setCustomAnimations(R.anim.rns_slide_in_from_right, R.anim.rns_slide_out_to_left);
+      } else if (stackAnimation == Screen.StackAnimation.SLIDE_FROM_LEFT) {
+        getOrCreateTransaction().setCustomAnimations(R.anim.rns_slide_in_from_left, R.anim.rns_slide_out_to_right);
       }
+    } else {
+      transition = FragmentTransaction.TRANSIT_FRAGMENT_CLOSE;
 
-      if (!customAnimation) {
-        getOrCreateTransaction().setTransition(transition);
+      if (stackAnimation == Screen.StackAnimation.SLIDE_FROM_RIGHT) {
+        getOrCreateTransaction().setCustomAnimations(R.anim.rns_slide_in_from_left, R.anim.rns_slide_out_to_right);
+      } else if (stackAnimation == Screen.StackAnimation.SLIDE_FROM_LEFT) {
+        getOrCreateTransaction().setCustomAnimations(R.anim.rns_slide_in_from_right, R.anim.rns_slide_out_to_left);
       }
     }
 
+    if (stackAnimation == Screen.StackAnimation.NONE) {
+      transition = FragmentTransaction.TRANSIT_NONE;
+    }
+    if (stackAnimation == Screen.StackAnimation.FADE) {
+      transition = FragmentTransaction.TRANSIT_FRAGMENT_FADE;
+    }
+
+    if (!isCustomAnimation) {
+      getOrCreateTransaction().setTransition(transition);
+    }
+    // animation logic end
+
     // remove all screens previously on stack
     for (ScreenStackFragment screen : mStack) {
       if (!mScreenFragments.contains(screen) || mDismissed.contains(screen)) {
@@ -340,6 +338,10 @@ private void setupBackHandlerIfNeeded(ScreenStackFragment topScreen) {
     }
   }
 
+  private static boolean isCustomAnimation(ScreenStackFragment fragment) {
+    return fragment.getScreen().getStackAnimation() == Screen.StackAnimation.SLIDE_FROM_RIGHT || fragment.getScreen().getStackAnimation() == Screen.StackAnimation.SLIDE_FROM_LEFT;
+  }
+
   private static boolean isTransparent(ScreenStackFragment fragment){
     return fragment.getScreen().getStackPresentation() == Screen.StackPresentation.TRANSPARENT_MODAL;
   }