Bluesky app fork with some witchin' additions 💫 witchsky.app
bluesky fork client

Remove hardcoded warning color, add yellow and pink to ALF palette (#9911)

authored by samuel.fm and committed by

GitHub 3fae42c0 80c0aa35

+13 -22
+1 -1
package.json
··· 76 76 "@atproto/api": "^0.18.21", 77 77 "@bitdrift/react-native": "^0.6.8", 78 78 "@braintree/sanitize-url": "^6.0.2", 79 - "@bsky.app/alf": "^0.1.6", 79 + "@bsky.app/alf": "^0.1.7", 80 80 "@bsky.app/expo-image-crop-tool": "^0.5.0", 81 81 "@bsky.app/react-native-mmkv": "2.12.5", 82 82 "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
+2 -6
src/components/Admonition.tsx
··· 9 9 import {Text as BaseText, type TextProps} from '#/components/Typography' 10 10 import {EmojiSad_Stroke2_Corner0_Rounded as EmojiSadIcon} from './icons/Emoji' 11 11 12 - export const colors = { 13 - warning: '#FFC404', 14 - } 15 - 16 12 type Context = { 17 13 type: 'info' | 'tip' | 'warning' | 'error' | 'apology' 18 14 } ··· 35 31 const fill = { 36 32 info: t.atoms.text_contrast_medium.color, 37 33 tip: t.palette.primary_500, 38 - warning: colors.warning, 34 + warning: t.palette.yellow, 39 35 error: t.palette.negative_500, 40 36 apology: t.atoms.text_contrast_medium.color, 41 37 }[type] ··· 110 106 const borderColor = { 111 107 info: t.atoms.border_contrast_high.borderColor, 112 108 tip: t.palette.primary_500, 113 - warning: colors.warning, 109 + warning: t.palette.yellow, 114 110 error: t.palette.negative_500, 115 111 apology: t.atoms.border_contrast_high.borderColor, 116 112 }[type]
+1 -4
src/screens/PostThread/components/ThreadItemAnchor.tsx
··· 38 38 REPLY_LINE_WIDTH, 39 39 } from '#/screens/PostThread/const' 40 40 import {atoms as a, useTheme} from '#/alf' 41 - import {colors} from '#/components/Admonition' 42 41 import {Button} from '#/components/Button' 43 42 import {DebugFieldDisplay} from '#/components/DebugFieldDisplay' 44 43 import {CalendarClock_Stroke2_Corner0_Rounded as CalendarClockIcon} from '#/components/icons/CalendarClock' ··· 647 646 648 647 if (!isBackdated) return null 649 648 650 - const orange = colors.warning 651 - 652 649 return ( 653 650 <> 654 651 <Button ··· 675 672 paddingVertical: 3, 676 673 }, 677 674 ]}> 678 - <CalendarClockIcon fill={orange} size="sm" aria-hidden /> 675 + <CalendarClockIcon fill={t.palette.yellow} size="sm" aria-hidden /> 679 676 <Text 680 677 style={[ 681 678 a.text_xs,
+3 -5
src/screens/Profile/components/ProfileFeedHeader.tsx
··· 259 259 size="xs" 260 260 fill={ 261 261 likeUri 262 - ? t.palette.like 262 + ? t.palette.pink 263 263 : t.atoms.text_contrast_low.color 264 264 } 265 265 /> ··· 503 503 disabled={isLikePending || isUnlikePending} 504 504 label={_(msg`Like this feed`)} 505 505 size="small" 506 - variant="solid" 507 506 color="secondary" 508 507 onPress={onToggleLiked} 509 508 style={[a.flex_1]}> 510 509 {isLiked ? ( 511 - <HeartFilled size="sm" fill={t.palette.like} /> 510 + <HeartFilled size="sm" fill={t.palette.pink} /> 512 511 ) : ( 513 - <ButtonIcon icon={Heart} position="left" /> 512 + <ButtonIcon icon={Heart} /> 514 513 )} 515 514 516 515 <ButtonText> ··· 521 520 disabled={isFeedStateChangePending} 522 521 label={isPinned ? _(msg`Unpin feed`) : _(msg`Pin feed`)} 523 522 size="small" 524 - variant="solid" 525 523 color={isPinned ? 'secondary' : 'primary'} 526 524 onPress={onTogglePinned} 527 525 style={[a.flex_1]}>
+2 -2
src/screens/Settings/AppPasswords.tsx
··· 21 21 import {ErrorScreen} from '#/view/com/util/error/ErrorScreen' 22 22 import * as Toast from '#/view/com/util/Toast' 23 23 import {atoms as a, useTheme} from '#/alf' 24 - import {Admonition, colors} from '#/components/Admonition' 24 + import {Admonition} from '#/components/Admonition' 25 25 import {Button, ButtonIcon, ButtonText} from '#/components/Button' 26 26 import {useDialogControl} from '#/components/Dialog' 27 27 import {Growth_Stroke2_Corner0_Rounded as Growth} from '#/components/icons/Growth' ··· 195 195 </View> 196 196 {appPassword.privileged && ( 197 197 <View style={[a.flex_row, a.gap_sm, a.align_center, a.mt_md]}> 198 - <WarningIcon style={[{color: colors.warning}]} /> 198 + <WarningIcon style={[{color: t.palette.yellow}]} /> 199 199 <Text style={t.atoms.text_contrast_high}> 200 200 <Trans>Allows access to direct messages</Trans> 201 201 </Text>
+4 -4
yarn.lock
··· 3590 3590 resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz#923ca57e173c6b232bbbb07347b1be982f03e783" 3591 3591 integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A== 3592 3592 3593 - "@bsky.app/alf@^0.1.6": 3594 - version "0.1.6" 3595 - resolved "https://registry.yarnpkg.com/@bsky.app/alf/-/alf-0.1.6.tgz#256dac988702f076b98f1963c9d594141bc74a10" 3596 - integrity sha512-8DdAOP+qRVgme+5WwqhxU20qzHXvEkEzr60SIBvDEVblCkyEiPZ36YznbpbmpT23qXbfbUFf9mb5IXYJqd8ELQ== 3593 + "@bsky.app/alf@^0.1.7": 3594 + version "0.1.7" 3595 + resolved "https://registry.yarnpkg.com/@bsky.app/alf/-/alf-0.1.7.tgz#96190f9069d4bd599f8c56d0da5cbed50df7cbf3" 3596 + integrity sha512-/Qe3fTDaInfZdwXKk6kkDd7xoAWUmUqrlAbuU1ydEzSzjMFa+icfeEaRmbQ8cFIv3XJiU+iuvgBKjJSw0msypQ== 3597 3597 dependencies: 3598 3598 react-responsive "^10.0.1" 3599 3599