682 lines
23 KiB
Diff
682 lines
23 KiB
Diff
diff --git a/src/Navigation.tsx b/src/Navigation.tsx
|
|
index fa33a9d56..13af087c2 100644
|
|
--- a/src/Navigation.tsx
|
|
+++ b/src/Navigation.tsx
|
|
@@ -62,6 +62,7 @@ import {NotFoundScreen} from '#/view/screens/NotFound'
|
|
import {NotificationsScreen} from '#/view/screens/Notifications'
|
|
import {PostThreadScreen} from '#/view/screens/PostThread'
|
|
import {PrivacyPolicyScreen} from '#/view/screens/PrivacyPolicy'
|
|
+import {LicenseScreen} from '#/view/screens/License'
|
|
import {ProfileScreen} from '#/view/screens/Profile'
|
|
import {ProfileFeedLikedByScreen} from '#/view/screens/ProfileFeedLikedBy'
|
|
import {Storybook} from '#/view/screens/Storybook'
|
|
@@ -335,6 +336,11 @@ function commonScreens(Stack: typeof Flat, unreadCountLabel?: string) {
|
|
getComponent={() => TermsOfServiceScreen}
|
|
options={{title: title(msg`Terms of Service`)}}
|
|
/>
|
|
+ <Stack.Screen
|
|
+ name="License"
|
|
+ getComponent={() => LicenseScreen}
|
|
+ options={{title: title(msg`License`)}}
|
|
+ />
|
|
<Stack.Screen
|
|
name="CommunityGuidelines"
|
|
getComponent={() => CommunityGuidelinesScreen}
|
|
diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts
|
|
index c315a8341..9b2f50a83 100644
|
|
--- a/src/lib/routes/types.ts
|
|
+++ b/src/lib/routes/types.ts
|
|
@@ -39,6 +39,7 @@ export type CommonNavigatorParams = {
|
|
Support: undefined
|
|
PrivacyPolicy: undefined
|
|
TermsOfService: undefined
|
|
+ License: undefined
|
|
CommunityGuidelines: undefined
|
|
CopyrightPolicy: undefined
|
|
LanguageSettings: undefined
|
|
diff --git a/src/routes.ts b/src/routes.ts
|
|
index 1ed913bb2..aa6fccc4e 100644
|
|
--- a/src/routes.ts
|
|
+++ b/src/routes.ts
|
|
@@ -71,8 +71,9 @@ export const router = new Router<AllNavigatableRoutes>({
|
|
MiscellaneousNotificationSettings: '/settings/notifications/miscellaneous',
|
|
// support
|
|
Support: '/support',
|
|
- PrivacyPolicy: '/support/privacy',
|
|
- TermsOfService: '/support/tos',
|
|
+ PrivacyPolicy: 'https://syu.is/about/support/privacy-policy',
|
|
+ TermsOfService: 'https://syu.is/about/support/tos',
|
|
+ License: '/support/license',
|
|
CommunityGuidelines: '/support/community-guidelines',
|
|
CopyrightPolicy: '/support/copyright',
|
|
// hashtags
|
|
diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx
|
|
index ed2a6cfb7..982c40b55 100644
|
|
--- a/src/view/shell/Drawer.tsx
|
|
+++ b/src/view/shell/Drawer.tsx
|
|
@@ -1,60 +1,50 @@
|
|
-import React, {type ComponentProps, type JSX} from 'react'
|
|
-import {Linking, ScrollView, TouchableOpacity, View} from 'react-native'
|
|
-import {useSafeAreaInsets} from 'react-native-safe-area-context'
|
|
-import {msg, Plural, plural, Trans} from '@lingui/macro'
|
|
-import {useLingui} from '@lingui/react'
|
|
-import {StackActions, useNavigation} from '@react-navigation/native'
|
|
-
|
|
-import {useActorStatus} from '#/lib/actor-status'
|
|
-import {FEEDBACK_FORM_URL, HELP_DESK_URL} from '#/lib/constants'
|
|
-import {type PressableScale} from '#/lib/custom-animations/PressableScale'
|
|
-import {useNavigationTabState} from '#/lib/hooks/useNavigationTabState'
|
|
-import {getTabState, TabState} from '#/lib/routes/helpers'
|
|
-import {type NavigationProp} from '#/lib/routes/types'
|
|
-import {sanitizeHandle} from '#/lib/strings/handles'
|
|
-import {colors} from '#/lib/styles'
|
|
-import {isWeb} from '#/platform/detection'
|
|
-import {emitSoftReset} from '#/state/events'
|
|
-import {useKawaiiMode} from '#/state/preferences/kawaii'
|
|
-import {useUnreadNotifications} from '#/state/queries/notifications/unread'
|
|
-import {useProfileQuery} from '#/state/queries/profile'
|
|
-import {type SessionAccount, useSession} from '#/state/session'
|
|
-import {useSetDrawerOpen} from '#/state/shell'
|
|
-import {formatCount} from '#/view/com/util/numeric/format'
|
|
-import {UserAvatar} from '#/view/com/util/UserAvatar'
|
|
-import {NavSignupCard} from '#/view/shell/NavSignupCard'
|
|
-import {atoms as a, tokens, useTheme, web} from '#/alf'
|
|
-import {Button, ButtonIcon, ButtonText} from '#/components/Button'
|
|
-import {Divider} from '#/components/Divider'
|
|
+import React, { type ComponentProps, type JSX } from 'react'
|
|
+import { Linking, ScrollView, TouchableOpacity, View } from 'react-native'
|
|
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
|
|
+import { msg, Plural, plural, Trans } from '@lingui/macro'
|
|
+import { useLingui } from '@lingui/react'
|
|
+import { StackActions, useNavigation } from '@react-navigation/native'
|
|
+
|
|
+import { useActorStatus } from '#/lib/actor-status'
|
|
+import { FEEDBACK_FORM_URL, HELP_DESK_URL } from '#/lib/constants'
|
|
+import { type PressableScale } from '#/lib/custom-animations/PressableScale'
|
|
+import { useNavigationTabState } from '#/lib/hooks/useNavigationTabState'
|
|
+import { getTabState, TabState } from '#/lib/routes/helpers'
|
|
+import { type NavigationProp } from '#/lib/routes/types'
|
|
+import { sanitizeHandle } from '#/lib/strings/handles'
|
|
+import { colors } from '#/lib/styles'
|
|
+import { isWeb } from '#/platform/detection'
|
|
+import { emitSoftReset } from '#/state/events'
|
|
+import { useKawaiiMode } from '#/state/preferences/kawaii'
|
|
+import { useUnreadNotifications } from '#/state/queries/notifications/unread'
|
|
+import { useProfileQuery } from '#/state/queries/profile'
|
|
+import { type SessionAccount, useSession } from '#/state/session'
|
|
+import { useSetDrawerOpen } from '#/state/shell'
|
|
+import { formatCount } from '#/view/com/util/numeric/format'
|
|
+import { UserAvatar } from '#/view/com/util/UserAvatar'
|
|
+import { NavSignupCard } from '#/view/shell/NavSignupCard'
|
|
+import { atoms as a, tokens, useTheme, web } from '#/alf'
|
|
+import { Button } from '#/components/Button'
|
|
+import { Divider } from '#/components/Divider'
|
|
import {
|
|
Bell_Filled_Corner0_Rounded as BellFilled,
|
|
Bell_Stroke2_Corner0_Rounded as Bell,
|
|
} from '#/components/icons/Bell'
|
|
-import {Bookmark, BookmarkFilled} from '#/components/icons/Bookmark'
|
|
-import {BulletList_Stroke2_Corner0_Rounded as List} from '#/components/icons/BulletList'
|
|
-import {
|
|
- Hashtag_Filled_Corner0_Rounded as HashtagFilled,
|
|
- Hashtag_Stroke2_Corner0_Rounded as Hashtag,
|
|
-} from '#/components/icons/Hashtag'
|
|
import {
|
|
HomeOpen_Filled_Corner0_Rounded as HomeFilled,
|
|
HomeOpen_Stoke2_Corner0_Rounded as Home,
|
|
} from '#/components/icons/HomeOpen'
|
|
-import {MagnifyingGlass_Filled_Stroke2_Corner0_Rounded as MagnifyingGlassFilled} from '#/components/icons/MagnifyingGlass'
|
|
-import {MagnifyingGlass2_Stroke2_Corner0_Rounded as MagnifyingGlass} from '#/components/icons/MagnifyingGlass2'
|
|
-import {
|
|
- Message_Stroke2_Corner0_Rounded as Message,
|
|
- Message_Stroke2_Corner0_Rounded_Filled as MessageFilled,
|
|
-} from '#/components/icons/Message'
|
|
-import {SettingsGear2_Stroke2_Corner0_Rounded as Settings} from '#/components/icons/SettingsGear2'
|
|
+import { MagnifyingGlass_Filled_Stroke2_Corner0_Rounded as MagnifyingGlassFilled } from '#/components/icons/MagnifyingGlass'
|
|
+import { MagnifyingGlass2_Stroke2_Corner0_Rounded as MagnifyingGlass } from '#/components/icons/MagnifyingGlass2'
|
|
+import { SettingsGear2_Stroke2_Corner0_Rounded as Settings } from '#/components/icons/SettingsGear2'
|
|
import {
|
|
UserCircle_Filled_Corner0_Rounded as UserCircleFilled,
|
|
UserCircle_Stroke2_Corner0_Rounded as UserCircle,
|
|
} from '#/components/icons/UserCircle'
|
|
-import {InlineLinkText} from '#/components/Link'
|
|
-import {Text} from '#/components/Typography'
|
|
-import {useSimpleVerificationState} from '#/components/verification'
|
|
-import {VerificationCheck} from '#/components/verification/VerificationCheck'
|
|
+import { InlineLinkText } from '#/components/Link'
|
|
+import { Text } from '#/components/Typography'
|
|
+import { useSimpleVerificationState } from '#/components/verification'
|
|
+import { VerificationCheck } from '#/components/verification/VerificationCheck'
|
|
|
|
const iconWidth = 26
|
|
|
|
@@ -65,11 +55,11 @@ let DrawerProfileCard = ({
|
|
account: SessionAccount
|
|
onPressProfile: () => void
|
|
}): React.ReactNode => {
|
|
- const {_, i18n} = useLingui()
|
|
+ const { _, i18n } = useLingui()
|
|
const t = useTheme()
|
|
- const {data: profile} = useProfileQuery({did: account.did})
|
|
- const verification = useSimpleVerificationState({profile})
|
|
- const {isActive: live} = useActorStatus(profile)
|
|
+ const { data: profile } = useProfileQuery({ did: account.did })
|
|
+ const verification = useSimpleVerificationState({ profile })
|
|
+ const { isActive: live } = useActorStatus(profile)
|
|
|
|
return (
|
|
<TouchableOpacity
|
|
@@ -81,7 +71,6 @@ let DrawerProfileCard = ({
|
|
<UserAvatar
|
|
size={52}
|
|
avatar={profile?.avatar}
|
|
- // See https://github.com/bluesky-social/social-app/pull/1801:
|
|
usePlainRNImage={true}
|
|
type={profile?.associated?.labeler ? 'labeler' : 'user'}
|
|
live={live}
|
|
@@ -140,9 +129,9 @@ let DrawerProfileCard = ({
|
|
)
|
|
}
|
|
DrawerProfileCard = React.memo(DrawerProfileCard)
|
|
-export {DrawerProfileCard}
|
|
+export { DrawerProfileCard }
|
|
|
|
-let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
+let DrawerContent = ({ }: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
const t = useTheme()
|
|
const insets = useSafeAreaInsets()
|
|
const setDrawerOpen = useSetDrawerOpen()
|
|
@@ -150,27 +139,20 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
const {
|
|
isAtHome,
|
|
isAtSearch,
|
|
- isAtFeeds,
|
|
- isAtBookmarks,
|
|
isAtNotifications,
|
|
isAtMyProfile,
|
|
- isAtMessages,
|
|
} = useNavigationTabState()
|
|
- const {hasSession, currentAccount} = useSession()
|
|
-
|
|
- // events
|
|
- // =
|
|
+ const { hasSession, currentAccount } = useSession()
|
|
|
|
const onPressTab = React.useCallback(
|
|
(tab: 'Home' | 'Search' | 'Messages' | 'Notifications' | 'MyProfile') => {
|
|
const state = navigation.getState()
|
|
setDrawerOpen(false)
|
|
if (isWeb) {
|
|
- // hack because we have flat navigator for web and MyProfile does not exist on the web navigator -ansh
|
|
if (tab === 'MyProfile') {
|
|
- navigation.navigate('Profile', {name: currentAccount!.handle})
|
|
+ navigation.navigate('Profile', { name: currentAccount!.handle })
|
|
} else {
|
|
- // @ts-expect-error struggles with string unions, apparently
|
|
+ // @ts-expect-error struggles with string unions
|
|
navigation.navigate(tab)
|
|
}
|
|
} else {
|
|
@@ -178,21 +160,11 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
if (tabState === TabState.InsideAtRoot) {
|
|
emitSoftReset()
|
|
} else if (tabState === TabState.Inside) {
|
|
- // find the correct navigator in which to pop-to-top
|
|
- const target = state.routes.find(route => route.name === `${tab}Tab`)
|
|
- ?.state?.key
|
|
+ const target = state.routes.find(route => route.name === `${tab}Tab`)?.state?.key
|
|
if (target) {
|
|
- // if we found it, trigger pop-to-top
|
|
- navigation.dispatch({
|
|
- ...StackActions.popToTop(),
|
|
- target,
|
|
- })
|
|
+ navigation.dispatch({ ...StackActions.popToTop(), target })
|
|
} else {
|
|
- // fallback: reset navigation
|
|
- navigation.reset({
|
|
- index: 0,
|
|
- routes: [{name: `${tab}Tab`}],
|
|
- })
|
|
+ navigation.reset({ index: 0, routes: [{ name: `${tab}Tab` }] })
|
|
}
|
|
} else {
|
|
navigation.navigate(`${tab}Tab`)
|
|
@@ -203,76 +175,21 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
)
|
|
|
|
const onPressHome = React.useCallback(() => onPressTab('Home'), [onPressTab])
|
|
-
|
|
- const onPressSearch = React.useCallback(
|
|
- () => onPressTab('Search'),
|
|
- [onPressTab],
|
|
- )
|
|
-
|
|
- const onPressMessages = React.useCallback(
|
|
- () => onPressTab('Messages'),
|
|
- [onPressTab],
|
|
- )
|
|
-
|
|
- const onPressNotifications = React.useCallback(
|
|
- () => onPressTab('Notifications'),
|
|
- [onPressTab],
|
|
- )
|
|
-
|
|
- const onPressProfile = React.useCallback(() => {
|
|
- onPressTab('MyProfile')
|
|
- }, [onPressTab])
|
|
-
|
|
- const onPressMyFeeds = React.useCallback(() => {
|
|
- navigation.navigate('Feeds')
|
|
- setDrawerOpen(false)
|
|
- }, [navigation, setDrawerOpen])
|
|
-
|
|
- const onPressLists = React.useCallback(() => {
|
|
- navigation.navigate('Lists')
|
|
- setDrawerOpen(false)
|
|
- }, [navigation, setDrawerOpen])
|
|
-
|
|
- const onPressBookmarks = React.useCallback(() => {
|
|
- navigation.navigate('Bookmarks')
|
|
- setDrawerOpen(false)
|
|
- }, [navigation, setDrawerOpen])
|
|
-
|
|
+ const onPressSearch = React.useCallback(() => onPressTab('Search'), [onPressTab])
|
|
+ const onPressNotifications = React.useCallback(() => onPressTab('Notifications'), [onPressTab])
|
|
+ const onPressProfile = React.useCallback(() => { onPressTab('MyProfile') }, [onPressTab])
|
|
const onPressSettings = React.useCallback(() => {
|
|
navigation.navigate('Settings')
|
|
setDrawerOpen(false)
|
|
}, [navigation, setDrawerOpen])
|
|
|
|
- const onPressFeedback = React.useCallback(() => {
|
|
- Linking.openURL(
|
|
- FEEDBACK_FORM_URL({
|
|
- email: currentAccount?.email,
|
|
- handle: currentAccount?.handle,
|
|
- }),
|
|
- )
|
|
- }, [currentAccount])
|
|
-
|
|
- const onPressHelp = React.useCallback(() => {
|
|
- Linking.openURL(HELP_DESK_URL)
|
|
- }, [])
|
|
-
|
|
- // rendering
|
|
- // =
|
|
-
|
|
return (
|
|
<View
|
|
testID="drawer"
|
|
style={[a.flex_1, a.border_r, t.atoms.bg, t.atoms.border_contrast_low]}>
|
|
<ScrollView
|
|
style={[a.flex_1]}
|
|
- contentContainerStyle={[
|
|
- {
|
|
- paddingTop: Math.max(
|
|
- insets.top + a.pt_xl.paddingTop,
|
|
- a.pt_xl.paddingTop,
|
|
- ),
|
|
- },
|
|
- ]}>
|
|
+ contentContainerStyle={[{ paddingTop: Math.max(insets.top + a.pt_xl.paddingTop, a.pt_xl.paddingTop) }]}>
|
|
<View style={[a.px_xl]}>
|
|
{hasSession && currentAccount ? (
|
|
<DrawerProfileCard
|
|
@@ -284,7 +201,6 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
<NavSignupCard />
|
|
</View>
|
|
)}
|
|
-
|
|
<Divider style={[a.mt_xl, a.mb_sm]} />
|
|
</View>
|
|
|
|
@@ -292,17 +208,10 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
<>
|
|
<SearchMenuItem isActive={isAtSearch} onPress={onPressSearch} />
|
|
<HomeMenuItem isActive={isAtHome} onPress={onPressHome} />
|
|
- <ChatMenuItem isActive={isAtMessages} onPress={onPressMessages} />
|
|
<NotificationsMenuItem
|
|
isActive={isAtNotifications}
|
|
onPress={onPressNotifications}
|
|
/>
|
|
- <FeedsMenuItem isActive={isAtFeeds} onPress={onPressMyFeeds} />
|
|
- <ListsMenuItem onPress={onPressLists} />
|
|
- <BookmarksMenuItem
|
|
- isActive={isAtBookmarks}
|
|
- onPress={onPressBookmarks}
|
|
- />
|
|
<ProfileMenuItem
|
|
isActive={isAtMyProfile}
|
|
onPress={onPressProfile}
|
|
@@ -312,7 +221,6 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
) : (
|
|
<>
|
|
<HomeMenuItem isActive={isAtHome} onPress={onPressHome} />
|
|
- <FeedsMenuItem isActive={isAtFeeds} onPress={onPressMyFeeds} />
|
|
<SearchMenuItem isActive={isAtSearch} onPress={onPressSearch} />
|
|
</>
|
|
)}
|
|
@@ -322,69 +230,11 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
<ExtraLinks />
|
|
</View>
|
|
</ScrollView>
|
|
-
|
|
- <DrawerFooter
|
|
- onPressFeedback={onPressFeedback}
|
|
- onPressHelp={onPressHelp}
|
|
- />
|
|
</View>
|
|
)
|
|
}
|
|
DrawerContent = React.memo(DrawerContent)
|
|
-export {DrawerContent}
|
|
-
|
|
-let DrawerFooter = ({
|
|
- onPressFeedback,
|
|
- onPressHelp,
|
|
-}: {
|
|
- onPressFeedback: () => void
|
|
- onPressHelp: () => void
|
|
-}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
- const insets = useSafeAreaInsets()
|
|
- return (
|
|
- <View
|
|
- style={[
|
|
- a.flex_row,
|
|
- a.gap_sm,
|
|
- a.flex_wrap,
|
|
- a.pl_xl,
|
|
- a.pt_md,
|
|
- {
|
|
- paddingBottom: Math.max(
|
|
- insets.bottom + tokens.space.xs,
|
|
- tokens.space.xl,
|
|
- ),
|
|
- },
|
|
- ]}>
|
|
- <Button
|
|
- label={_(msg`Send feedback`)}
|
|
- size="small"
|
|
- variant="solid"
|
|
- color="secondary"
|
|
- onPress={onPressFeedback}>
|
|
- <ButtonIcon icon={Message} position="left" />
|
|
- <ButtonText>
|
|
- <Trans>Feedback</Trans>
|
|
- </ButtonText>
|
|
- </Button>
|
|
- <Button
|
|
- label={_(msg`Get help`)}
|
|
- size="small"
|
|
- variant="outline"
|
|
- color="secondary"
|
|
- onPress={onPressHelp}
|
|
- style={{
|
|
- backgroundColor: 'transparent',
|
|
- }}>
|
|
- <ButtonText>
|
|
- <Trans>Help</Trans>
|
|
- </ButtonText>
|
|
- </Button>
|
|
- </View>
|
|
- )
|
|
-}
|
|
-DrawerFooter = React.memo(DrawerFooter)
|
|
+export { DrawerContent }
|
|
|
|
interface MenuItemProps extends ComponentProps<typeof PressableScale> {
|
|
icon: JSX.Element
|
|
@@ -400,7 +250,7 @@ let SearchMenuItem = ({
|
|
isActive: boolean
|
|
onPress: () => void
|
|
}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
+ const { _ } = useLingui()
|
|
const t = useTheme()
|
|
return (
|
|
<MenuItem
|
|
@@ -426,7 +276,7 @@ let HomeMenuItem = ({
|
|
isActive: boolean
|
|
onPress: () => void
|
|
}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
+ const { _ } = useLingui()
|
|
const t = useTheme()
|
|
return (
|
|
<MenuItem
|
|
@@ -445,32 +295,6 @@ let HomeMenuItem = ({
|
|
}
|
|
HomeMenuItem = React.memo(HomeMenuItem)
|
|
|
|
-let ChatMenuItem = ({
|
|
- isActive,
|
|
- onPress,
|
|
-}: {
|
|
- isActive: boolean
|
|
- onPress: () => void
|
|
-}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
- const t = useTheme()
|
|
- return (
|
|
- <MenuItem
|
|
- icon={
|
|
- isActive ? (
|
|
- <MessageFilled style={[t.atoms.text]} width={iconWidth} />
|
|
- ) : (
|
|
- <Message style={[t.atoms.text]} width={iconWidth} />
|
|
- )
|
|
- }
|
|
- label={_(msg`Chat`)}
|
|
- bold={isActive}
|
|
- onPress={onPress}
|
|
- />
|
|
- )
|
|
-}
|
|
-ChatMenuItem = React.memo(ChatMenuItem)
|
|
-
|
|
let NotificationsMenuItem = ({
|
|
isActive,
|
|
onPress,
|
|
@@ -478,7 +302,7 @@ let NotificationsMenuItem = ({
|
|
isActive: boolean
|
|
onPress: () => void
|
|
}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
+ const { _ } = useLingui()
|
|
const t = useTheme()
|
|
const numUnreadNotifications = useUnreadNotifications()
|
|
return (
|
|
@@ -495,11 +319,11 @@ let NotificationsMenuItem = ({
|
|
numUnreadNotifications === ''
|
|
? ''
|
|
: _(
|
|
- msg`${plural(numUnreadNotifications ?? 0, {
|
|
- one: '# unread item',
|
|
- other: '# unread items',
|
|
- })}` || '',
|
|
- )
|
|
+ msg`${plural(numUnreadNotifications ?? 0, {
|
|
+ one: '# unread item',
|
|
+ other: '# unread items',
|
|
+ })}` || '',
|
|
+ )
|
|
}
|
|
count={numUnreadNotifications}
|
|
bold={isActive}
|
|
@@ -509,72 +333,6 @@ let NotificationsMenuItem = ({
|
|
}
|
|
NotificationsMenuItem = React.memo(NotificationsMenuItem)
|
|
|
|
-let FeedsMenuItem = ({
|
|
- isActive,
|
|
- onPress,
|
|
-}: {
|
|
- isActive: boolean
|
|
- onPress: () => void
|
|
-}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
- const t = useTheme()
|
|
- return (
|
|
- <MenuItem
|
|
- icon={
|
|
- isActive ? (
|
|
- <HashtagFilled width={iconWidth} style={[t.atoms.text]} />
|
|
- ) : (
|
|
- <Hashtag width={iconWidth} style={[t.atoms.text]} />
|
|
- )
|
|
- }
|
|
- label={_(msg`Feeds`)}
|
|
- bold={isActive}
|
|
- onPress={onPress}
|
|
- />
|
|
- )
|
|
-}
|
|
-FeedsMenuItem = React.memo(FeedsMenuItem)
|
|
-
|
|
-let ListsMenuItem = ({onPress}: {onPress: () => void}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
- const t = useTheme()
|
|
-
|
|
- return (
|
|
- <MenuItem
|
|
- icon={<List style={[t.atoms.text]} width={iconWidth} />}
|
|
- label={_(msg`Lists`)}
|
|
- onPress={onPress}
|
|
- />
|
|
- )
|
|
-}
|
|
-ListsMenuItem = React.memo(ListsMenuItem)
|
|
-
|
|
-let BookmarksMenuItem = ({
|
|
- isActive,
|
|
- onPress,
|
|
-}: {
|
|
- isActive: boolean
|
|
- onPress: () => void
|
|
-}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
- const t = useTheme()
|
|
-
|
|
- return (
|
|
- <MenuItem
|
|
- icon={
|
|
- isActive ? (
|
|
- <BookmarkFilled style={[t.atoms.text]} width={iconWidth} />
|
|
- ) : (
|
|
- <Bookmark style={[t.atoms.text]} width={iconWidth} />
|
|
- )
|
|
- }
|
|
- label={_(msg({message: 'Saved', context: 'link to bookmarks screen'}))}
|
|
- onPress={onPress}
|
|
- />
|
|
- )
|
|
-}
|
|
-BookmarksMenuItem = React.memo(BookmarksMenuItem)
|
|
-
|
|
let ProfileMenuItem = ({
|
|
isActive,
|
|
onPress,
|
|
@@ -582,7 +340,7 @@ let ProfileMenuItem = ({
|
|
isActive: boolean
|
|
onPress: () => void
|
|
}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
+ const { _ } = useLingui()
|
|
const t = useTheme()
|
|
return (
|
|
<MenuItem
|
|
@@ -600,8 +358,8 @@ let ProfileMenuItem = ({
|
|
}
|
|
ProfileMenuItem = React.memo(ProfileMenuItem)
|
|
|
|
-let SettingsMenuItem = ({onPress}: {onPress: () => void}): React.ReactNode => {
|
|
- const {_} = useLingui()
|
|
+let SettingsMenuItem = ({ onPress }: { onPress: () => void }): React.ReactNode => {
|
|
+ const { _ } = useLingui()
|
|
const t = useTheme()
|
|
return (
|
|
<MenuItem
|
|
@@ -613,7 +371,7 @@ let SettingsMenuItem = ({onPress}: {onPress: () => void}): React.ReactNode => {
|
|
}
|
|
SettingsMenuItem = React.memo(SettingsMenuItem)
|
|
|
|
-function MenuItem({icon, label, count, bold, onPress}: MenuItemProps) {
|
|
+function MenuItem({ icon, label, count, bold, onPress }: MenuItemProps) {
|
|
const t = useTheme()
|
|
return (
|
|
<Button
|
|
@@ -621,7 +379,7 @@ function MenuItem({icon, label, count, bold, onPress}: MenuItemProps) {
|
|
onPress={onPress}
|
|
accessibilityRole="tab"
|
|
label={label}>
|
|
- {({hovered, pressed}) => (
|
|
+ {({ hovered, pressed }) => (
|
|
<View
|
|
style={[
|
|
a.flex_1,
|
|
@@ -640,7 +398,7 @@ function MenuItem({icon, label, count, bold, onPress}: MenuItemProps) {
|
|
a.absolute,
|
|
a.inset_0,
|
|
a.align_end,
|
|
- {top: -4, right: a.gap_sm.gap * -1},
|
|
+ { top: -4, right: a.gap_sm.gap * -1 },
|
|
]}>
|
|
<View
|
|
style={[
|
|
@@ -686,37 +444,28 @@ function MenuItem({icon, label, count, bold, onPress}: MenuItemProps) {
|
|
}
|
|
|
|
function ExtraLinks() {
|
|
- const {_} = useLingui()
|
|
+ const { _ } = useLingui()
|
|
const t = useTheme()
|
|
const kawaii = useKawaiiMode()
|
|
+ const navigation = useNavigation<NavigationProp>()
|
|
|
|
return (
|
|
<View style={[a.flex_col, a.gap_md, a.flex_wrap]}>
|
|
- <InlineLinkText
|
|
- style={[a.text_md]}
|
|
- label={_(msg`Terms of Service`)}
|
|
- to="https://bsky.social/about/support/tos">
|
|
- <Trans>Terms of Service</Trans>
|
|
- </InlineLinkText>
|
|
- <InlineLinkText
|
|
- style={[a.text_md]}
|
|
- to="https://bsky.social/about/support/privacy-policy"
|
|
- label={_(msg`Privacy Policy`)}>
|
|
- <Trans>Privacy Policy</Trans>
|
|
- </InlineLinkText>
|
|
- {kawaii && (
|
|
- <Text style={t.atoms.text_contrast_medium}>
|
|
- <Trans>
|
|
- Logo by{' '}
|
|
- <InlineLinkText
|
|
- style={[a.text_md]}
|
|
- to="/profile/sawaratsuki.bsky.social"
|
|
- label="@sawaratsuki.bsky.social">
|
|
- @sawaratsuki.bsky.social
|
|
- </InlineLinkText>
|
|
- </Trans>
|
|
+ <TouchableOpacity onPress={() => navigation.navigate('TermsOfService')}>
|
|
+ <Text style={[a.text_md, t.atoms.text_contrast_medium]}>
|
|
+ <Trans>Terms of Service</Trans>
|
|
</Text>
|
|
- )}
|
|
+ </TouchableOpacity>
|
|
+ <TouchableOpacity onPress={() => navigation.navigate('PrivacyPolicy')}>
|
|
+ <Text style={[a.text_md, t.atoms.text_contrast_medium]}>
|
|
+ <Trans>Privacy Policy</Trans>
|
|
+ </Text>
|
|
+ </TouchableOpacity>
|
|
+ <TouchableOpacity onPress={() => navigation.navigate('License')}>
|
|
+ <Text style={[a.text_md, t.atoms.text_contrast_medium]}>
|
|
+ <Trans>License</Trans>
|
|
+ </Text>
|
|
+ </TouchableOpacity>
|
|
</View>
|
|
)
|
|
}
|