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