- Add iPadPro

- Add DeviceInches for Simulator

Pod/Classes/UIDevice-Hardware.h

@@ -73,6 +73,13 @@ typedef NS_ENUM(NSUInteger, UIDeviceModelInches) {
     UIDeviceModelInches79,
     UIDeviceModelInches97,
     UIDeviceModelInches129,
+    UIDeviceSimulatorModelInches35 = UIDeviceModelInches35,
+    UIDeviceSimulatorModelInches4 = UIDeviceModelInches4,
+    UIDeviceSimulatorModelInches47 = UIDeviceModelInches47,
+    UIDeviceSimulatorModelInches55 = UIDeviceModelInches55,
+    UIDeviceSimulatorModelInches79 = UIDeviceModelInches79,
+    UIDeviceSimulatorModelInches97 = UIDeviceModelInches97,
+    UIDeviceSimulatorModelInches129 = UIDeviceModelInches129,
     UIDeviceModelInchesUnKnown
 };
 

Pod/Classes/UIDevice-Hardware.m

@@ -331,42 +331,62 @@
         case UIDeviceGenerationModeliPad4:
         case UIDeviceGenerationModeliPadAir:
         case UIDeviceGenerationModeliPadAir2:{
-            
             return UIDeviceModelInches97;
         }
             break;
         case UIDeviceGenerationModeliPadMini1:
         case UIDeviceGenerationModeliPadMini2:
         case UIDeviceGenerationModeliPadMini3:
-        case UIDeviceGenerationModeliPadMini4:
-        {
+        case UIDeviceGenerationModeliPadMini4:{
             return UIDeviceModelInches79;
         }
             break;
         case UIDeviceGenerationModeliPadPro:{
             return UIDeviceModelInches129;
-        }
-        case UIDeviceGenerationModeliPadSimulator:{
-            
-        }
             break;
+        }
+        case UIDeviceGenerationModeliPadSimulator:
         case UIDeviceGenerationModeliPhoneSimulator:{
             CGRect screenRect = [[UIScreen mainScreen] bounds];
-            NSInteger screenWidth = (NSInteger)screenRect.size.width;
-            NSInteger screenHeight = (NSInteger)screenRect.size.height;
+            NSInteger screenHeight = ((NSInteger)screenRect.size.height > (NSInteger)screenRect.size.width) ? (NSInteger)screenRect.size.height : (NSInteger)screenRect.size.width;
+            
             
             switch (screenHeight) {
-                case 480:
-                    
+                case 480:{
+                    return UIDeviceSimulatorModelInches35;
+                }
                     break;
-                case <#expression#>:
-                default:
+                case 568:{
+                    return UIDeviceSimulatorModelInches4;
                     break;
+                }
+                case 667:{
+                    return UIDeviceSimulatorModelInches47;
+                    break;
+                }
+                case 736:{
+                    return UIDeviceSimulatorModelInches55;
+                    break;
+                }
+                case 1024:{
+                    return UIDeviceModelInches97;
+                    break;
+                }
+                case 1366:{
+                    return UIDeviceSimulatorModelInches129;
+                    break;
+                }
+                default:{
+                    return UIDeviceModelInchesUnKnown;
+                    break;
+                }
             }
+            break;
         }
+        default: {
+            return UIDeviceModelInchesUnKnown;
             break;
-        default:
-            break;
+        }
     }
     return UIDeviceModelInchesUnKnown;
 }