Revert "iOS: Resolves #11119: Add iOS Dark Icon (#11460)"

This reverts commit dc44557.

Reason: Trying to fix error "Asset validation failed"

packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,37 +1,116 @@
 {
-  "images" : [
-    {
-      "filename" : "ios_marketing1024x1024.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "ios_marketing_dark1024x1024.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "tinted"
-        }
-      ],
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+  "images": [
+    {
+      "filename": "ios_marketing1024x1024.png",
+      "idiom": "ios-marketing",
+      "size": "1024x1024",
+      "scale": "1x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "size": "20x20",
+      "scale": "2x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "size": "20x20",
+      "scale": "3x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "size": "29x29",
+      "scale": "2x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "size": "29x29",
+      "scale": "3x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "size": "40x40",
+      "scale": "2x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "size": "40x40",
+      "scale": "3x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "size": "60x60",
+      "scale": "2x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "size": "60x60",
+      "scale": "3x"
+    },
+    {
+      "filename": "ipad_notification20x20.png",
+      "idiom": "ipad",
+      "size": "20x20",
+      "scale": "1x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "ipad",
+      "size": "20x20",
+      "scale": "2x"
+    },
+    {
+      "filename": "ipad_settings29x29.png",
+      "idiom": "ipad",
+      "size": "29x29",
+      "scale": "1x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "ipad",
+      "size": "29x29",
+      "scale": "2x"
+    },
+    {
+      "filename": "ipad_spotlight40x40.png",
+      "idiom": "ipad",
+      "size": "40x40",
+      "scale": "1x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "ipad",
+      "size": "40x40",
+      "scale": "2x"
+    },
+    {
+      "filename": "ipad_app76x76.png",
+      "idiom": "ipad",
+      "size": "76x76",
+      "scale": "1x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "ipad",
+      "size": "76x76",
+      "scale": "2x"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "ipad",
+      "size": "83.5x83.5",
+      "scale": "2x"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "version": 1,
+    "author": "xcode"
   }
-}
+}

packages/tools/generate-images.json

@@ -71,7 +71,6 @@
 		"12_c1ecc4672fe806dda0c25ec58ddf498a_packages/server/public/images/icons/cloud/icon-32.png_32_32___joplinCloud32_": true,
 		"12_c1ecc4672fe806dda0c25ec58ddf498a_packages/server/public/images/icons/cloud/icon.svg______": true,
 		"12_c1ecc4672fe806dda0c25ec58ddf498a_packages/server/public/images/icons/cloud/favicon.ico______joplinCloud32": true,
-		"icns_to_icon_set_89ddfe84307b49fa96580655b5d7c045_216bb492f34224f24aabacb5f98c3620_fe652082bfb7427cd5c74566ecc24322_ebf1ccaf3f5b77b01ff690b763a411f9_216bb492f34224f24aabacb5f98c3620_950b970a784b14c329e09e78af827a77_ebf1ccaf3f5b77b01ff690b763a411f9_d33dafc8081155149dd1d8c1713bf03f_950b970a784b14c329e09e78af827a77_94949c497e46ed0c67082175f5bb22f8": true,
-		"13_81d4e1a631a97f3db0d033de420f14df_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ios_marketing_dark1024x1024.png_1024_1024____": true
+		"icns_to_icon_set_9f922e3fd5465dd99eabaa24a3dd3c1d_12cd001124be423c65c1b36deccad273_717fde633fffdca1ae13cca5e4d05143_a8f4a3f97ceaefa3151416a40cfab0af_12cd001124be423c65c1b36deccad273_0bf543ae51a3980ce194156b14a77eee_a8f4a3f97ceaefa3151416a40cfab0af_35d1c48c7d56a96cafd8fb898432f25d_0bf543ae51a3980ce194156b14a77eee_b38e4ecf1acfdc684712c8f7d9b9305d": true
 	}
-}
+}

packages/tools/generate-images.ts

@@ -82,10 +82,6 @@ const sources: Source[] = [
 		id: 12,
 		name: 'JoplinCloudIcon2.svg',
 	},
-	{
-		id: 13,
-		name: '../JoplinLetterBlue.svg',
-	},
 ];
 
 function sourceById(id: number) {
@@ -108,10 +104,106 @@ const operations: Operation[] = [
 		height: 1024,
 	},
 	{
-		source: 13,
-		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ios_marketing_dark1024x1024.png',
-		width: 1024,
-		height: 1024,
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_app76x76.png',
+		width: 76,
+		height: 76,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 152,
+		height: 152,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_notification20x20.png',
+		width: 20,
+		height: 20,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 40,
+		height: 40,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 167,
+		height: 167,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_settings29x29.png',
+		width: 29,
+		height: 29,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 58,
+		height: 58,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_spotlight40x40.png',
+		width: 40,
+		height: 40,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 80,
+		height: 80,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 120,
+		height: 120,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 180,
+		height: 180,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 40,
+		height: 40,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 60,
+		height: 60,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 58,
+		height: 58,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 87,
+		height: 87,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 80,
+		height: 80,
+	},
+	{
+		source: 1,
+		dest: 'packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/[email protected]',
+		width: 120,
+		height: 120,
 	},
 
 	// ============================================================================