From af991fdc56ea9b6bb93f5fd62c98d5e196e6c1ec Mon Sep 17 00:00:00 2001 From: xmflsct Date: Fri, 10 Mar 2023 13:45:01 +0100 Subject: [PATCH 1/4] For #711 --- src/screens/Tabs/Me/Push.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/screens/Tabs/Me/Push.tsx b/src/screens/Tabs/Me/Push.tsx index 727e0998..728229a8 100644 --- a/src/screens/Tabs/Me/Push.tsx +++ b/src/screens/Tabs/Me/Push.tsx @@ -37,6 +37,9 @@ const TabMePush: React.FC = () => { const appsQuery = useAppsQuery() + const [pushEnabled, setPushEnabled] = useState() + const [pushCanAskAgain, setPushCanAskAgain] = useState() + const checkPush = async () => { const permissions = await Notifications.getPermissionsAsync() setPushEnabled(permissions.granted) @@ -47,6 +50,9 @@ const TabMePush: React.FC = () => { useEffect(() => { checkPush() }, []) + useEffect(() => { + checkPush() + }, [pushEnabled]) useEffect(() => { const subscription = AppState.addEventListener('change', checkPush) return () => { @@ -54,9 +60,6 @@ const TabMePush: React.FC = () => { } }, []) - const [pushEnabled, setPushEnabled] = useState() - const [pushCanAskAgain, setPushCanAskAgain] = useState() - const alerts = () => push?.alerts ? PUSH_DEFAULT().map(alert => ( @@ -121,7 +124,7 @@ const TabMePush: React.FC = () => { {!!appsQuery.data?.vapid_key ? ( <> - {!!expoToken?.length ? ( + {!!expoToken?.length || (!expoToken?.length && !pushEnabled) ? ( <> {pushEnabled === false ? ( From 97fb5b8e6ddb73e00056cdd6ff00167988ca5a4b Mon Sep 17 00:00:00 2001 From: xmflsct Date: Fri, 10 Mar 2023 14:03:10 +0100 Subject: [PATCH 2/4] Bump packages --- ios/Podfile.lock | 4 ++-- package.json | 4 ++-- .../Timeline/Shared/HeaderDefault.tsx | 2 +- src/components/contextMenu/index.d.ts | 4 ++-- src/screens/Tabs/Local/Root.tsx | 2 +- src/screens/Tabs/Me/List/menus.tsx | 6 ++--- yarn.lock | 22 +++++++++---------- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index cec81258..2a67dd4d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -340,7 +340,7 @@ PODS: - glog - react-native-blur (4.3.0): - React-Core - - react-native-cameraroll (5.2.4): + - react-native-cameraroll (5.3.0): - React-Core - react-native-image-picker (5.1.0): - React-Core @@ -812,7 +812,7 @@ SPEC CHECKSUMS: React-jsinspector: 1f51e775819199d3fe9410e69ee8d4c4161c7b06 React-logger: 0d58569ec51d30d1792c5e86a8e3b78d24b582c6 react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3 - react-native-cameraroll: cb752fda6d5268f1646b4390bd5be1f27706b9a0 + react-native-cameraroll: a05136a5e648c35f2e8cced939ba85966e3bba8e react-native-image-picker: c33d4e79f0a14a2b66e5065e14946ae63749660b react-native-ios-context-menu: e529171ba760a1af7f2ef0729f5a7f4d226171c5 react-native-language-detection: f414937fa715108ab50a6269a3de0bcb95e4ceb0 diff --git a/package.json b/package.json index e46d0d14..a8e87ab3 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@mattermost/react-native-paste-input": "^0.6.2", "@neverdull-agency/expo-unlimited-secure-store": "^1.0.10", "@react-native-async-storage/async-storage": "~1.17.11", - "@react-native-camera-roll/camera-roll": "^5.2.4", + "@react-native-camera-roll/camera-roll": "^5.3.0", "@react-native-clipboard/clipboard": "^1.11.2", "@react-native-community/blur": "^4.3.0", "@react-native-community/netinfo": "9.3.7", @@ -89,7 +89,7 @@ "react-native-tab-view": "^3.5.1", "rn-placeholder": "^3.0.3", "url-parse": "^1.5.10", - "zeego": "^1.1.0" + "zeego": "^1.3.1" }, "devDependencies": { "@babel/core": "^7.21.0", diff --git a/src/components/Timeline/Shared/HeaderDefault.tsx b/src/components/Timeline/Shared/HeaderDefault.tsx index d917c0f9..33b9235c 100644 --- a/src/components/Timeline/Shared/HeaderDefault.tsx +++ b/src/components/Timeline/Shared/HeaderDefault.tsx @@ -105,7 +105,7 @@ const TimelineHeaderDefault: React.FC = () => { case 'sub': return ( // @ts-ignore - + [] } diff --git a/src/screens/Tabs/Local/Root.tsx b/src/screens/Tabs/Local/Root.tsx index 432811dd..d8cf3bfd 100644 --- a/src/screens/Tabs/Local/Root.tsx +++ b/src/screens/Tabs/Local/Root.tsx @@ -152,7 +152,7 @@ const Root: React.FC ( diff --git a/src/screens/Tabs/Me/List/menus.tsx b/src/screens/Tabs/Me/List/menus.tsx index dea9adbb..b71943f4 100644 --- a/src/screens/Tabs/Me/List/menus.tsx +++ b/src/screens/Tabs/Me/List/menus.tsx @@ -7,7 +7,7 @@ export const menuListAccounts = ({ list }: { list: Mastodon.List }) => ({ key: 'list-accounts', onSelect: () => navigationRef.navigate('Tab-Me-List-Accounts', list), title: i18next.t('screenTabs:me.listAccounts.heading'), - icon: 'person.crop.circle.fill.badge.checkmark' + icon: 'person.crop.circle.fill.badge.checkmark' as any }) export const menuListEdit = ({ list, key }: { list: Mastodon.List; key: string }) => ({ @@ -19,7 +19,7 @@ export const menuListEdit = ({ list, key }: { list: Mastodon.List; key: string } key }), title: i18next.t('screenTabs:me.listEdit.heading'), - icon: 'square.and.pencil' + icon: 'square.and.pencil' as any }) export const menuListDelete = ({ @@ -44,5 +44,5 @@ export const menuListDelete = ({ ] ), title: i18next.t('screenTabs:me.listDelete.heading'), - icon: 'trash' + icon: 'trash' as any }) diff --git a/yarn.lock b/yarn.lock index a2bdf414..ee64f63d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3017,12 +3017,12 @@ __metadata: languageName: node linkType: hard -"@react-native-camera-roll/camera-roll@npm:^5.2.4": - version: 5.2.4 - resolution: "@react-native-camera-roll/camera-roll@npm:5.2.4" +"@react-native-camera-roll/camera-roll@npm:^5.3.0": + version: 5.3.0 + resolution: "@react-native-camera-roll/camera-roll@npm:5.3.0" peerDependencies: react-native: ">=0.59" - checksum: cd75ae079ad8784934abfeb968f031bf68814be2abbf306ae67979b8839e6ea9274c86f7749edfda9ecefd38eed53ec8c1d2fb9cf794efa13540423c8dac6bf8 + checksum: 89f439802c21d7d5e8a52798aa962bce4b992a46422a1eb780f3af6a09c5985e1baab83363f833c99deb73fbf5b8451bee9c9b646c38667ec1a748ff2f4eaf0c languageName: node linkType: hard @@ -11450,7 +11450,7 @@ __metadata: "@mattermost/react-native-paste-input": ^0.6.2 "@neverdull-agency/expo-unlimited-secure-store": ^1.0.10 "@react-native-async-storage/async-storage": ~1.17.11 - "@react-native-camera-roll/camera-roll": ^5.2.4 + "@react-native-camera-roll/camera-roll": ^5.3.0 "@react-native-clipboard/clipboard": ^1.11.2 "@react-native-community/blur": ^4.3.0 "@react-native-community/netinfo": 9.3.7 @@ -11525,7 +11525,7 @@ __metadata: rn-placeholder: ^3.0.3 typescript: ^4.9.5 url-parse: ^1.5.10 - zeego: ^1.1.0 + zeego: ^1.3.1 languageName: unknown linkType: soft @@ -12326,9 +12326,9 @@ __metadata: languageName: node linkType: hard -"zeego@npm:^1.1.0": - version: 1.1.0 - resolution: "zeego@npm:1.1.0" +"zeego@npm:^1.3.1": + version: 1.3.1 + resolution: "zeego@npm:1.3.1" dependencies: "@radix-ui/react-context-menu": ^2.0.1 "@radix-ui/react-dropdown-menu": ^2.0.1 @@ -12337,7 +12337,7 @@ __metadata: "@react-native-menu/menu": "*" react: "*" react-native: "*" - react-native-ios-context-menu: ^1.14.0 - checksum: 61c5d8406394814e9e7659cd2534abd6d77911cfc8f19f2821a677b5cbe5bbf1d43d397c305a5b8620e359cd68d24b955d87219befaaa1d2449cd68dc39d6586 + react-native-ios-context-menu: ^1.15.1 + checksum: 2d8c568e72ba6ac1f39e9685016edf13585002511f4e80fd41eecd0c42d4d84442c00fe0ad59aee0a4aedc658c6cd1c29fee30ad176a14bd83d288f45d3808e1 languageName: node linkType: hard From 43d26016606893b4052a9b997d5fd0a2758886b6 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Fri, 10 Mar 2023 14:04:01 +0100 Subject: [PATCH 3/4] Fix #706 Very strange bug again only on Android of drawing svgs --- src/screens/Tabs/Shared/Toot.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx index 807b51f2..07b97fe6 100644 --- a/src/screens/Tabs/Shared/Toot.tsx +++ b/src/screens/Tabs/Shared/Toot.tsx @@ -392,7 +392,7 @@ const TabSharedToot: React.FC> = ({ StyleConstants.Spacing.S } /> - {leadingItem._level > 1 + {Platform.OS !== 'android' && leadingItem._level > 1 ? [...new Array(leadingItem._level - 1)].map((_, i) => ( Date: Fri, 10 Mar 2023 14:04:24 +0100 Subject: [PATCH 4/4] New translations tabs.json (Belarusian) (#715) --- src/i18n/be/screens/tabs.json | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/i18n/be/screens/tabs.json b/src/i18n/be/screens/tabs.json index b12be38f..c0b6020a 100644 --- a/src/i18n/be/screens/tabs.json +++ b/src/i18n/be/screens/tabs.json @@ -262,7 +262,7 @@ "label": "Назва", "content": "Змесціва" }, - "mediaSelectionFailed": "" + "mediaSelectionFailed": "Збой апрацоўкі відарыса. Паспрабуйце яшчэ раз." }, "push": { "notAvailable": "Ваш тэлефон не падтрымлівае push-апавяшчэнні", @@ -275,11 +275,11 @@ "description": "Звярніцеся да адміністратара вашага сервера, каб наладзіць падтрымку push" }, "global": { - "heading": "", - "description": "" + "heading": "Уключыць для {{acct}}", + "description": "Паведамленні накіроўваюцца праз сервер tooot" }, "decode": { - "heading": "", + "heading": "Паказаць дэталі паведамлення", "description": "" }, "default": { @@ -292,37 +292,37 @@ "heading": "Запыты на падпіску" }, "favourite": { - "heading": "" + "heading": "Дадаў у абранае" }, "reblog": { - "heading": "" + "heading": "Пашырыў" }, "mention": { - "heading": "" + "heading": "Згадаў вас" }, "poll": { - "heading": "" + "heading": "Абнаўленні апытання" }, "status": { - "heading": "" + "heading": "Допіс ад падпісаных карыстальнікаў" }, "update": { - "heading": "" + "heading": "Пашырэнне было адрэдагавана" }, "admin.sign_up": { - "heading": "" + "heading": "Адміністраванне: рэгістрацыя" }, "admin.report": { - "heading": "" + "heading": "Адміністраванне: скаргі" }, - "howitworks": "" + "howitworks": "Даведацца, як працуе маршрутызацыя" }, "root": { "announcements": { "content": { - "unread": "", - "read": "", - "empty": "" + "unread": "{{amount}} непрачытаных", + "read": "Усё прачытана", + "empty": "Няма" } }, "push": { @@ -344,7 +344,7 @@ "theme": { "heading": "Знешні выгляд", "options": { - "auto": "", + "auto": "Як у сістэме", "light": "Светлы рэжым", "dark": "Цёмны рэжым" } @@ -364,18 +364,18 @@ } }, "autoplayGifv": { - "heading": "" + "heading": "Аўтапрайграванне GIF у стужцы" }, "feedback": { - "heading": "" + "heading": "Прапанаваць ідэю" }, "support": { - "heading": "" + "heading": "Падтрымаць tooot" }, "contact": { - "heading": "" + "heading": "Звязацца з tooot" }, - "version": "", + "version": "Версія: {{version}}", "instanceVersion": "Версія Mastodon: v{{version}}" }, "switch": { @@ -419,7 +419,7 @@ }, "report": { "name": "", - "report": "", + "report": "Скарга", "forward": { "heading": "Ананімна пераслаць на аддалены сервер {{instance}}" },