mirror of
https://github.com/tooot-app/app
synced 2025-03-03 02:58:05 +01:00
Merge branch 'main' into candidate
This commit is contained in:
commit
78060daf26
@ -4,7 +4,7 @@
|
|||||||
"native": "210511",
|
"native": "210511",
|
||||||
"major": 2,
|
"major": 2,
|
||||||
"minor": 1,
|
"minor": 1,
|
||||||
"patch": 1,
|
"patch": 2,
|
||||||
"expo": "41.0.0"
|
"expo": "41.0.0"
|
||||||
},
|
},
|
||||||
"description": "tooot app for Mastodon",
|
"description": "tooot app for Mastodon",
|
||||||
|
@ -84,16 +84,20 @@ const AttachmentVideo: React.FC<Props> = ({
|
|||||||
})}
|
})}
|
||||||
useNativeControls={false}
|
useNativeControls={false}
|
||||||
onFullscreenUpdate={event => {
|
onFullscreenUpdate={event => {
|
||||||
if (event.fullscreenUpdate === 3) {
|
if (
|
||||||
analytics('timeline_shared_attachment_video_pause_press', {
|
event.fullscreenUpdate ===
|
||||||
id: video.id,
|
Video.FULLSCREEN_UPDATE_PLAYER_DID_DISMISS
|
||||||
timestamp: Date.now()
|
) {
|
||||||
})
|
if (gifv) {
|
||||||
videoPlayer.current?.pauseAsync()
|
videoPlayer.current?.setIsLoopingAsync(true)
|
||||||
|
videoPlayer.current?.playAsync()
|
||||||
|
} else {
|
||||||
|
videoPlayer.current?.pauseAsync()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Pressable style={styles.overlay}>
|
<Pressable style={styles.overlay} onPress={gifv ? playOnPress : null}>
|
||||||
{sensitiveShown ? (
|
{sensitiveShown ? (
|
||||||
video.blurhash ? (
|
video.blurhash ? (
|
||||||
<Blurhash
|
<Blurhash
|
||||||
|
@ -123,14 +123,15 @@ const openLink = async (
|
|||||||
|
|
||||||
loadingLink = false
|
loadingLink = false
|
||||||
switch (getSettingsBrowser(store.getState())) {
|
switch (getSettingsBrowser(store.getState())) {
|
||||||
|
// Some links might end with an empty space at the end that triggers an error
|
||||||
case 'internal':
|
case 'internal':
|
||||||
await WebBrowser.openBrowserAsync(url, {
|
await WebBrowser.openBrowserAsync(encodeURI(url), {
|
||||||
dismissButtonStyle: 'close',
|
dismissButtonStyle: 'close',
|
||||||
enableBarCollapsing: true
|
enableBarCollapsing: true
|
||||||
})
|
})
|
||||||
break
|
break
|
||||||
case 'external':
|
case 'external':
|
||||||
await Linking.openURL(url)
|
await Linking.openURL(encodeURI(url))
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user