From 9852f5c5ea960059dbf91e5d70af3969828373a9 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 2 Apr 2020 12:22:47 +0200 Subject: [PATCH 01/15] Fix ios appicon catalog --- .../ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json index 05946256..cfec9f9e 100644 --- a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json +++ b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json @@ -102,6 +102,12 @@ "filename" : "AppIcon167x167.png", "scale" : "2x" }, + { + "size" : "167x167", + "idiom" : "ipad", + "filename" : "AppIcon167x167.png", + "scale" : "1x" + }, { "size" : "1024x1024", "idiom" : "ios-marketing", From a2627bbb975a877932fd267b55b8e2961d44168f Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 2 Apr 2020 12:51:33 +0200 Subject: [PATCH 02/15] Try to add the iconset to the info.plist --- packaging/ios/Info.plist.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index ccd2f13b..6f3d0b30 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -41,5 +41,7 @@ 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 From ba76e7f61200a039416efacaaa9741136b07ef52 Mon Sep 17 00:00:00 2001 From: nymea Date: Thu, 2 Apr 2020 13:28:32 +0200 Subject: [PATCH 03/15] Update catalog --- .../AppIcon.appiconset/Contents.json | 118 +++++++++--------- 1 file changed, 56 insertions(+), 62 deletions(-) diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json index cfec9f9e..540c768e 100644 --- a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json +++ b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1,116 @@ { "images" : [ { - "size" : "20x20", - "idiom" : "iphone", "filename" : "AppIcon20x20@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "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", - "idiom" : "ipad", "filename" : "AppIcon29x29@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", - "idiom" : "ipad", "filename" : "AppIcon40x40.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", - "idiom" : "ipad", "filename" : "AppIcon40x40@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "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" }, { - "size" : "167x167", + "filename" : "AppIcon167x167.png", "idiom" : "ipad", - "filename" : "AppIcon167x167.png", - "scale" : "1x" + "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 } } From b80640e9c8961f09865d416825b880e13cfc8d31 Mon Sep 17 00:00:00 2001 From: nymea Date: Thu, 2 Apr 2020 17:54:19 +0200 Subject: [PATCH 04/15] try harder --- .../{AppIcon167x167.png => AppIcon83.5x83.5@2x.png} | Bin .../AppIcon.appiconset/Contents.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename packaging/ios/AppIcons.xcassets/AppIcon.appiconset/{AppIcon167x167.png => AppIcon83.5x83.5@2x.png} (100%) diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon83.5x83.5@2x.png similarity index 100% rename from packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon83.5x83.5@2x.png diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json index 540c768e..358d718e 100644 --- a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json +++ b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json @@ -97,7 +97,7 @@ "size" : "76x76" }, { - "filename" : "AppIcon167x167.png", + "filename" : "AppIcon83.5x83.5@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "83.5x83.5" From 8f480159cd927288f167b30b0f6e97cf17b78cf0 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 2 Apr 2020 18:26:52 +0200 Subject: [PATCH 05/15] fix minimum os version --- packaging/ios/Info.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 6f3d0b30..2a027612 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -23,7 +23,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 10 + 10.0 NOTE This file was generated by Qt/QMake. UILaunchStoryboardName From cbd8af7a6b482b81df85c87636b9214c22b90c01 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 2 Apr 2020 19:45:17 +0200 Subject: [PATCH 06/15] Include bundle icons in Info.plist --- packaging/ios/Info.plist.in | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 2a027612..e19f3dd6 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -1,7 +1,7 @@ - + CFBundleDisplayName nymea:app CFBundleExecutable @@ -43,5 +43,35 @@ XSAppIconAssets AppIcons.xcassets/AppIcon.appiconset - + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + AppIcon29x29.png + AppIcon29x29@2x.png + AppIcon40x40@2x.png + AppIcon60x60@2x.png + + + + CFBundleIcons~ipad + + CFBundlePrimaryIcon + + CFBundleIconFiles + + AppIcon29x29.png + AppIcon29x29@2x.png + AppIcon40x40.png + AppIcon40x40@2x.png + AppIcon60x60@2x.png + AppIcon76x76.png + AppIcon76x76@2x.png + AppIcon83.5x83.5@2x.png + + + + From cda12b74bfb3cba56f86b20afd333640ba584e94 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 2 Apr 2020 20:12:07 +0200 Subject: [PATCH 07/15] Install all icons as Bundle data --- nymea-app/nymea-app.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e073bfb2fd5a4b2b9271c20e00bd4c203c7bc78b Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 2 Apr 2020 20:41:18 +0200 Subject: [PATCH 08/15] more trying --- .../AppIcon.appiconset/AppIcon176x176~ipad.png | Bin 0 -> 8077 bytes packaging/ios/AppIcons.xcassets/Contents.json | 6 ------ 2 files changed, 6 deletions(-) create mode 100644 packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon176x176~ipad.png delete mode 100644 packaging/ios/AppIcons.xcassets/Contents.json diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon176x176~ipad.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon176x176~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..ff0eb67353790e9fde16c98549de61f872dcd606 GIT binary patch literal 8077 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 Date: Thu, 2 Apr 2020 20:42:16 +0200 Subject: [PATCH 09/15] fix name --- ...Icon176x176~ipad.png => AppIcon167x167~ipad.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename packaging/ios/AppIcons.xcassets/AppIcon.appiconset/{AppIcon176x176~ipad.png => AppIcon167x167~ipad.png} (100%) diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon176x176~ipad.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167~ipad.png similarity index 100% rename from packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon176x176~ipad.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167~ipad.png From 47334d662d765f670a390bc5e5d58920cf7ef26a Mon Sep 17 00:00:00 2001 From: nymea Date: Thu, 2 Apr 2020 21:58:07 +0200 Subject: [PATCH 10/15] Regenerate icon assets --- .../AppIcon.appiconset/AppIcon20x20@2x-1.png | Bin 0 -> 1320 bytes .../AppIcon.appiconset/AppIcon29x29@2x-1.png | Bin 0 -> 2081 bytes .../AppIcon.appiconset/AppIcon40x40@2x-1.png | Bin 0 -> 3234 bytes .../AppIcon.appiconset/Contents.json | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png create mode 100644 packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png create mode 100644 packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.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 0000000000000000000000000000000000000000..fce7979be8320adf819ff1857365199515f2a907 GIT binary patch literal 1320 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 LNkvXXu0mjfA{6Wm literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..230ad82929b310ed2d846f1955e0e7f7930ebdd8 GIT binary patch literal 3234 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 Uk0Rv1kN^Mx07*qoM6N<$g0g@RmH+?% literal 0 HcmV?d00001 diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json index 358d718e..64b03082 100644 --- a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json +++ b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "AppIcon20x20@2x.png", + "filename" : "AppIcon20x20@2x-1.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" @@ -67,7 +67,7 @@ "size" : "29x29" }, { - "filename" : "AppIcon29x29@2x.png", + "filename" : "AppIcon29x29@2x-1.png", "idiom" : "ipad", "scale" : "2x", "size" : "29x29" @@ -79,7 +79,7 @@ "size" : "40x40" }, { - "filename" : "AppIcon40x40@2x.png", + "filename" : "AppIcon40x40@2x-1.png", "idiom" : "ipad", "scale" : "2x", "size" : "40x40" From d49efbaacd338222056de55d2092c113e0dac438 Mon Sep 17 00:00:00 2001 From: nymea Date: Fri, 3 Apr 2020 00:58:17 +0200 Subject: [PATCH 11/15] Add icon to normal icon bundle too... --- packaging/ios/Info.plist.in | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index e19f3dd6..e091592c 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -53,6 +53,7 @@ AppIcon29x29@2x.png AppIcon40x40@2x.png AppIcon60x60@2x.png + AppIcon83.5x83.5@2.png From e3b1690a297a5e3eb8b96426cc5249504bc014c9 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 3 Apr 2020 01:20:29 +0200 Subject: [PATCH 12/15] and another attempt --- packaging/ios/Info.plist.in | 39 ++++++++----------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index e091592c..5582e1cc 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -43,36 +43,13 @@ XSAppIconAssets AppIcons.xcassets/AppIcon.appiconset - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon40x40@2x.png - AppIcon60x60@2x.png - AppIcon83.5x83.5@2.png - - - - CFBundleIcons~ipad - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon40x40.png - AppIcon40x40@2x.png - AppIcon60x60@2x.png - AppIcon76x76.png - AppIcon76x76@2x.png - AppIcon83.5x83.5@2x.png - - - + CFBundleIconFiles + + AppIcon29x29.png + AppIcon29x29@2x.png + AppIcon40x40@2x.png + AppIcon60x60@2x.png + AppIcon83.5x83.5@2.png + From b2aa81ba9b3f792fe995a80b0be7566e29293449 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 3 Apr 2020 10:18:10 +0200 Subject: [PATCH 13/15] fix filename --- packaging/ios/Info.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 5582e1cc..33dc346c 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -49,7 +49,7 @@ AppIcon29x29@2x.png AppIcon40x40@2x.png AppIcon60x60@2x.png - AppIcon83.5x83.5@2.png + AppIcon83.5x83.5@2x.png From c7971472f2e5772dd1672fa38fad9b408759215e Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 3 Apr 2020 10:50:01 +0200 Subject: [PATCH 14/15] bump minimum ios version --- packaging/ios/Info.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 33dc346c..8ca366ef 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -23,7 +23,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 10.0 + 11.0 NOTE This file was generated by Qt/QMake. UILaunchStoryboardName From a206647460670b141af5deebeeeb0643f1ef795a Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 3 Apr 2020 11:17:46 +0200 Subject: [PATCH 15/15] try this --- packaging/ios/Info.plist.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 8ca366ef..8a343cb4 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -22,8 +22,6 @@ $$APP_REVISION LSRequiresIPhoneOS - MinimumOSVersion - 11.0 NOTE This file was generated by Qt/QMake. UILaunchStoryboardName