143e2c802d
* Add common gutter styles as hook * Add computed scrollbar gutter CSS vars * Add new layout components * Replace layout components in settings screens * Remove old back button * Invert web border logic for easier migration * Clean up Slot API * Port over FF handling of scrollbar offset * Trade boilerplate for ease of use * Limit to one line * Allow two lines, fix wrapping * Fix alignment * sticky headers * set max with on header and center * [Layout] Notifications Header (#6910) * Replace notifications screen header * fix cropped indicator --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com> * Replace Hashtag header (#6928) * [Layout] ChatList header (#6929) * Replace ChatList header * update chat settings as well --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com> * Add web borders to Chat settings * Remove unused var * Move ChatList header outside center * Replace empty chat layout * fix breakpoints * [Layout] Scrollbar gutters (#6908) * Fix sidebar alignment * Make sure scrollbars don't hide * Gift left nav more space * Use stable one-edge, update logic in RightNav * Ope * Increase width * Reset * Add transform to sidebars * Remove bg in sidebars * Handle shifts in layout components * Replace scroll-removal handling * Make react-remove-scroll an explicit dep * Remove unused script * use correct scroll insets (#6950) * [Layout] Feeds headers (#6913) * Replace ViewHeader internals, duplicate old ViewHeader * Replace Feeds header * Replace SavedFeeds header * Visual alignment * Uglier but clear * Use old ViewHeader for SavedFeeds * use Layout.Center instead of Layout.Content * use left-aligned header for feed edit * delete unused old view header --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com> * [Layout] Every other screen (#6953) * attempt to fix double borders on every other screen * delete ListHeaderDesktop * delete `SimpleViewHeader` and fix screens (#6956) * Make Layout.Center not full height * Refactor List to use Layout.Center, remove built-in borders * Fix Home screen * Refactor PagerWithHeader to use Layout components * Replace components in ProfileFeed and ProfileList * Borders on Profile * Search screen replacements * use new header for profile subpage header (#6958) * Search AutocompleteResults * use new header for starter pack wizard (#6957) * Fix post thread * Enable borders by default * Moderation muted and blocked accounts * Fix scrollbar offset on Labeler * Remove ScrollView from Moderation * Remove ScrollView from Deactivated * Remove ScrollView from onboarding * Remove ScrollView from SignupQueued * Mark deprecations * fix lint * Fix double borders on profile load * Remove unneeded CenteredView from noty Feed * Remove double Center layout on Notifications screen * Remove double Center layout on ChatList screen * Handle scrollbar offset in chat * Use new atom for other scrollbar offsets * Remove borders from old views * Better doc * Remove temp migration prop * Fix new atom usage on native * Clean up Hashtag screen * Layout docs * Clarify usage in Pager * Handle nested offset contexts * Clean up Layout * fix feeds page * asymmetric header on native (#6969) * Reusable header const * Fix up home header * Add back button to convo * Add hitslop to header buttons * Comment * Better handling on native for new atom * Format * Fix nested flatlist on mod screens * Use react-remove-scroll-bar directly * Fix notification count overflow on web * Clarify doc --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com>
453 lines
14 KiB
TypeScript
453 lines
14 KiB
TypeScript
import React from 'react'
|
|
import {ActivityIndicator, Pressable, StyleSheet, View} from 'react-native'
|
|
import Animated, {LinearTransition} from 'react-native-reanimated'
|
|
import {AppBskyActorDefs} from '@atproto/api'
|
|
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
|
import {msg, Trans} from '@lingui/macro'
|
|
import {useLingui} from '@lingui/react'
|
|
import {useFocusEffect} from '@react-navigation/native'
|
|
import {useNavigation} from '@react-navigation/native'
|
|
import {NativeStackScreenProps} from '@react-navigation/native-stack'
|
|
|
|
import {useHaptics} from '#/lib/haptics'
|
|
import {usePalette} from '#/lib/hooks/usePalette'
|
|
import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
|
|
import {CommonNavigatorParams, NavigationProp} from '#/lib/routes/types'
|
|
import {colors, s} from '#/lib/styles'
|
|
import {logger} from '#/logger'
|
|
import {
|
|
useOverwriteSavedFeedsMutation,
|
|
usePreferencesQuery,
|
|
} from '#/state/queries/preferences'
|
|
import {UsePreferencesQueryResponse} from '#/state/queries/preferences/types'
|
|
import {useSetMinimalShellMode} from '#/state/shell'
|
|
import {FeedSourceCard} from '#/view/com/feeds/FeedSourceCard'
|
|
import {TextLink} from '#/view/com/util/Link'
|
|
import {Text} from '#/view/com/util/text/Text'
|
|
import * as Toast from '#/view/com/util/Toast'
|
|
import {NoFollowingFeed} from '#/screens/Feeds/NoFollowingFeed'
|
|
import {NoSavedFeedsOfAnyType} from '#/screens/Feeds/NoSavedFeedsOfAnyType'
|
|
import {atoms as a, useTheme} from '#/alf'
|
|
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
|
|
import {FilterTimeline_Stroke2_Corner0_Rounded as FilterTimeline} from '#/components/icons/FilterTimeline'
|
|
import {FloppyDisk_Stroke2_Corner0_Rounded as SaveIcon} from '#/components/icons/FloppyDisk'
|
|
import * as Layout from '#/components/Layout'
|
|
import {Loader} from '#/components/Loader'
|
|
|
|
type Props = NativeStackScreenProps<CommonNavigatorParams, 'SavedFeeds'>
|
|
export function SavedFeeds({}: Props) {
|
|
const {data: preferences} = usePreferencesQuery()
|
|
if (!preferences) {
|
|
return <View />
|
|
}
|
|
return <SavedFeedsInner preferences={preferences} />
|
|
}
|
|
|
|
function SavedFeedsInner({
|
|
preferences,
|
|
}: {
|
|
preferences: UsePreferencesQueryResponse
|
|
}) {
|
|
const pal = usePalette('default')
|
|
const {_} = useLingui()
|
|
const {isMobile, isDesktop} = useWebMediaQueries()
|
|
const setMinimalShellMode = useSetMinimalShellMode()
|
|
const {mutateAsync: overwriteSavedFeeds, isPending: isOverwritePending} =
|
|
useOverwriteSavedFeedsMutation()
|
|
const navigation = useNavigation<NavigationProp>()
|
|
|
|
/*
|
|
* Use optimistic data if exists and no error, otherwise fallback to remote
|
|
* data
|
|
*/
|
|
const [currentFeeds, setCurrentFeeds] = React.useState(
|
|
() => preferences.savedFeeds || [],
|
|
)
|
|
const hasUnsavedChanges = currentFeeds !== preferences.savedFeeds
|
|
const pinnedFeeds = currentFeeds.filter(f => f.pinned)
|
|
const unpinnedFeeds = currentFeeds.filter(f => !f.pinned)
|
|
const noSavedFeedsOfAnyType = pinnedFeeds.length + unpinnedFeeds.length === 0
|
|
const noFollowingFeed =
|
|
currentFeeds.every(f => f.type !== 'timeline') && !noSavedFeedsOfAnyType
|
|
|
|
useFocusEffect(
|
|
React.useCallback(() => {
|
|
setMinimalShellMode(false)
|
|
}, [setMinimalShellMode]),
|
|
)
|
|
|
|
const onSaveChanges = React.useCallback(async () => {
|
|
try {
|
|
await overwriteSavedFeeds(currentFeeds)
|
|
Toast.show(_(msg`Feeds updated!`))
|
|
navigation.navigate('Feeds')
|
|
} catch (e) {
|
|
Toast.show(_(msg`There was an issue contacting the server`), 'xmark')
|
|
logger.error('Failed to toggle pinned feed', {message: e})
|
|
}
|
|
}, [_, overwriteSavedFeeds, currentFeeds, navigation])
|
|
|
|
return (
|
|
<Layout.Screen>
|
|
<Layout.Header.Outer>
|
|
<Layout.Header.BackButton />
|
|
<Layout.Header.Content align="left">
|
|
<Layout.Header.TitleText>
|
|
<Trans>Feeds</Trans>
|
|
</Layout.Header.TitleText>
|
|
</Layout.Header.Content>
|
|
<Button
|
|
testID="saveChangesBtn"
|
|
size="small"
|
|
variant={hasUnsavedChanges ? 'solid' : 'solid'}
|
|
color={hasUnsavedChanges ? 'primary' : 'secondary'}
|
|
onPress={onSaveChanges}
|
|
label={_(msg`Save changes`)}
|
|
disabled={isOverwritePending || !hasUnsavedChanges}>
|
|
<ButtonIcon icon={isOverwritePending ? Loader : SaveIcon} />
|
|
<ButtonText>
|
|
{isDesktop ? <Trans>Save changes</Trans> : <Trans>Save</Trans>}
|
|
</ButtonText>
|
|
</Button>
|
|
</Layout.Header.Outer>
|
|
|
|
<Layout.Content>
|
|
{noSavedFeedsOfAnyType && (
|
|
<View style={[pal.border, a.border_b]}>
|
|
<NoSavedFeedsOfAnyType />
|
|
</View>
|
|
)}
|
|
|
|
<View style={[pal.text, pal.border, styles.title]}>
|
|
<Text type="title" style={pal.text}>
|
|
<Trans>Pinned Feeds</Trans>
|
|
</Text>
|
|
</View>
|
|
|
|
{preferences ? (
|
|
!pinnedFeeds.length ? (
|
|
<View
|
|
style={[
|
|
pal.border,
|
|
isMobile && s.flex1,
|
|
pal.viewLight,
|
|
styles.empty,
|
|
]}>
|
|
<Text type="lg" style={[pal.text]}>
|
|
<Trans>You don't have any pinned feeds.</Trans>
|
|
</Text>
|
|
</View>
|
|
) : (
|
|
pinnedFeeds.map(f => (
|
|
<ListItem
|
|
key={f.id}
|
|
feed={f}
|
|
isPinned
|
|
currentFeeds={currentFeeds}
|
|
setCurrentFeeds={setCurrentFeeds}
|
|
preferences={preferences}
|
|
/>
|
|
))
|
|
)
|
|
) : (
|
|
<ActivityIndicator style={{marginTop: 20}} />
|
|
)}
|
|
|
|
{noFollowingFeed && (
|
|
<View style={[pal.border, a.border_b]}>
|
|
<NoFollowingFeed />
|
|
</View>
|
|
)}
|
|
|
|
<View style={[pal.text, pal.border, styles.title]}>
|
|
<Text type="title" style={pal.text}>
|
|
<Trans>Saved Feeds</Trans>
|
|
</Text>
|
|
</View>
|
|
{preferences ? (
|
|
!unpinnedFeeds.length ? (
|
|
<View
|
|
style={[
|
|
pal.border,
|
|
isMobile && s.flex1,
|
|
pal.viewLight,
|
|
styles.empty,
|
|
]}>
|
|
<Text type="lg" style={[pal.text]}>
|
|
<Trans>You don't have any saved feeds.</Trans>
|
|
</Text>
|
|
</View>
|
|
) : (
|
|
unpinnedFeeds.map(f => (
|
|
<ListItem
|
|
key={f.id}
|
|
feed={f}
|
|
isPinned={false}
|
|
currentFeeds={currentFeeds}
|
|
setCurrentFeeds={setCurrentFeeds}
|
|
preferences={preferences}
|
|
/>
|
|
))
|
|
)
|
|
) : (
|
|
<ActivityIndicator style={{marginTop: 20}} />
|
|
)}
|
|
|
|
<View style={styles.footerText}>
|
|
<Text type="sm" style={pal.textLight}>
|
|
<Trans>
|
|
Feeds are custom algorithms that users build with a little coding
|
|
expertise.{' '}
|
|
<TextLink
|
|
type="sm"
|
|
style={pal.link}
|
|
href="https://github.com/bluesky-social/feed-generator"
|
|
text={_(msg`See this guide`)}
|
|
/>{' '}
|
|
for more information.
|
|
</Trans>
|
|
</Text>
|
|
</View>
|
|
</Layout.Content>
|
|
</Layout.Screen>
|
|
)
|
|
}
|
|
|
|
function ListItem({
|
|
feed,
|
|
isPinned,
|
|
currentFeeds,
|
|
setCurrentFeeds,
|
|
}: {
|
|
feed: AppBskyActorDefs.SavedFeed
|
|
isPinned: boolean
|
|
currentFeeds: AppBskyActorDefs.SavedFeed[]
|
|
setCurrentFeeds: React.Dispatch<AppBskyActorDefs.SavedFeed[]>
|
|
preferences: UsePreferencesQueryResponse
|
|
}) {
|
|
const {_} = useLingui()
|
|
const pal = usePalette('default')
|
|
const playHaptic = useHaptics()
|
|
const feedUri = feed.value
|
|
|
|
const onTogglePinned = React.useCallback(async () => {
|
|
playHaptic()
|
|
setCurrentFeeds(
|
|
currentFeeds.map(f =>
|
|
f.id === feed.id ? {...feed, pinned: !feed.pinned} : f,
|
|
),
|
|
)
|
|
}, [playHaptic, feed, currentFeeds, setCurrentFeeds])
|
|
|
|
const onPressUp = React.useCallback(async () => {
|
|
if (!isPinned) return
|
|
|
|
const nextFeeds = currentFeeds.slice()
|
|
const ids = currentFeeds.map(f => f.id)
|
|
const index = ids.indexOf(feed.id)
|
|
const nextIndex = index - 1
|
|
|
|
if (index === -1 || index === 0) return
|
|
;[nextFeeds[index], nextFeeds[nextIndex]] = [
|
|
nextFeeds[nextIndex],
|
|
nextFeeds[index],
|
|
]
|
|
|
|
setCurrentFeeds(nextFeeds)
|
|
}, [feed, isPinned, setCurrentFeeds, currentFeeds])
|
|
|
|
const onPressDown = React.useCallback(async () => {
|
|
if (!isPinned) return
|
|
|
|
const nextFeeds = currentFeeds.slice()
|
|
const ids = currentFeeds.map(f => f.id)
|
|
const index = ids.indexOf(feed.id)
|
|
const nextIndex = index + 1
|
|
|
|
if (index === -1 || index >= nextFeeds.filter(f => f.pinned).length - 1)
|
|
return
|
|
;[nextFeeds[index], nextFeeds[nextIndex]] = [
|
|
nextFeeds[nextIndex],
|
|
nextFeeds[index],
|
|
]
|
|
|
|
setCurrentFeeds(nextFeeds)
|
|
}, [feed, isPinned, setCurrentFeeds, currentFeeds])
|
|
|
|
const onPressRemove = React.useCallback(async () => {
|
|
playHaptic()
|
|
setCurrentFeeds(currentFeeds.filter(f => f.id !== feed.id))
|
|
}, [playHaptic, feed, currentFeeds, setCurrentFeeds])
|
|
|
|
return (
|
|
<Animated.View
|
|
style={[styles.itemContainer, pal.border]}
|
|
layout={LinearTransition.duration(100)}>
|
|
{feed.type === 'timeline' ? (
|
|
<FollowingFeedCard />
|
|
) : (
|
|
<FeedSourceCard
|
|
key={feedUri}
|
|
feedUri={feedUri}
|
|
style={[isPinned && {paddingRight: 8}]}
|
|
showMinimalPlaceholder
|
|
hideTopBorder={true}
|
|
/>
|
|
)}
|
|
{isPinned ? (
|
|
<>
|
|
<Pressable
|
|
accessibilityRole="button"
|
|
onPress={onPressUp}
|
|
hitSlop={5}
|
|
style={state => ({
|
|
backgroundColor: pal.viewLight.backgroundColor,
|
|
paddingHorizontal: 12,
|
|
paddingVertical: 10,
|
|
borderRadius: 4,
|
|
marginRight: 8,
|
|
opacity: state.hovered || state.pressed ? 0.5 : 1,
|
|
})}
|
|
testID={`feed-${feed.type}-moveUp`}>
|
|
<FontAwesomeIcon
|
|
icon="arrow-up"
|
|
size={14}
|
|
style={[pal.textLight]}
|
|
/>
|
|
</Pressable>
|
|
<Pressable
|
|
accessibilityRole="button"
|
|
onPress={onPressDown}
|
|
hitSlop={5}
|
|
style={state => ({
|
|
backgroundColor: pal.viewLight.backgroundColor,
|
|
paddingHorizontal: 12,
|
|
paddingVertical: 10,
|
|
borderRadius: 4,
|
|
marginRight: 8,
|
|
opacity: state.hovered || state.pressed ? 0.5 : 1,
|
|
})}
|
|
testID={`feed-${feed.type}-moveDown`}>
|
|
<FontAwesomeIcon
|
|
icon="arrow-down"
|
|
size={14}
|
|
style={[pal.textLight]}
|
|
/>
|
|
</Pressable>
|
|
</>
|
|
) : (
|
|
<Pressable
|
|
testID={`feed-${feedUri}-toggleSave`}
|
|
accessibilityRole="button"
|
|
accessibilityLabel={_(msg`Remove from my feeds`)}
|
|
accessibilityHint=""
|
|
onPress={onPressRemove}
|
|
hitSlop={5}
|
|
style={state => ({
|
|
marginRight: 8,
|
|
paddingHorizontal: 12,
|
|
paddingVertical: 10,
|
|
borderRadius: 4,
|
|
opacity: state.hovered || state.focused ? 0.5 : 1,
|
|
})}>
|
|
<FontAwesomeIcon
|
|
icon={['far', 'trash-can']}
|
|
size={19}
|
|
color={pal.colors.icon}
|
|
/>
|
|
</Pressable>
|
|
)}
|
|
<View style={{paddingRight: 16}}>
|
|
<Pressable
|
|
accessibilityRole="button"
|
|
hitSlop={5}
|
|
onPress={onTogglePinned}
|
|
style={state => ({
|
|
backgroundColor: pal.viewLight.backgroundColor,
|
|
paddingHorizontal: 12,
|
|
paddingVertical: 10,
|
|
borderRadius: 4,
|
|
opacity: state.hovered || state.focused ? 0.5 : 1,
|
|
})}
|
|
testID={`feed-${feed.type}-togglePin`}>
|
|
<FontAwesomeIcon
|
|
icon="thumb-tack"
|
|
size={14}
|
|
color={isPinned ? colors.blue3 : pal.colors.icon}
|
|
/>
|
|
</Pressable>
|
|
</View>
|
|
</Animated.View>
|
|
)
|
|
}
|
|
|
|
function FollowingFeedCard() {
|
|
const t = useTheme()
|
|
return (
|
|
<View
|
|
style={[
|
|
a.flex_row,
|
|
a.align_center,
|
|
a.flex_1,
|
|
{
|
|
paddingHorizontal: 18,
|
|
paddingVertical: 20,
|
|
},
|
|
]}>
|
|
<View
|
|
style={[
|
|
a.align_center,
|
|
a.justify_center,
|
|
a.rounded_sm,
|
|
{
|
|
width: 36,
|
|
height: 36,
|
|
backgroundColor: t.palette.primary_500,
|
|
marginRight: 10,
|
|
},
|
|
]}>
|
|
<FilterTimeline
|
|
style={[
|
|
{
|
|
width: 22,
|
|
height: 22,
|
|
},
|
|
]}
|
|
fill={t.palette.white}
|
|
/>
|
|
</View>
|
|
<View
|
|
style={{flex: 1, flexDirection: 'row', gap: 8, alignItems: 'center'}}>
|
|
<Text type="lg-medium" style={[t.atoms.text]} numberOfLines={1}>
|
|
<Trans>Following</Trans>
|
|
</Text>
|
|
</View>
|
|
</View>
|
|
)
|
|
}
|
|
|
|
const styles = StyleSheet.create({
|
|
empty: {
|
|
paddingHorizontal: 20,
|
|
paddingVertical: 20,
|
|
borderRadius: 8,
|
|
marginHorizontal: 10,
|
|
marginTop: 10,
|
|
},
|
|
title: {
|
|
paddingHorizontal: 14,
|
|
paddingTop: 20,
|
|
paddingBottom: 10,
|
|
borderBottomWidth: StyleSheet.hairlineWidth,
|
|
},
|
|
itemContainer: {
|
|
flexDirection: 'row',
|
|
alignItems: 'center',
|
|
borderBottomWidth: StyleSheet.hairlineWidth,
|
|
},
|
|
footerText: {
|
|
paddingHorizontal: 26,
|
|
paddingVertical: 22,
|
|
},
|
|
})
|