Switch to single size app icon

20 files changed, 14 insertions, 153 deletions

diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppStoreIosMarketing.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIcon.png
index 837fea7fef..837fea7fef 100644
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppStoreIosMarketing.png
+++ b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIcon.png
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPad.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPad.png
deleted file mode 100644
index acf1c0e2b3..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPad.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPad@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPad@2x.png
deleted file mode 100644
index eff085756b..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPad@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadNotifications.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadNotifications.png
deleted file mode 100644
index 4874e87aea..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadNotifications.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadNotifications@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadNotifications@2x.png
deleted file mode 100644
index 6ca6369d09..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadNotifications@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadPro@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadPro@2x.png
deleted file mode 100644
index 1fbbd06b99..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadPro@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSettings.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSettings.png
deleted file mode 100644
index 4eaa8e358c..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSettings.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSettings@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSettings@2x.png
deleted file mode 100644
index 7a13c9f3c3..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSettings@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSpotlight.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSpotlight.png
deleted file mode 100644
index 6ca6369d09..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSpotlight.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSpotlight@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSpotlight@2x.png
deleted file mode 100644
index 10a5d3860d..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPadSpotlight@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhone@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhone@2x.png
deleted file mode 100644
index 0bab29e0f7..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhone@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhone@3x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhone@3x.png
deleted file mode 100644
index 0f86cfb193..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhone@3x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneNotification@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneNotification@2x.png
deleted file mode 100644
index 6ca6369d09..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneNotification@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneNotification@3x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneNotification@3x.png
deleted file mode 100644
index c0f3706473..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneNotification@3x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSettings@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSettings@2x.png
deleted file mode 100644
index 7a13c9f3c3..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSettings@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSettings@3x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSettings@3x.png
deleted file mode 100644
index 7360f9f52b..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSettings@3x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSpotlight@2x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSpotlight@2x.png
deleted file mode 100644
index 10a5d3860d..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSpotlight@2x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSpotlight@3x.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSpotlight@3x.png
deleted file mode 100644
index 0bab29e0f7..0000000000
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIconPhoneSpotlight@3x.png
+++ /dev/null
diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/Contents.json
index 7d5dc9d70b..cefcc878e0 100644
--- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,116 +1,14 @@
 {
   "images" : [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "AppIconPhoneNotification@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "AppIconPhoneNotification@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "AppIconPhoneSettings@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "AppIconPhoneSettings@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "AppIconPhoneSpotlight@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "AppIconPhoneSpotlight@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "AppIconPhone@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "AppIconPhone@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "AppIconPadNotifications.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "AppIconPadNotifications@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "AppIconPadSettings.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "AppIconPadSettings@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "AppIconPadSpotlight.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "AppIconPadSpotlight@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "AppIconPad.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "AppIconPad@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "AppIconPadPro@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "AppStoreIosMarketing.png",
-      "scale" : "1x"
+      "filename" : "AppIcon.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/ios/convert-assets.rb b/ios/convert-assets.rb
index 7898fca99c..e863f79eef 100755
--- a/ios/convert-assets.rb
+++ b/ios/convert-assets.rb
@@ -7,13 +7,16 @@ ROOT_DIR = File.dirname(SCRIPT_DIR)
 
 # assets catalogue root
 XCASSETS_DIR = File.join(SCRIPT_DIR, "MullvadVPN/Assets.xcassets")
-XCASSETS_APPICON_DIR = File.join(XCASSETS_DIR, "AppIcon.appiconset")
 
 # graphical assets sources
 APPICON_PATH = File.join(ROOT_DIR, "graphics/icon-square.svg")
 GRAPHICAL_ASSETS_DIR = File.join(ROOT_DIR, "gui/assets/images")
 ADDITIONAL_ASSETS_DIR = File.join(SCRIPT_DIR, "AdditionalAssets")
 
+# app icon output
+XCASSETS_APPICON_PATH = File.join(XCASSETS_DIR, "AppIcon.appiconset/AppIcon.png")
+XCASSETS_APPICON_SIZE = 1024
+
 # graphical assets to import
 GRAPHICAL_ASSETS = [
   "icon-arrow.svg",
@@ -44,39 +47,6 @@ RESIZE_ASSETS = {
    "icon-tick.svg" => ["icon-tick-sml.svg", 16, 16],
 }
 
-# App icon sizes
-APP_ICON_SIZES = [
-  # iphone-notification 20pt at 2x, 3x
-  ["AppIconPhoneNotification", 20, 2, 3],
-
-  # iphone-settings at 29pt, 2x, 3x
-  ["AppIconPhoneSettings", 29, 2, 3],
-
-  # iphone-spotlight at 40pt, 2x, 3x
-  ["AppIconPhoneSpotlight", 40, 2, 3],
-
-  # iphone-app at 60pt, 2x, 3x
-  ["AppIconPhone", 60, 2, 3],
-
-  # ipad-notifications at 20pt, 1x, 2x
-  ["AppIconPadNotifications", 20, 1, 2],
-
-  # ipad-settings at 29pt, 1x, 2x
-  ["AppIconPadSettings", 29, 1, 2],
-
-  # ipad-spotlight at 40pt, 1x, 2x
-  ["AppIconPadSpotlight", 40, 1, 2],
-
-  # ipad-app at 76pt, 1x, 2x
-  ["AppIconPad", 76, 1, 2],
-
-  # ipad-pro-app at 83.5pt, 2x
-  ["AppIconPadPro", 83.5, 2],
-
-  # appstore-ios (marketing) at 1024pt, 1x
-  ["AppStoreIosMarketing", 1024, 1],
-]
-
 # Additional assets generated from SVG -> vector PDF
 ADDITIONAL_ASSETS = [
   "DefaultButton.svg",
@@ -136,16 +106,9 @@ def generate_resized_assets()
 end
 
 def genereate_app_icon()
-  for (icon_name, nominal_size, *retina_scales) in APP_ICON_SIZES do
-    for retina_scale in retina_scales do
-      scale_suffix = retina_scale_suffix(retina_scale)
-      output_file = File.join(XCASSETS_APPICON_DIR, "#{icon_name}#{scale_suffix}.png")
-      actual_size = (nominal_size * retina_scale).to_i
-
-      puts "Generate #{icon_name}: #{nominal_size} (#{retina_scale}x) -> #{output_file}"
-      system("rsvg-convert", "--width=#{actual_size}", "--height=#{actual_size}", "--format=png", APPICON_PATH, "--output", output_file)
-    end
-  end
+  image_name = File.basename(XCASSETS_APPICON_PATH, ".png")
+  puts "Generate #{image_name} -> #{XCASSETS_APPICON_PATH}"
+  system("rsvg-convert", "--width=#{XCASSETS_APPICON_SIZE}", "--height=#{XCASSETS_APPICON_SIZE}", "--format=png", APPICON_PATH, "--output", XCASSETS_APPICON_PATH)
 end
 
 def generate_additional_assets()