mattermost-mobile/patches/react-native-youtube+2.0.1.patch
Elias Nahum 9f238d5ef4
Post List & post components refactored (#5409)
* Update transform to make Android's post list scroll smooth

* set start since metric when appStarted is false

* Refactor Formatted components

* Downgrade RNN to 7.13.0 & patch XCDYouTube to allow video playback

* Refactor Post list and all related components

* review suggestion rename hour12 to isMilitaryTime

* feedback review use aliases

* feedback review deconstruct actions in markdown_link

* feedback review simplify if/else statement in combined_used_activity

* Simplify if statement for consecutive posts

* Specify npm version to build iOS on CI

* Refactor network_indicator

* render Icon in file gallery with transparent background

* Increase timeout to scroll to bottom when posting a new message

* fix: scroll when tapping on the new messages bar

* fix: dismiss all modals

* fix navigation tests

* Handle dismissAllModals for iOS to prevent blank screens

* Prevent modal from dismissing when showing the thread screen in the stack

* Update app/components/image_viewport.tsx

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>

* Update app/utils/post.ts

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>

* fix: rename selector and prop

* Fix XCDYouTube patch

* Fix posting from a thread in the right channel

* do not render reply bar on the thread screen

* close previous permalink before showing a new one

* move XCDYouTube patch to ios/patches folder

* closePermalink directly instead of using an onClose prop

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>
Co-authored-by: Miguel Alatzar <this.migbot@gmail.com>
2021-06-03 11:12:15 -07:00

87 lines
4.3 KiB
Diff

diff --git a/node_modules/react-native-youtube/RCTYouTubeStandalone.m b/node_modules/react-native-youtube/RCTYouTubeStandalone.m
index fabd291..45b322b 100644
--- a/node_modules/react-native-youtube/RCTYouTubeStandalone.m
+++ b/node_modules/react-native-youtube/RCTYouTubeStandalone.m
@@ -5,6 +5,15 @@
#endif
@import AVKit;
+@interface AVPlayerViewControllerRotation : AVPlayerViewController
+@end
+
+@implementation AVPlayerViewControllerRotation
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+ return UIInterfaceOrientationMaskAllButUpsideDown;
+}
+@end
+
@implementation RCTYouTubeStandalone {
RCTPromiseResolveBlock resolver;
RCTPromiseRejectBlock rejecter;
@@ -14,6 +23,7 @@ RCT_EXPORT_MODULE();
RCT_REMAP_METHOD(playVideo,
playVideoWithResolver:(NSString*)videoId
+ startTime:(NSNumber* _Nonnull)startTime
resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject)
{
@@ -22,10 +32,10 @@ RCT_REMAP_METHOD(playVideo,
#else
dispatch_async(dispatch_get_main_queue(), ^{
UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
- AVPlayerViewController *playerViewController = [AVPlayerViewController new];
+ AVPlayerViewControllerRotation *playerViewController = [AVPlayerViewControllerRotation new];
[root presentViewController:playerViewController animated:YES completion:nil];
- __weak AVPlayerViewController *weakPlayerViewController = playerViewController;
+ __weak AVPlayerViewControllerRotation *weakPlayerViewController = playerViewController;
[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:videoId
completionHandler:^(XCDYouTubeVideo * _Nullable video, NSError * _Nullable error) {
@@ -38,10 +48,18 @@ RCT_REMAP_METHOD(playVideo,
streamURLs[@(XCDYouTubeVideoQualitySmall240)
];
- weakPlayerViewController.player = [AVPlayer playerWithURL:streamURL];
- [weakPlayerViewController.player play];
-
- resolve(@"YouTubeStandaloneIOS player launched successfully");
+ @try {
+ CMTime initialPlaybackTime = CMTimeMakeWithSeconds([startTime doubleValue], 1);
+ weakPlayerViewController.player = [AVPlayer playerWithURL:streamURL];
+ [weakPlayerViewController.player seekToTime:initialPlaybackTime completionHandler: ^(BOOL finished) {
+ [weakPlayerViewController.player play];
+ resolve(@"YouTubeStandaloneIOS player launched successfully");
+ }];
+ }
+ @catch (NSException *ex) {
+ reject(@"error", ex.reason, nil);
+ [root dismissViewControllerAnimated:YES completion:nil];
+ }
} else {
reject(@"error", error.localizedDescription, nil);
[root dismissViewControllerAnimated:YES completion:nil];
diff --git a/node_modules/react-native-youtube/YouTubeStandalone.ios.js b/node_modules/react-native-youtube/YouTubeStandalone.ios.js
index 0ee59c6..4a8294b 100644
--- a/node_modules/react-native-youtube/YouTubeStandalone.ios.js
+++ b/node_modules/react-native-youtube/YouTubeStandalone.ios.js
@@ -4,4 +4,4 @@ const { YouTubeStandalone } = NativeModules;
export const YouTubeStandaloneIOS = !YouTubeStandalone
? null
- : { playVideo: (videoId) => YouTubeStandalone.playVideo(videoId) };
+ : { playVideo: (videoId, startTime) => YouTubeStandalone.playVideo(videoId, startTime) };
diff --git a/node_modules/react-native-youtube/main.d.ts b/node_modules/react-native-youtube/main.d.ts
index d771db7..410709d 100644
--- a/node_modules/react-native-youtube/main.d.ts
+++ b/node_modules/react-native-youtube/main.d.ts
@@ -35,7 +35,7 @@ declare class YouTube extends React.Component<YouTubeProps> {
}
export declare const YouTubeStandaloneIOS: {
- playVideo(videoId: string): Promise<void>;
+ playVideo(videoId: string, startTime: number): Promise<void>;
};
export declare const YouTubeStandaloneAndroid: {