From a940ed4cf3a30b178f6c514808c4d5851c4ac4e7 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 17 May 2023 13:39:55 +0200 Subject: [PATCH 1/3] Fix visuals and haptics --- src/components/Timeline/Shared/Actioned.tsx | 2 +- src/screens/Tabs/index.tsx | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/components/Timeline/Shared/Actioned.tsx b/src/components/Timeline/Shared/Actioned.tsx index a0fb206e9..f613ec956 100644 --- a/src/components/Timeline/Shared/Actioned.tsx +++ b/src/components/Timeline/Shared/Actioned.tsx @@ -35,7 +35,7 @@ const TimelineActioned: React.FC = ({ action, isNotification, ...rest }) content={content} emojis={account.emojis} size='S' - style={{ color: action === 'admin.report' ? colors.red : colors.primaryDefault }} + style={{ flex: 1, color: action === 'admin.report' ? colors.red : colors.primaryDefault }} /> ) diff --git a/src/screens/Tabs/index.tsx b/src/screens/Tabs/index.tsx index 25ef18737..4bcb6763c 100644 --- a/src/screens/Tabs/index.tsx +++ b/src/screens/Tabs/index.tsx @@ -59,7 +59,7 @@ const ScreenTabs = () => { case 'Tab-Me': return ( <> - haptics('Light')}> + { onValueChange={async () => { if (!account.active) { await setAccount(account.key) - haptics('Light') } }} > @@ -144,17 +143,7 @@ const ScreenTabs = () => { {() => null} - ({ - // tabLongPress: () => { - // haptics('Light') - // navigation.navigate('Tab-Me', { screen: 'Tab-Me-Root' }) - // navigation.navigate('Tab-Me', { screen: 'Tab-Me-Switch' }) - // } - // })} - /> + ) } From 96c219e3f9de865c9a33c9247f73ac74eccfac03 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 17 May 2023 13:49:16 +0200 Subject: [PATCH 2/3] Bump zeego --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2d1763a39..7a37eb09e 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "react-native-swipe-list-view": "^3.2.9", "react-native-tab-view": "^3.5.1", "rn-placeholder": "^3.0.3", - "zeego": "^1.6.0" + "zeego": "^1.6.1" }, "devDependencies": { "@babel/core": "^7.21.8", diff --git a/yarn.lock b/yarn.lock index 879d9ec9f..7a5c77547 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11327,7 +11327,7 @@ __metadata: react-native-tab-view: ^3.5.1 rn-placeholder: ^3.0.3 typescript: ^5.0.4 - zeego: ^1.6.0 + zeego: ^1.6.1 languageName: unknown linkType: soft @@ -12145,9 +12145,9 @@ __metadata: languageName: node linkType: hard -"zeego@npm:^1.6.0": - version: 1.6.0 - resolution: "zeego@npm:1.6.0" +"zeego@npm:^1.6.1": + version: 1.6.1 + resolution: "zeego@npm:1.6.1" dependencies: "@radix-ui/react-context-menu": ^2.0.1 "@radix-ui/react-dropdown-menu": ^2.0.1 @@ -12157,6 +12157,6 @@ __metadata: react: "*" react-native: "*" react-native-ios-context-menu: ^1.15.1 - checksum: c943a97135ba1eba7097eb671fe006b1b47c9d4a1ada05fbc18d8c00b48e2f74b41ae15181d9950c8011dc004041d402fcf6b35c6d0e2b86b6f564401c802826 + checksum: 1244edd2f5257934c2e09a6f30cd30a90f2bd56d9c66c60df3950820b204fd0ae46010ec547b4c902696f4917985b649bcf19a679bebdcd0470032ec96ae0519 languageName: node linkType: hard From c5eb1591f891af76c45b0cb31f104a0bedaed6b4 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 17 May 2023 13:51:22 +0200 Subject: [PATCH 3/3] New Crowdin updates (#740) * New translations relationship.json (Vietnamese) * New translations contextMenu.json (Vietnamese) --- src/i18n/vi/components/contextMenu.json | 4 ++-- src/i18n/vi/components/relationship.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/vi/components/contextMenu.json b/src/i18n/vi/components/contextMenu.json index 6ba73e961..3813a0695 100644 --- a/src/i18n/vi/components/contextMenu.json +++ b/src/i18n/vi/components/contextMenu.json @@ -4,7 +4,7 @@ "title": "Hành động người dùng", "following": { "action_false": "Theo dõi người này", - "action_true": "Ngưng theo dõi người này" + "action_true": "Bỏ theo dõi người này" }, "inLists": "Danh sách người ...", "showBoosts": { @@ -57,7 +57,7 @@ "hashtag": { "follow": { "action_false": "Theo dõi", - "action_true": "Ngưng theo dõi" + "action_true": "Bỏ theo dõi" }, "filter": { "action": "Lọc hashtag..." diff --git a/src/i18n/vi/components/relationship.json b/src/i18n/vi/components/relationship.json index f9ccf6c68..12948f125 100644 --- a/src/i18n/vi/components/relationship.json +++ b/src/i18n/vi/components/relationship.json @@ -9,7 +9,7 @@ "error": "Xảy ra lỗi khi tải", "blocked_by": "Đã chặn", "blocking": "Bỏ chặn", - "following": "Ngưng theo dõi", + "following": "Bỏ theo dõi", "requested": "Yêu cầu theo dõi", "default": "Theo dõi" }