Merge branch 'main' into candidate

2025-02-16 20:00:53 +01:00 · 2022-10-31 00:31:52 +01:00 · 2022-10-31 00:31:52 +01:00 · bf10e15445
commit bf10e15445
parent 7655d313a7 da1ea314a4
8 changed files with 187 additions and 96 deletions
--- a/ios/Podfile
+++ b/ios/Podfile
@ -43,6 +43,15 @@ target 'tooot' do
        config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'No'
      end
    end
+
+    # For Xcode 14
+    installer.generated_projects.each do |project|
+      project.targets.each do |target|
+        target.build_configurations.each do |config|
+          config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
+      end
+    end
  end

  post_integrate do |installer|
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -947,6 +947,6 @@ SPEC CHECKSUMS:
  Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
  Yoga: 75bf4b0131cfb46a659cd0c13309b79a6fcff66d

-PODFILE CHECKSUM: 7f078a0355bc9bdbcbbe7257e7e62e1d45f77f75
+PODFILE CHECKSUM: 244b6793e4be83f0909a91b2fe15c8f89a5e8151

 COCOAPODS: 1.11.3
--- a/ios/tooot.xcodeproj/project.pbxproj
+++ b/ios/tooot.xcodeproj/project.pbxproj
@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
@ -330,6 +330,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@ -446,6 +447,7 @@
 		};
 		FD10A7F022414F080027D42C /* Start Packager */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@ -536,13 +538,17 @@
 				CURRENT_PROJECT_VERSION = 2102022230;
 				DEVELOPMENT_TEAM = 8EGBLQ2MA6;
 				ENABLE_BITCODE = NO;
+				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					"FB_SONARKIT_ENABLED=1",
 				);
 				INFOPLIST_FILE = tooot/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@ -573,9 +579,13 @@
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 2102022230;
 				DEVELOPMENT_TEAM = 8EGBLQ2MA6;
+				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
 				INFOPLIST_FILE = tooot/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@ -645,7 +655,10 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
-				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+				);
 				LIBRARY_SEARCH_PATHS = "\"\"";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@ -698,7 +711,10 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
-				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+				);
 				LIBRARY_SEARCH_PATHS = "\"\"";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
@ -733,7 +749,11 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@ -778,7 +798,11 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
--- a/ios/tooot/tooot.entitlements
+++ b/ios/tooot/tooot.entitlements
@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>aps-environment</key>
-    <string>development</string>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.application-groups</key>
-    <array>
-      <string>group.com.xmflsct.app.tooot</string>
-    </array>
-    <key>com.apple.security.device.audio-input</key>
-    <true/>
-    <key>com.apple.security.device.camera</key>
-    <true/>
-    <key>com.apple.security.network.client</key>
-    <true/>
-    <key>com.apple.security.personal-information.location</key>
-    <true/>
-    <key>com.apple.security.personal-information.photos-library</key>
-    <true/>
-  </dict>
-</plist>
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.xmflsct.app.tooot</string>
+	</array>
+	<key>com.apple.security.device.camera</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.personal-information.photos-library</key>
+	<true/>
+</dict>
+</plist>
--- a/patches/react-native-reanimated-zoom+0.3.1.patch
+++ b/patches/react-native-reanimated-zoom+0.3.1.patch
@ -0,0 +1,68 @@
+diff --git a/node_modules/react-native-reanimated-zoom/lib/typescript/zoom.d.ts b/node_modules/react-native-reanimated-zoom/lib/typescript/zoom.d.ts
+index 9b3e4a3..558944d 100644
+--- a/node_modules/react-native-reanimated-zoom/lib/typescript/zoom.d.ts
+++ b/node_modules/react-native-reanimated-zoom/lib/typescript/zoom.d.ts
+@@ -4,6 +4,7 @@ declare type Props = {
+     children: React.ReactNode;
+     minimumZoomScale?: number;
+     maximumZoomScale?: number;
+    simultaneousGesture?: GestureType;
+ } & ViewProps;
+ export declare function Zoom(props: Props): JSX.Element;
+ export {};
+diff --git a/node_modules/react-native-reanimated-zoom/src/zoom.tsx b/node_modules/react-native-reanimated-zoom/src/zoom.tsx
+index 2c48163..bc2d3dd 100644
+--- a/node_modules/react-native-reanimated-zoom/src/zoom.tsx
+++ b/node_modules/react-native-reanimated-zoom/src/zoom.tsx
+@@ -8,13 +8,18 @@ import Animated, {
+   cancelAnimation,
+   runOnJS,
+ } from 'react-native-reanimated';
+-import { Gesture, GestureDetector } from 'react-native-gesture-handler';
+import {
+  Gesture,
+  GestureDetector,
+  GestureType,
+} from 'react-native-gesture-handler';
+ import { ZoomListContext } from './zoom-list-context';
+ 
+ type Props = {
+   children: React.ReactNode;
+   minimumZoomScale?: number;
+   maximumZoomScale?: number;
+  simultaneousGesture?: GestureType;
+ } & ViewProps;
+ 
+ export function Zoom(props: Props) {
+@@ -23,6 +28,7 @@ export function Zoom(props: Props) {
+     maximumZoomScale = 8,
+     style: propStyle,
+     onLayout,
+    simultaneousGesture,
+   } = props;
+ 
+   const zoomListContext = useContext(ZoomListContext);
+@@ -198,11 +204,21 @@ export function Zoom(props: Props) {
+       );
+     }
+ 
+-    return Gesture.Race(doubleTap, Gesture.Simultaneous(pan, pinch));
+    return Gesture.Race(
+      doubleTap,
+      simultaneousGesture
+        ? Gesture.Simultaneous(pan, pinch, simultaneousGesture)
+        : Gesture.Simultaneous(pan, pinch)
+    );
+ 
+     // only add prop dependencies
+     // eslint-disable-next-line react-hooks/exhaustive-deps
+-  }, [maximumZoomScale, minimumZoomScale, zoomListContext]);
+  }, [
+    maximumZoomScale,
+    minimumZoomScale,
+    zoomListContext,
+    simultaneousGesture,
+  ]);
+ 
+   useDerivedValue(() => {
+     if (scale.value > 1 && !isZoomed.value) {
--- a/src/i18n/zh-Hant/components/mediaSelector.json
+++ b/src/i18n/zh-Hant/components/mediaSelector.json
@ -3,8 +3,8 @@
  "message": "媒體 EXIF 資料不會被上傳",
  "options": {
    "image": "上傳圖片",
-    "image_max": "上傳圖片（最大 {{max}}）",
+    "image_max": "上傳圖片（最多 {{max}}）",
    "video": "上傳影片",
-    "video_max": "上傳影片（最大 {{max}}）"
+    "video_max": "上傳影片（最多 {{max}}）"
  }
 }
--- a/src/i18n/zh-Hant/screens/compose.json
+++ b/src/i18n/zh-Hant/screens/compose.json
@ -39,7 +39,7 @@
      "header": {
        "postingAs": "以 @{{acct}}@{{domain}} 發嘟",
        "spoilerInput": {
-          "placeholder": "警告訊息"
+          "placeholder": "輸入警告訊息"
        },
        "textInput": {
          "placeholder": "正在想些什麼嗎？",
--- a/src/screens/ImagesViewer.tsx
+++ b/src/screens/ImagesViewer.tsx
@ -17,12 +17,9 @@ import {
  ViewToken
 } from 'react-native'
 import FlashMessage from 'react-native-flash-message'
-import {
-  Directions,
-  FlingGestureHandler,
-  LongPressGestureHandler
-} from 'react-native-gesture-handler'
+import { Directions, Gesture, LongPressGestureHandler } from 'react-native-gesture-handler'
 import { LiveTextImageView } from 'react-native-live-text-image-view'
+import { runOnJS } from 'react-native-reanimated'
 import { Zoom, createZoomListComponent } from 'react-native-reanimated-zoom'
 import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-context'
 import saveImage from './ImageViewer/save'
@ -106,6 +103,9 @@ const ScreenImagesViewer = ({
      return (
        <Zoom
          maximumZoomScale={max > 8 ? 8 : max}
+          simultaneousGesture={Gesture.Fling()
+            .direction(Directions.DOWN)
+            .onStart(() => runOnJS(navigation.goBack)())}
          children={
            <View
              style={{
@ -172,67 +172,61 @@ const ScreenImagesViewer = ({
          onPress={onPress}
        />
      </View>
-      <FlingGestureHandler
-        direction={Directions.DOWN}
-        numberOfPointers={1}
-        onEnded={() => navigation.goBack()}
-      >
-        <LongPressGestureHandler
-          onEnded={() => {
-            analytics('imageviewer_more_press')
-            showActionSheetWithOptions(
-              {
-                options: [
-                  t('content.options.save'),
-                  t('content.options.share'),
-                  t('content.options.cancel')
-                ],
-                cancelButtonIndex: 2,
-                userInterfaceStyle: mode
-              },
-              async buttonIndex => {
-                switch (buttonIndex) {
-                  case 0:
-                    analytics('imageviewer_more_save_press')
-                    saveImage({ theme, image: imageUrls[currentIndex] })
-                    break
-                  case 1:
-                    analytics('imageviewer_more_share_press')
-                    switch (Platform.OS) {
-                      case 'ios':
-                        await Share.share({ url: imageUrls[currentIndex].url })
-                        break
-                      case 'android':
-                        await Share.share({
-                          message: imageUrls[currentIndex].url
-                        })
-                        break
-                    }
-                    break
-                }
+      <LongPressGestureHandler
+        onEnded={() => {
+          analytics('imageviewer_more_press')
+          showActionSheetWithOptions(
+            {
+              options: [
+                t('content.options.save'),
+                t('content.options.share'),
+                t('content.options.cancel')
+              ],
+              cancelButtonIndex: 2,
+              userInterfaceStyle: mode
+            },
+            async buttonIndex => {
+              switch (buttonIndex) {
+                case 0:
+                  analytics('imageviewer_more_save_press')
+                  saveImage({ theme, image: imageUrls[currentIndex] })
+                  break
+                case 1:
+                  analytics('imageviewer_more_share_press')
+                  switch (Platform.OS) {
+                    case 'ios':
+                      await Share.share({ url: imageUrls[currentIndex].url })
+                      break
+                    case 'android':
+                      await Share.share({
+                        message: imageUrls[currentIndex].url
+                      })
+                      break
+                  }
+                  break
              }
-            )
+            }
+          )
+        }}
+      >
+        <ZoomFlatList
+          data={imageUrls}
+          pagingEnabled
+          horizontal
+          keyExtractor={item => item.id}
+          renderItem={renderItem}
+          onViewableItemsChanged={onViewableItemsChanged}
+          viewabilityConfig={{
+            itemVisiblePercentThreshold: 50
          }}
-        >
-          <ZoomFlatList
-            data={imageUrls}
-            pagingEnabled
-            horizontal
-            keyExtractor={item => item.id}
-            renderItem={renderItem}
-            onViewableItemsChanged={onViewableItemsChanged}
-            viewabilityConfig={{
-              itemVisiblePercentThreshold: 50
-            }}
-            initialScrollIndex={initialIndex}
-            getItemLayout={(_, index) => ({
-              length: SCREEN_WIDTH,
-              offset: SCREEN_WIDTH * index,
-              index
-            })}
-          />
-        </LongPressGestureHandler>
-      </FlingGestureHandler>
+          initialScrollIndex={initialIndex}
+          getItemLayout={(_, index) => ({
+            length: SCREEN_WIDTH,
+            offset: SCREEN_WIDTH * index,
+            index
+          })}
+        />
+      </LongPressGestureHandler>
    </SafeAreaProvider>
  )
 }