diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-02-01 16:01:03 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-02-01 16:01:03 -0500 |
| commit | 8d1013e86cf2d66671c337d49a80da157802ad86 (patch) | |
| tree | 656b1656068bb6636919359d4faaf7051994ff74 /src/routes | |
| parent | 951d85348acef13ec7830629205c30ad5f766bee (diff) | |
| parent | 7a09cc96bf1fe468a612bb44362bbef24fccc773 (diff) | |
Merge branch 'master' into TMA-546-Onboarding-Page
Diffstat (limited to 'src/routes')
| -rw-r--r-- | src/routes/main/MainStackNavigator.tsx | 1 | ||||
| -rw-r--r-- | src/routes/main/MainStackScreen.tsx | 27 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index bd838ef2..663aeaea 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -37,6 +37,7 @@ export type MainStackParams = { moment_id: string; userXId: string | undefined; screenType: ScreenType; + comment_id?: string; }; FriendsListScreen: { userXId: string | undefined; diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx index b4eaa213..3e425101 100644 --- a/src/routes/main/MainStackScreen.tsx +++ b/src/routes/main/MainStackScreen.tsx @@ -54,7 +54,7 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => { })(); const modalStyle: StackNavigationOptions = { - cardStyle: {backgroundColor: 'transparent'}, + cardStyle: {backgroundColor: 'rgba(80,80,80,0.9)'}, gestureDirection: 'vertical', cardOverlayEnabled: true, cardStyleInterpolator: ({current: {progress}}) => ({ @@ -64,14 +64,6 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => { outputRange: [0, 0.25, 0.7, 1], }), }, - overlayStyle: { - backgroundColor: '#505050', - opacity: progress.interpolate({ - inputRange: [0, 1], - outputRange: [0, 0.9], - extrapolate: 'clamp', - }), - }, }), }; @@ -156,16 +148,25 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => { name="IndividualMoment" component={IndividualMoment} options={{ - ...modalStyle, + gestureEnabled: false, + cardStyle: { + backgroundColor: 'rgba(0, 0, 0, 0.6)', + }, + cardOverlayEnabled: true, + cardStyleInterpolator: ({current: {progress}}) => ({ + cardStyle: { + opacity: progress.interpolate({ + inputRange: [0, 0.5, 0.9, 1], + outputRange: [0, 0.25, 0.7, 1], + }), + }, + }), }} initialParams={{screenType}} /> <MainStack.Screen name="MomentCommentsScreen" component={MomentCommentsScreen} - options={{ - ...modalStyle, - }} initialParams={{screenType}} /> <MainStack.Screen |