fix dark mode styling

zio/stable
Ansh Nanda 2023-05-16 18:39:02 -07:00
parent 53ca0cd626
commit ff3cc3b84d
3 changed files with 19 additions and 9 deletions

View File

@ -81,7 +81,7 @@ export const CustomFeed = withAuthRequired(
currentFeed?.like() currentFeed?.like()
} }
}} }}
style={[styles.likeButton]}> style={[styles.likeButton, pal.viewLight]}>
<Text style={[pal.text, s.semiBold]}> <Text style={[pal.text, s.semiBold]}>
{currentFeed?.data.likeCount} {currentFeed?.data.likeCount}
</Text> </Text>
@ -143,7 +143,6 @@ const styles = StyleSheet.create({
paddingVertical: 4, paddingVertical: 4,
paddingHorizontal: 8, paddingHorizontal: 8,
borderRadius: 24, borderRadius: 24,
backgroundColor: colors.gray1,
gap: 4, gap: 4,
}, },
}) })

View File

@ -91,7 +91,11 @@ export const PinnedFeeds = withAuthRequired(
accessibilityRole="button" accessibilityRole="button"
onLongPress={drag} onLongPress={drag}
style={styles.itemContainer}> style={styles.itemContainer}>
<FontAwesomeIcon icon="bars" size={20} style={styles.icon} /> <FontAwesomeIcon
icon="bars"
size={20}
style={[styles.icon, pal.text]}
/>
<SavedFeedItem item={item} savedFeeds={savedFeeds} /> <SavedFeedItem item={item} savedFeeds={savedFeeds} />
</Pressable> </Pressable>
</ShadowDecorator> </ShadowDecorator>

View File

@ -19,7 +19,7 @@ import {withAuthRequired} from 'view/com/auth/withAuthRequired'
import {ViewHeader} from 'view/com/util/ViewHeader' import {ViewHeader} from 'view/com/util/ViewHeader'
import {CenteredView} from 'view/com/util/Views' import {CenteredView} from 'view/com/util/Views'
import {Text} from 'view/com/util/text/Text' import {Text} from 'view/com/util/text/Text'
import {isDesktopWeb} from 'platform/detection' import {isDesktopWeb, isWeb} from 'platform/detection'
import {s} from 'lib/styles' import {s} from 'lib/styles'
import {SavedFeedsModel} from 'state/models/feeds/algo/saved' import {SavedFeedsModel} from 'state/models/feeds/algo/saved'
import {Link} from 'view/com/util/Link' import {Link} from 'view/com/util/Link'
@ -113,20 +113,23 @@ const ListHeaderComponent = observer(
savedFeeds: SavedFeedsModel savedFeeds: SavedFeedsModel
navigation: Props['navigation'] navigation: Props['navigation']
}) => { }) => {
const pal = usePalette('default')
return ( return (
<View style={styles.headerContainer}> <View style={styles.headerContainer}>
{savedFeeds.pinned.length > 0 ? ( {savedFeeds.pinned.length > 0 ? (
<View style={styles.pinnedContainer}> <View style={styles.pinnedContainer}>
<View style={styles.pinnedHeader}> <View style={styles.pinnedHeader}>
<Text type="lg-bold">Pinned Feeds</Text> <Text type="lg-bold" style={[pal.text]}>
Pinned Feeds
</Text>
<Link href="/settings/pinned-feeds"> <Link href="/settings/pinned-feeds">
<Text style={styles.editPinned}>Edit</Text> <Text style={[styles.editPinned, pal.text]}>Edit</Text>
</Link> </Link>
</View> </View>
<ScrollView <ScrollView
horizontal={true} horizontal={true}
showsHorizontalScrollIndicator={false}> showsHorizontalScrollIndicator={isWeb}>
{savedFeeds.pinned.map(item => { {savedFeeds.pinned.map(item => {
return ( return (
<TouchableOpacity <TouchableOpacity
@ -140,7 +143,10 @@ const ListHeaderComponent = observer(
}} }}
style={styles.pinnedItem}> style={styles.pinnedItem}>
<UserAvatar avatar={item.data.avatar} size={80} /> <UserAvatar avatar={item.data.avatar} size={80} />
<Text type="sm-medium" numberOfLines={1}> <Text
type="sm-medium"
numberOfLines={1}
style={[pal.text, styles.pinnedItemName]}>
{item.data.displayName ?? {item.data.displayName ??
`${item.data.creator.displayName}'s feed`} `${item.data.creator.displayName}'s feed`}
</Text> </Text>
@ -168,7 +174,7 @@ const styles = StyleSheet.create({
marginHorizontal: 24, marginHorizontal: 24,
marginTop: 10, marginTop: 10,
}, },
headerContainer: {paddingHorizontal: 18}, headerContainer: {paddingHorizontal: 18, paddingTop: 18},
pinnedContainer: {marginBottom: 18, gap: 18}, pinnedContainer: {marginBottom: 18, gap: 18},
pinnedHeader: {flexDirection: 'row', justifyContent: 'space-between'}, pinnedHeader: {flexDirection: 'row', justifyContent: 'space-between'},
pinnedItem: { pinnedItem: {
@ -177,5 +183,6 @@ const styles = StyleSheet.create({
marginRight: 18, marginRight: 18,
maxWidth: 100, maxWidth: 100,
}, },
pinnedItemName: {marginTop: 8, textAlign: 'center'},
editPinned: {textDecorationLine: 'underline'}, editPinned: {textDecorationLine: 'underline'},
}) })