go back gesture, tweak header copy

src/components/StarterPack/Wizard/BackGestureDetector.ios.tsx

@@ -0,0 +1,28 @@
+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 <GestureDetector gesture={swipeGesture}>{children}</GestureDetector>
+}

src/components/StarterPack/Wizard/BackGestureDetector.tsx

@@ -0,0 +1,11 @@
+import React from 'react'
+
+export function BackGestureDetector({
+  onBack: _onBack,
+  children,
+}: {
+  onBack: () => void
+  children: React.ReactNode
+}) {
+  return children
+}

src/screens/StarterPack/Wizard/StepDetails.tsx

@@ -2,13 +2,16 @@ 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'
 
@@ -16,6 +19,7 @@ export function StepDetails() {
   const {_} = useLingui()
   const t = useTheme()
   const [state, dispatch] = useWizardState()
+  const navigation = useNavigation<NavigationProp>()
 
   const {currentAccount} = useSession()
   const {data: currentProfile} = useProfileQuery({
@@ -24,6 +28,14 @@ export function StepDetails() {
   })
 
   return (
+    <BackGestureDetector
+      onBack={() => {
+        if (navigation.canGoBack()) {
+          navigation.goBack()
+        } else {
+          navigation.navigate('Home')
+        }
+      }}>
       <ScreenTransition direction={state.transitionDirection}>
         <View style={[a.px_xl, a.gap_xl, a.mt_4xl]}>
           <View style={[a.gap_md, a.align_center, a.px_md, a.mb_md]}>
@@ -51,7 +63,8 @@ export function StepDetails() {
                 value={state.name}
                 onChangeText={text => dispatch({type: 'SetName', name: text})}
               />
-            <TextField.SuffixText label={_(`${state.name?.length} out of 50`)}>
+              <TextField.SuffixText
+                label={_(`${state.name?.length} out of 50`)}>
                 <Text style={[t.atoms.text_contrast_medium]}>
                   {state.name?.length ?? 0}/50
                 </Text>
@@ -80,5 +93,6 @@ export function StepDetails() {
           </View>
         </View>
       </ScreenTransition>
+    </BackGestureDetector>
   )
 }

src/screens/StarterPack/Wizard/StepFeeds.tsx

@@ -17,6 +17,7 @@ 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'
@@ -64,7 +65,10 @@ export function StepFeeds({moderationOpts}: {moderationOpts: ModerationOpts}) {
   }
 
   return (
-    <ScreenTransition style={[a.flex_1]} direction={state.transitionDirection}>
+    <BackGestureDetector onBack={() => dispatch({type: 'Back'})}>
+      <ScreenTransition
+        style={[a.flex_1]}
+        direction={state.transitionDirection}>
         <View style={[a.border_b, t.atoms.border_contrast_medium]}>
           <View style={[a.my_sm, a.px_md, {height: 40}]}>
             <SearchInput
@@ -84,7 +88,9 @@ export function StepFeeds({moderationOpts}: {moderationOpts: ModerationOpts}) {
             !query && !screenReaderEnabled ? () => fetchNextPage() : undefined
           }
           onEndReachedThreshold={2}
-        renderScrollComponent={props => <KeyboardAwareScrollView {...props} />}
+          renderScrollComponent={props => (
+            <KeyboardAwareScrollView {...props} />
+          )}
           keyboardShouldPersistTaps="handled"
           containWeb={true}
           sideBorders={false}
@@ -102,12 +108,15 @@ export function StepFeeds({moderationOpts}: {moderationOpts: ModerationOpts}) {
                     a.mt_lg,
                     a.leading_snug,
                   ]}>
-                <Trans>No feeds found. Try searching for something else.</Trans>
+                  <Trans>
+                    No feeds found. Try searching for something else.
+                  </Trans>
                 </Text>
               )}
             </View>
           }
         />
       </ScreenTransition>
+    </BackGestureDetector>
   )
 }

src/screens/StarterPack/Wizard/StepProfiles.tsx

@@ -13,6 +13,7 @@ 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'
@@ -53,7 +54,10 @@ export function StepProfiles({
   }
 
   return (
-    <ScreenTransition style={[a.flex_1]} direction={state.transitionDirection}>
+    <BackGestureDetector onBack={() => dispatch({type: 'Back'})}>
+      <ScreenTransition
+        style={[a.flex_1]}
+        direction={state.transitionDirection}>
         <View style={[a.border_b, t.atoms.border_contrast_medium]}>
           <View style={[a.my_sm, a.px_md, {height: 40}]}>
             <SearchInput
@@ -68,7 +72,9 @@ export function StepProfiles({
           data={query ? results : topFollowers}
           renderItem={renderItem}
           keyExtractor={keyExtractor}
-        renderScrollComponent={props => <KeyboardAwareScrollView {...props} />}
+          renderScrollComponent={props => (
+            <KeyboardAwareScrollView {...props} />
+          )}
           keyboardShouldPersistTaps="handled"
           containWeb={true}
           sideBorders={false}
@@ -90,12 +96,15 @@ export function StepProfiles({
                     a.mt_lg,
                     a.leading_snug,
                   ]}>
-                <Trans>Nobody was found. Try searching for someone else.</Trans>
+                  <Trans>
+                    Nobody was found. Try searching for someone else.
+                  </Trans>
                 </Text>
               )}
             </View>
           }
         />
       </ScreenTransition>
+    </BackGestureDetector>
   )
 }

src/screens/StarterPack/Wizard/index.tsx

@@ -560,9 +560,9 @@ function Footer({
 
 function getName(item: AppBskyActorDefs.ProfileViewBasic | GeneratorView) {
   if (typeof item.displayName === 'string') {
-    return enforceLen(sanitizeDisplayName(item.displayName), 16, true)
+    return enforceLen(sanitizeDisplayName(item.displayName), 28, true)
   } else if (typeof item.handle === 'string') {
-    return enforceLen(sanitizeHandle(item.handle), 16, true)
+    return enforceLen(sanitizeHandle(item.handle), 28, true)
   }
   return ''
 }