diff --git a/src/Screens.tsx b/src/Screens.tsx index 82408307..330caf7e 100644 --- a/src/Screens.tsx +++ b/src/Screens.tsx @@ -166,9 +166,6 @@ const Screens: React.FC = ({ localCorrupt }) => { } | { data: string | string[]; mimeType: string } ) => { - if (Platform.OS === 'android') { - return - } if (instanceActive < 0) { return } @@ -233,14 +230,18 @@ const Screens: React.FC = ({ localCorrupt }) => { } } break - // case 'android': - // if (!item.mimeType) { - // return - // } - // for (const d of item.data) { - // filterMedia({ uri: d, mime: item.mimeType }) - // } - // break + case 'android': + if (!item.mimeType) { + return + } + if (Array.isArray(item.data)) { + for (const d of item.data) { + filterMedia({ uri: d, mime: item.mimeType }) + } + } else { + filterMedia({ uri: item.data, mime: item.mimeType }) + } + break } if (!text && !media.length) { diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx index 5adcf7e4..18d88803 100644 --- a/src/components/Timeline/Default.tsx +++ b/src/components/Timeline/Default.tsx @@ -64,6 +64,7 @@ const TimelineDefault: React.FC = ({ } const onPress = () => { + if (highlighted) return analytics('timeline_default_press', { page: queryKey ? queryKey[1].page : origin }) diff --git a/src/i18n/es/components/timeline.json b/src/i18n/es/components/timeline.json index 3d6e3511..50304540 100644 --- a/src/i18n/es/components/timeline.json +++ b/src/i18n/es/components/timeline.json @@ -27,7 +27,7 @@ "follow_request": "{{name}} ha solicitado seguirte", "poll": "Una encuesta en la que has votado ha terminado", "reblog": { - "default": "{{name}} impulsado", + "default": "{{name}} ha impulsado", "notification": "{{name}} ha impulsado tu toot" }, "update": "El impulso ha sido editado" diff --git a/src/i18n/es/screens.json b/src/i18n/es/screens.json index 7112c5ba..c6843011 100644 --- a/src/i18n/es/screens.json +++ b/src/i18n/es/screens.json @@ -1,7 +1,7 @@ { "screenshot": { "title": "Protección de la privacidad", - "message": "Por favor, no revele la identidad de otros usuarios, como nombre de usuario, avatar, etc. ¡Gracias!", + "message": "Por favor, no revele la identidad de otros usuarios, como el nombre de usuario, avatar, etc. ¡Gracias!", "button": "Confirmar" }, "localCorrupt": { diff --git a/src/i18n/es/screens/tabs.json b/src/i18n/es/screens/tabs.json index 5c282b4b..be1155a7 100644 --- a/src/i18n/es/screens/tabs.json +++ b/src/i18n/es/screens/tabs.json @@ -117,8 +117,8 @@ }, "fields": { "title": "Metadatos", - "total_one": "Campo {{count}}", - "total_other": "Campos {{count}}" + "total_one": "{{count}} campo", + "total_other": "{{count}} campos" }, "visibility": { "title": "Visibilidad de publicación", @@ -346,7 +346,7 @@ }, "users": { "accounts": { - "following": "Siguiendo {{count}}", + "following": "{{count}} seguidos", "followers": "{{count}} seguidores" }, "statuses": { diff --git a/src/i18n/zh-Hant/components/relationship.json b/src/i18n/zh-Hant/components/relationship.json index 613097c8..33d83ffa 100644 --- a/src/i18n/zh-Hant/components/relationship.json +++ b/src/i18n/zh-Hant/components/relationship.json @@ -1,6 +1,6 @@ { "follow": { - "function": "追蹤使用者" + "function": "跟隨使用者" }, "block": { "function": "封鎖使用者" @@ -9,8 +9,8 @@ "error": "載入錯誤", "blocked_by": "已被使用者封鎖", "blocking": "解除封鎖", - "following": "取消追蹤", + "following": "取消跟隨", "requested": "收回要求", - "default": "追蹤" + "default": "跟隨" } } \ No newline at end of file diff --git a/src/i18n/zh-Hant/screens/tabs.json b/src/i18n/zh-Hant/screens/tabs.json index 7eb60826..96fee96c 100644 --- a/src/i18n/zh-Hant/screens/tabs.json +++ b/src/i18n/zh-Hant/screens/tabs.json @@ -311,8 +311,8 @@ "name": "<0 /><1>的媒體" }, "hashtag": { - "follow": "追蹤", - "unfollow": "取消追蹤" + "follow": "跟隨", + "unfollow": "取消跟隨" }, "history": { "name": "編輯歷史" diff --git a/src/startup/audio.ts b/src/startup/audio.ts index 228a7023..2f3c2b51 100644 --- a/src/startup/audio.ts +++ b/src/startup/audio.ts @@ -4,7 +4,7 @@ import log from './log' const audio = () => { log('log', 'audio', 'setting audio playback default options') Audio.setAudioModeAsync({ - interruptionModeIOS: InterruptionModeIOS.DoNotMix, + interruptionModeIOS: InterruptionModeIOS.MixWithOthers, interruptionModeAndroid: InterruptionModeAndroid.DuckOthers, staysActiveInBackground: false })