Merge branch 'main' of github.com:bluesky-social/social-app into main
commit
e13777c191
|
@ -119,7 +119,7 @@ export function StepAlgoFeeds() {
|
|||
<FeedCard config={PRIMARY_FEEDS[0]} />
|
||||
<Text
|
||||
style={[a.text_md, a.pt_4xl, a.pb_lg, t.atoms.text_contrast_700]}>
|
||||
<Trans>Or you can try our "Discover" algorithm:</Trans>
|
||||
<Trans>You can also try our "Discover" algorithm:</Trans>
|
||||
</Text>
|
||||
<FeedCard config={PRIMARY_FEEDS[1]} />
|
||||
</Toggle.Group>
|
||||
|
|
|
@ -129,13 +129,13 @@ export function StepSuggestedAccounts() {
|
|||
<IconCircle icon={At} style={[a.mb_2xl]} />
|
||||
|
||||
<Title>
|
||||
<Trans>Here are some accounts for your to follow</Trans>
|
||||
<Trans>Here are some accounts for you to follow</Trans>
|
||||
</Title>
|
||||
<Description>
|
||||
{state.interestsStepResults.selectedInterests.length ? (
|
||||
<Trans>Based on your interest in {interestsText}</Trans>
|
||||
) : (
|
||||
<Trans>These are popular accounts you might like.</Trans>
|
||||
<Trans>These are popular accounts you might like:</Trans>
|
||||
)}
|
||||
</Description>
|
||||
|
||||
|
@ -171,7 +171,7 @@ export function StepSuggestedAccounts() {
|
|||
color="gradient_sky"
|
||||
size="large"
|
||||
label={_(
|
||||
msg`Follow selected accounts and continue to then next step`,
|
||||
msg`Follow selected accounts and continue to the next step`,
|
||||
)}
|
||||
onPress={handleContinue}>
|
||||
<ButtonText>
|
||||
|
|
|
@ -40,6 +40,7 @@ import {useLingui} from '@lingui/react'
|
|||
import {useLanguagePrefs} from '#/state/preferences'
|
||||
import {useComposerControls} from '#/state/shell/composer'
|
||||
import {useModerationOpts} from '#/state/queries/preferences'
|
||||
import {useOpenLink} from '#/state/preferences/in-app-browser'
|
||||
import {Shadow, usePostShadow, POST_TOMBSTONE} from '#/state/cache/post-shadow'
|
||||
import {ThreadPost} from '#/state/queries/post-thread'
|
||||
import {useSession} from '#/state/session'
|
||||
|
@ -701,17 +702,23 @@ function ExpandedPostDetails({
|
|||
}) {
|
||||
const pal = usePalette('default')
|
||||
const {_} = useLingui()
|
||||
const openLink = useOpenLink()
|
||||
const onTranslatePress = React.useCallback(
|
||||
() => openLink(translatorUrl),
|
||||
[openLink, translatorUrl],
|
||||
)
|
||||
return (
|
||||
<View style={[s.flexRow, s.mt2, s.mb10]}>
|
||||
<Text style={pal.textLight}>{niceDate(post.indexedAt)}</Text>
|
||||
{needsTranslation && (
|
||||
<>
|
||||
<Text style={pal.textLight}> · </Text>
|
||||
<Link href={translatorUrl} title={_(msg`Translate`)}>
|
||||
<Text style={pal.link}>
|
||||
<Trans>Translate</Trans>
|
||||
</Text>
|
||||
</Link>
|
||||
<Text
|
||||
style={pal.link}
|
||||
title={_(msg`Translate`)}
|
||||
onPress={onTranslatePress}>
|
||||
<Trans>Translate</Trans>
|
||||
</Text>
|
||||
</>
|
||||
)}
|
||||
</View>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import React, {memo} from 'react'
|
||||
import {Linking, StyleProp, View, ViewStyle} from 'react-native'
|
||||
import {StyleProp, View, ViewStyle} from 'react-native'
|
||||
import Clipboard from '@react-native-clipboard/clipboard'
|
||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||
import {
|
||||
|
@ -24,6 +24,7 @@ import {usePostDeleteMutation} from '#/state/queries/post'
|
|||
import {useMutedThreads, useToggleThreadMute} from '#/state/muted-threads'
|
||||
import {useLanguagePrefs} from '#/state/preferences'
|
||||
import {useHiddenPosts, useHiddenPostsApi} from '#/state/preferences'
|
||||
import {useOpenLink} from '#/state/preferences/in-app-browser'
|
||||
import {logger} from '#/logger'
|
||||
import {msg} from '@lingui/macro'
|
||||
import {useLingui} from '@lingui/react'
|
||||
|
@ -61,6 +62,7 @@ let PostDropdownBtn = ({
|
|||
const postDeleteMutation = usePostDeleteMutation()
|
||||
const hiddenPosts = useHiddenPosts()
|
||||
const {hidePost} = useHiddenPostsApi()
|
||||
const openLink = useOpenLink()
|
||||
|
||||
const rootUri = record.reply?.root?.uri || postUri
|
||||
const isThreadMuted = mutedThreads.includes(rootUri)
|
||||
|
@ -111,8 +113,8 @@ let PostDropdownBtn = ({
|
|||
}, [_, richText])
|
||||
|
||||
const onOpenTranslate = React.useCallback(() => {
|
||||
Linking.openURL(translatorUrl)
|
||||
}, [translatorUrl])
|
||||
openLink(translatorUrl)
|
||||
}, [openLink, translatorUrl])
|
||||
|
||||
const onHidePost = React.useCallback(() => {
|
||||
hidePost({uri: postUri})
|
||||
|
|
Loading…
Reference in New Issue