diff --git a/src/components/RichText.tsx b/src/components/RichText.tsx index 4110619b91..40dddce6c2 100644 --- a/src/components/RichText.tsx +++ b/src/components/RichText.tsx @@ -3,7 +3,7 @@ import {type StyleProp, type TextStyle} from 'react-native' import {AppBskyRichtextFacet, RichText as RichTextAPI} from '@atproto/api' import {toShortUrl} from '#/lib/strings/url-helpers' -import {atoms as a, flatten, ios, type TextStyleProp} from '#/alf' +import {atoms as a, flatten, native, type TextStyleProp} from '#/alf' import {isOnlyEmoji} from '#/alf/typography' import {InlineLinkText, type LinkProps} from '#/components/Link' import {ProfileHoverCard} from '#/components/ProfileHoverCard' @@ -32,10 +32,10 @@ export type RichTextProps = TextStyleProp & * How far below the text baseline `suffix` extends, in px. * * Inline views inside `Text` sit with their bottom edge on the baseline, so - * a suffix nudged below it overflows the `Text`'s measured bounds and iOS - * clips it. We reserve this much room as bottom padding and cancel it with - * an equal negative margin, so the suffix can paint without moving anything - * after it. Pass the same offset the suffix nudges itself by. + * a suffix nudged below it overflows the `Text`'s measured bounds and + * native clips it. We reserve this much room as bottom padding and cancel + * it with an equal negative margin, so the suffix can paint without moving + * anything after it. Pass the same offset the suffix nudges itself by. * * Overrides any `paddingBottom`/`marginBottom` set via `style`. */ @@ -84,7 +84,7 @@ export function RichText({ const plainStyles = style const suffixStyles = suffix && suffixOffset - ? ios({paddingBottom: suffixOffset, marginBottom: -suffixOffset}) + ? native({paddingBottom: suffixOffset, marginBottom: -suffixOffset}) : null const interactiveStyles = [plainStyles, interactiveStyle] diff --git a/src/screens/PostThread/components/ThreadItemPostNumber.tsx b/src/screens/PostThread/components/ThreadItemPostNumber.tsx index ea9cc906a5..07469ff10b 100644 --- a/src/screens/PostThread/components/ThreadItemPostNumber.tsx +++ b/src/screens/PostThread/components/ThreadItemPostNumber.tsx @@ -2,13 +2,13 @@ import {Text, View} from 'react-native' import {type AppBskyUnspeccedDefs} from '@atproto/api' import {Trans, useLingui} from '@lingui/react/macro' -import {atoms as a, native, platform, useTheme} from '#/alf' +import {atoms as a, ios, platform, useTheme} from '#/alf' import {useAnalytics} from '#/analytics' /** * How far the inline badge is nudged below the text baseline to optically * center it. The containing `RichText` must reserve matching room via - * `suffixOffset`, or iOS clips the overflow. + * `suffixOffset`, or native clips the overflow. */ export const POST_NUMBER_INLINE_OFFSET = 6 @@ -52,8 +52,8 @@ export function ThreadItemPostNumber({ a.flex_shrink_0, a.rounded_full, t.atoms.bg_contrast_50, - native(a.py_2xs), !inline && a.self_start, + ios(a.py_2xs), { paddingLeft: 5, paddingRight: 5, @@ -76,7 +76,7 @@ export function ThreadItemPostNumber({ style={[ a.text_xs, a.font_medium, - t.atoms.text_contrast_high, + t.atoms.text_contrast_medium, { fontVariant: ['tabular-nums'], },