Remove hardcoded warning color, add yellow and pink to ALF palette (#9911)
This commit is contained in:
+1
-1
@@ -76,7 +76,7 @@
|
|||||||
"@atproto/api": "^0.18.21",
|
"@atproto/api": "^0.18.21",
|
||||||
"@bitdrift/react-native": "^0.6.8",
|
"@bitdrift/react-native": "^0.6.8",
|
||||||
"@braintree/sanitize-url": "^6.0.2",
|
"@braintree/sanitize-url": "^6.0.2",
|
||||||
"@bsky.app/alf": "^0.1.6",
|
"@bsky.app/alf": "^0.1.7",
|
||||||
"@bsky.app/expo-image-crop-tool": "^0.5.0",
|
"@bsky.app/expo-image-crop-tool": "^0.5.0",
|
||||||
"@bsky.app/react-native-mmkv": "2.12.5",
|
"@bsky.app/react-native-mmkv": "2.12.5",
|
||||||
"@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
|
"@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
|
||||||
|
|||||||
@@ -9,10 +9,6 @@ import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons
|
|||||||
import {Text as BaseText, type TextProps} from '#/components/Typography'
|
import {Text as BaseText, type TextProps} from '#/components/Typography'
|
||||||
import {EmojiSad_Stroke2_Corner0_Rounded as EmojiSadIcon} from './icons/Emoji'
|
import {EmojiSad_Stroke2_Corner0_Rounded as EmojiSadIcon} from './icons/Emoji'
|
||||||
|
|
||||||
export const colors = {
|
|
||||||
warning: '#FFC404',
|
|
||||||
}
|
|
||||||
|
|
||||||
type Context = {
|
type Context = {
|
||||||
type: 'info' | 'tip' | 'warning' | 'error' | 'apology'
|
type: 'info' | 'tip' | 'warning' | 'error' | 'apology'
|
||||||
}
|
}
|
||||||
@@ -35,7 +31,7 @@ export function Icon() {
|
|||||||
const fill = {
|
const fill = {
|
||||||
info: t.atoms.text_contrast_medium.color,
|
info: t.atoms.text_contrast_medium.color,
|
||||||
tip: t.palette.primary_500,
|
tip: t.palette.primary_500,
|
||||||
warning: colors.warning,
|
warning: t.palette.yellow,
|
||||||
error: t.palette.negative_500,
|
error: t.palette.negative_500,
|
||||||
apology: t.atoms.text_contrast_medium.color,
|
apology: t.atoms.text_contrast_medium.color,
|
||||||
}[type]
|
}[type]
|
||||||
@@ -110,7 +106,7 @@ export function Outer({
|
|||||||
const borderColor = {
|
const borderColor = {
|
||||||
info: t.atoms.border_contrast_high.borderColor,
|
info: t.atoms.border_contrast_high.borderColor,
|
||||||
tip: t.palette.primary_500,
|
tip: t.palette.primary_500,
|
||||||
warning: colors.warning,
|
warning: t.palette.yellow,
|
||||||
error: t.palette.negative_500,
|
error: t.palette.negative_500,
|
||||||
apology: t.atoms.border_contrast_high.borderColor,
|
apology: t.atoms.border_contrast_high.borderColor,
|
||||||
}[type]
|
}[type]
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ import {
|
|||||||
REPLY_LINE_WIDTH,
|
REPLY_LINE_WIDTH,
|
||||||
} from '#/screens/PostThread/const'
|
} from '#/screens/PostThread/const'
|
||||||
import {atoms as a, useTheme} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
import {colors} from '#/components/Admonition'
|
|
||||||
import {Button} from '#/components/Button'
|
import {Button} from '#/components/Button'
|
||||||
import {DebugFieldDisplay} from '#/components/DebugFieldDisplay'
|
import {DebugFieldDisplay} from '#/components/DebugFieldDisplay'
|
||||||
import {CalendarClock_Stroke2_Corner0_Rounded as CalendarClockIcon} from '#/components/icons/CalendarClock'
|
import {CalendarClock_Stroke2_Corner0_Rounded as CalendarClockIcon} from '#/components/icons/CalendarClock'
|
||||||
@@ -647,8 +646,6 @@ function BackdatedPostIndicator({post}: {post: AppBskyFeedDefs.PostView}) {
|
|||||||
|
|
||||||
if (!isBackdated) return null
|
if (!isBackdated) return null
|
||||||
|
|
||||||
const orange = colors.warning
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Button
|
<Button
|
||||||
@@ -675,7 +672,7 @@ function BackdatedPostIndicator({post}: {post: AppBskyFeedDefs.PostView}) {
|
|||||||
paddingVertical: 3,
|
paddingVertical: 3,
|
||||||
},
|
},
|
||||||
]}>
|
]}>
|
||||||
<CalendarClockIcon fill={orange} size="sm" aria-hidden />
|
<CalendarClockIcon fill={t.palette.yellow} size="sm" aria-hidden />
|
||||||
<Text
|
<Text
|
||||||
style={[
|
style={[
|
||||||
a.text_xs,
|
a.text_xs,
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ export function ProfileFeedHeader({info}: {info: FeedSourceFeedInfo}) {
|
|||||||
size="xs"
|
size="xs"
|
||||||
fill={
|
fill={
|
||||||
likeUri
|
likeUri
|
||||||
? t.palette.like
|
? t.palette.pink
|
||||||
: t.atoms.text_contrast_low.color
|
: t.atoms.text_contrast_low.color
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -503,14 +503,13 @@ function DialogInner({
|
|||||||
disabled={isLikePending || isUnlikePending}
|
disabled={isLikePending || isUnlikePending}
|
||||||
label={_(msg`Like this feed`)}
|
label={_(msg`Like this feed`)}
|
||||||
size="small"
|
size="small"
|
||||||
variant="solid"
|
|
||||||
color="secondary"
|
color="secondary"
|
||||||
onPress={onToggleLiked}
|
onPress={onToggleLiked}
|
||||||
style={[a.flex_1]}>
|
style={[a.flex_1]}>
|
||||||
{isLiked ? (
|
{isLiked ? (
|
||||||
<HeartFilled size="sm" fill={t.palette.like} />
|
<HeartFilled size="sm" fill={t.palette.pink} />
|
||||||
) : (
|
) : (
|
||||||
<ButtonIcon icon={Heart} position="left" />
|
<ButtonIcon icon={Heart} />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<ButtonText>
|
<ButtonText>
|
||||||
@@ -521,7 +520,6 @@ function DialogInner({
|
|||||||
disabled={isFeedStateChangePending}
|
disabled={isFeedStateChangePending}
|
||||||
label={isPinned ? _(msg`Unpin feed`) : _(msg`Pin feed`)}
|
label={isPinned ? _(msg`Unpin feed`) : _(msg`Pin feed`)}
|
||||||
size="small"
|
size="small"
|
||||||
variant="solid"
|
|
||||||
color={isPinned ? 'secondary' : 'primary'}
|
color={isPinned ? 'secondary' : 'primary'}
|
||||||
onPress={onTogglePinned}
|
onPress={onTogglePinned}
|
||||||
style={[a.flex_1]}>
|
style={[a.flex_1]}>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import {EmptyState} from '#/view/com/util/EmptyState'
|
|||||||
import {ErrorScreen} from '#/view/com/util/error/ErrorScreen'
|
import {ErrorScreen} from '#/view/com/util/error/ErrorScreen'
|
||||||
import * as Toast from '#/view/com/util/Toast'
|
import * as Toast from '#/view/com/util/Toast'
|
||||||
import {atoms as a, useTheme} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
import {Admonition, colors} from '#/components/Admonition'
|
import {Admonition} from '#/components/Admonition'
|
||||||
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
|
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
|
||||||
import {useDialogControl} from '#/components/Dialog'
|
import {useDialogControl} from '#/components/Dialog'
|
||||||
import {Growth_Stroke2_Corner0_Rounded as Growth} from '#/components/icons/Growth'
|
import {Growth_Stroke2_Corner0_Rounded as Growth} from '#/components/icons/Growth'
|
||||||
@@ -195,7 +195,7 @@ function AppPasswordCard({
|
|||||||
</View>
|
</View>
|
||||||
{appPassword.privileged && (
|
{appPassword.privileged && (
|
||||||
<View style={[a.flex_row, a.gap_sm, a.align_center, a.mt_md]}>
|
<View style={[a.flex_row, a.gap_sm, a.align_center, a.mt_md]}>
|
||||||
<WarningIcon style={[{color: colors.warning}]} />
|
<WarningIcon style={[{color: t.palette.yellow}]} />
|
||||||
<Text style={t.atoms.text_contrast_high}>
|
<Text style={t.atoms.text_contrast_high}>
|
||||||
<Trans>Allows access to direct messages</Trans>
|
<Trans>Allows access to direct messages</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
|
|||||||
@@ -3590,10 +3590,10 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz#923ca57e173c6b232bbbb07347b1be982f03e783"
|
resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz#923ca57e173c6b232bbbb07347b1be982f03e783"
|
||||||
integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==
|
integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==
|
||||||
|
|
||||||
"@bsky.app/alf@^0.1.6":
|
"@bsky.app/alf@^0.1.7":
|
||||||
version "0.1.6"
|
version "0.1.7"
|
||||||
resolved "https://registry.yarnpkg.com/@bsky.app/alf/-/alf-0.1.6.tgz#256dac988702f076b98f1963c9d594141bc74a10"
|
resolved "https://registry.yarnpkg.com/@bsky.app/alf/-/alf-0.1.7.tgz#96190f9069d4bd599f8c56d0da5cbed50df7cbf3"
|
||||||
integrity sha512-8DdAOP+qRVgme+5WwqhxU20qzHXvEkEzr60SIBvDEVblCkyEiPZ36YznbpbmpT23qXbfbUFf9mb5IXYJqd8ELQ==
|
integrity sha512-/Qe3fTDaInfZdwXKk6kkDd7xoAWUmUqrlAbuU1ydEzSzjMFa+icfeEaRmbQ8cFIv3XJiU+iuvgBKjJSw0msypQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
react-responsive "^10.0.1"
|
react-responsive "^10.0.1"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user