Commit 7d805f13 authored by Ash Mishra's avatar Ash Mishra
Browse files

Improvements to urlFilePath so that it only does a /Documents/ folder check if... 

Improvements to urlFilePath so that it only does a /Documents/ folder check if the file does not exist; improvements to full-screen options for iOS to default autorotate, and to respect landscape / portrait masks
parent f7fd5dc5

ios/RCTVideo.m

+6 −4
Changes for ios/RCTVideo.m: 6 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -358,15 +358,17 @@ static int const RCTVideoUnset = -1; 
}



- (NSURL*) urlFilePath:(NSString*) filepath {

  if ([filepath containsString:@"file://"] && ![filepath containsString:@"/Documents/"]) {

    return [NSURL URLWithString:filepath];

  

  // check if the file exists at the specified location

  if ([[NSFileManager defaultManager] fileExistsAtPath:filepath]) {

    return [NSURL fileURLWithPath:filepath];

  }

  

  // code to support local caching

  // if no file found, check if the file exists in the Document directory

  NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);

  NSString* relativeFilePath = [filepath lastPathComponent];

  // the file may be multiple levels below the documents directory

  NSArray* fileComponents = [filepath componentsSeparatedByString:@"Documents/"];

  NSArray* fileComponents = [filepath componentsSeparatedByString:@"/Documents/"];

  if (fileComponents.count>1) {

    relativeFilePath = [fileComponents objectAtIndex:1];

  }

ios/RCTVideoPlayerViewController.m

+8 −2
Changes for ios/RCTVideoPlayerViewController.m: 8 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
- (id)init {

  self = [super init];

  if (self) {

    self.autorotate = false;

    self.autorotate = true; // autorotate should be true by default

  }

  return self;

}
@@ -27,12 +27,18 @@ 


- (UIInterfaceOrientationMask)supportedInterfaceOrientations {

  

  if ([self.preferredOrientation.lowercaseString isEqualToString:@"landscape"]) {

    return UIInterfaceOrientationMaskLandscape;

  }

  else if ([self.preferredOrientation.lowercaseString isEqualToString:@"portrait"]) {

    return UIInterfaceOrientationMaskPortrait;

  }

  return UIInterfaceOrientationMaskAll;

}



- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {

  if ([self.preferredOrientation.lowercaseString isEqualToString:@"landscape"]) {

    return UIInterfaceOrientationLandscapeLeft;

    return UIInterfaceOrientationLandscapeRight;

  }

  else if ([self.preferredOrientation.lowercaseString isEqualToString:@"portrait"]) {

    return UIInterfaceOrientationPortrait;