1
0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
This commit is contained in:
xmflsct
2023-02-24 13:54:27 +01:00
parent b1a796d3f1
commit 04a56edcf4
5 changed files with 22 additions and 24 deletions

View File

@ -61,7 +61,7 @@ const GracefullyImage = ({
placeholderContentFit='cover'
placeholder={sources.blurhash || connectMedia(sources.preview)}
source={hidden ? undefined : connectMedia(source)}
{...((!withoutTransition || !reduceMotionEnabled) && { transition: { duration: 120 } })}
{...(!withoutTransition && !reduceMotionEnabled && { transition: { duration: 120 } })}
style={{ flex: 1, ...imageStyle }}
onError={() => {
if (

View File

@ -17,13 +17,8 @@ import { Pressable, View } from 'react-native'
import StatusContext from '../Context'
const TimelineAttachment = () => {
const { status, disableDetails } = useContext(StatusContext)
if (
!status ||
disableDetails ||
!Array.isArray(status.media_attachments) ||
!status.media_attachments.length
)
const { status, spoilerHidden, disableDetails } = useContext(StatusContext)
if (!status || !Array.isArray(status.media_attachments) || !status.media_attachments.length)
return null
const { t } = useTranslation('componentTimeline')
@ -170,6 +165,8 @@ const TimelineAttachment = () => {
}
}
if (spoilerHidden || disableDetails) return null
return (
<View style={{ marginTop: StyleConstants.Spacing.M, ...(isLargeDevice && { maxWidth: 375 }) }}>
<View style={{ gap: StyleConstants.Spacing.XS }}>

View File

@ -167,12 +167,12 @@ const Timeline: React.FC<Props> = ({
}
)
const latestMarker = useRef<string>()
const latestMarker = useRef<string>('')
const updateMarkers = useCallback(
throttle(() => {
if (readMarker) {
const currentMarker = getAccountStorage.string(readMarker) || '0'
if ((latestMarker.current || '0') > currentMarker) {
if (latestMarker.current > currentMarker) {
setAccountStorage([{ key: readMarker, value: latestMarker.current }])
} else {
// setAccountStorage([{ key: readMarker, value: '105250709762254246' }])
@ -183,9 +183,12 @@ const Timeline: React.FC<Props> = ({
)
readMarker &&
useEffect(() => {
const unsubscribe = navigation.addListener('blur', () =>
setAccountStorage([{ key: readMarker, value: latestMarker.current }])
)
const unsubscribe = navigation.addListener('blur', () => {
const currentMarker = getAccountStorage.string(readMarker) || '0'
if (latestMarker.current > currentMarker) {
setAccountStorage([{ key: readMarker, value: latestMarker.current }])
}
})
return unsubscribe
}, [])
const viewabilityConfigCallbackPairs = useRef<