diff --git a/src/components/StarterPack/Wizard/BackGestureDetector.ios.tsx b/src/components/StarterPack/Wizard/BackGestureDetector.ios.tsx deleted file mode 100644 index bf0b2593c0..0000000000 --- a/src/components/StarterPack/Wizard/BackGestureDetector.ios.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import React from 'react' -import {Gesture, GestureDetector} from 'react-native-gesture-handler' -import {runOnJS} from 'react-native-reanimated' - -export function BackGestureDetector({ - onBack, - children, -}: { - onBack: () => void - children: React.ReactNode -}) { - const swipeGesture = Gesture.Pan() - .maxPointers(1) - .onEnd(({translationX, translationY, velocityX}) => { - if ( - // Make sure it isn't a scrollview - translationX > translationY && - translationY <= 10 && - translationX >= 25 && - // Shouldn't be a really slow swipe - velocityX >= 300 - ) { - runOnJS(onBack)() - } - }) - - return {children} -} diff --git a/src/components/StarterPack/Wizard/BackGestureDetector.tsx b/src/components/StarterPack/Wizard/BackGestureDetector.tsx deleted file mode 100644 index 84440fc58b..0000000000 --- a/src/components/StarterPack/Wizard/BackGestureDetector.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react' - -export function BackGestureDetector({ - onBack: _onBack, - children, -}: { - onBack: () => void - children: React.ReactNode -}) { - return children -} diff --git a/src/screens/StarterPack/Wizard/StepDetails.tsx b/src/screens/StarterPack/Wizard/StepDetails.tsx index be73f55dd2..24c992c60b 100644 --- a/src/screens/StarterPack/Wizard/StepDetails.tsx +++ b/src/screens/StarterPack/Wizard/StepDetails.tsx @@ -2,16 +2,13 @@ import React from 'react' import {View} from 'react-native' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useNavigation} from '@react-navigation/native' -import {NavigationProp} from 'lib/routes/types' import {useProfileQuery} from 'state/queries/profile' import {useSession} from 'state/session' import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {atoms as a, useTheme} from '#/alf' import * as TextField from '#/components/forms/TextField' import {StarterPack} from '#/components/icons/StarterPack' -import {BackGestureDetector} from '#/components/StarterPack/Wizard/BackGestureDetector' import {ScreenTransition} from '#/components/StarterPack/Wizard/ScreenTransition' import {Text} from '#/components/Typography' @@ -19,7 +16,6 @@ export function StepDetails() { const {_} = useLingui() const t = useTheme() const [state, dispatch] = useWizardState() - const navigation = useNavigation() const {currentAccount} = useSession() const {data: currentProfile} = useProfileQuery({ @@ -28,71 +24,61 @@ export function StepDetails() { }) return ( - { - if (navigation.canGoBack()) { - navigation.goBack() - } else { - navigation.navigate('Home') - } - }}> - - - - - - Invites, but personal - - - - Invite your friends to follow your favorite feeds and people - - - - - - What do you want to call your starter pack? - - - dispatch({type: 'SetName', name: text})} - /> - - - {state.name?.length ?? 0}/50 - - - - - - - Tell us a little more - - - - dispatch({type: 'SetDescription', description: text}) - } - multiline - style={{minHeight: 150}} - /> - - + + + + + + Invites, but personal + + + + Invite your friends to follow your favorite feeds and people + + - - + + + What do you want to call your starter pack? + + + dispatch({type: 'SetName', name: text})} + /> + + + {state.name?.length ?? 0}/50 + + + + + + + Tell us a little more + + + + dispatch({type: 'SetDescription', description: text}) + } + multiline + style={{minHeight: 150}} + /> + + + + ) } diff --git a/src/screens/StarterPack/Wizard/StepFeeds.tsx b/src/screens/StarterPack/Wizard/StepFeeds.tsx index f1f137ddb1..fbd8e7389d 100644 --- a/src/screens/StarterPack/Wizard/StepFeeds.tsx +++ b/src/screens/StarterPack/Wizard/StepFeeds.tsx @@ -17,7 +17,6 @@ import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {atoms as a, useTheme} from '#/alf' import {useThrottledValue} from '#/components/hooks/useThrottledValue' import {Loader} from '#/components/Loader' -import {BackGestureDetector} from '#/components/StarterPack/Wizard/BackGestureDetector' import {ScreenTransition} from '#/components/StarterPack/Wizard/ScreenTransition' import {WizardFeedCard} from '#/components/StarterPack/Wizard/WizardListCard' import {Text} from '#/components/Typography' @@ -68,58 +67,50 @@ export function StepFeeds({moderationOpts}: {moderationOpts: ModerationOpts}) { } return ( - dispatch({type: 'Back'})}> - - - - setQuery(t)} - onPressCancelSearch={() => setQuery('')} - onSubmitQuery={() => {}} - /> - + + + + setQuery(t)} + onPressCancelSearch={() => setQuery('')} + onSubmitQuery={() => {}} + /> - fetchNextPage() : undefined - } - onEndReachedThreshold={2} - renderScrollComponent={props => ( - - )} - keyboardShouldPersistTaps="handled" - containWeb={true} - sideBorders={false} - style={{flex: 1}} - ListEmptyComponent={ - - {isLoadingSearch ? ( - - ) : ( - - - No feeds found. Try searching for something else. - - - )} - - } - /> - - + + fetchNextPage() : undefined + } + onEndReachedThreshold={2} + renderScrollComponent={props => } + keyboardShouldPersistTaps="handled" + containWeb={true} + sideBorders={false} + style={{flex: 1}} + ListEmptyComponent={ + + {isLoadingSearch ? ( + + ) : ( + + No feeds found. Try searching for something else. + + )} + + } + /> + ) } diff --git a/src/screens/StarterPack/Wizard/StepProfiles.tsx b/src/screens/StarterPack/Wizard/StepProfiles.tsx index 877edacbc9..f21b01d40d 100644 --- a/src/screens/StarterPack/Wizard/StepProfiles.tsx +++ b/src/screens/StarterPack/Wizard/StepProfiles.tsx @@ -13,7 +13,6 @@ import {List} from 'view/com/util/List' import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {atoms as a, useTheme} from '#/alf' import {Loader} from '#/components/Loader' -import {BackGestureDetector} from '#/components/StarterPack/Wizard/BackGestureDetector' import {ScreenTransition} from '#/components/StarterPack/Wizard/ScreenTransition' import {WizardProfileCard} from '#/components/StarterPack/Wizard/WizardListCard' import {Text} from '#/components/Typography' @@ -55,57 +54,49 @@ export function StepProfiles({ } return ( - dispatch({type: 'Back'})}> - - - - setQuery('')} - onSubmitQuery={() => {}} - /> - + + + + setQuery('')} + onSubmitQuery={() => {}} + /> - ( - - )} - keyboardShouldPersistTaps="handled" - containWeb={true} - sideBorders={false} - style={[a.flex_1]} - onEndReached={ - !query && !screenReaderEnabled ? () => fetchNextPage() : undefined - } - onEndReachedThreshold={isNative ? 2 : 0.25} - ListEmptyComponent={ - - {isLoadingResults ? ( - - ) : ( - - - Nobody was found. Try searching for someone else. - - - )} - - } - /> - - + + } + keyboardShouldPersistTaps="handled" + containWeb={true} + sideBorders={false} + style={[a.flex_1]} + onEndReached={ + !query && !screenReaderEnabled ? () => fetchNextPage() : undefined + } + onEndReachedThreshold={isNative ? 2 : 0.25} + ListEmptyComponent={ + + {isLoadingResults ? ( + + ) : ( + + Nobody was found. Try searching for someone else. + + )} + + } + /> + ) }