diff --git a/Example/Podfile.lock b/Example/Podfile.lock index a1f3dc2..6b82f3c 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - UIDevice-Utils (1.0.8) + - UIDevice-Utils (1.0.9) DEPENDENCIES: - UIDevice-Utils (from `../`) @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - UIDevice-Utils: a420661f05caed425573a99866f79c79f625ec56 + UIDevice-Utils: 19f27d93ceaebd6af1bb0246167fc79c37f31fa0 PODFILE CHECKSUM: 29850ff9a3324af2d39c0303e01cd7bcbab47fb5 -COCOAPODS: 1.5.0 +COCOAPODS: 1.5.3 diff --git a/Example/Pods/Local Podspecs/UIDevice-Utils.podspec.json b/Example/Pods/Local Podspecs/UIDevice-Utils.podspec.json index 7023b3a..23ee3cd 100644 --- a/Example/Pods/Local Podspecs/UIDevice-Utils.podspec.json +++ b/Example/Pods/Local Podspecs/UIDevice-Utils.podspec.json @@ -1,6 +1,6 @@ { "name": "UIDevice-Utils", - "version": "1.0.8", + "version": "1.0.9", "summary": "Category on UIDevice to distinguish between platforms.", "description": "Category to easy distinguish devices, family platform device, or device inches. Provide human-readable device names e.g. 'iPhone 6S Plus' or enums e.g. 'UIDeviceGenerationModeliPhone6SPlus'", "homepage": "https://github.com/giuseppenucifora/UIDevice-Utils", @@ -10,7 +10,7 @@ }, "source": { "git": "https://github.com/giuseppenucifora/UIDevice-Utils.git", - "tag": "1.0.8" + "tag": "1.0.9" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index a1f3dc2..6b82f3c 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - UIDevice-Utils (1.0.8) + - UIDevice-Utils (1.0.9) DEPENDENCIES: - UIDevice-Utils (from `../`) @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - UIDevice-Utils: a420661f05caed425573a99866f79c79f625ec56 + UIDevice-Utils: 19f27d93ceaebd6af1bb0246167fc79c37f31fa0 PODFILE CHECKSUM: 29850ff9a3324af2d39c0303e01cd7bcbab47fb5 -COCOAPODS: 1.5.0 +COCOAPODS: 1.5.3 diff --git a/Example/Pods/Target Support Files/Pods-UIDevice-Utils_Example/Pods-UIDevice-Utils_Example-resources.sh b/Example/Pods/Target Support Files/Pods-UIDevice-Utils_Example/Pods-UIDevice-Utils_Example-resources.sh index fe3f9c7..345301f 100755 --- a/Example/Pods/Target Support Files/Pods-UIDevice-Utils_Example/Pods-UIDevice-Utils_Example-resources.sh +++ b/Example/Pods/Target Support Files/Pods-UIDevice-Utils_Example/Pods-UIDevice-Utils_Example-resources.sh @@ -113,6 +113,6 @@ then if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" else - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_BUILD_DIR}/assetcatalog_generated_info.plist" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist" fi fi diff --git a/Example/Pods/Target Support Files/UIDevice-Utils/Info.plist b/Example/Pods/Target Support Files/UIDevice-Utils/Info.plist index 3f38271..e366a71 100644 --- a/Example/Pods/Target Support Files/UIDevice-Utils/Info.plist +++ b/Example/Pods/Target Support Files/UIDevice-Utils/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.8 + 1.0.9 CFBundleSignature ???? CFBundleVersion diff --git a/Example/UIDevice-Utils.xcodeproj/project.pbxproj b/Example/UIDevice-Utils.xcodeproj/project.pbxproj index fe2e515..8ccbc80 100644 --- a/Example/UIDevice-Utils.xcodeproj/project.pbxproj +++ b/Example/UIDevice-Utils.xcodeproj/project.pbxproj @@ -178,7 +178,6 @@ 6003F588195388D20070C39A /* Resources */, 35E4213B9E1C67B7EE10F07B /* 📦 Embed Pods Frameworks */, 61FBE1F7D10697521EBBC633 /* [CP] Embed Pods Frameworks */, - D5B2822A3A0FEEF20334CB8F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -302,21 +301,6 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - D5B2822A3A0FEEF20334CB8F /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UIDevice-Utils_Example/Pods-UIDevice-Utils_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Example/UIDevice-Utils/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/UIDevice-Utils/Images.xcassets/AppIcon.appiconset/Contents.json index eeea76c..d8db8d6 100644 --- a/Example/UIDevice-Utils/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/UIDevice-Utils/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -30,6 +40,16 @@ "size" : "60x60", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "29x29", @@ -64,6 +84,11 @@ "idiom" : "ipad", "size" : "83.5x83.5", "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Contents.json index 0c793eb..9cc019c 100644 --- a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -2,157 +2,211 @@ "images" : [ { "extent" : "full-screen", + "filename" : "Default-Portrait-1792h@3x.png", + "orientation" : "portrait", "idiom" : "iphone", - "subtype" : "736h", + "minimum-system-version" : "12.0", + "scale" : "2x", + "subtype" : "1792h" + }, + { + "extent" : "full-screen", + "filename" : "Default-Landscape-1792h@3x.png", + "orientation" : "landscape", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "scale" : "2x", + "subtype" : "1792h" + }, + { + "extent" : "full-screen", + "filename" : "Default-Portrait-2688h@3x.png", + "orientation" : "portrait", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "scale" : "3x", + "subtype" : "2688h" + }, + { + "extent" : "full-screen", + "filename" : "Default-Landscape-2688h@3x.png", + "orientation" : "landscape", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "scale" : "3x", + "subtype" : "2688h" + }, + { + "extent" : "full-screen", + "filename" : "Default-Portrait-2436h@3x.png", + "orientation" : "portrait", + "idiom" : "iphone", + "minimum-system-version" : "11.0", + "scale" : "3x", + "subtype" : "2436h" + }, + { + "extent" : "full-screen", + "filename" : "Default-Landscape-2436h@3x.png", + "orientation" : "landscape", + "idiom" : "iphone", + "minimum-system-version" : "11.0", + "scale" : "3x", + "subtype" : "2436h" + }, + { + "scale" : "1x", + "idiom" : "iphone", + "orientation" : "portrait", + "extent" : "full-screen", + "filename" : "Default.png" + }, + { + "minimum-system-version" : "7.0", + "idiom" : "iphone", + "scale" : "2x", + "orientation" : "portrait", + "extent" : "full-screen", + "filename" : "Default@2x.png" + }, + { + "scale" : "2x", + "idiom" : "iphone", + "orientation" : "portrait", + "extent" : "full-screen", + "subtype" : "retina4", + "filename" : "Default-568h@2x.png" + }, + { + "extent" : "full-screen", + "filename" : "Default-568h@2x.png", + "orientation" : "portrait", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "scale" : "2x", + "subtype" : "retina4" + }, + { + "scale" : "2x", + "idiom" : "iphone", + "orientation" : "portrait", + "extent" : "full-screen", + "filename" : "Default@2x.png" + }, + { + "scale" : "1x", + "idiom" : "ipad", + "orientation" : "portrait", + "extent" : "to-status-bar", + "filename" : "Default~ipad.png" + }, + { + "scale" : "2x", + "idiom" : "ipad", + "orientation" : "portrait", + "extent" : "to-status-bar", + "filename" : "Default~ipad@2x.png" + }, + { + "scale" : "1x", + "idiom" : "ipad", + "orientation" : "landscape", + "extent" : "to-status-bar", + "filename" : "Default~ipad~landscape.png" + }, + { + "scale" : "2x", + "idiom" : "ipad", + "orientation" : "landscape", + "extent" : "to-status-bar", + "filename" : "Default~ipad~landscape@2x.png" + }, + { + "minimum-system-version" : "7.0", + "idiom" : "ipad", + "scale" : "1x", + "orientation" : "portrait", + "extent" : "full-screen", + "filename" : "Default~ipad~nostatusbar.png" + }, + { + "scale" : "1x", + "idiom" : "ipad", + "orientation" : "portrait", + "extent" : "full-screen", + "filename" : "Default~ipad~nostatusbar.png" + }, + { + "minimum-system-version" : "7.0", + "idiom" : "ipad", + "scale" : "2x", + "orientation" : "portrait", + "extent" : "full-screen", + "filename" : "Default~ipad~nostatusbar@2x.png" + }, + { + "scale" : "2x", + "idiom" : "ipad", + "orientation" : "portrait", + "extent" : "full-screen", + "filename" : "Default~ipad~nostatusbar@2x.png" + }, + { + "minimum-system-version" : "7.0", + "idiom" : "ipad", + "scale" : "1x", + "orientation" : "landscape", + "extent" : "full-screen", + "filename" : "Default~ipad~landscape~nostatusbar.png" + }, + { + "scale" : "1x", + "idiom" : "ipad", + "orientation" : "landscape", + "extent" : "full-screen", + "filename" : "Default~ipad~landscape~nostatusbar.png" + }, + { + "minimum-system-version" : "7.0", + "idiom" : "ipad", + "scale" : "2x", + "orientation" : "landscape", + "extent" : "full-screen", + "filename" : "Default~ipad~landscape~nostatusbar@2x.png" + }, + { + "scale" : "2x", + "idiom" : "ipad", + "orientation" : "landscape", + "extent" : "full-screen", + "filename" : "Default~ipad~landscape~nostatusbar@2x.png" + }, + { + "extent" : "full-screen", "filename" : "Default-Portrait-736h@3x.png", - "minimum-system-version" : "8.0", "orientation" : "portrait", - "scale" : "3x" + "idiom" : "iphone", + "minimum-system-version" : "8.0", + "scale" : "3x", + "subtype" : "736h" }, { "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", "filename" : "Default-Landscape-736h@3x.png", - "minimum-system-version" : "8.0", "orientation" : "landscape", - "scale" : "3x" + "idiom" : "iphone", + "minimum-system-version" : "8.0", + "scale" : "3x", + "subtype" : "736h" }, { "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "667h", "filename" : "Default-667h@2x.png", + "orientation" : "portrait", + "idiom" : "iphone", "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "retina4", - "filename" : "Default-568h@2x.png", - "minimum-system-version" : "7.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default~ipad~nostatusbar.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default~ipad~landscape~nostatusbar.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default~ipad~nostatusbar@2x.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default~ipad~landscape~nostatusbar@2x.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x.png", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default-568h@2x.png", - "extent" : "full-screen", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default~ipad.png", - "extent" : "to-status-bar", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default~ipad~nostatusbar.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default~ipad~landscape.png", - "extent" : "to-status-bar", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default~ipad~landscape~nostatusbar.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default~ipad@2x.png", - "extent" : "to-status-bar", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default~ipad~nostatusbar@2x.png", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default~ipad~landscape@2x.png", - "extent" : "to-status-bar", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default~ipad~landscape~nostatusbar@2x.png", - "extent" : "full-screen", - "scale" : "2x" + "scale" : "2x", + "subtype" : "667h" } ], "info" : { diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png index 52555a8..680948b 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png index 499a143..7142e99 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-1792h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-1792h@3x.png new file mode 100644 index 0000000..61d28a6 Binary files /dev/null and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-1792h@3x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2436h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2436h@3x.png new file mode 100644 index 0000000..4c6de5a Binary files /dev/null and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2436h@3x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2688h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2688h@3x.png new file mode 100644 index 0000000..b4666f8 Binary files /dev/null and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-2688h@3x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-736h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-736h@3x.png index 2d727e8..5944095 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-736h@3x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-736h@3x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-1792h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-1792h@3x.png new file mode 100644 index 0000000..4b43786 Binary files /dev/null and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-1792h@3x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-2436h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-2436h@3x.png new file mode 100644 index 0000000..8e5c090 Binary files /dev/null and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-2436h@3x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-2688h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-2688h@3x.png new file mode 100644 index 0000000..9848c46 Binary files /dev/null and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-2688h@3x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png index 5453d81..22330ea 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default.png index 43dedf5..f59eaed 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default@2x.png index 3ffae63..b6b093f 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default@2x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default@2x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad.png index d8dfb22..63a02fc 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad@2x.png index d091503..d056006 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad@2x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad@2x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape.png index 942487c..623387f 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape@2x.png index 9024a89..c320aea 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape@2x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape@2x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar.png index 5bfb356..8965cd4 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar@2x.png index 342667d..3786e69 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar@2x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar@2x.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar.png index 4401e6a..f680111 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar.png differ diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar@2x.png index f772331..a8f58a4 100644 Binary files a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar@2x.png and b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar@2x.png differ diff --git a/Pod/Classes/UIDevice-Hardware.h b/Pod/Classes/UIDevice-Hardware.h index 204fe3b..66063fd 100755 --- a/Pod/Classes/UIDevice-Hardware.h +++ b/Pod/Classes/UIDevice-Hardware.h @@ -36,6 +36,9 @@ typedef NS_ENUM(NSUInteger, UIDeviceGenerationModel) { UIDeviceGenerationModeliPhone8, UIDeviceGenerationModeliPhone8Plus, UIDeviceGenerationModeliPhoneX, + UIDeviceGenerationModeliPhoneXR, + UIDeviceGenerationModeliPhoneXS, + UIDeviceGenerationModeliPhoneXSMax, UIDeviceGenerationModeliPhoneSimulator, UIDeviceGenerationModeliPad1, UIDeviceGenerationModeliPad2, @@ -73,6 +76,7 @@ typedef NS_ENUM(NSUInteger, UIDeviceModelInches) { UIDeviceModelInches47, UIDeviceModelInches55, UIDeviceModelInches58, + UIDeviceModelInches65, UIDeviceModelInches79, UIDeviceModelInches97, UIDeviceModelInches105, @@ -82,6 +86,7 @@ typedef NS_ENUM(NSUInteger, UIDeviceModelInches) { UIDeviceSimulatorModelInches47 = UIDeviceModelInches47, UIDeviceSimulatorModelInches55 = UIDeviceModelInches55, UIDeviceSimulatorModelInches58 = UIDeviceModelInches58, + UIDeviceSimulatorModelInches65 = UIDeviceModelInches65, UIDeviceSimulatorModelInches79 = UIDeviceModelInches79, UIDeviceSimulatorModelInches97 = UIDeviceModelInches97, UIDeviceSimulatorModelInches105 = UIDeviceModelInches105, diff --git a/Pod/Classes/UIDevice-Hardware.m b/Pod/Classes/UIDevice-Hardware.m index 646c8a3..a5239b9 100755 --- a/Pod/Classes/UIDevice-Hardware.m +++ b/Pod/Classes/UIDevice-Hardware.m @@ -72,6 +72,10 @@ if ([modelIdentifier isEqualToString:@"iPhone10,4"]) return UIDeviceGenerationModeliPhone8; if ([modelIdentifier isEqualToString:@"iPhone10,5"]) return UIDeviceGenerationModeliPhone8Plus; if ([modelIdentifier isEqualToString:@"iPhone10,6"]) return UIDeviceGenerationModeliPhoneX; + if ([modelIdentifier isEqualToString:@"iPhone11,2"]) return UIDeviceGenerationModeliPhoneXS; + if ([modelIdentifier isEqualToString:@"iPhone11,4"]) return UIDeviceGenerationModeliPhoneXSMax; + if ([modelIdentifier isEqualToString:@"iPhone11,6"]) return UIDeviceGenerationModeliPhoneXSMax; + if ([modelIdentifier isEqualToString:@"iPhone11,8"]) return UIDeviceGenerationModeliPhoneXR; // iPad http://theiphonewiki.com/wiki/IPad @@ -182,6 +186,11 @@ if ([modelIdentifier isEqualToString:@"iPhone10,4"]) return @"iPhone 8"; // AT&T, Global if ([modelIdentifier isEqualToString:@"iPhone10,5"]) return @"iPhone 8 Plus"; // AT&T, Global if ([modelIdentifier isEqualToString:@"iPhone10,6"]) return @"iPhone X"; // AT&T, Global + if ([modelIdentifier isEqualToString:@"iPhone11,2"]) return @"iPhone XS"; + if ([modelIdentifier isEqualToString:@"iPhone11,4"]) return @"iPhone XSMax"; + if ([modelIdentifier isEqualToString:@"iPhone11,6"]) return @"iPhone XSMax"; + if ([modelIdentifier isEqualToString:@"iPhone10,8"]) return @"iPhone XR"; + // iPad http://theiphonewiki.com/wiki/IPad @@ -286,10 +295,16 @@ return UIDeviceModelInches55; } break; - case UIDeviceGenerationModeliPhoneX:{ + case UIDeviceGenerationModeliPhoneX: + case UIDeviceGenerationModeliPhoneXS: + case UIDeviceGenerationModeliPhoneXR:{ return UIDeviceModelInches58; } break; + case UIDeviceGenerationModeliPhoneXSMax:{ + return UIDeviceModelInches65; + } + break; case UIDeviceGenerationModeliPad1: case UIDeviceGenerationModeliPad2: case UIDeviceGenerationModeliPad3: @@ -343,6 +358,11 @@ break; } break; + case 896:{ + return UIDeviceSimulatorModelInches65; + break; + } + break; case 1024:{ return UIDeviceModelInches97; break; diff --git a/UIDevice-Utils.podspec b/UIDevice-Utils.podspec index 16006dd..8cf61ff 100644 --- a/UIDevice-Utils.podspec +++ b/UIDevice-Utils.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "UIDevice-Utils" -s.version = "1.0.8" +s.version = "1.0.9" s.summary = "Category on UIDevice to distinguish between platforms." s.description = "Category to easy distinguish devices, family platform device, or device inches. Provide human-readable device names e.g. 'iPhone 6S Plus' or enums e.g. 'UIDeviceGenerationModeliPhone6SPlus'" s.homepage = "https://github.com/giuseppenucifora/UIDevice-Utils"