diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 256f34c2..0de142b6 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -124,7 +124,7 @@ ios: { OTHER_FILES += ../packaging/ios/Info.plist.in \ ../packaging/ios/pushnotifications.entitlements - ios_icon_files.files += $$files(../packaging/ios/AppIcon*.png) + ios_icon_files.files += $$files(../packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon*.png) ios_launch_images.files += $$files(../packaging/ios/LaunchImage*.png) ../packaging/ios/LaunchScreen1.xib QMAKE_BUNDLE_DATA += ios_icon_files ios_launch_images diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167~ipad.png similarity index 100% rename from packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167~ipad.png diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png new file mode 100644 index 00000000..fce7979b Binary files /dev/null and b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png differ diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png new file mode 100644 index 00000000..5b9bd73e Binary files /dev/null and b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png differ diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png new file mode 100644 index 00000000..230ad829 Binary files /dev/null and b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png differ diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon83.5x83.5@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon83.5x83.5@2x.png new file mode 100644 index 00000000..ff0eb673 Binary files /dev/null and b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon83.5x83.5@2x.png differ diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json index 05946256..64b03082 100644 --- a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json +++ b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json @@ -1,116 +1,116 @@ { "images" : [ { - "size" : "20x20", + "filename" : "AppIcon20x20@2x-1.png", "idiom" : "iphone", - "filename" : "AppIcon20x20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "20x20", - "idiom" : "iphone", "filename" : "AppIcon20x20@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "AppIcon29x29@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "AppIcon29x29@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", - "idiom" : "iphone", "filename" : "AppIcon40x40@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", - "idiom" : "iphone", "filename" : "AppIcon40x40@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" }, { - "size" : "60x60", - "idiom" : "iphone", "filename" : "AppIcon60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { "filename" : "AppIcon60x60@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" }, { - "size" : "20x20", - "idiom" : "ipad", "filename" : "AppIcon20x20.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" }, { - "size" : "20x20", - "idiom" : "ipad", "filename" : "AppIcon20x20@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" }, { - "size" : "29x29", - "idiom" : "ipad", "filename" : "AppIcon29x29.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "AppIcon29x29@2x-1.png", "idiom" : "ipad", - "filename" : "AppIcon29x29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", - "idiom" : "ipad", "filename" : "AppIcon40x40.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "AppIcon40x40@2x-1.png", "idiom" : "ipad", - "filename" : "AppIcon40x40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "76x76", - "idiom" : "ipad", "filename" : "AppIcon76x76.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" }, { - "size" : "76x76", - "idiom" : "ipad", "filename" : "AppIcon76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "AppIcon167x167.png", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "AppIcon83.5x83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" }, { - "size" : "1024x1024", - "idiom" : "ios-marketing", "filename" : "AppIcon1024x1024.png", - "scale" : "1x" + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/packaging/ios/AppIcons.xcassets/Contents.json b/packaging/ios/AppIcons.xcassets/Contents.json deleted file mode 100644 index da4a164c..00000000 --- a/packaging/ios/AppIcons.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index ccd2f13b..8a343cb4 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -1,7 +1,7 @@ - + CFBundleDisplayName nymea:app CFBundleExecutable @@ -22,8 +22,6 @@ $$APP_REVISION LSRequiresIPhoneOS - MinimumOSVersion - 10 NOTE This file was generated by Qt/QMake. UILaunchStoryboardName @@ -41,5 +39,15 @@ Nymea boxes can be connected to WiFi using a Bluetooth setup. Also, this app can connect to nymea boxes using Bluetooth only, without requiring WiFi at all. UIViewControllerBasedStatusBarAppearance - + XSAppIconAssets + AppIcons.xcassets/AppIcon.appiconset + CFBundleIconFiles + + AppIcon29x29.png + AppIcon29x29@2x.png + AppIcon40x40@2x.png + AppIcon60x60@2x.png + AppIcon83.5x83.5@2x.png + +