Make dedicated stack from SendSheet (#330)

streamable.com/dmmsx
rainbow-me · Feb 3, 2020 · b2d7cb5 · b2d7cb5
1 parent 78fd954
commit b2d7cb5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/src/navigation/transitions/effects.js b/src/navigation/transitions/effects.js
@@ -39,13 +39,13 @@ const exchangeStyleInterpolator = ({
   };
 };
 
-const expandStyleInterpolator = ({
+const expandStyleInterpolator = targetOpacity => ({
   current: { progress: current },
   layouts: { screen },
 }) => {
   const backgroundOpacity = current.interpolate({
     inputRange: [-1, 0, 0.975, 2],
-    outputRange: [0, 0, 0.7, 0.7],
+    outputRange: [0, 0, targetOpacity, targetOpacity],
   });
 
   const translateY = current.interpolate({
@@ -160,7 +160,7 @@ export const overlayExpandedPreset = {
   cardOverlayEnabled: true,
   cardShadowEnabled: true,
   cardStyle: { backgroundColor: 'transparent' },
-  cardStyleInterpolator: expandStyleInterpolator,
+  cardStyleInterpolator: expandStyleInterpolator(0.4),
   cardTransparent: true,
   gestureDirection: 'vertical',
   gestureResponseDistance,
@@ -171,7 +171,7 @@ export const expandedPreset = {
   cardOverlayEnabled: true,
   cardShadowEnabled: true,
   cardStyle: { backgroundColor: 'transparent' },
-  cardStyleInterpolator: expandStyleInterpolator,
+  cardStyleInterpolator: expandStyleInterpolator(0.7),
   cardTransparent: true,
   gestureDirection: 'vertical',
   gestureResponseDistance,

diff --git a/src/screens/Routes/Routes.ios.js b/src/screens/Routes/Routes.ios.js
@@ -100,10 +100,6 @@ const MainNavigator = createStackNavigator(
       },
       screen: ExpandedAssetScreenWithData,
     },
-    OverlayExpandedAssetScreen: {
-      navigationOptions: overlayExpandedPreset,
-      screen: ExpandedAssetScreenWithData,
-    },
     ReceiveModal: {
       navigationOptions: {
         ...expandedPreset,
@@ -168,9 +164,28 @@ const NativeStack = createNativeStackNavigator(
       );
     },
     MainNavigator,
-    SendSheet: function SendSheetWrapper(...props) {
-      return <SendSheetWithData {...props} setAppearListener={setListener} />;
-    },
+    SendSheetNavigator: createStackNavigator(
+      {
+        OverlayExpandedAssetScreen: {
+          navigationOptions: overlayExpandedPreset,
+          screen: ExpandedAssetScreenWithData,
+        },
+        SendSheet: function SendSheetWrapper(...props) {
+          return (
+            <SendSheetWithData {...props} setAppearListener={setListener} />
+          );
+        },
+      },
+      {
+        defaultNavigationOptions: {
+          onTransitionEnd,
+          onTransitionStart,
+        },
+        headerMode: 'none',
+        initialRouteName: 'SendSheet',
+        mode: 'modal',
+      }
+    ),
   },
   {
     defaultNavigationOptions: {