Bluesky app fork with some witchin' additions 💫

Rename search to explore in titles and links (#8116)

* Rename search to explore in titles and links

* Conditionally use Explore

authored by

Eric Bailey and committed by
GitHub
94bc677e 148bfa80

+21 -13
+1 -1
src/Navigation.tsx
··· 637 <Flat.Screen 638 name="Search" 639 getComponent={() => SearchScreen} 640 - options={{title: title(msg`Search`)}} 641 /> 642 <Flat.Screen 643 name="Notifications"
··· 637 <Flat.Screen 638 name="Search" 639 getComponent={() => SearchScreen} 640 + options={{title: title(msg`Explore`)}} 641 /> 642 <Flat.Screen 643 name="Notifications"
+3 -1
src/screens/Search/Shell.tsx
··· 55 fixedParams, 56 navButton = 'menu', 57 inputPlaceholder, 58 }: { 59 queryParam: string 60 testID: string 61 fixedParams?: Params 62 navButton?: 'back' | 'menu' 63 inputPlaceholder?: string 64 }) { 65 const t = useTheme() 66 const {gtMobile} = useBreakpoints() ··· 302 )} 303 <Layout.Header.Content align="left"> 304 <Layout.Header.TitleText> 305 - <Trans>Search</Trans> 306 </Layout.Header.TitleText> 307 </Layout.Header.Content> 308 {showFilters ? (
··· 55 fixedParams, 56 navButton = 'menu', 57 inputPlaceholder, 58 + isExplore, 59 }: { 60 queryParam: string 61 testID: string 62 fixedParams?: Params 63 navButton?: 'back' | 'menu' 64 inputPlaceholder?: string 65 + isExplore?: boolean 66 }) { 67 const t = useTheme() 68 const {gtMobile} = useBreakpoints() ··· 304 )} 305 <Layout.Header.Content align="left"> 306 <Layout.Header.TitleText> 307 + {isExplore ? <Trans>Explore</Trans> : <Trans>Search</Trans>} 308 </Layout.Header.TitleText> 309 </Layout.Header.Content> 310 {showFilters ? (
+7 -1
src/screens/Search/index.tsx
··· 9 ) { 10 const queryParam = props.route?.params?.q ?? '' 11 12 - return <SearchScreenShell queryParam={queryParam} testID="searchScreen" /> 13 }
··· 9 ) { 10 const queryParam = props.route?.params?.q ?? '' 11 12 + return ( 13 + <SearchScreenShell 14 + queryParam={queryParam} 15 + testID="searchScreen" 16 + isExplore 17 + /> 18 + ) 19 }
+5 -5
src/view/shell/Drawer.tsx
··· 1 - import React, {ComponentProps} from 'react' 2 import {Linking, ScrollView, TouchableOpacity, View} from 'react-native' 3 import {useSafeAreaInsets} from 'react-native-safe-area-context' 4 import {msg, Plural, plural, Trans} from '@lingui/macro' ··· 6 import {StackActions, useNavigation} from '@react-navigation/native' 7 8 import {FEEDBACK_FORM_URL, HELP_DESK_URL} from '#/lib/constants' 9 - import {PressableScale} from '#/lib/custom-animations/PressableScale' 10 import {useNavigationTabState} from '#/lib/hooks/useNavigationTabState' 11 import {getTabState, TabState} from '#/lib/routes/helpers' 12 - import {NavigationProp} from '#/lib/routes/types' 13 import {sanitizeHandle} from '#/lib/strings/handles' 14 import {colors} from '#/lib/styles' 15 import {isWeb} from '#/platform/detection' ··· 17 import {useKawaiiMode} from '#/state/preferences/kawaii' 18 import {useUnreadNotifications} from '#/state/queries/notifications/unread' 19 import {useProfileQuery} from '#/state/queries/profile' 20 - import {SessionAccount, useSession} from '#/state/session' 21 import {useSetDrawerOpen} from '#/state/shell' 22 import {formatCount} from '#/view/com/util/numeric/format' 23 import {UserAvatar} from '#/view/com/util/UserAvatar' ··· 367 <MagnifyingGlass style={[t.atoms.text]} width={iconWidth} /> 368 ) 369 } 370 - label={_(msg`Search`)} 371 bold={isActive} 372 onPress={onPress} 373 />
··· 1 + import React, {type ComponentProps} from 'react' 2 import {Linking, ScrollView, TouchableOpacity, View} from 'react-native' 3 import {useSafeAreaInsets} from 'react-native-safe-area-context' 4 import {msg, Plural, plural, Trans} from '@lingui/macro' ··· 6 import {StackActions, useNavigation} from '@react-navigation/native' 7 8 import {FEEDBACK_FORM_URL, HELP_DESK_URL} from '#/lib/constants' 9 + import {type PressableScale} from '#/lib/custom-animations/PressableScale' 10 import {useNavigationTabState} from '#/lib/hooks/useNavigationTabState' 11 import {getTabState, TabState} from '#/lib/routes/helpers' 12 + import {type NavigationProp} from '#/lib/routes/types' 13 import {sanitizeHandle} from '#/lib/strings/handles' 14 import {colors} from '#/lib/styles' 15 import {isWeb} from '#/platform/detection' ··· 17 import {useKawaiiMode} from '#/state/preferences/kawaii' 18 import {useUnreadNotifications} from '#/state/queries/notifications/unread' 19 import {useProfileQuery} from '#/state/queries/profile' 20 + import {type SessionAccount, useSession} from '#/state/session' 21 import {useSetDrawerOpen} from '#/state/shell' 22 import {formatCount} from '#/view/com/util/numeric/format' 23 import {UserAvatar} from '#/view/com/util/UserAvatar' ··· 367 <MagnifyingGlass style={[t.atoms.text]} width={iconWidth} /> 368 ) 369 } 370 + label={_(msg`Explore`)} 371 bold={isActive} 372 onPress={onPress} 373 />
+5 -5
src/view/shell/desktop/LeftNav.tsx
··· 1 import React from 'react' 2 import {StyleSheet, View} from 'react-native' 3 - import {AppBskyActorDefs} from '@atproto/api' 4 import {msg, plural, Trans} from '@lingui/macro' 5 import {useLingui} from '@lingui/react' 6 import { ··· 14 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries' 15 import {getCurrentRoute, isTab} from '#/lib/routes/helpers' 16 import {makeProfileLink} from '#/lib/routes/links' 17 - import {CommonNavigatorParams} from '#/lib/routes/types' 18 import {useGate} from '#/lib/statsig/statsig' 19 import {sanitizeDisplayName} from '#/lib/strings/display-names' 20 import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles' ··· 24 import {useUnreadMessageCount} from '#/state/queries/messages/list-conversations' 25 import {useUnreadNotifications} from '#/state/queries/notifications/unread' 26 import {useProfilesQuery} from '#/state/queries/profile' 27 - import {SessionAccount, useSession, useSessionApi} from '#/state/session' 28 import {useComposerControls} from '#/state/shell/composer' 29 import {useLoggedOutViewControls} from '#/state/shell/logged-out' 30 import {useCloseAllActiveElements} from '#/state/util' ··· 34 import {NavSignupCard} from '#/view/shell/NavSignupCard' 35 import {atoms as a, tokens, useLayoutBreakpoints, useTheme} from '#/alf' 36 import {Button, ButtonIcon, ButtonText} from '#/components/Button' 37 - import {DialogControlProps} from '#/components/Dialog' 38 import {ArrowBoxLeft_Stroke2_Corner0_Rounded as LeaveIcon} from '#/components/icons/ArrowBoxLeft' 39 import { 40 Bell_Filled_Corner0_Rounded as BellFilled, ··· 614 width={NAV_ICON_WIDTH} 615 /> 616 } 617 - label={_(msg`Search`)} 618 /> 619 <NavItem 620 href="/notifications"
··· 1 import React from 'react' 2 import {StyleSheet, View} from 'react-native' 3 + import {type AppBskyActorDefs} from '@atproto/api' 4 import {msg, plural, Trans} from '@lingui/macro' 5 import {useLingui} from '@lingui/react' 6 import { ··· 14 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries' 15 import {getCurrentRoute, isTab} from '#/lib/routes/helpers' 16 import {makeProfileLink} from '#/lib/routes/links' 17 + import {type CommonNavigatorParams} from '#/lib/routes/types' 18 import {useGate} from '#/lib/statsig/statsig' 19 import {sanitizeDisplayName} from '#/lib/strings/display-names' 20 import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles' ··· 24 import {useUnreadMessageCount} from '#/state/queries/messages/list-conversations' 25 import {useUnreadNotifications} from '#/state/queries/notifications/unread' 26 import {useProfilesQuery} from '#/state/queries/profile' 27 + import {type SessionAccount, useSession, useSessionApi} from '#/state/session' 28 import {useComposerControls} from '#/state/shell/composer' 29 import {useLoggedOutViewControls} from '#/state/shell/logged-out' 30 import {useCloseAllActiveElements} from '#/state/util' ··· 34 import {NavSignupCard} from '#/view/shell/NavSignupCard' 35 import {atoms as a, tokens, useLayoutBreakpoints, useTheme} from '#/alf' 36 import {Button, ButtonIcon, ButtonText} from '#/components/Button' 37 + import {type DialogControlProps} from '#/components/Dialog' 38 import {ArrowBoxLeft_Stroke2_Corner0_Rounded as LeaveIcon} from '#/components/icons/ArrowBoxLeft' 39 import { 40 Bell_Filled_Corner0_Rounded as BellFilled, ··· 614 width={NAV_ICON_WIDTH} 615 /> 616 } 617 + label={_(msg`Explore`)} 618 /> 619 <NavItem 620 href="/notifications"