diff options
| -rw-r--r-- | src/components/interstitials/TrendingVideos.tsx | 108 | ||||
| -rw-r--r-- | src/locale/locales/en/messages.po | 68 |
2 files changed, 91 insertions, 85 deletions
diff --git a/src/components/interstitials/TrendingVideos.tsx b/src/components/interstitials/TrendingVideos.tsx index 4d59e2fb5..6be64335a 100644 --- a/src/components/interstitials/TrendingVideos.tsx +++ b/src/components/interstitials/TrendingVideos.tsx @@ -1,4 +1,4 @@ -import React, {useEffect} from 'react' +import {useCallback, useEffect, useMemo} from 'react' import {ScrollView, View} from 'react-native' import {AppBskyEmbedVideo, AtUri} from '@atproto/api' import {msg, Trans} from '@lingui/macro' @@ -55,7 +55,7 @@ export function TrendingVideos() { const {setTrendingVideoDisabled} = useTrendingSettingsApi() const trendingPrompt = Prompt.usePromptControl() - const onConfirmHide = React.useCallback(() => { + const onConfirmHide = useCallback(() => { setTrendingVideoDisabled(true) logEvent('trendingVideos:hide', {context: 'interstitial:discover'}) }, [setTrendingVideoDisabled]) @@ -147,9 +147,7 @@ function VideoCards({ }: { data: Exclude<ReturnType<typeof usePostFeedQuery>['data'], undefined> }) { - const t = useTheme() - const {_} = useLingui() - const items = React.useMemo(() => { + const items = useMemo(() => { return data.pages .flatMap(page => page.slices) .map(slice => slice.items[0]) @@ -157,10 +155,6 @@ function VideoCards({ .filter(item => AppBskyEmbedVideo.isView(item.post.embed)) .slice(0, 8) }, [data]) - const href = React.useMemo(() => { - const urip = new AtUri(VIDEO_FEED_URI) - return makeCustomFeedLink(urip.host, urip.rkey, undefined, 'discover') - }, []) return ( <> @@ -183,50 +177,58 @@ function VideoCards({ </View> ))} - <View style={[{width: CARD_WIDTH * 2}]}> - <Link - to={href} - label={_(msg`View more`)} - style={[ - a.justify_center, - a.align_center, - a.flex_1, - a.rounded_lg, - a.border, - t.atoms.border_contrast_low, - t.atoms.bg, - t.atoms.shadow_sm, - ]}> - {({pressed}) => ( - <View - style={[ - a.flex_row, - a.align_center, - a.gap_md, - { - opacity: pressed ? 0.6 : 1, - }, - ]}> - <Text style={[a.text_md]}> - <Trans>View more</Trans> - </Text> - <View - style={[ - a.align_center, - a.justify_center, - a.rounded_full, - { - width: 34, - height: 34, - backgroundColor: t.palette.primary_500, - }, - ]}> - <ButtonIcon icon={ChevronRight} /> - </View> - </View> - )} - </Link> - </View> + <ViewMoreCard /> </> ) } + +function ViewMoreCard() { + const t = useTheme() + const {_} = useLingui() + + const href = useMemo(() => { + const urip = new AtUri(VIDEO_FEED_URI) + return makeCustomFeedLink(urip.host, urip.rkey, undefined, 'discover') + }, []) + + return ( + <View style={[{width: CARD_WIDTH * 2}]}> + <Link + to={href} + label={_(msg`View more`)} + style={[ + a.justify_center, + a.align_center, + a.flex_1, + a.rounded_lg, + a.border, + t.atoms.border_contrast_low, + t.atoms.bg, + t.atoms.shadow_sm, + ]}> + {({pressed}) => ( + <View + style={[ + a.flex_row, + a.align_center, + a.gap_md, + { + opacity: pressed ? 0.6 : 1, + }, + ]}> + <Text style={[a.text_md]}> + <Trans>View more</Trans> + </Text> + <Button + color="primary" + size="small" + shape="round" + label={_(msg`View more trending videos`)}> + <ButtonIcon icon={ChevronRight} /> + </Button> + </View> + )} + </Link> + </View> + ) +} diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po index f8031f13c..c08ea29e8 100644 --- a/src/locale/locales/en/messages.po +++ b/src/locale/locales/en/messages.po @@ -602,7 +602,7 @@ msgstr "" msgid "Account removed from quick access" msgstr "" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:132 #: src/view/com/profile/ProfileMenu.tsx:148 msgctxt "toast" msgid "Account unblocked" @@ -1280,7 +1280,7 @@ msgid "Birthday" msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:753 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:320 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:328 #: src/view/com/profile/ProfileMenu.tsx:473 msgid "Block" msgstr "" @@ -1449,20 +1449,20 @@ msgstr "" msgid "Books" msgstr "" -#: src/components/FeedInterstitials.tsx:435 +#: src/components/FeedInterstitials.tsx:428 msgid "Browse more accounts on the Explore page" msgstr "" -#: src/components/FeedInterstitials.tsx:566 +#: src/components/FeedInterstitials.tsx:556 msgid "Browse more feeds on the Explore page" msgstr "" -#: src/components/FeedInterstitials.tsx:547 -#: src/components/FeedInterstitials.tsx:550 +#: src/components/FeedInterstitials.tsx:537 +#: src/components/FeedInterstitials.tsx:540 msgid "Browse more suggestions" msgstr "" -#: src/components/FeedInterstitials.tsx:575 +#: src/components/FeedInterstitials.tsx:565 msgid "Browse more suggestions on the Explore page" msgstr "" @@ -2906,12 +2906,12 @@ msgstr "" #: src/screens/Profile/Header/EditProfileDialog.tsx:276 #: src/screens/Profile/Header/EditProfileDialog.tsx:282 #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:183 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:185 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:190 msgid "Edit profile" msgstr "" #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:186 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:188 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:193 msgid "Edit Profile" msgstr "" @@ -3630,7 +3630,7 @@ msgstr "" #: src/components/ProfileCard.tsx:517 #: src/components/ProfileHoverCard/index.web.tsx:496 #: src/components/ProfileHoverCard/index.web.tsx:507 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:245 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:252 #: src/screens/VideoFeed/index.tsx:851 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:131 msgid "Follow" @@ -3641,7 +3641,7 @@ msgctxt "action" msgid "Follow" msgstr "" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:230 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:237 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:113 msgid "Follow {0}" msgstr "" @@ -3669,7 +3669,7 @@ msgstr "" msgid "Follow all" msgstr "" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:243 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:250 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:129 msgid "Follow Back" msgstr "" @@ -3708,7 +3708,7 @@ msgstr "" #: src/components/ProfileCard.tsx:511 #: src/components/ProfileHoverCard/index.web.tsx:495 #: src/components/ProfileHoverCard/index.web.tsx:506 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:241 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:248 #: src/screens/VideoFeed/index.tsx:849 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:134 msgid "Following" @@ -3721,7 +3721,7 @@ msgid "Following" msgstr "" #: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:89 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:92 msgid "Following {0}" msgstr "" @@ -5479,7 +5479,7 @@ msgid "No likes yet" msgstr "" #: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:110 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:114 msgid "No longer following {0}" msgstr "" @@ -7432,15 +7432,15 @@ msgstr "" msgid "See jobs at Bluesky" msgstr "" -#: src/components/FeedInterstitials.tsx:397 +#: src/components/FeedInterstitials.tsx:393 msgid "See more" msgstr "" -#: src/components/FeedInterstitials.tsx:444 +#: src/components/FeedInterstitials.tsx:437 msgid "See more accounts you might like" msgstr "" -#: src/components/FeedInterstitials.tsx:395 +#: src/components/FeedInterstitials.tsx:391 msgid "See more suggested profiles on the Explore page" msgstr "" @@ -8023,7 +8023,7 @@ msgstr "" msgid "Signed in as @{0}" msgstr "" -#: src/components/FeedInterstitials.tsx:389 +#: src/components/FeedInterstitials.tsx:386 msgid "Similar accounts" msgstr "" @@ -8053,7 +8053,7 @@ msgstr "" msgid "Some of your verifications are invalid." msgstr "" -#: src/components/FeedInterstitials.tsx:529 +#: src/components/FeedInterstitials.tsx:519 msgid "Some other feeds you might like" msgstr "" @@ -8285,7 +8285,7 @@ msgstr "" msgid "Suggested Accounts" msgstr "" -#: src/components/FeedInterstitials.tsx:391 +#: src/components/FeedInterstitials.tsx:384 msgid "Suggested for you" msgstr "" @@ -8475,7 +8475,7 @@ msgstr "" msgid "That's everything!" msgstr "" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:316 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:324 #: src/view/com/profile/ProfileMenu.tsx:461 msgid "The account will be able to interact with you after unblocking." msgstr "" @@ -8645,9 +8645,9 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:361 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:374 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:384 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:98 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:132 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:101 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:123 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:136 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:90 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:101 #: src/view/com/profile/ProfileMenu.tsx:128 @@ -9095,14 +9095,14 @@ msgstr "" #: src/components/dms/MessagesListBlockedFooter.tsx:104 #: src/components/dms/MessagesListBlockedFooter.tsx:112 #: src/components/dms/MessagesListBlockedFooter.tsx:119 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:203 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:320 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:208 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:328 #: src/view/com/profile/ProfileMenu.tsx:473 #: src/view/screens/ProfileList.tsx:723 msgid "Unblock" msgstr "" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:208 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:213 msgctxt "action" msgid "Unblock" msgstr "" @@ -9114,7 +9114,7 @@ msgstr "" msgid "Unblock account" msgstr "" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:314 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:322 #: src/view/com/profile/ProfileMenu.tsx:455 msgid "Unblock Account?" msgstr "" @@ -9138,7 +9138,7 @@ msgctxt "action" msgid "Unfollow" msgstr "" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:229 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:236 msgid "Unfollow {0}" msgstr "" @@ -9674,13 +9674,17 @@ msgstr "" msgid "View information about these labels" msgstr "" -#: src/components/interstitials/TrendingVideos.tsx:189 -#: src/components/interstitials/TrendingVideos.tsx:211 +#: src/components/interstitials/TrendingVideos.tsx:198 +#: src/components/interstitials/TrendingVideos.tsx:220 #: src/screens/Search/modules/ExploreTrendingVideos.tsx:194 #: src/screens/Search/modules/ExploreTrendingVideos.tsx:213 msgid "View more" msgstr "" +#: src/components/interstitials/TrendingVideos.tsx:226 +msgid "View more trending videos" +msgstr "" + #: src/components/ProfileHoverCard/index.web.tsx:466 #: src/components/ProfileHoverCard/index.web.tsx:486 #: src/components/ProfileHoverCard/index.web.tsx:513 |