zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

use `s.likeColor` everywhere (#2234)

zio/stable
Samuel Newman 2023-12-18 17:47:17 +00:00 committed by GitHub
parent 81fefabe1a
commit edc6bdb4d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/view/com/util/post-ctrls/PostCtrls.tsx
View File

@ -10,7 +10,7 @@ import {AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
import {Text} from '../text/Text' import {Text} from '../text/Text'
import {PostDropdownBtn} from '../forms/PostDropdownBtn' import {PostDropdownBtn} from '../forms/PostDropdownBtn'
import {HeartIcon, HeartIconSolid, CommentBottomArrow} from 'lib/icons' import {HeartIcon, HeartIconSolid, CommentBottomArrow} from 'lib/icons'
import {s, colors} from 'lib/styles' import {s} from 'lib/styles'
import {pluralize} from 'lib/strings/helpers' import {pluralize} from 'lib/strings/helpers'
import {useTheme} from 'lib/ThemeContext' import {useTheme} from 'lib/ThemeContext'
import {RepostButton} from './RepostButton' import {RepostButton} from './RepostButton'
@ -180,7 +180,7 @@ let PostCtrls = ({
accessibilityHint="" accessibilityHint=""
hitSlop={big ? HITSLOP_20 : HITSLOP_10}> hitSlop={big ? HITSLOP_20 : HITSLOP_10}>
{post.viewer?.like ? ( {post.viewer?.like ? (
<HeartIconSolid style={styles.ctrlIconLiked} size={big ? 22 : 16} /> <HeartIconSolid style={s.likeColor} size={big ? 22 : 16} />
) : ( ) : (
<HeartIcon <HeartIcon
style={[defaultCtrlColor, big ? styles.mt1 : undefined]} style={[defaultCtrlColor, big ? styles.mt1 : undefined]}
@ -193,7 +193,7 @@ let PostCtrls = ({
testID="likeCount" testID="likeCount"
style={ style={
post.viewer?.like post.viewer?.like
? [s.bold, s.red3, s.f15, s.ml5] ? [s.bold, s.likeColor, s.f15, s.ml5]
: [defaultCtrlColor, s.f15, s.ml5] : [defaultCtrlColor, s.f15, s.ml5]
}> }>
{post.likeCount} {post.likeCount}
@ -233,9 +233,6 @@ const styles = StyleSheet.create({
paddingLeft: 5, paddingLeft: 5,
paddingRight: 5, paddingRight: 5,
}, },
ctrlIconLiked: {
color: colors.like,
},
mt1: { mt1: {
marginTop: 1, marginTop: 1,
}, },

7
src/view/screens/ProfileFeed.tsx
View File

@ -8,7 +8,7 @@ import {HeartIcon, HeartIconSolid} from 'lib/icons'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
import {CommonNavigatorParams} from 'lib/routes/types' import {CommonNavigatorParams} from 'lib/routes/types'
import {makeRecordUri} from 'lib/strings/url-helpers' import {makeRecordUri} from 'lib/strings/url-helpers'
import {colors, s} from 'lib/styles' import {s} from 'lib/styles'
import {FeedDescriptor} from '#/state/queries/post-feed' import {FeedDescriptor} from '#/state/queries/post-feed'
import {PagerWithHeader} from 'view/com/pager/PagerWithHeader' import {PagerWithHeader} from 'view/com/pager/PagerWithHeader'
import {ProfileSubpageHeader} from 'view/com/profile/ProfileSubpageHeader' import {ProfileSubpageHeader} from 'view/com/profile/ProfileSubpageHeader'
@ -580,7 +580,7 @@ function AboutSection({
onPress={onToggleLiked} onPress={onToggleLiked}
style={{paddingHorizontal: 10}}> style={{paddingHorizontal: 10}}>
{isLiked ? ( {isLiked ? (
<HeartIconSolid size={19} style={styles.liked} /> <HeartIconSolid size={19} style={s.likeColor} />
) : ( ) : (
<HeartIcon strokeWidth={3} size={19} style={pal.textLight} /> <HeartIcon strokeWidth={3} size={19} style={pal.textLight} />
)} )}
@ -623,9 +623,6 @@ const styles = StyleSheet.create({
borderRadius: 50, borderRadius: 50,
marginLeft: 6, marginLeft: 6,
}, },
liked: {
color: colors.red3,
},
notFoundContainer: { notFoundContainer: {
margin: 10, margin: 10,
paddingHorizontal: 18, paddingHorizontal: 18,