diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b28323f2..42ee26b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: run: bundle install - name: -- Step 5 -- Run fastlane env: - DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_14.0.1.app/Contents/Developer ENVIRONMENT: ${{ steps.branch.outputs.branch }} SENTRY_ENVIRONMENT: ${{ steps.branch.outputs.branch }} LC_ALL: en_US.UTF-8 diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt new file mode 120000 index 00000000..457102d1 --- /dev/null +++ b/fastlane/metadata/default/release_notes.txt @@ -0,0 +1 @@ +../en-US/release_notes.txt \ No newline at end of file diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt new file mode 100644 index 00000000..284ae423 --- /dev/null +++ b/fastlane/metadata/en-US/release_notes.txt @@ -0,0 +1 @@ +Enjoy using tooot \ No newline at end of file diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt new file mode 100644 index 00000000..5729003f --- /dev/null +++ b/fastlane/metadata/zh-Hans/release_notes.txt @@ -0,0 +1 @@ +tooot使用愉快 \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9a06bbb7..11046c90 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -20,11 +20,11 @@ PODS: - EXFirebaseCore (5.2.0): - ExpoModulesCore - Firebase/Core (= 9.5.0) - - EXFont (10.2.0): + - EXFont (10.2.1): - ExpoModulesCore - EXNotifications (0.16.1): - ExpoModulesCore - - Expo (46.0.10): + - Expo (46.0.15): - ExpoModulesCore - ExpoCrypto (11.0.0): - ExpoModulesCore @@ -34,7 +34,7 @@ PODS: - ExpoModulesCore - ExpoLocalization (13.1.0): - ExpoModulesCore - - ExpoModulesCore (0.11.5): + - ExpoModulesCore (0.11.7): - React-Core - ReactCommon/turbomodule/core - ExpoRandom (12.3.0): @@ -52,14 +52,14 @@ PODS: - ExpoModulesCore - EXVideoThumbnails (6.4.0): - ExpoModulesCore - - FBLazyVector (0.69.5) - - FBReactNativeSpec (0.69.5): + - FBLazyVector (0.69.6) + - FBReactNativeSpec (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.69.5) - - RCTTypeSafety (= 0.69.5) - - React-Core (= 0.69.5) - - React-jsi (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) + - RCTRequired (= 0.69.6) + - RCTTypeSafety (= 0.69.6) + - React-Core (= 0.69.6) + - React-jsi (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) - Firebase (9.5.0): - Firebase/Core (= 9.5.0) - Firebase/Core (9.5.0): @@ -161,7 +161,7 @@ PODS: - GoogleUtilities/MethodSwizzler - GoogleUtilities/UserDefaults (7.8.0): - GoogleUtilities/Logger - - hermes-engine (0.69.5) + - hermes-engine (0.69.6) - libevent (2.1.12) - libwebp (1.2.3): - libwebp/demux (= 1.2.3) @@ -195,220 +195,220 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.69.5) - - RCTTypeSafety (0.69.5): - - FBLazyVector (= 0.69.5) - - RCTRequired (= 0.69.5) - - React-Core (= 0.69.5) - - React (0.69.5): - - React-Core (= 0.69.5) - - React-Core/DevSupport (= 0.69.5) - - React-Core/RCTWebSocket (= 0.69.5) - - React-RCTActionSheet (= 0.69.5) - - React-RCTAnimation (= 0.69.5) - - React-RCTBlob (= 0.69.5) - - React-RCTImage (= 0.69.5) - - React-RCTLinking (= 0.69.5) - - React-RCTNetwork (= 0.69.5) - - React-RCTSettings (= 0.69.5) - - React-RCTText (= 0.69.5) - - React-RCTVibration (= 0.69.5) - - React-bridging (0.69.5): + - RCTRequired (0.69.6) + - RCTTypeSafety (0.69.6): + - FBLazyVector (= 0.69.6) + - RCTRequired (= 0.69.6) + - React-Core (= 0.69.6) + - React (0.69.6): + - React-Core (= 0.69.6) + - React-Core/DevSupport (= 0.69.6) + - React-Core/RCTWebSocket (= 0.69.6) + - React-RCTActionSheet (= 0.69.6) + - React-RCTAnimation (= 0.69.6) + - React-RCTBlob (= 0.69.6) + - React-RCTImage (= 0.69.6) + - React-RCTLinking (= 0.69.6) + - React-RCTNetwork (= 0.69.6) + - React-RCTSettings (= 0.69.6) + - React-RCTText (= 0.69.6) + - React-RCTVibration (= 0.69.6) + - React-bridging (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi (= 0.69.5) - - React-callinvoker (0.69.5) - - React-Codegen (0.69.5): - - FBReactNativeSpec (= 0.69.5) + - React-jsi (= 0.69.6) + - React-callinvoker (0.69.6) + - React-Codegen (0.69.6): + - FBReactNativeSpec (= 0.69.6) - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.69.5) - - RCTTypeSafety (= 0.69.5) - - React-Core (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-Core (0.69.5): + - RCTRequired (= 0.69.6) + - RCTTypeSafety (= 0.69.6) + - React-Core (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-Core (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.69.5) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-Core/Default (= 0.69.6) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/CoreModulesHeaders (0.69.5): + - React-Core/CoreModulesHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/Default (0.69.5): + - React-Core/Default (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/DevSupport (0.69.5): + - React-Core/DevSupport (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.69.5) - - React-Core/RCTWebSocket (= 0.69.5) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-jsinspector (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-Core/Default (= 0.69.6) + - React-Core/RCTWebSocket (= 0.69.6) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-jsinspector (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTActionSheetHeaders (0.69.5): + - React-Core/RCTActionSheetHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTAnimationHeaders (0.69.5): + - React-Core/RCTAnimationHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTBlobHeaders (0.69.5): + - React-Core/RCTBlobHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTImageHeaders (0.69.5): + - React-Core/RCTImageHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTLinkingHeaders (0.69.5): + - React-Core/RCTLinkingHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTNetworkHeaders (0.69.5): + - React-Core/RCTNetworkHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTSettingsHeaders (0.69.5): + - React-Core/RCTSettingsHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTTextHeaders (0.69.5): + - React-Core/RCTTextHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTVibrationHeaders (0.69.5): + - React-Core/RCTVibrationHeaders (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-Core/RCTWebSocket (0.69.5): + - React-Core/RCTWebSocket (0.69.6): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.69.5) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-perflogger (= 0.69.5) + - React-Core/Default (= 0.69.6) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-perflogger (= 0.69.6) - Yoga - - React-CoreModules (0.69.5): + - React-CoreModules (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.5) - - React-Codegen (= 0.69.5) - - React-Core/CoreModulesHeaders (= 0.69.5) - - React-jsi (= 0.69.5) - - React-RCTImage (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-cxxreact (0.69.5): + - RCTTypeSafety (= 0.69.6) + - React-Codegen (= 0.69.6) + - React-Core/CoreModulesHeaders (= 0.69.6) + - React-jsi (= 0.69.6) + - React-RCTImage (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-cxxreact (0.69.6): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsinspector (= 0.69.5) - - React-logger (= 0.69.5) - - React-perflogger (= 0.69.5) - - React-runtimeexecutor (= 0.69.5) - - React-hermes (0.69.5): + - React-callinvoker (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsinspector (= 0.69.6) + - React-logger (= 0.69.6) + - React-perflogger (= 0.69.6) + - React-runtimeexecutor (= 0.69.6) + - React-hermes (0.69.6): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly/Futures (= 2021.06.28.00-v2) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-jsiexecutor (= 0.69.5) - - React-jsinspector (= 0.69.5) - - React-perflogger (= 0.69.5) - - React-jsi (0.69.5): + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-jsiexecutor (= 0.69.6) + - React-jsinspector (= 0.69.6) + - React-perflogger (= 0.69.6) + - React-jsi (0.69.6): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.69.5) - - React-jsi/Default (0.69.5): + - React-jsi/Default (= 0.69.6) + - React-jsi/Default (0.69.6): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.69.5): + - React-jsiexecutor (0.69.6): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-perflogger (= 0.69.5) - - React-jsinspector (0.69.5) - - React-logger (0.69.5): + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-perflogger (= 0.69.6) + - React-jsinspector (0.69.6) + - React-logger (0.69.6): - glog - react-native-blur (4.2.0): - React-Core - react-native-blurhash (1.1.10): - React-Core - - react-native-cameraroll (4.1.2): + - react-native-cameraroll (5.0.4): - React-Core - react-native-context-menu-view (1.5.4): - React @@ -416,14 +416,14 @@ PODS: - React-Core - react-native-language-detection (0.1.0): - React - - react-native-netinfo (9.3.1): + - react-native-netinfo (9.3.4): - React-Core - - react-native-pager-view (6.0.0): + - react-native-pager-view (6.0.1): - React-Core - - react-native-paste-input (0.5.0): + - react-native-paste-input (0.5.1): - React-Core - Swime (= 3.0.6) - - react-native-safe-area-context (4.3.4): + - react-native-safe-area-context (4.4.1): - RCT-Folly - RCTRequired - RCTTypeSafety @@ -431,112 +431,112 @@ PODS: - ReactCommon/turbomodule/core - react-native-segmented-control (2.2.2): - React-Core - - React-perflogger (0.69.5) - - React-RCTActionSheet (0.69.5): - - React-Core/RCTActionSheetHeaders (= 0.69.5) - - React-RCTAnimation (0.69.5): + - React-perflogger (0.69.6) + - React-RCTActionSheet (0.69.6): + - React-Core/RCTActionSheetHeaders (= 0.69.6) + - React-RCTAnimation (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.5) - - React-Codegen (= 0.69.5) - - React-Core/RCTAnimationHeaders (= 0.69.5) - - React-jsi (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-RCTBlob (0.69.5): + - RCTTypeSafety (= 0.69.6) + - React-Codegen (= 0.69.6) + - React-Core/RCTAnimationHeaders (= 0.69.6) + - React-jsi (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-RCTBlob (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.69.5) - - React-Core/RCTBlobHeaders (= 0.69.5) - - React-Core/RCTWebSocket (= 0.69.5) - - React-jsi (= 0.69.5) - - React-RCTNetwork (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-RCTImage (0.69.5): + - React-Codegen (= 0.69.6) + - React-Core/RCTBlobHeaders (= 0.69.6) + - React-Core/RCTWebSocket (= 0.69.6) + - React-jsi (= 0.69.6) + - React-RCTNetwork (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-RCTImage (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.5) - - React-Codegen (= 0.69.5) - - React-Core/RCTImageHeaders (= 0.69.5) - - React-jsi (= 0.69.5) - - React-RCTNetwork (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-RCTLinking (0.69.5): - - React-Codegen (= 0.69.5) - - React-Core/RCTLinkingHeaders (= 0.69.5) - - React-jsi (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-RCTNetwork (0.69.5): + - RCTTypeSafety (= 0.69.6) + - React-Codegen (= 0.69.6) + - React-Core/RCTImageHeaders (= 0.69.6) + - React-jsi (= 0.69.6) + - React-RCTNetwork (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-RCTLinking (0.69.6): + - React-Codegen (= 0.69.6) + - React-Core/RCTLinkingHeaders (= 0.69.6) + - React-jsi (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-RCTNetwork (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.5) - - React-Codegen (= 0.69.5) - - React-Core/RCTNetworkHeaders (= 0.69.5) - - React-jsi (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-RCTSettings (0.69.5): + - RCTTypeSafety (= 0.69.6) + - React-Codegen (= 0.69.6) + - React-Core/RCTNetworkHeaders (= 0.69.6) + - React-jsi (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-RCTSettings (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.5) - - React-Codegen (= 0.69.5) - - React-Core/RCTSettingsHeaders (= 0.69.5) - - React-jsi (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-RCTText (0.69.5): - - React-Core/RCTTextHeaders (= 0.69.5) - - React-RCTVibration (0.69.5): + - RCTTypeSafety (= 0.69.6) + - React-Codegen (= 0.69.6) + - React-Core/RCTSettingsHeaders (= 0.69.6) + - React-jsi (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-RCTText (0.69.6): + - React-Core/RCTTextHeaders (= 0.69.6) + - React-RCTVibration (0.69.6): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.69.5) - - React-Core/RCTVibrationHeaders (= 0.69.5) - - React-jsi (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - React-runtimeexecutor (0.69.5): - - React-jsi (= 0.69.5) - - ReactCommon (0.69.5): - - React-logger (= 0.69.5) - - ReactCommon/react_debug_core (= 0.69.5) - - ReactCommon/turbomodule (= 0.69.5) - - ReactCommon/react_debug_core (0.69.5): - - React-logger (= 0.69.5) - - ReactCommon/turbomodule (0.69.5): + - React-Codegen (= 0.69.6) + - React-Core/RCTVibrationHeaders (= 0.69.6) + - React-jsi (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - React-runtimeexecutor (0.69.6): + - React-jsi (= 0.69.6) + - ReactCommon (0.69.6): + - React-logger (= 0.69.6) + - ReactCommon/react_debug_core (= 0.69.6) + - ReactCommon/turbomodule (= 0.69.6) + - ReactCommon/react_debug_core (0.69.6): + - React-logger (= 0.69.6) + - ReactCommon/turbomodule (0.69.6): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-bridging (= 0.69.5) - - React-callinvoker (= 0.69.5) - - React-Core (= 0.69.5) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-logger (= 0.69.5) - - React-perflogger (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) - - ReactCommon/turbomodule/samples (= 0.69.5) - - ReactCommon/turbomodule/core (0.69.5): + - React-bridging (= 0.69.6) + - React-callinvoker (= 0.69.6) + - React-Core (= 0.69.6) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-logger (= 0.69.6) + - React-perflogger (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) + - ReactCommon/turbomodule/samples (= 0.69.6) + - ReactCommon/turbomodule/core (0.69.6): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-bridging (= 0.69.5) - - React-callinvoker (= 0.69.5) - - React-Core (= 0.69.5) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-logger (= 0.69.5) - - React-perflogger (= 0.69.5) - - ReactCommon/turbomodule/samples (0.69.5): + - React-bridging (= 0.69.6) + - React-callinvoker (= 0.69.6) + - React-Core (= 0.69.6) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-logger (= 0.69.6) + - React-perflogger (= 0.69.6) + - ReactCommon/turbomodule/samples (0.69.6): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-bridging (= 0.69.5) - - React-callinvoker (= 0.69.5) - - React-Core (= 0.69.5) - - React-cxxreact (= 0.69.5) - - React-jsi (= 0.69.5) - - React-logger (= 0.69.5) - - React-perflogger (= 0.69.5) - - ReactCommon/turbomodule/core (= 0.69.5) + - React-bridging (= 0.69.6) + - React-callinvoker (= 0.69.6) + - React-Core (= 0.69.6) + - React-cxxreact (= 0.69.6) + - React-jsi (= 0.69.6) + - React-logger (= 0.69.6) + - React-perflogger (= 0.69.6) + - ReactCommon/turbomodule/core (= 0.69.6) - RNCAsyncStorage (1.17.10): - React-Core - RNCClipboard (1.11.1): - React-Core - RNFastImage (8.6.1): - React-Core - - SDWebImage (~> 5.13.3) + - SDWebImage (~> 5.13.4) - SDWebImageWebPCoder (~> 0.9.0) - - RNGestureHandler (2.6.2): + - RNGestureHandler (2.7.0): - React-Core - RNReanimated (2.10.0): - DoubleConversion @@ -565,25 +565,25 @@ PODS: - React-RCTText - ReactCommon/turbomodule/core - Yoga - - RNScreens (3.17.0): + - RNScreens (3.18.0): - React-Core - React-RCTImage - - RNSentry (4.4.0): + - RNSentry (4.6.1): - React-Core - - Sentry (= 7.25.1) + - Sentry (= 7.27.1) - RNShareMenu (6.0.0): - React - RNSVG (13.0.0): - React-Core - - SDWebImage (5.13.3): - - SDWebImage/Core (= 5.13.3) - - SDWebImage/Core (5.13.3) + - SDWebImage (5.13.4): + - SDWebImage/Core (= 5.13.4) + - SDWebImage/Core (5.13.4) - SDWebImageWebPCoder (0.9.1): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.13) - - Sentry (7.25.1): - - Sentry/Core (= 7.25.1) - - Sentry/Core (7.25.1) + - Sentry (7.27.1): + - Sentry/Core (= 7.27.1) + - Sentry/Core (7.27.1) - Swime (3.0.6) - Yoga (1.14.0) @@ -638,7 +638,7 @@ DEPENDENCIES: - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - "react-native-blur (from `../node_modules/@react-native-community/blur`)" - react-native-blurhash (from `../node_modules/react-native-blurhash`) - - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)" + - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)" - react-native-context-menu-view (from `../node_modules/react-native-context-menu-view`) - react-native-image-picker (from `../node_modules/react-native-image-picker`) - react-native-language-detection (from `../node_modules/react-native-language-detection`) @@ -783,7 +783,7 @@ EXTERNAL SOURCES: react-native-blurhash: :path: "../node_modules/react-native-blurhash" react-native-cameraroll: - :path: "../node_modules/@react-native-community/cameraroll" + :path: "../node_modules/@react-native-camera-roll/camera-roll" react-native-context-menu-view: :path: "../node_modules/react-native-context-menu-view" react-native-image-picker: @@ -855,14 +855,14 @@ SPEC CHECKSUMS: EXFileSystem: 927e0a8885aa9c49e50fc38eaba2c2389f2f1019 EXFirebaseAnalytics: 2e478758e153b908b67477dff7adf99ffbf37a1b EXFirebaseCore: cb1e6afad20c4c32a4966432c78ebfff29d8db6b - EXFont: a5d80bd9b3452b2d5abbce2487da89b0150e6487 + EXFont: 06df627203afcb8a3b3152ec06eb2f11f46f0cff EXNotifications: 9a2aa201deb19dfe1dbe0e370eeb2922de0d2422 - Expo: fcdb32274e2ca9c7638d3b21b30fb665c6869219 + Expo: 7e821e708a35d2720ef6baa658e224dd91c4821e ExpoCrypto: e534314db0e1a17ae12b5140d529bd0c5efcbc6a ExpoHaptics: efe9e68e9dfe0d15c183c0c70a25f3874124ab9e ExpoKeepAwake: 0e8f18142e71bbf2c7f6aa66ebed249ba1420320 ExpoLocalization: 63204f4b9d4f653469d266332ceaa6c6ac8a305d - ExpoModulesCore: 5a973701f4400d70254bc836305228731c829010 + ExpoModulesCore: 2d60ec04c49641afb55fee3faac86fb108c68fe0 ExpoRandom: f9f1faa299a40733867f344d6b7bfa2d1f4ab04d ExpoWebBrowser: 5804ac42a8269d0e534bc4461993005f72535649 EXScreenCapture: 23de056fdb02edd1fb8f147b0fd198c6d5cada3d @@ -870,8 +870,8 @@ SPEC CHECKSUMS: EXSplashScreen: 799bece80089219b2c989c1082d70f3b00995cda EXStoreReview: cbb6b2202bb6f831cd3234d9d8b995cec0eb32f2 EXVideoThumbnails: 486533e1a66c9859f9b9e3b2e1f9f0b275515b48 - FBLazyVector: 0045cf98ca4a48af3bf7108d85b1c243740fa289 - FBReactNativeSpec: 82e74141263f8c962e288f5cd6b5d149cdc8afe1 + FBLazyVector: 739d2f9719faecb463c7aa191591af31c8c94182 + FBReactNativeSpec: 957de82f66e31f2f14bbec34e37242282fdd26de Firebase: 800f16f07af493d98d017446a315c27af0552f41 FirebaseAnalytics: 1b60984a408320dda637306f3f733699ef8473d7 FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f @@ -883,63 +883,63 @@ SPEC CHECKSUMS: GoogleAppMeasurement: 6ee231473fbd75c11221dfce489894334024eead GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 - hermes-engine: 479687cd0904b24f1b2ae71d1196b44786af5601 + hermes-engine: c2c873a670bc435451449f918c2b3ab3c39255fc libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a - RCTRequired: 85c60c4bde8241278be2c93420de4c65475a2151 - RCTTypeSafety: 15990f289215eb0fc65c5eb6e2610faeeda8d5e1 - React: 6cfa9367042a85f6235740420df017d51efc6494 - React-bridging: bf49ea3fa02446c647748d33cc9cbc0f5509bba7 - React-callinvoker: 6b98a94d1f5063afe211379d061b01f40707394a - React-Codegen: 2fe0ade7442acce0b729a228a2d9111b6ef294e2 - React-Core: ad82eacbe769f918b0d199df3cb7c780cd3f46ff - React-CoreModules: 72b07fed89ab0e7f2600f9275ec9642130aa920c - React-cxxreact: 2bba16be9eb4116bee86e3dfd85aeb67b2795eca - React-hermes: 1bf0fdad2d569e81c3da59dc23eef5630b5f1950 - React-jsi: 013de11039e08ae5d67868a72f1012794d34e72f - React-jsiexecutor: e42f0b46de293a026c2fb20e524d4fe09f81f575 - React-jsinspector: e385fb7a1440ae3f3b2cd1a139ca5aadaab43c10 - React-logger: 15c734997c06fe9c9b88e528fb7757601e7a56df + RCTRequired: c8c080849a3670601d5c7056023a2176067a69d8 + RCTTypeSafety: 710aef40f5ae246bc5fff7e873855b17ed11c180 + React: b6bb382534be4de9d367ef3d04f92108c1768160 + React-bridging: 0fca0337cef9305026814907dd29254a833a2db7 + React-callinvoker: 700e6eb96b5f7f2fdd96d7263cd4627d2fa080ed + React-Codegen: fd21633c4b9f47d0681bbb54b173a203963a5e4d + React-Core: 8ec15c9727c8c01b1e4f14cad5bd21f7c1d56d49 + React-CoreModules: 79486447bf901292a83df52d4f7acbecda296723 + React-cxxreact: 9022135650dd9960a60a1361e9add424c6c37ab9 + React-hermes: b5ce7fb460ff6d39e7bb9bbe1f523272c4b85c0b + React-jsi: 4ccb3599c422ad071e3895c5feab9b0afc40505d + React-jsiexecutor: c61b60de03b3474e5749b8a8fd8e6507630d62c4 + React-jsinspector: eaacb698c5af7a99131bc1933806372c20222dfd + React-logger: ebb4d31bbbe4f1a8a1a9b658d7429210b8f68160 react-native-blur: 3e9c8e8e9f7d17fa1b94e1a0ae9fd816675f5382 react-native-blurhash: add4df9a937b4e021a24bc67a0714f13e0bd40b7 - react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866 + react-native-cameraroll: 38b40d9033e4077b6c603f92f95c6d05fa7907df react-native-context-menu-view: b0beca02aad4bd9f9d7d932bf437e0a03baa69ef react-native-image-picker: 4bc9ed38c8be255b515d8c88babbaf74973f91a8 react-native-language-detection: 0e43195ad014974f1b7a31b64820eff34a243f2d - react-native-netinfo: c8d02a805706024f8de3a339a028f7e64f63b4b6 - react-native-pager-view: e76d64a5114a152e942caa09136e4e250709378c - react-native-paste-input: 3037f113267c367e863790bcfd57cdb3ace3cad6 - react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9 + react-native-netinfo: 6ac9bcc7c88dc51717bda3484eb99093acb755e0 + react-native-pager-view: 3051346698a0ba0c4e13e40097cc11b00ee03cca + react-native-paste-input: 183ad7dc224e192719616f4258dde5b548627d08 + react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a react-native-segmented-control: 65df6cd0619b780b3843d574a72d4c7cec396097 - React-perflogger: 367418425c5e4a9f0f80385ee1eaacd2a7348f8e - React-RCTActionSheet: e4885e7136f98ded1137cd3daccc05eaed97d5a6 - React-RCTAnimation: 7c5a74f301c9b763343ba98a3dd776ed2676993f - React-RCTBlob: 5c294e0415b290b1b3b72ec454c43e3afcfab444 - React-RCTImage: e82034ab64dfbadd3e0b42d830a810702f59f758 - React-RCTLinking: f007e2b4094e1fd364f3bde8bbd94113d4e1e70f - React-RCTNetwork: 72eaf2f4cbcb5105b2ef4ac6a987b51047d8835f - React-RCTSettings: 61949292107ca7b6cf9601679e952b1b5a3546a7 - React-RCTText: 307181243987b73aaefc22afd0b57b10ef970429 - React-RCTVibration: 42b34fde72e42446d9b08d2b9a3ddc2fa9ac6189 - React-runtimeexecutor: c778439c3c430a5719d027d3c67423b390a221fe - ReactCommon: ab1003b81be740fecd82509c370a45b1a7dda0c1 + React-perflogger: 1fb1ad5333b43a5137afd7608695f7a42c5efd27 + React-RCTActionSheet: a435bd67689433575a1e5d7614b021d2c17f0726 + React-RCTAnimation: d097c5ed2d00735958508617555abd85183b94e2 + React-RCTBlob: f43a0fceb328e1a40aa52701a4eba955635444ab + React-RCTImage: 08f4428e931efe0eefb94443c8ca08cfb250a556 + React-RCTLinking: 3a8851e818652582f87e5a7577302e6ad7e1de3e + React-RCTNetwork: 19f7c66b612e2336eefdfbc7ab3a9bd8ca4e21cf + React-RCTSettings: 9324e718a865ff01e4a96be4c65923581b2d5170 + React-RCTText: 9cadcd5d982c1d25f7439f47354b1c1b75e60105 + React-RCTVibration: 285f8538386c660e6b9497e204636acd93bf7fcc + React-runtimeexecutor: 0af71c94f968fa10015bf0119951bccd2e4d8865 + ReactCommon: fe7580b9d10f00249facf25659e0ec051320cc8a RNCAsyncStorage: 0c357f3156fcb16c8589ede67cc036330b6698ca RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd - RNFastImage: 86db49d153ff3cd09b015374e922d1aecc529307 - RNGestureHandler: 4defbd70b2faf3d6761b82fa7880285241762cb0 + RNFastImage: e6267e27581b81918ebef6432c94c20718ec3b91 + RNGestureHandler: 7673697e7c0e9391adefae4faa087442bc04af33 RNReanimated: 7faa787e8d4493fbc95fab2ad331fa7625828cfa - RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9 - RNSentry: 6386245031a4dc3091523b941de8241c03e7f214 + RNScreens: f3230dd008a7d0ce5c0a8bc78ff12cf2315bda24 + RNSentry: f8591057d48d4f6d64196a76cbca67895667b033 RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3 RNSVG: 42a0c731b11179ebbd27a3eeeafa7201ebb476ff - SDWebImage: af5bbffef2cde09f148d826f9733dcde1a9414cd + SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0 - Sentry: dd29c18c32b0af9269949f079cf631d581ca76ca + Sentry: bc644307e2eb6a4c9c55cf117a80b895bb2a25a7 Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b - Yoga: c2b1f2494060865ac1f27e49639e72371b1205fa + Yoga: 75bf4b0131cfb46a659cd0c13309b79a6fcff66d PODFILE CHECKSUM: 7f078a0355bc9bdbcbbe7257e7e62e1d45f77f75 diff --git a/package.json b/package.json index 1d4b1518..21f1e490 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tooot", - "version": "4.3.3", + "version": "4.3.4", "description": "tooot app for Mastodon", "author": "xmflsct ", "license": "GPL-3.0-or-later", @@ -18,30 +18,30 @@ "postinstall": "patch-package" }, "dependencies": { - "@expo/react-native-action-sheet": "^3.13.0", + "@expo/react-native-action-sheet": "^3.14.0", "@formatjs/intl-datetimeformat": "^6.2.0", "@formatjs/intl-getcanonicallocales": "^2.0.4", "@formatjs/intl-locale": "^3.0.6", "@formatjs/intl-numberformat": "^8.1.3", "@formatjs/intl-pluralrules": "^5.1.3", "@formatjs/intl-relativetimeformat": "^11.1.3", - "@mattermost/react-native-paste-input": "^0.5.0", + "@mattermost/react-native-paste-input": "^0.5.1", "@neverdull-agency/expo-unlimited-secure-store": "^1.0.10", "@react-native-async-storage/async-storage": "^1.17.10", + "@react-native-camera-roll/camera-roll": "^5.0.4", "@react-native-clipboard/clipboard": "^1.11.1", "@react-native-community/blur": "^4.2.0", - "@react-native-community/cameraroll": "^4.1.2", - "@react-native-community/netinfo": "^9.3.1", + "@react-native-community/netinfo": "^9.3.4", "@react-native-community/segmented-control": "^2.2.2", "@react-navigation/bottom-tabs": "^6.4.0", "@react-navigation/native": "^6.0.13", "@react-navigation/native-stack": "^6.9.0", - "@react-navigation/stack": "^6.3.1", - "@reduxjs/toolkit": "^1.8.5", - "@sentry/react-native": "^4.4.0", + "@react-navigation/stack": "^6.3.2", + "@reduxjs/toolkit": "^1.8.6", + "@sentry/react-native": "^4.6.1", "@sharcoux/slider": "^6.0.3", "axios": "^0.27.2", - "expo": "^46.0.10", + "expo": "^46.0.15", "expo-auth-session": "^3.7.1", "expo-av": "^12.0.4", "expo-constants": "^13.2.4", @@ -59,15 +59,15 @@ "expo-store-review": "^5.3.0", "expo-video-thumbnails": "^6.4.0", "expo-web-browser": "^11.0.0", - "i18next": "^21.9.2", + "i18next": "^21.10.0", "li": "^1.3.0", "linkify-it": "^4.0.1", "lodash": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", "react-i18next": "^11.18.6", - "react-intl": "^6.1.1", - "react-native": "^0.69.4", + "react-intl": "^6.1.2", + "react-native": "^0.69.6", "react-native-animated-spinkit": "^1.5.2", "react-native-base64": "^0.2.1", "react-native-blurhash": "^1.1.10", @@ -75,34 +75,33 @@ "react-native-fast-image": "^8.6.1", "react-native-feather": "^1.1.2", "react-native-flash-message": "^0.3.1", - "react-native-gesture-handler": "^2.6.2", + "react-native-gesture-handler": "^2.7.0", "react-native-htmlview": "^0.16.0", "react-native-image-picker": "^4.10.0", "react-native-language-detection": "^0.1.0", - "react-native-pager-view": "^6.0.0", + "react-native-pager-view": "^6.0.1", "react-native-reanimated": "^2.10.0", "react-native-reanimated-zoom": "^0.3.1", - "react-native-safe-area-context": "^4.3.4", - "react-native-screens": "^3.17.0", + "react-native-safe-area-context": "^4.4.1", + "react-native-screens": "^3.18.0", "react-native-share-menu": "^6.0.0", "react-native-svg": "13.0.0", "react-native-swipe-list-view": "^3.2.9", - "react-native-tab-view": "^3.1.1", + "react-native-tab-view": "^3.2.1", "react-query": "^3.39.2", "react-redux": "^8.0.4", "redux-persist": "^6.0.0", "rn-placeholder": "^3.0.3", - "tslib": "^2.4.0", "valid-url": "^1.0.9" }, "devDependencies": { - "@babel/core": "^7.19.1", + "@babel/core": "^7.19.3", "@babel/plugin-proposal-optional-chaining": "^7.18.9", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", "@expo/config": "^7.0.1", "@types/linkify-it": "^3.0.2", - "@types/lodash": "^4.14.185", + "@types/lodash": "^4.14.186", "@types/react": "^18.0.21", "@types/react-dom": "^18.0.6", "@types/react-native": "^0.69.5", @@ -114,10 +113,10 @@ "babel-plugin-module-resolver": "^4.1.0", "babel-plugin-transform-remove-console": "^6.9.4", "chalk": "^4.1.2", - "dotenv": "^16.0.2", + "dotenv": "^16.0.3", "patch-package": "^6.4.7", "postinstall-postinstall": "^2.1.0", "react-native-clean-project": "^4.0.1", - "typescript": "^4.8.3" + "typescript": "^4.8.4" } } diff --git a/patches/@sentry+react-native+4.4.0.patch b/patches/@sentry+react-native+4.4.0.patch deleted file mode 100644 index b1b3c5f3..00000000 --- a/patches/@sentry+react-native+4.4.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/node_modules/@sentry/react-native/ios/RNSentry.h b/node_modules/@sentry/react-native/ios/RNSentry.h -index 6f7df58..84b50c9 100644 ---- a/node_modules/@sentry/react-native/ios/RNSentry.h -+++ b/node_modules/@sentry/react-native/ios/RNSentry.h -@@ -1,7 +1,7 @@ - #if __has_include() - #import - #else --#import "RCTBridge.h" -+#import - #endif - - @interface RNSentry : NSObject -diff --git a/node_modules/@sentry/react-native/ios/RNSentry.m b/node_modules/@sentry/react-native/ios/RNSentry.m -index 32a6087..003a001 100644 ---- a/node_modules/@sentry/react-native/ios/RNSentry.m -+++ b/node_modules/@sentry/react-native/ios/RNSentry.m -@@ -3,7 +3,7 @@ - #if __has_include() - #import - #else --#import "RCTConvert.h" -+#import - #endif - - #import -diff --git a/node_modules/@sentry/react-native/react-native.config.js b/node_modules/@sentry/react-native/react-native.config.js -index f85fa01..053999b 100644 ---- a/node_modules/@sentry/react-native/react-native.config.js -+++ b/node_modules/@sentry/react-native/react-native.config.js -@@ -1,18 +1,10 @@ - module.exports = { - dependency: { - platforms: { -- ios: { -- sharedLibraries: ['libz'] -- }, -+ ios: {}, - android: { - packageInstance: 'new RNSentryPackage()' - } -- }, -- hooks: { -- postlink: -- 'node node_modules/@sentry/wizard/dist/bin.js -i reactNative -p ios android', -- postunlink: -- 'node node_modules/@sentry/wizard/dist/bin.js -i reactNative -p ios android --uninstall' - } - } - }; -\ No newline at end of file diff --git a/patches/react-native-fast-image+8.6.1.patch b/patches/react-native-fast-image+8.6.1.patch index 1fdc8dc2..145af302 100644 --- a/patches/react-native-fast-image+8.6.1.patch +++ b/patches/react-native-fast-image+8.6.1.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/react-native-fast-image/RNFastImage.podspec b/node_modules/react-native-fast-image/RNFastImage.podspec -index db0fada..a869641 100644 +index db0fada..c68771e 100644 --- a/node_modules/react-native-fast-image/RNFastImage.podspec +++ b/node_modules/react-native-fast-image/RNFastImage.podspec @@ -16,6 +16,6 @@ Pod::Spec.new do |s| @@ -8,7 +8,7 @@ index db0fada..a869641 100644 s.dependency 'React-Core' - s.dependency 'SDWebImage', '~> 5.11.1' - s.dependency 'SDWebImageWebPCoder', '~> 0.8.4' -+ s.dependency 'SDWebImage', '~> 5.13.3' ++ s.dependency 'SDWebImage', '~> 5.13.4' + s.dependency 'SDWebImageWebPCoder', '~> 0.9.0' end diff --git a/node_modules/react-native-fast-image/android/build.gradle b/node_modules/react-native-fast-image/android/build.gradle diff --git a/src/components/Parse/HTML.tsx b/src/components/Parse/HTML.tsx index b42b28c8..bd0fd13a 100644 --- a/src/components/Parse/HTML.tsx +++ b/src/components/Parse/HTML.tsx @@ -76,9 +76,7 @@ const renderNode = ({ ) } else if (classes.includes('mention') && mentions) { - const accountIndex = mentions.findIndex( - mention => mention.url === href - ) + const accountIndex = mentions.findIndex(mention => mention.url === href) const differentAccount = routeParams?.account ? routeParams.account.id !== mentions[accountIndex]?.id : true @@ -86,8 +84,7 @@ const renderNode = ({ `#${tag.name}` === content).length > 0 + const content = node.children && node.children[0] && node.children[0].data + const shouldBeTag = tags && tags.filter(tag => `#${tag.name}` === content).length > 0 return ( - {(content && content !== href && content) || - (showFullLink ? href : domain[1])} + {(content && content !== href && content) || (showFullLink ? href : domain[1])} {!shouldBeTag ? ( >() + const navigation = useNavigation>() const route = useRoute() const { colors, theme } = useTheme() const { t, i18n } = useTranslation('componentParse') @@ -254,7 +247,7 @@ const ParseHTML = React.memo( return ( - {typeof totalLines === 'number' ? ( + {typeof totalLines === 'number' || numberOfLines === 1 ? ( { @@ -296,10 +289,7 @@ const ParseHTML = React.memo( { - if ( - numberOfLines === 1 || - nativeEvent.lines.length >= numberOfLines + 5 - ) { + if (numberOfLines === 1 || nativeEvent.lines.length >= numberOfLines + 5) { setTotalLines(nativeEvent.lines.length) } }} @@ -307,11 +297,7 @@ const ParseHTML = React.memo( height: numberOfLines === 1 && !expanded ? 0 : undefined }} numberOfLines={ - typeof totalLines === 'number' - ? expanded - ? 999 - : numberOfLines - : undefined + typeof totalLines === 'number' ? (expanded ? 999 : numberOfLines) : undefined } selectable={selectable} /> diff --git a/src/components/Timeline/Shared/Attachment/Video.tsx b/src/components/Timeline/Shared/Attachment/Video.tsx index 054c1077..6771438d 100644 --- a/src/components/Timeline/Shared/Attachment/Video.tsx +++ b/src/components/Timeline/Shared/Attachment/Video.tsx @@ -7,6 +7,7 @@ import { Blurhash } from 'react-native-blurhash' import attachmentAspectRatio from './aspectRatio' import analytics from '@components/analytics' import AttachmentAltText from './AltText' +import { Platform } from 'expo-modules-core' export interface Props { total: number @@ -27,6 +28,7 @@ const AttachmentVideo: React.FC = ({ const [videoLoading, setVideoLoading] = useState(false) const [videoLoaded, setVideoLoaded] = useState(false) const [videoPosition, setVideoPosition] = useState(0) + const [videoResizeMode, setVideoResizeMode] = useState(ResizeMode.COVER) const playOnPress = useCallback(async () => { analytics('timeline_shared_attachment_video_length', { length: video.meta?.length @@ -39,6 +41,7 @@ const AttachmentVideo: React.FC = ({ if (!videoLoaded) { await videoPlayer.current?.loadAsync({ uri: video.url }) } + Platform.OS === 'android' && setVideoResizeMode(ResizeMode.CONTAIN) await videoPlayer.current?.setPositionAsync(videoPosition) await videoPlayer.current?.presentFullscreenPlayer() videoPlayer.current?.playAsync() @@ -62,11 +65,7 @@ const AttachmentVideo: React.FC = ({ const _handleAppStateChange = async (nextAppState: AppStateStatus) => { if (appState.current.match(/active/) && nextAppState.match(/inactive/)) { await videoPlayer.current?.pauseAsync() - } else if ( - gifv && - appState.current.match(/background/) && - nextAppState.match(/active/) - ) { + } else if (gifv && appState.current.match(/background/) && nextAppState.match(/active/)) { await videoPlayer.current?.setIsMutedAsync(true) await videoPlayer.current?.playAsync() } @@ -99,7 +98,7 @@ const AttachmentVideo: React.FC = ({ opacity: sensitiveShown ? 0 : 1 }} usePoster - resizeMode={ResizeMode.COVER} + resizeMode={videoResizeMode} {...(gifv ? { shouldPlay: true, @@ -113,12 +112,9 @@ const AttachmentVideo: React.FC = ({ })} useNativeControls={false} onFullscreenUpdate={async event => { - if ( - event.fullscreenUpdate === VideoFullscreenUpdate.PLAYER_DID_DISMISS - ) { - if (gifv) { - await videoPlayer.current?.pauseAsync() - } else { + if (event.fullscreenUpdate === VideoFullscreenUpdate.PLAYER_DID_DISMISS) { + Platform.OS === 'android' && setVideoResizeMode(ResizeMode.COVER) + if (!gifv) { await videoPlayer.current?.pauseAsync() } } @@ -156,10 +152,7 @@ const AttachmentVideo: React.FC = ({ loading={videoLoading} /> ) : null} - + ) diff --git a/src/components/Timeline/Shared/Content.tsx b/src/components/Timeline/Shared/Content.tsx index 25df7d5b..cfdbcbb7 100644 --- a/src/components/Timeline/Shared/Content.tsx +++ b/src/components/Timeline/Shared/Content.tsx @@ -9,18 +9,12 @@ export interface Props { mentions?: Mastodon.Status['mentions'] tags?: Mastodon.Status['tags'] } - numberOfLines?: number highlighted?: boolean disableDetails?: boolean } const TimelineContent = React.memo( - ({ - status, - numberOfLines, - highlighted = false, - disableDetails = false - }: Props) => { + ({ status, highlighted = false, disableDetails = false }: Props) => { const { t } = useTranslation('componentTimeline') const instanceAccount = useSelector(getInstanceAccount, () => true) @@ -46,9 +40,7 @@ const TimelineContent = React.memo( emojis={status.emojis} mentions={status.mentions} tags={status.tags} - numberOfLines={ - instanceAccount.preferences['reading:expand:spoilers'] ? 999 : 1 - } + numberOfLines={instanceAccount.preferences['reading:expand:spoilers'] ? 999 : 1} expandHint={t('shared.content.expandHint')} highlighted={highlighted} disableDetails={disableDetails} @@ -62,7 +54,7 @@ const TimelineContent = React.memo( emojis={status.emojis} mentions={status.mentions} tags={status.tags} - numberOfLines={highlighted ? 999 : numberOfLines} + numberOfLines={highlighted ? 999 : undefined} disableDetails={disableDetails} /> )} diff --git a/src/components/mediaSelector.ts b/src/components/mediaSelector.ts index 89404cd2..18ea1051 100644 --- a/src/components/mediaSelector.ts +++ b/src/components/mediaSelector.ts @@ -93,6 +93,7 @@ const mediaSelector = async ({ showActionSheetWithOptions( { title: i18next.t('componentMediaSelector:title'), + message: i18next.t('componentMediaSelector:message'), options: options(), cancelButtonIndex: mediaType ? 1 : 2 }, diff --git a/src/i18n/de/components/mediaSelector.json b/src/i18n/de/components/mediaSelector.json index 8789b337..87b949a1 100644 --- a/src/i18n/de/components/mediaSelector.json +++ b/src/i18n/de/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "Datenquelle auswählen", + "message": "", "options": { "image": "", "image_max": "", "video": "", "video_max": "" - }, - "library": { - "alert": { - "title": "Kein Zugriff", - "message": "Für den Upload ist eine Zugriffsgenehmigung erforderlich", - "buttons": { - "settings": "Einstellungen bestätigen" - } - } } } \ No newline at end of file diff --git a/src/i18n/en/components/mediaSelector.json b/src/i18n/en/components/mediaSelector.json index adc0fa47..090ea97c 100644 --- a/src/i18n/en/components/mediaSelector.json +++ b/src/i18n/en/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "Select media source", + "message": "Media EXIF data are not uploaded", "options": { "image": "Upload photos", "image_max": "Upload photos (max {{max}})", "video": "Upload video", "video_max": "Upload video (max {{max}})" - }, - "library": { - "alert": { - "title": "No permission", - "message": "Require photo library read permission to upload", - "buttons": { - "settings": "Update setting" - } - } } } \ No newline at end of file diff --git a/src/i18n/it/components/mediaSelector.json b/src/i18n/it/components/mediaSelector.json index 3816ac31..a91b2894 100644 --- a/src/i18n/it/components/mediaSelector.json +++ b/src/i18n/it/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "Seleziona origine media", + "message": "", "options": { "image": "Carica foto", "image_max": "Carica foto (massimo {{max}})", "video": "Carica video", "video_max": "Carica video (max {{max}})" - }, - "library": { - "alert": { - "title": "Permesso non concesso", - "message": "È richiesto l'accesso ai file del dispositivo per il caricamento dalla libreria", - "buttons": { - "settings": "Correggi impostazioni" - } - } } } \ No newline at end of file diff --git a/src/i18n/ja/components/mediaSelector.json b/src/i18n/ja/components/mediaSelector.json index d811edee..5fbbf341 100644 --- a/src/i18n/ja/components/mediaSelector.json +++ b/src/i18n/ja/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "メディアソースを選択", + "message": "", "options": { "image": "写真をアップロード", "image_max": "写真をアップロード (最大{{max}}枚)", "video": "動画をアップロード", "video_max": "動画をアップロード (最大{{max}}本)" - }, - "library": { - "alert": { - "title": "権限がありません", - "message": "アップロードするにはフォトライブラリの読み取り許可が必要です", - "buttons": { - "settings": "設定を更新する" - } - } } } \ No newline at end of file diff --git a/src/i18n/ko/components/mediaSelector.json b/src/i18n/ko/components/mediaSelector.json index 2d15ced1..d7beb132 100644 --- a/src/i18n/ko/components/mediaSelector.json +++ b/src/i18n/ko/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "미디어 소스 선택", + "message": "", "options": { "image": "", "image_max": "", "video": "", "video_max": "" - }, - "library": { - "alert": { - "title": "권한 없음", - "message": "업로드를 위해 사진 라이브러리 권한이 필요해요", - "buttons": { - "settings": "설정 업데이트" - } - } } } \ No newline at end of file diff --git a/src/i18n/pt_BR/components/mediaSelector.json b/src/i18n/pt_BR/components/mediaSelector.json index f100048b..62fa2f29 100644 --- a/src/i18n/pt_BR/components/mediaSelector.json +++ b/src/i18n/pt_BR/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "Selecionar fonte de mídia", + "message": "", "options": { "image": "Enviar fotos", "image_max": "Carregar fotos (máx. {{max}})", "video": "Enviar vídeo", "video_max": "Carregar vídeo (máx. {{max}})" - }, - "library": { - "alert": { - "title": "Sem permissão", - "message": "Exigir permissão de leitura da biblioteca de fotos para fazer upload", - "buttons": { - "settings": "Atualizar configurações" - } - } } } \ No newline at end of file diff --git a/src/i18n/vi/components/mediaSelector.json b/src/i18n/vi/components/mediaSelector.json index e06ffcbc..12e8a2b1 100644 --- a/src/i18n/vi/components/mediaSelector.json +++ b/src/i18n/vi/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "Chọn nguồn", + "message": "", "options": { "image": "Tải ảnh lên", "image_max": "Tải ảnh lên (tối đa {{max}})", "video": "Tải video lên", "video_max": "Tải video lên (tối đa {{max}})" - }, - "library": { - "alert": { - "title": "Chưa được cấp quyền", - "message": "Bạn cần cấp quyền đọc thư viện ảnh trước", - "buttons": { - "settings": "Cài đặt cập nhật" - } - } } } \ No newline at end of file diff --git a/src/i18n/zh-Hans/components/mediaSelector.json b/src/i18n/zh-Hans/components/mediaSelector.json index 039007b7..004a8b08 100644 --- a/src/i18n/zh-Hans/components/mediaSelector.json +++ b/src/i18n/zh-Hans/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "选择媒体", + "message": "媒体EXIF数据不被上传", "options": { "image": "上传图片", "image_max": "上传照片(上限 {{max}})", "video": "上传视频", "video_max": "上传视频(上限 {{max}})" - }, - "library": { - "alert": { - "title": "无权限", - "message": "需要读取相册权限才能上传附件", - "buttons": { - "settings": "去更新设置" - } - } } } \ No newline at end of file diff --git a/src/i18n/zh-Hant/components/mediaSelector.json b/src/i18n/zh-Hant/components/mediaSelector.json index 1f0d0b96..ba000d9d 100644 --- a/src/i18n/zh-Hant/components/mediaSelector.json +++ b/src/i18n/zh-Hant/components/mediaSelector.json @@ -1,18 +1,10 @@ { "title": "選擇媒體來源", + "message": "", "options": { "image": "", "image_max": "", "video": "", "video_max": "" - }, - "library": { - "alert": { - "title": "權限不足", - "message": "上傳照片需要讀取的權限", - "buttons": { - "settings": "更新設定" - } - } } } \ No newline at end of file diff --git a/src/screens/ImageViewer/save.ts b/src/screens/ImageViewer/save.ts index 8388489c..6d605b89 100644 --- a/src/screens/ImageViewer/save.ts +++ b/src/screens/ImageViewer/save.ts @@ -1,6 +1,6 @@ import haptics from '@components/haptics' import { displayMessage } from '@components/Message' -import CameraRoll from '@react-native-community/cameraroll' +import { CameraRoll } from '@react-native-camera-roll/camera-roll' import { RootStackParamList } from '@utils/navigation/navigators' import { Theme } from '@utils/styles/themes' import * as FileSystem from 'expo-file-system' diff --git a/src/screens/Tabs/Local.tsx b/src/screens/Tabs/Local.tsx index c7ff98ae..7b30a1c6 100644 --- a/src/screens/Tabs/Local.tsx +++ b/src/screens/Tabs/Local.tsx @@ -9,6 +9,7 @@ import { QueryKeyTimeline } from '@utils/queryHooks/timeline' import layoutAnimation from '@utils/styles/layoutAnimation' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' +import { Platform } from 'react-native' import ContextMenu from 'react-native-context-menu-view' import TabSharedRoot from './Shared/Root' @@ -33,7 +34,7 @@ const TabLocal = React.memo( headerTitle: () => (