Merge branch 'pnbx/base' of https://github.com/bluesky-social/social-app into pnbx/base

This commit is contained in:
Samuel Newman
2025-01-19 00:41:35 +00:00
2 changed files with 7 additions and 6 deletions
@@ -191,12 +191,13 @@ export function Scrubber({
a.justify_end, a.justify_end,
a.py_lg, a.py_lg,
{ {
paddingBottom: insets.bottom + a.py_md.paddingBottom, paddingBottom: insets.bottom + tokens.space.md,
height: height:
// bottom padding // bottom padding
insets.bottom + insets.bottom +
// actual height // actual height
tokens.space.xl, tokens.space.xl +
tokens.space.md,
}, },
a.z_10, a.z_10,
]}> ]}>
@@ -233,7 +234,7 @@ export function ScrubberPlaceholder() {
a.w_full, a.w_full,
{ {
// same as Scrubber // same as Scrubber
height: bottom + tokens.space.xl, height: bottom + tokens.space.xl + tokens.space.md,
}, },
]} ]}
/> />
+3 -3
View File
@@ -940,10 +940,10 @@ function PlayPauseTapArea({
post: Shadow<AppBskyFeedDefs.PostView> post: Shadow<AppBskyFeedDefs.PostView>
feedContext: string | undefined feedContext: string | undefined
}) { }) {
const {_} = useLingui()
const doubleTapRef = useRef<ReturnType<typeof setTimeout> | null>(null) const doubleTapRef = useRef<ReturnType<typeof setTimeout> | null>(null)
const playHaptic = useHaptics() const playHaptic = useHaptics()
const [queueLike] = usePostLikeMutationQueue(post, 'ImmersiveVideo') const [queueLike] = usePostLikeMutationQueue(post, 'ImmersiveVideo')
const {sendInteraction} = useFeedFeedbackContext() const {sendInteraction} = useFeedFeedbackContext()
const togglePlayPause = () => { const togglePlayPause = () => {
@@ -975,8 +975,8 @@ function PlayPauseTapArea({
return ( return (
<Button <Button
disabled={!player} disabled={!player}
label="Toggle play/pause" label={_(`Tap to play or pause the video`)}
accessibilityHint="Double tap to like" accessibilityHint={_(msg`Double tap to like`)}
onPress={onPress} onPress={onPress}
style={[a.absolute, a.inset_0]}> style={[a.absolute, a.inset_0]}>
<View /> <View />