Add feed discovery page

This commit is contained in:
Paul Frazee 2023-05-24 22:09:39 -05:00
parent 12c7f6d6a5
commit dfb39e7c4f
10 changed files with 252 additions and 20 deletions

View file

@ -53,14 +53,28 @@ export const SavedFeeds = observer(
const renderListFooterComponent = useCallback(() => {
return (
<>
<Link
style={[styles.footerLink, pal.border]}
href="/settings/saved-feeds">
<FontAwesomeIcon icon="cog" size={18} color={pal.colors.icon} />
<Text type="lg-medium" style={pal.textLight}>
Change Order
</Text>
</Link>
<View style={[styles.footerLinks, pal.border]}>
<Link style={[styles.footerLink, pal.border]} href="/search/feeds">
<FontAwesomeIcon
icon="search"
size={18}
color={pal.colors.icon}
/>
<Text type="lg-medium" style={pal.textLight}>
Discover new feeds
</Text>
</Link>
{!store.me.savedFeeds.isEmpty && (
<Link
style={[styles.footerLink, pal.border]}
href="/settings/saved-feeds">
<FontAwesomeIcon icon="cog" size={18} color={pal.colors.icon} />
<Text type="lg-medium" style={pal.textLight}>
Change Order
</Text>
</Link>
)}
</View>
<View
style={[
pal.border,
@ -82,7 +96,7 @@ export const SavedFeeds = observer(
</View>
</>
)
}, [pal])
}, [pal, store.me.savedFeeds.isEmpty])
const renderItem = useCallback(
({item}) => <CustomFeed key={item.data.uri} item={item} />,
@ -118,14 +132,16 @@ export const SavedFeeds = observer(
)
const styles = StyleSheet.create({
footerLinks: {
marginTop: 8,
borderBottomWidth: 1,
},
footerLink: {
flexDirection: 'row',
borderTopWidth: 1,
borderBottomWidth: 1,
paddingHorizontal: 26,
paddingVertical: 18,
gap: 18,
marginTop: 8,
},
empty: {
paddingHorizontal: 18,
@ -134,7 +150,4 @@ const styles = StyleSheet.create({
marginHorizontal: 18,
marginTop: 10,
},
feedItem: {
borderTopWidth: 1,
},
})

View file

@ -220,7 +220,7 @@ export const CustomFeedScreen = withAuthRequired(
</Text>
)}
{isDesktopWeb && (
<View style={styles.headerBtns}>
<View style={[styles.headerBtns, styles.headerBtnsDesktop]}>
<Button
type={currentFeed?.isSaved ? 'default' : 'inverted'}
onPress={onToggleSaved}
@ -366,6 +366,10 @@ const styles = StyleSheet.create({
flexDirection: 'row',
alignItems: 'center',
},
headerBtnsDesktop: {
marginTop: 8,
gap: 4,
},
headerAddBtn: {
flexDirection: 'row',
alignItems: 'center',

View file

@ -0,0 +1,109 @@
import React from 'react'
import {RefreshControl, StyleSheet, View} from 'react-native'
import {observer} from 'mobx-react-lite'
import {useFocusEffect} from '@react-navigation/native'
import {NativeStackScreenProps, CommonNavigatorParams} from 'lib/routes/types'
import {withAuthRequired} from 'view/com/auth/withAuthRequired'
import {ViewHeader} from '../com/util/ViewHeader'
import {useStores} from 'state/index'
import {FeedsDiscoveryModel} from 'state/models/discovery/feeds'
import {CenteredView, FlatList} from 'view/com/util/Views'
import {CustomFeed} from 'view/com/feeds/CustomFeed'
import {Text} from 'view/com/util/text/Text'
import {isDesktopWeb} from 'platform/detection'
import {usePalette} from 'lib/hooks/usePalette'
import {s} from 'lib/styles'
type Props = NativeStackScreenProps<CommonNavigatorParams, 'DiscoverFeeds'>
export const DiscoverFeedsScreen = withAuthRequired(
observer(({}: Props) => {
const store = useStores()
const pal = usePalette('default')
const feeds = React.useMemo(() => new FeedsDiscoveryModel(store), [store])
useFocusEffect(
React.useCallback(() => {
store.shell.setMinimalShellMode(false)
feeds.refresh()
}, [store, feeds]),
)
const onRefresh = React.useCallback(() => {
store.me.savedFeeds.refresh()
}, [store])
const renderListEmptyComponent = React.useCallback(() => {
return (
<View
style={[
pal.border,
!isDesktopWeb && s.flex1,
pal.viewLight,
styles.empty,
]}>
<Text type="lg" style={[pal.text]}>
{feeds.isLoading
? 'Loading...'
: `We can't find any feeds for some reason. This is probably an error - try refreshing!`}
</Text>
</View>
)
}, [pal, feeds.isLoading])
const renderItem = React.useCallback(
({item}) => (
<CustomFeed
key={item.data.uri}
item={item}
showSaveBtn
showDescription
showLikes
/>
),
[],
)
return (
<CenteredView style={[styles.container, pal.view]}>
<View style={[isDesktopWeb && styles.containerDesktop, pal.border]}>
<ViewHeader title="Discover Feeds" showOnDesktop />
</View>
<FlatList
style={[!isDesktopWeb && s.flex1]}
data={feeds.feeds}
keyExtractor={item => item.data.uri}
refreshControl={
<RefreshControl
refreshing={feeds.isRefreshing}
onRefresh={onRefresh}
tintColor={pal.colors.text}
titleColor={pal.colors.text}
/>
}
renderItem={renderItem}
initialNumToRender={10}
ListEmptyComponent={renderListEmptyComponent}
extraData={feeds.isLoading}
/>
</CenteredView>
)
}),
)
const styles = StyleSheet.create({
container: {
flex: 1,
paddingBottom: isDesktopWeb ? 0 : 100,
},
containerDesktop: {
borderLeftWidth: 1,
borderRightWidth: 1,
},
empty: {
paddingHorizontal: 18,
paddingVertical: 16,
borderRadius: 8,
marginHorizontal: 18,
marginTop: 10,
},
})