go back gesture, tweak header copy

2024-06-22 13:15:40 -07:00
parent 4d2c4f1c50
commit 4d711b7f1d
6 changed files with 214 additions and 143 deletions
@@ -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>
+}
@@ -0,0 +1,11 @@
+import React from 'react'
+
+export function BackGestureDetector({
+  onBack: _onBack,
+  children,
+}: {
+  onBack: () => void
+  children: React.ReactNode
+}) {
+  return children
+}
@@ -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,61 +28,71 @@ export function StepDetails() {
  })

  return (
-    <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]}>
-          <StarterPack width={90} gradient="sky" />
-          <Text style={[a.font_bold, a.text_3xl]}>
-            <Trans>Invites, but personal</Trans>
-          </Text>
-          <Text style={[a.text_center, a.text_md, a.px_md]}>
-            <Trans>
-              Invite your friends to follow your favorite feeds and people
-            </Trans>
-          </Text>
+    <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]}>
+            <StarterPack width={90} gradient="sky" />
+            <Text style={[a.font_bold, a.text_3xl]}>
+              <Trans>Invites, but personal</Trans>
+            </Text>
+            <Text style={[a.text_center, a.text_md, a.px_md]}>
+              <Trans>
+                Invite your friends to follow your favorite feeds and people
+              </Trans>
+            </Text>
+          </View>
+          <View>
+            <TextField.LabelText>
+              <Trans>What do you want to call your starter pack?</Trans>
+            </TextField.LabelText>
+            <TextField.Root>
+              <TextField.Input
+                label={_(
+                  msg`${
+                    currentProfile?.displayName || currentProfile?.handle
+                  }'s starter pack`,
+                )}
+                value={state.name}
+                onChangeText={text => dispatch({type: 'SetName', name: text})}
+              />
+              <TextField.SuffixText
+                label={_(`${state.name?.length} out of 50`)}>
+                <Text style={[t.atoms.text_contrast_medium]}>
+                  {state.name?.length ?? 0}/50
+                </Text>
+              </TextField.SuffixText>
+            </TextField.Root>
+          </View>
+          <View>
+            <TextField.LabelText>
+              <Trans>Tell us a little more</Trans>
+            </TextField.LabelText>
+            <TextField.Root>
+              <TextField.Input
+                label={_(
+                  msg`${
+                    currentProfile?.displayName || currentProfile?.handle
+                  }'s favorite feeds and people - join me!`,
+                )}
+                value={state.description}
+                onChangeText={text =>
+                  dispatch({type: 'SetDescription', description: text})
+                }
+                multiline
+                style={{minHeight: 150}}
+              />
+            </TextField.Root>
+          </View>
        </View>
-        <View>
-          <TextField.LabelText>
-            <Trans>What do you want to call your starter pack?</Trans>
-          </TextField.LabelText>
-          <TextField.Root>
-            <TextField.Input
-              label={_(
-                msg`${
-                  currentProfile?.displayName || currentProfile?.handle
-                }'s starter pack`,
-              )}
-              value={state.name}
-              onChangeText={text => dispatch({type: 'SetName', name: text})}
-            />
-            <TextField.SuffixText label={_(`${state.name?.length} out of 50`)}>
-              <Text style={[t.atoms.text_contrast_medium]}>
-                {state.name?.length ?? 0}/50
-              </Text>
-            </TextField.SuffixText>
-          </TextField.Root>
-        </View>
-        <View>
-          <TextField.LabelText>
-            <Trans>Tell us a little more</Trans>
-          </TextField.LabelText>
-          <TextField.Root>
-            <TextField.Input
-              label={_(
-                msg`${
-                  currentProfile?.displayName || currentProfile?.handle
-                }'s favorite feeds and people - join me!`,
-              )}
-              value={state.description}
-              onChangeText={text =>
-                dispatch({type: 'SetDescription', description: text})
-              }
-              multiline
-              style={{minHeight: 150}}
-            />
-          </TextField.Root>
-        </View>
-      </View>
-    </ScreenTransition>
+      </ScreenTransition>
+    </BackGestureDetector>
  )
 }
@@ -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,50 +65,58 @@ export function StepFeeds({moderationOpts}: {moderationOpts: ModerationOpts}) {
  }

  return (
-    <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
-            query={query}
-            onChangeQuery={t => setQuery(t)}
-            onPressCancelSearch={() => setQuery('')}
-            onSubmitQuery={() => {}}
-          />
-        </View>
-      </View>
-      <List
-        data={query ? searchedFeeds : suggestedFeeds}
-        renderItem={renderItem}
-        keyExtractor={keyExtractor}
-        contentContainerStyle={{paddingTop: 6}}
-        onEndReached={
-          !query && !screenReaderEnabled ? () => fetchNextPage() : undefined
-        }
-        onEndReachedThreshold={2}
-        renderScrollComponent={props => <KeyboardAwareScrollView {...props} />}
-        keyboardShouldPersistTaps="handled"
-        containWeb={true}
-        sideBorders={false}
-        style={{flex: 1}}
-        ListEmptyComponent={
-          <View style={[a.flex_1, a.align_center, a.mt_lg, a.px_lg]}>
-            {isLoadingSearch ? (
-              <Loader size="lg" />
-            ) : (
-              <Text
-                style={[
-                  a.font_bold,
-                  a.text_lg,
-                  a.text_center,
-                  a.mt_lg,
-                  a.leading_snug,
-                ]}>
-                <Trans>No feeds found. Try searching for something else.</Trans>
-              </Text>
-            )}
+    <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
+              query={query}
+              onChangeQuery={t => setQuery(t)}
+              onPressCancelSearch={() => setQuery('')}
+              onSubmitQuery={() => {}}
+            />
          </View>
-        }
-      />
-    </ScreenTransition>
+        </View>
+        <List
+          data={query ? searchedFeeds : suggestedFeeds}
+          renderItem={renderItem}
+          keyExtractor={keyExtractor}
+          contentContainerStyle={{paddingTop: 6}}
+          onEndReached={
+            !query && !screenReaderEnabled ? () => fetchNextPage() : undefined
+          }
+          onEndReachedThreshold={2}
+          renderScrollComponent={props => (
+            <KeyboardAwareScrollView {...props} />
+          )}
+          keyboardShouldPersistTaps="handled"
+          containWeb={true}
+          sideBorders={false}
+          style={{flex: 1}}
+          ListEmptyComponent={
+            <View style={[a.flex_1, a.align_center, a.mt_lg, a.px_lg]}>
+              {isLoadingSearch ? (
+                <Loader size="lg" />
+              ) : (
+                <Text
+                  style={[
+                    a.font_bold,
+                    a.text_lg,
+                    a.text_center,
+                    a.mt_lg,
+                    a.leading_snug,
+                  ]}>
+                  <Trans>
+                    No feeds found. Try searching for something else.
+                  </Trans>
+                </Text>
+              )}
+            </View>
+          }
+        />
+      </ScreenTransition>
+    </BackGestureDetector>
  )
 }
@@ -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,49 +54,57 @@ export function StepProfiles({
  }

  return (
-    <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
-            query={query}
-            onChangeQuery={setQuery}
-            onPressCancelSearch={() => setQuery('')}
-            onSubmitQuery={() => {}}
-          />
-        </View>
-      </View>
-      <List
-        data={query ? results : topFollowers}
-        renderItem={renderItem}
-        keyExtractor={keyExtractor}
-        renderScrollComponent={props => <KeyboardAwareScrollView {...props} />}
-        keyboardShouldPersistTaps="handled"
-        containWeb={true}
-        sideBorders={false}
+    <BackGestureDetector onBack={() => dispatch({type: 'Back'})}>
+      <ScreenTransition
        style={[a.flex_1]}
-        onEndReached={
-          !query && !screenReaderEnabled ? () => fetchNextPage() : undefined
-        }
-        onEndReachedThreshold={isNative ? 2 : 0.25}
-        ListEmptyComponent={
-          <View style={[a.flex_1, a.align_center, a.mt_lg, a.px_lg]}>
-            {isLoadingResults ? (
-              <Loader size="lg" />
-            ) : (
-              <Text
-                style={[
-                  a.font_bold,
-                  a.text_lg,
-                  a.text_center,
-                  a.mt_lg,
-                  a.leading_snug,
-                ]}>
-                <Trans>Nobody was found. Try searching for someone else.</Trans>
-              </Text>
-            )}
+        direction={state.transitionDirection}>
+        <View style={[a.border_b, t.atoms.border_contrast_medium]}>
+          <View style={[a.my_sm, a.px_md, {height: 40}]}>
+            <SearchInput
+              query={query}
+              onChangeQuery={setQuery}
+              onPressCancelSearch={() => setQuery('')}
+              onSubmitQuery={() => {}}
+            />
          </View>
-        }
-      />
-    </ScreenTransition>
+        </View>
+        <List
+          data={query ? results : topFollowers}
+          renderItem={renderItem}
+          keyExtractor={keyExtractor}
+          renderScrollComponent={props => (
+            <KeyboardAwareScrollView {...props} />
+          )}
+          keyboardShouldPersistTaps="handled"
+          containWeb={true}
+          sideBorders={false}
+          style={[a.flex_1]}
+          onEndReached={
+            !query && !screenReaderEnabled ? () => fetchNextPage() : undefined
+          }
+          onEndReachedThreshold={isNative ? 2 : 0.25}
+          ListEmptyComponent={
+            <View style={[a.flex_1, a.align_center, a.mt_lg, a.px_lg]}>
+              {isLoadingResults ? (
+                <Loader size="lg" />
+              ) : (
+                <Text
+                  style={[
+                    a.font_bold,
+                    a.text_lg,
+                    a.text_center,
+                    a.mt_lg,
+                    a.leading_snug,
+                  ]}>
+                  <Trans>
+                    Nobody was found. Try searching for someone else.
+                  </Trans>
+                </Text>
+              )}
+            </View>
+          }
+        />
+      </ScreenTransition>
+    </BackGestureDetector>
  )
 }
@@ -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 ''
 }