Update feeds header to just have edit link (#4484)
parent
46e12c6d34
commit
aca0fa23ec
|
@ -1,11 +1,5 @@
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {
|
import {ActivityIndicator, type FlatList, StyleSheet, View} from 'react-native'
|
||||||
ActivityIndicator,
|
|
||||||
type FlatList,
|
|
||||||
Pressable,
|
|
||||||
StyleSheet,
|
|
||||||
View,
|
|
||||||
} from 'react-native'
|
|
||||||
import {AppBskyActorDefs} from '@atproto/api'
|
import {AppBskyActorDefs} from '@atproto/api'
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||||
import {FontAwesomeIconStyle} from '@fortawesome/react-native-fontawesome'
|
import {FontAwesomeIconStyle} from '@fortawesome/react-native-fontawesome'
|
||||||
|
@ -25,18 +19,17 @@ import {usePreferencesQuery} from '#/state/queries/preferences'
|
||||||
import {useSession} from '#/state/session'
|
import {useSession} from '#/state/session'
|
||||||
import {useSetMinimalShellMode} from '#/state/shell'
|
import {useSetMinimalShellMode} from '#/state/shell'
|
||||||
import {useComposerControls} from '#/state/shell/composer'
|
import {useComposerControls} from '#/state/shell/composer'
|
||||||
import {HITSLOP_10} from 'lib/constants'
|
|
||||||
import {usePalette} from 'lib/hooks/usePalette'
|
import {usePalette} from 'lib/hooks/usePalette'
|
||||||
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
|
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
|
||||||
import {CogIcon, ComposeIcon2, MagnifyingGlassIcon2} from 'lib/icons'
|
import {ComposeIcon2} from 'lib/icons'
|
||||||
import {CommonNavigatorParams, NativeStackScreenProps} from 'lib/routes/types'
|
import {CommonNavigatorParams, NativeStackScreenProps} from 'lib/routes/types'
|
||||||
import {cleanError} from 'lib/strings/errors'
|
import {cleanError} from 'lib/strings/errors'
|
||||||
import {s} from 'lib/styles'
|
import {s} from 'lib/styles'
|
||||||
import {FeedSourceCard} from 'view/com/feeds/FeedSourceCard'
|
import {FeedSourceCard} from 'view/com/feeds/FeedSourceCard'
|
||||||
import {ErrorMessage} from 'view/com/util/error/ErrorMessage'
|
import {ErrorMessage} from 'view/com/util/error/ErrorMessage'
|
||||||
import {FAB} from 'view/com/util/fab/FAB'
|
import {FAB} from 'view/com/util/fab/FAB'
|
||||||
import {SearchInput, SearchInputRef} from 'view/com/util/forms/SearchInput'
|
import {SearchInput} from 'view/com/util/forms/SearchInput'
|
||||||
import {Link} from 'view/com/util/Link'
|
import {Link, TextLink} from 'view/com/util/Link'
|
||||||
import {List} from 'view/com/util/List'
|
import {List} from 'view/com/util/List'
|
||||||
import {
|
import {
|
||||||
FeedFeedLoadingPlaceholder,
|
FeedFeedLoadingPlaceholder,
|
||||||
|
@ -159,7 +152,6 @@ export function FeedsScreen(_props: Props) {
|
||||||
} = useSearchPopularFeedsMutation()
|
} = useSearchPopularFeedsMutation()
|
||||||
const {hasSession} = useSession()
|
const {hasSession} = useSession()
|
||||||
const listRef = React.useRef<FlatList>(null)
|
const listRef = React.useRef<FlatList>(null)
|
||||||
const searchInputRef = React.useRef<SearchInputRef>(null)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A search query is present. We may not have search results yet.
|
* A search query is present. We may not have search results yet.
|
||||||
|
@ -399,24 +391,14 @@ export function FeedsScreen(_props: Props) {
|
||||||
const renderHeaderBtn = React.useCallback(() => {
|
const renderHeaderBtn = React.useCallback(() => {
|
||||||
return (
|
return (
|
||||||
<View style={styles.headerBtnGroup}>
|
<View style={styles.headerBtnGroup}>
|
||||||
<Pressable
|
<TextLink
|
||||||
accessibilityRole="button"
|
type="lg-medium"
|
||||||
hitSlop={HITSLOP_10}
|
|
||||||
onPress={searchInputRef.current?.focus}>
|
|
||||||
<MagnifyingGlassIcon2
|
|
||||||
size={22}
|
|
||||||
strokeWidth={2}
|
|
||||||
style={pal.textLight}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
|
||||||
<Link
|
|
||||||
href="/settings/saved-feeds"
|
href="/settings/saved-feeds"
|
||||||
hitSlop={10}
|
accessibilityLabel={_(msg`Edit My Feeds`)}
|
||||||
accessibilityRole="button"
|
accessibilityHint=""
|
||||||
accessibilityLabel={_(msg`Edit Saved Feeds`)}
|
text={_(msg`Edit`)}
|
||||||
accessibilityHint={_(msg`Opens screen to edit Saved Feeds`)}>
|
style={[pal.link, a.pr_xs]}
|
||||||
<CogIcon size={22} strokeWidth={2} style={pal.textLight} />
|
/>
|
||||||
</Link>
|
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}, [pal, _])
|
}, [pal, _])
|
||||||
|
@ -480,22 +462,14 @@ export function FeedsScreen(_props: Props) {
|
||||||
<Trans>Feeds</Trans>
|
<Trans>Feeds</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
<View style={styles.headerBtnGroup}>
|
<View style={styles.headerBtnGroup}>
|
||||||
<Pressable
|
<TextLink
|
||||||
accessibilityRole="button"
|
type="lg"
|
||||||
hitSlop={HITSLOP_10}
|
|
||||||
onPress={searchInputRef.current?.focus}>
|
|
||||||
<MagnifyingGlassIcon2
|
|
||||||
size={22}
|
|
||||||
strokeWidth={2}
|
|
||||||
style={pal.icon}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
|
||||||
<Link
|
|
||||||
href="/settings/saved-feeds"
|
href="/settings/saved-feeds"
|
||||||
accessibilityLabel={_(msg`Edit My Feeds`)}
|
accessibilityLabel={_(msg`Edit My Feeds`)}
|
||||||
accessibilityHint="">
|
accessibilityHint=""
|
||||||
<CogIcon strokeWidth={1.5} style={pal.icon} size={28} />
|
text={_(msg`Edit`)}
|
||||||
</Link>
|
style={[pal.link]}
|
||||||
|
/>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
@ -522,7 +496,6 @@ export function FeedsScreen(_props: Props) {
|
||||||
<FeedsAboutHeader />
|
<FeedsAboutHeader />
|
||||||
<View style={{paddingHorizontal: 12, paddingBottom: 12}}>
|
<View style={{paddingHorizontal: 12, paddingBottom: 12}}>
|
||||||
<SearchInput
|
<SearchInput
|
||||||
ref={searchInputRef}
|
|
||||||
query={query}
|
query={query}
|
||||||
onChangeQuery={onChangeQuery}
|
onChangeQuery={onChangeQuery}
|
||||||
onPressCancelSearch={onPressCancelSearch}
|
onPressCancelSearch={onPressCancelSearch}
|
||||||
|
@ -577,8 +550,8 @@ export function FeedsScreen(_props: Props) {
|
||||||
pal.view,
|
pal.view,
|
||||||
pal.border,
|
pal.border,
|
||||||
pal.text,
|
pal.text,
|
||||||
pal.icon,
|
|
||||||
pal.textLight,
|
pal.textLight,
|
||||||
|
pal.link,
|
||||||
_,
|
_,
|
||||||
query,
|
query,
|
||||||
onChangeQuery,
|
onChangeQuery,
|
||||||
|
|
Loading…
Reference in New Issue