iOS build: update icons

Latest xcode requires more and different(?) icons.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

packaging/ios/Info.plist.in

@@ -8,47 +8,8 @@
 	<string>Subsurface-mobile</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Created by Qt/QMake</string>
-	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon29x29.png</string>
-				<string>AppIcon29x29@2x.png</string>
-				<string>AppIcon40x40@2x.png</string>
-				<string>AppIcon57x57.png</string>
-				<string>AppIcon57x57@2x.png</string>
-				<string>AppIcon60x60@2x.png</string>
-			</array>
-		</dict>
-	</dict>
-	<key>CFBundleIcons~ipad</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon29x29.png</string>
-				<string>AppIcon29x29@2x.png</string>
-				<string>AppIcon40x40@2x.png</string>
-				<string>AppIcon57x57.png</string>
-				<string>AppIcon57x57@2x.png</string>
-				<string>AppIcon60x60@2x.png</string>
-				<string>AppIcon29x29~ipad.png</string>
-				<string>AppIcon29x29@2x~ipad.png</string>
-				<string>AppIcon40x40~ipad.png</string>
-				<string>AppIcon40x40@2x~ipad.png</string>
-				<string>AppIcon50x50~ipad.png</string>
-				<string>AppIcon50x50@2x~ipad.png</string>
-				<string>AppIcon72x72~ipad.png</string>
-				<string>AppIcon72x72@2x~ipad.png</string>
-				<string>AppIcon76x76~ipad.png</string>
-				<string>AppIcon76x76@2x~ipad.png</string>
-				<string>AppIcon167x167~ipad.png</string>
-			</array>
-		</dict>
-	</dict>
+	<key>CFBundleIconName</key>
+	<string>AppIcon</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.subsurface-divelog.subsurface-mobile</string>
 	<key>CFBundleName</key>

packaging/ios/Subsurface-mobile/Subsurface-mobile.pro

@@ -243,8 +243,8 @@ include(deployment.pri)
 include(../../../mobile-widgets/qml/kirigami/kirigami.pri)
 
 ios {
-    ios_icon.files = $$files(../../../icons/AppIcon*.png)
+    QMAKE_ASSET_CATALOGS += ../storeIcon.xcassets
     app_launch_images.files = ../SubsurfaceMobileLaunch.xib $$files(../SubsurfaceMobileLaunchImage*.png)
-    QMAKE_BUNDLE_DATA += app_launch_images ios_icon
+    QMAKE_BUNDLE_DATA += app_launch_images
     QMAKE_INFO_PLIST = ../Info.plist
 }

packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,115 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon29x29.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon40x40~ipad.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

packaging/ios/storeIcon.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}