octo/tooot
octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2024-12-12 09:10:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #156 from tooot-app/main

Browse Source 
Fixed #149
This commit is contained in:
xmflsct 2021-08-20 23:41:05 +02:00 committed by GitHub
commit 492b77b1bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -4,7 +4,7 @@
"native": "210511", "native": "210511",
"major": 2, "major": 2,
"minor": 1, "minor": 1,
"patch": 2, "patch": 3,
"expo": "41.0.0" "expo": "41.0.0"
}, },
"description": "tooot app for Mastodon", "description": "tooot app for Mastodon",

26
src/components/Timeline/Shared/Attachment.tsx
View File

@ -9,6 +9,7 @@ import { useNavigation } from '@react-navigation/native'
import { StyleConstants } from '@utils/styles/constants' import { StyleConstants } from '@utils/styles/constants'
import layoutAnimation from '@utils/styles/layoutAnimation' import layoutAnimation from '@utils/styles/layoutAnimation'
import React, { useCallback, useMemo, useRef, useState } from 'react' import React, { useCallback, useMemo, useRef, useState } from 'react'
import { useEffect } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { Pressable, StyleSheet, View } from 'react-native' import { Pressable, StyleSheet, View } from 'react-native'
@ -37,6 +38,22 @@ const TimelineAttachment = React.memo(
Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls'] Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls']
>([]) >([])
const navigation = useNavigation() const navigation = useNavigation()
useEffect(() => {
status.media_attachments.forEach((attachment, index) => {
switch (attachment.type) {
case 'image':
imageUrls.current.push({
id: attachment.id,
preview_url: attachment.preview_url,
url: attachment.url,
remote_url: attachment.remote_url,
blurhash: attachment.blurhash,
width: attachment.meta?.original?.width,
height: attachment.meta?.original?.height
})
}
})
}, [])
const navigateToImagesViewer = (id: string) => const navigateToImagesViewer = (id: string) =>
navigation.navigate('Screen-ImagesViewer', { navigation.navigate('Screen-ImagesViewer', {
imageUrls: imageUrls.current, imageUrls: imageUrls.current,
@ -47,15 +64,6 @@ const TimelineAttachment = React.memo(
status.media_attachments.map((attachment, index) => { status.media_attachments.map((attachment, index) => {
switch (attachment.type) { switch (attachment.type) {
case 'image': case 'image':
imageUrls.current.push({
id: attachment.id,
preview_url: attachment.preview_url,
url: attachment.url,
remote_url: attachment.remote_url,
blurhash: attachment.blurhash,
width: attachment.meta?.original?.width,
height: attachment.meta?.original?.height
})
return ( return (
<AttachmentImage <AttachmentImage
key={index} key={index}