Fix iphoneX support

devgeeks · Jan 10, 2018 · 1c95da6 · 1c95da6
1 parent d0cf3ab
commit 1c95da6
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/src/ios/PrivacyScreenPlugin.m b/src/ios/PrivacyScreenPlugin.m
@@ -101,8 +101,12 @@ - (NSString*)getImageName:(UIInterfaceOrientation)currentOrientation delegate:(i
       imageName = [imageName stringByAppendingString:@"-700"];
     } else if(device.iPhone6) {
       imageName = [imageName stringByAppendingString:@"-800"];
-    } else if(device.iPhone6Plus) {
-      imageName = [imageName stringByAppendingString:@"-800"];
+    } else if(device.iPhone6Plus || device.iPhoneX) {
+      if(device.iPhone6Plus) {
+        imageName = [imageName stringByAppendingString:@"-800"];
+      } else {
+        imageName = [imageName stringByAppendingString:@"-1100"];
+      }
       if (currentOrientation == UIInterfaceOrientationPortrait || currentOrientation == UIInterfaceOrientationPortraitUpsideDown) {
         imageName = [imageName stringByAppendingString:@"-Portrait"];
       }
@@ -116,7 +120,7 @@ - (NSString*)getImageName:(UIInterfaceOrientation)currentOrientation delegate:(i
     imageName = isLandscape ? nil : [imageName stringByAppendingString:@"-568h"];
   } else if (device.iPhone6) { // does not support landscape
     imageName = isLandscape ? nil : [imageName stringByAppendingString:@"-667h"];
-  } else if (device.iPhone6Plus) { // supports landscape
+  } else if (device.iPhone6Plus || device.iPhoneX) { // supports landscape
     if (isOrientationLocked) {
       imageName = [imageName stringByAppendingString:(supportsLandscape ? @"-Landscape" : @"")];
     } else {
@@ -129,7 +133,11 @@ - (NSString*)getImageName:(UIInterfaceOrientation)currentOrientation delegate:(i
           break;
       }
     }
-    imageName = [imageName stringByAppendingString:@"-736h"];
+    if (device.iPhoneX) {
+      imageName = [imageName stringByAppendingString:@"-2436h"];
+    } else {
+      imageName = [imageName stringByAppendingString:@"-736h"];
+    }
 
   } else if (device.iPad) { // supports landscape
     if (isOrientationLocked) {
@@ -148,20 +156,6 @@ - (NSString*)getImageName:(UIInterfaceOrientation)currentOrientation delegate:(i
           break;
       }
     }
-  } else if (device.iPhoneX) { // supports landscape
-    if (isOrientationLocked) {
-      imageName = [imageName stringByAppendingString:(supportsLandscape ? @"-Landscape" : @"")];
-    } else {
-      switch (currentOrientation) {
-        case UIInterfaceOrientationLandscapeLeft:
-        case UIInterfaceOrientationLandscapeRight:
-          imageName = [imageName stringByAppendingString:@"-Landscape"];
-          break;
-        default:
-          break;
-      }
-    }
-    imageName = [imageName stringByAppendingString:@"-812h"];
   }
 
   return imageName;