Update usages of FeedCard and ListCard

This commit is contained in:
Eric Bailey
2024-06-25 18:15:44 -05:00
parent f2bc06c79e
commit 2b2df57ce2
6 changed files with 37 additions and 25 deletions
@@ -45,7 +45,7 @@ export const FeedsList = React.forwardRef<SectionRef, ProfilesListProps>(
(isWeb || index !== 0) && a.border_t,
t.atoms.border_contrast_low,
]}>
<FeedCard.Default type="feed" view={item} />
<FeedCard.Default view={item} />
</View>
)
}
@@ -285,7 +285,7 @@ function LandingScreenLoaded({
t.atoms.border_contrast_low,
]}
key={feed.uri}>
<FeedCard.Default type="feed" view={feed} />
<FeedCard.Default view={feed} />
</View>
))}
</View>
+1 -1
View File
@@ -163,7 +163,7 @@ export const ProfileFeedgens = React.forwardRef<
a.px_lg,
a.py_lg,
]}>
<FeedCard.Default type="feed" view={item} />
<FeedCard.Default view={item} />
</View>
)
}
+32 -20
View File
@@ -41,6 +41,7 @@ import hairlineWidth = StyleSheet.hairlineWidth
import {Divider} from '#/components/Divider'
import * as FeedCard from '#/components/FeedCard'
import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components/icons/Chevron'
import * as ListCard from '#/components/ListCard'
type Props = NativeStackScreenProps<CommonNavigatorParams, 'Feeds'>
@@ -495,7 +496,7 @@ export function FeedsScreen(_props: Props) {
} else if (item.type === 'popularFeed') {
return (
<View style={[a.px_lg, a.pt_lg, a.gap_lg]}>
<FeedCard.Default type="feed" view={item.feed} />
<FeedCard.Default view={item.feed} />
<Divider />
</View>
)
@@ -627,7 +628,7 @@ function FollowingFeed() {
fill={t.palette.white}
/>
</View>
<FeedCard.TitleAndByline title={_(msg`Following`)} type="feed" />
<FeedCard.TitleAndByline title={_(msg`Following`)} />
</FeedCard.Header>
</View>
)
@@ -639,34 +640,45 @@ function SavedFeed({
savedFeed: SavedFeedItem & {type: 'feed' | 'list'}
}) {
const t = useTheme()
const {view: feed} = savedFeed
const displayName =
savedFeed.type === 'feed' ? savedFeed.view.displayName : savedFeed.view.name
return (
<FeedCard.Link testID={`saved-feed-${feed.displayName}`} {...savedFeed}>
const commonStyle = [
a.flex_1,
a.px_lg,
a.py_md,
a.border_b,
t.atoms.border_contrast_low,
]
return savedFeed.type === 'feed' ? (
<FeedCard.Link
testID={`saved-feed-${savedFeed.view.displayName}`}
{...savedFeed}>
{({hovered, pressed}) => (
<View
style={[
a.flex_1,
a.px_lg,
a.py_md,
a.border_b,
t.atoms.border_contrast_low,
(hovered || pressed) && t.atoms.bg_contrast_25,
]}>
style={[commonStyle, (hovered || pressed) && t.atoms.bg_contrast_25]}>
<FeedCard.Header>
<FeedCard.Avatar src={feed.avatar} size={28} />
<FeedCard.TitleAndByline
title={displayName}
type={savedFeed.type}
/>
<FeedCard.Avatar src={savedFeed.view.avatar} size={28} />
<FeedCard.TitleAndByline title={savedFeed.view.displayName} />
<ChevronRight size="sm" fill={t.atoms.text_contrast_low.color} />
</FeedCard.Header>
</View>
)}
</FeedCard.Link>
) : (
<ListCard.Link testID={`saved-feed-${savedFeed.view.name}`} {...savedFeed}>
{({hovered, pressed}) => (
<View
style={[commonStyle, (hovered || pressed) && t.atoms.bg_contrast_25]}>
<ListCard.Header>
<ListCard.Avatar src={savedFeed.view.avatar} size={28} />
<ListCard.TitleAndByline title={savedFeed.view.name} />
<ChevronRight size="sm" fill={t.atoms.text_contrast_low.color} />
</ListCard.Header>
</View>
)}
</ListCard.Link>
)
}
+1 -1
View File
@@ -505,7 +505,7 @@ export function Explore() {
a.px_lg,
a.py_lg,
]}>
<FeedCard.Default type="feed" view={item.feed} />
<FeedCard.Default view={item.feed} />
</View>
)
}
+1 -1
View File
@@ -306,7 +306,7 @@ let SearchScreenFeedsResults = ({
a.px_lg,
a.py_lg,
]}>
<FeedCard.Default type="feed" view={item} />
<FeedCard.Default view={item} />
</View>
)}
keyExtractor={item => item.uri}