remove unused button, massively simplify
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
import React from 'react'
|
|
||||||
import {
|
import {
|
||||||
Linking,
|
Linking,
|
||||||
Pressable,
|
Pressable,
|
||||||
@@ -13,33 +12,23 @@ import {
|
|||||||
type AppBskyGraphDefs,
|
type AppBskyGraphDefs,
|
||||||
AtUri,
|
AtUri,
|
||||||
} from '@atproto/api'
|
} from '@atproto/api'
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
import {Plural, Trans} from '@lingui/macro'
|
||||||
import {msg, Plural, Trans} from '@lingui/macro'
|
|
||||||
import {useLingui} from '@lingui/react'
|
|
||||||
|
|
||||||
import {useNavigationDeduped} from '#/lib/hooks/useNavigationDeduped'
|
import {useNavigationDeduped} from '#/lib/hooks/useNavigationDeduped'
|
||||||
import {usePalette} from '#/lib/hooks/usePalette'
|
import {usePalette} from '#/lib/hooks/usePalette'
|
||||||
import {sanitizeHandle} from '#/lib/strings/handles'
|
import {sanitizeHandle} from '#/lib/strings/handles'
|
||||||
import {s} from '#/lib/styles'
|
import {s} from '#/lib/styles'
|
||||||
import {logger} from '#/logger'
|
|
||||||
import {
|
import {
|
||||||
type FeedSourceInfo,
|
type FeedSourceInfo,
|
||||||
hydrateFeedGenerator,
|
hydrateFeedGenerator,
|
||||||
hydrateList,
|
hydrateList,
|
||||||
useFeedSourceInfoQuery,
|
useFeedSourceInfoQuery,
|
||||||
} from '#/state/queries/feed'
|
} from '#/state/queries/feed'
|
||||||
import {
|
|
||||||
useAddSavedFeedsMutation,
|
|
||||||
usePreferencesQuery,
|
|
||||||
useRemoveFeedMutation,
|
|
||||||
} from '#/state/queries/preferences'
|
|
||||||
import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
|
import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
|
||||||
import {Text} from '#/view/com/util/text/Text'
|
import {Text} from '#/view/com/util/text/Text'
|
||||||
import * as Toast from '#/view/com/util/Toast'
|
|
||||||
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
||||||
import {atoms as a, useTheme} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
import {shouldClickOpenNewTab} from '#/components/Link'
|
import {shouldClickOpenNewTab} from '#/components/Link'
|
||||||
import * as Prompt from '#/components/Prompt'
|
|
||||||
import {RichText} from '#/components/RichText'
|
import {RichText} from '#/components/RichText'
|
||||||
|
|
||||||
type FeedSourceCardProps = {
|
type FeedSourceCardProps = {
|
||||||
@@ -68,7 +57,7 @@ export function FeedSourceCard({
|
|||||||
} else {
|
} else {
|
||||||
feed = hydrateList(feedData)
|
feed = hydrateList(feedData)
|
||||||
}
|
}
|
||||||
return <FeedSourceCardLoaded feedUri={feedUri} feed={feed} {...props} />
|
return <FeedSourceCardLoaded feed={feed} {...props} />
|
||||||
} else {
|
} else {
|
||||||
return <FeedSourceCardWithoutData feedUri={feedUri} {...props} />
|
return <FeedSourceCardWithoutData feedUri={feedUri} {...props} />
|
||||||
}
|
}
|
||||||
@@ -82,93 +71,36 @@ export function FeedSourceCardWithoutData({
|
|||||||
uri: feedUri,
|
uri: feedUri,
|
||||||
})
|
})
|
||||||
|
|
||||||
return <FeedSourceCardLoaded feedUri={feedUri} feed={feed} {...props} />
|
return <FeedSourceCardLoaded feed={feed} {...props} />
|
||||||
}
|
}
|
||||||
|
|
||||||
export function FeedSourceCardLoaded({
|
export function FeedSourceCardLoaded({
|
||||||
feedUri,
|
|
||||||
feed,
|
feed,
|
||||||
style,
|
style,
|
||||||
showSaveBtn = false,
|
|
||||||
showDescription = false,
|
showDescription = false,
|
||||||
showLikes = false,
|
showLikes = false,
|
||||||
pinOnSave = false,
|
|
||||||
showMinimalPlaceholder,
|
showMinimalPlaceholder,
|
||||||
hideTopBorder,
|
hideTopBorder,
|
||||||
}: {
|
}: {
|
||||||
feedUri: string
|
|
||||||
feed?: FeedSourceInfo
|
feed?: FeedSourceInfo
|
||||||
style?: StyleProp<ViewStyle>
|
style?: StyleProp<ViewStyle>
|
||||||
showSaveBtn?: boolean
|
|
||||||
showDescription?: boolean
|
showDescription?: boolean
|
||||||
showLikes?: boolean
|
showLikes?: boolean
|
||||||
pinOnSave?: boolean
|
|
||||||
showMinimalPlaceholder?: boolean
|
showMinimalPlaceholder?: boolean
|
||||||
hideTopBorder?: boolean
|
hideTopBorder?: boolean
|
||||||
}) {
|
}) {
|
||||||
const {data: preferences} = usePreferencesQuery()
|
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
const pal = usePalette('default')
|
const pal = usePalette('default')
|
||||||
const {_} = useLingui()
|
|
||||||
const removePromptControl = Prompt.usePromptControl()
|
|
||||||
const navigation = useNavigationDeduped()
|
const navigation = useNavigationDeduped()
|
||||||
|
|
||||||
const {isPending: isAddSavedFeedPending, mutateAsync: addSavedFeeds} =
|
|
||||||
useAddSavedFeedsMutation()
|
|
||||||
const {isPending: isRemovePending, mutateAsync: removeFeed} =
|
|
||||||
useRemoveFeedMutation()
|
|
||||||
|
|
||||||
const savedFeedConfig = preferences?.savedFeeds?.find(
|
|
||||||
f => f.value === feedUri,
|
|
||||||
)
|
|
||||||
const isSaved = Boolean(savedFeedConfig)
|
|
||||||
|
|
||||||
const onSave = React.useCallback(async () => {
|
|
||||||
if (!feed || isSaved) return
|
|
||||||
|
|
||||||
try {
|
|
||||||
await addSavedFeeds([
|
|
||||||
{
|
|
||||||
type: 'feed',
|
|
||||||
value: feed.uri,
|
|
||||||
pinned: pinOnSave,
|
|
||||||
},
|
|
||||||
])
|
|
||||||
Toast.show(_(msg`Added to my feeds`))
|
|
||||||
} catch (e) {
|
|
||||||
Toast.show(_(msg`There was an issue contacting your server`), 'xmark')
|
|
||||||
logger.error('Failed to save feed', {message: e})
|
|
||||||
}
|
|
||||||
}, [_, feed, pinOnSave, addSavedFeeds, isSaved])
|
|
||||||
|
|
||||||
const onUnsave = React.useCallback(async () => {
|
|
||||||
if (!savedFeedConfig) return
|
|
||||||
|
|
||||||
try {
|
|
||||||
await removeFeed(savedFeedConfig)
|
|
||||||
// await item.unsave()
|
|
||||||
Toast.show(_(msg`Removed from my feeds`))
|
|
||||||
} catch (e) {
|
|
||||||
Toast.show(_(msg`There was an issue contacting your server`), 'xmark')
|
|
||||||
logger.error('Failed to unsave feed', {message: e})
|
|
||||||
}
|
|
||||||
}, [_, removeFeed, savedFeedConfig])
|
|
||||||
|
|
||||||
const onToggleSaved = React.useCallback(async () => {
|
|
||||||
if (isSaved) {
|
|
||||||
removePromptControl.open()
|
|
||||||
} else {
|
|
||||||
await onSave()
|
|
||||||
}
|
|
||||||
}, [isSaved, removePromptControl, onSave])
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* LOAD STATE
|
* LOAD STATE
|
||||||
*
|
*
|
||||||
* This state also captures the scenario where a feed can't load for whatever
|
* This state also captures the scenario where a feed can't load for whatever
|
||||||
* reason.
|
* reason.
|
||||||
*/
|
*/
|
||||||
if (!feed || !preferences)
|
if (!feed)
|
||||||
return (
|
return (
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
@@ -186,36 +118,17 @@ export function FeedSourceCardLoaded({
|
|||||||
]}>
|
]}>
|
||||||
{showMinimalPlaceholder ? (
|
{showMinimalPlaceholder ? (
|
||||||
<FeedLoadingPlaceholder
|
<FeedLoadingPlaceholder
|
||||||
style={{flex: 1}}
|
style={[a.flex_1]}
|
||||||
showTopBorder={false}
|
showTopBorder={false}
|
||||||
showLowerPlaceholder={false}
|
showLowerPlaceholder={false}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<FeedLoadingPlaceholder style={{flex: 1}} showTopBorder={false} />
|
<FeedLoadingPlaceholder style={[a.flex_1]} showTopBorder={false} />
|
||||||
)}
|
|
||||||
|
|
||||||
{showSaveBtn && (
|
|
||||||
<Pressable
|
|
||||||
testID={`feed-${feedUri}-toggleSave`}
|
|
||||||
disabled={isRemovePending}
|
|
||||||
accessibilityRole="button"
|
|
||||||
accessibilityLabel={_(msg`Remove from my feeds`)}
|
|
||||||
accessibilityHint=""
|
|
||||||
onPress={onUnsave}
|
|
||||||
hitSlop={15}
|
|
||||||
style={styles.btn}>
|
|
||||||
<FontAwesomeIcon
|
|
||||||
icon={['far', 'trash-can']}
|
|
||||||
size={19}
|
|
||||||
color={pal.colors.icon}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<Pressable
|
<Pressable
|
||||||
testID={`feed-${feed.displayName}`}
|
testID={`feed-${feed.displayName}`}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
@@ -270,38 +183,6 @@ export function FeedSourceCardLoaded({
|
|||||||
)}
|
)}
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{showSaveBtn && (
|
|
||||||
<View style={{alignSelf: 'center'}}>
|
|
||||||
<Pressable
|
|
||||||
testID={`feed-${feed.displayName}-toggleSave`}
|
|
||||||
disabled={isAddSavedFeedPending || isRemovePending}
|
|
||||||
accessibilityRole="button"
|
|
||||||
accessibilityLabel={
|
|
||||||
isSaved
|
|
||||||
? _(msg`Remove from my feeds`)
|
|
||||||
: _(msg`Add to my feeds`)
|
|
||||||
}
|
|
||||||
accessibilityHint=""
|
|
||||||
onPress={onToggleSaved}
|
|
||||||
hitSlop={15}
|
|
||||||
style={styles.btn}>
|
|
||||||
{isSaved ? (
|
|
||||||
<FontAwesomeIcon
|
|
||||||
icon={['far', 'trash-can']}
|
|
||||||
size={19}
|
|
||||||
color={pal.colors.icon}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<FontAwesomeIcon
|
|
||||||
icon="plus"
|
|
||||||
size={18}
|
|
||||||
color={pal.colors.link}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</Pressable>
|
|
||||||
</View>
|
|
||||||
)}
|
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{showDescription && feed.description ? (
|
{showDescription && feed.description ? (
|
||||||
@@ -316,32 +197,10 @@ export function FeedSourceCardLoaded({
|
|||||||
<Text type="sm-medium" style={[pal.text, pal.textLight]}>
|
<Text type="sm-medium" style={[pal.text, pal.textLight]}>
|
||||||
<Trans>
|
<Trans>
|
||||||
Liked by{' '}
|
Liked by{' '}
|
||||||
<Plural
|
<Plural value={feed.likeCount || 0} one="# user" other="# users" />
|
||||||
value={feed.likeCount || 0}
|
|
||||||
one="# user"
|
|
||||||
other="# users"
|
|
||||||
/>
|
|
||||||
</Trans>
|
</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
</Pressable>
|
</Pressable>
|
||||||
|
|
||||||
<Prompt.Basic
|
|
||||||
control={removePromptControl}
|
|
||||||
title={_(msg`Remove from your feeds?`)}
|
|
||||||
description={_(
|
|
||||||
msg`Are you sure you want to remove ${feed.displayName} from your feeds?`,
|
|
||||||
)}
|
|
||||||
onConfirm={onUnsave}
|
|
||||||
confirmButtonCta={_(msg`Remove`)}
|
|
||||||
confirmButtonColor="negative"
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
|
||||||
btn: {
|
|
||||||
paddingVertical: 6,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|||||||
Reference in New Issue
Block a user