diff options
5 files changed, 38 insertions, 14 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index 10b8ec3d..69234c5f 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -75,7 +75,10 @@ export type MainStackParams = { screenType: ScreenType; }; UpdateSPPicture: { - goTo: string; + editing: boolean; + }; + BadgeSelection: { + editing: boolean; }; MutualBadgeHolders: { badge_id: string; diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx index 91f41fe4..068748b1 100644 --- a/src/routes/main/MainStackScreen.tsx +++ b/src/routes/main/MainStackScreen.tsx @@ -230,7 +230,15 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => { <MainStack.Screen name="UpdateSPPicture" component={SuggestedPeopleUploadPictureScreen} - initialParams={{goTo: 'Profile'}} + initialParams={{editing: true}} + options={{ + ...headerBarOptions('white', ''), + }} + /> + <MainStack.Screen + name="BadgeSelection" + component={BadgeSelection} + initialParams={{editing: true}} options={{ ...headerBarOptions('white', ''), }} diff --git a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx index 63547acb..30a83200 100644 --- a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx +++ b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx @@ -3,11 +3,11 @@ import {createStackNavigator} from '@react-navigation/stack'; export type SuggestedPeopleOnboardingStackParams = { WelcomeScreen: undefined; UploadPicture: { - goTo: string; + editing: boolean; + }; + BadgeSelection: { + editing: boolean; }; - BadgeSelection: undefined; }; -export const SuggestedPeopleOnboardingStack = createStackNavigator< - SuggestedPeopleOnboardingStackParams ->(); +export const SuggestedPeopleOnboardingStack = createStackNavigator<SuggestedPeopleOnboardingStackParams>(); diff --git a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx index d1a6e5e1..a02e8373 100644 --- a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx +++ b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx @@ -26,7 +26,7 @@ const SuggestedPeopleOnboardingStackScreen: React.FC = () => { <SuggestedPeopleOnboardingStack.Screen name="UploadPicture" component={SuggestedPeopleUploadPictureScreen} - initialParams={{goTo: 'SP Preview'}} + initialParams={{editing: false}} options={{ ...headerBarOptions('white', ''), }} @@ -34,6 +34,7 @@ const SuggestedPeopleOnboardingStackScreen: React.FC = () => { <SuggestedPeopleOnboardingStack.Screen name="BadgeSelection" component={BadgeSelection} + initialParams={{editing: false}} options={{ ...headerBarOptions('white', ''), }} diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx index 92f862c4..37f047d5 100644 --- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx +++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx @@ -25,7 +25,7 @@ import {RootState} from '../../store/rootReducer'; import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils'; const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => { - const {goTo} = route.params; + const {editing} = route.params; const [image, setImage] = useState<string | undefined>(undefined); const [loading, setLoading] = useState(false); const dispatch = useDispatch(); @@ -42,7 +42,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => { } }; // if we're in edit SP, attempt to load current sp image - if (goTo === 'Profile') { + if (editing) { loadData(); } }, []); @@ -76,7 +76,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => { const success = await sendSuggestedPeoplePhoto(image); if (success) { dispatch(uploadedSuggestedPeoplePhoto(image)); - if (goTo !== 'Profile') { + if (!editing) { navigation.push('BadgeSelection'); } } else { @@ -86,7 +86,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => { setLoading(false); // Navigated back to Profile if user is editing their Suggested People Picture - if (goTo === 'Profile') { + if (editing) { navigation.goBack(); setTimeout(() => { Alert.alert(SUCCESS_PIC_UPLOAD); @@ -99,9 +99,13 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => { {loading && <TaggLoadingIndicator fullscreen />} <StatusBar barStyle={'light-content'} /> <SafeAreaView style={styles.container}> - <Text style={styles.title}>PHOTO</Text> + <Text style={styles.title}>{editing ? 'Edit Suggested' : 'PHOTO'}</Text> {image ? ( - <Text style={styles.body}>Tap again to choose another photo</Text> + <Text style={styles.body}> + {editing + ? 'Tap to upload new photo' + : 'Tap again to choose another photo'} + </Text> ) : ( <Text style={styles.body}> Upload a photo, this is what other users will see @@ -132,6 +136,14 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => { </ImageBackground> </TouchableOpacity> )} + {editing && ( + <TouchableOpacity + onPress={() => { + navigation.push('BadgeSelection'); + }}> + <Text>edit badges ---></Text> + </TouchableOpacity> + )} {image && ( <TaggSquareButton onPress={uploadImage} |