Merge branch 'fix-convert-assets-dpi'

24 files changed, 30 insertions, 26 deletions

diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconAccount.imageset/IconAccount.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconAccount.imageset/IconAccount.pdf
index 1d57a67c83..fd1cda97a7 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconAccount.imageset/IconAccount.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconAccount.imageset/IconAccount.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconArrow.imageset/IconArrow.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconArrow.imageset/IconArrow.pdf
index 0476e39b57..84ab002638 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconArrow.imageset/IconArrow.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconArrow.imageset/IconArrow.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconBack.imageset/IconBack.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconBack.imageset/IconBack.pdf
index 9b4b57c821..30613fa0b8 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconBack.imageset/IconBack.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconBack.imageset/IconBack.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevron.imageset/IconChevron.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevron.imageset/IconChevron.pdf
index db695a81e0..5e00c5ce6f 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevron.imageset/IconChevron.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevron.imageset/IconChevron.pdf
@@ -42,7 +42,7 @@ endobj
 endobj
 6 0 obj
 << /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (20200729113941+01')
+   /CreationDate (20200729113941+00'00)
 >>
 endobj
 7 0 obj
@@ -59,12 +59,12 @@ xref
 0000000015 00000 n 
 0000000273 00000 n 
 0000000647 00000 n 
-0000000759 00000 n 
+0000000761 00000 n 
 trailer
 << /Size 8
    /Root 7 0 R
    /Info 6 0 R
 >>
 startxref
-811
+813
 %%EOF
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.pdf
index 803fe79fbd..f529e19908 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.pdf
@@ -41,7 +41,7 @@ endobj
 endobj
 6 0 obj
 << /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (20200729113941+01')
+   /CreationDate (20200729113941+00'00)
 >>
 endobj
 7 0 obj
@@ -58,12 +58,12 @@ xref
 0000000015 00000 n 
 0000000277 00000 n 
 0000000652 00000 n 
-0000000764 00000 n 
+0000000766 00000 n 
 trailer
 << /Size 8
    /Root 7 0 R
    /Info 6 0 R
 >>
 startxref
-816
+818
 %%EOF
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.pdf
index d4d1d23918..a1ee341016 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconClose.imageset/IconClose.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconClose.imageset/IconClose.pdf
index cc53916273..fcff861b53 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconClose.imageset/IconClose.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconClose.imageset/IconClose.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.pdf
index e552786d1c..9645ccfe88 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCopy.imageset/IconCopy.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCopy.imageset/IconCopy.pdf
index 47ec193d80..45cc203c23 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCopy.imageset/IconCopy.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconCopy.imageset/IconCopy.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconExtlink.imageset/IconExtlink.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconExtlink.imageset/IconExtlink.pdf
index 918fac610a..a68cb6bca1 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconExtlink.imageset/IconExtlink.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconExtlink.imageset/IconExtlink.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconFail.imageset/IconFail.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconFail.imageset/IconFail.pdf
index 65f239e175..e36941700a 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconFail.imageset/IconFail.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconFail.imageset/IconFail.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconObscure.imageset/IconObscure.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconObscure.imageset/IconObscure.pdf
index 813fa38764..8d11004e3e 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconObscure.imageset/IconObscure.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconObscure.imageset/IconObscure.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconReload.imageset/IconReload.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconReload.imageset/IconReload.pdf
index 0cedf546e4..d58fb05aa5 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconReload.imageset/IconReload.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconReload.imageset/IconReload.pdf
@@ -43,7 +43,7 @@ endobj
 endobj
 6 0 obj
 << /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (20200729113941+01')
+   /CreationDate (20200729113941+00'00)
 >>
 endobj
 7 0 obj
@@ -60,12 +60,12 @@ xref
 0000000015 00000 n 
 0000000452 00000 n 
 0000000829 00000 n 
-0000000941 00000 n 
+0000000943 00000 n 
 trailer
 << /Size 8
    /Root 7 0 R
    /Info 6 0 R
 >>
 startxref
-993
+995
 %%EOF
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSettings.imageset/IconSettings.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSettings.imageset/IconSettings.pdf
index 1efefb905b..2b24783204 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSettings.imageset/IconSettings.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSettings.imageset/IconSettings.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSpinner.imageset/IconSpinner.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSpinner.imageset/IconSpinner.pdf
index 95b6d6b73d..1856123f20 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSpinner.imageset/IconSpinner.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSpinner.imageset/IconSpinner.pdf
@@ -43,7 +43,7 @@ endobj
 endobj
 6 0 obj
 << /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (20200729113941+01')
+   /CreationDate (20200729113941+00'00)
 >>
 endobj
 7 0 obj
@@ -60,12 +60,12 @@ xref
 0000000015 00000 n 
 0000000498 00000 n 
 0000000905 00000 n 
-0000001017 00000 n 
+0000001019 00000 n 
 trailer
 << /Size 8
    /Root 7 0 R
    /Info 6 0 R
 >>
 startxref
-1069
+1071
 %%EOF
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSuccess.imageset/IconSuccess.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSuccess.imageset/IconSuccess.pdf
index b1fa595f75..f74a4f6de7 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSuccess.imageset/IconSuccess.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconSuccess.imageset/IconSuccess.pdf
@@ -40,7 +40,7 @@ endobj
 endobj
 6 0 obj
 << /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (20200729113941+01')
+   /CreationDate (20200729113941+00'00)
 >>
 endobj
 7 0 obj
@@ -57,12 +57,12 @@ xref
 0000000015 00000 n 
 0000000322 00000 n 
 0000000697 00000 n 
-0000000809 00000 n 
+0000000811 00000 n 
 trailer
 << /Size 8
    /Root 7 0 R
    /Info 6 0 R
 >>
 startxref
-861
+863
 %%EOF
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTick.imageset/IconTick.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTick.imageset/IconTick.pdf
index 70c7095ab3..afd775f85f 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTick.imageset/IconTick.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTick.imageset/IconTick.pdf
@@ -42,7 +42,7 @@ endobj
 endobj
 6 0 obj
 << /Producer (cairo 1.16.0 (https://cairographics.org))
-   /CreationDate (20200729113941+01')
+   /CreationDate (20200729113941+00'00)
 >>
 endobj
 7 0 obj
@@ -59,12 +59,12 @@ xref
 0000000015 00000 n 
 0000000268 00000 n 
 0000000643 00000 n 
-0000000755 00000 n 
+0000000757 00000 n 
 trailer
 << /Size 8
    /Root 7 0 R
    /Info 6 0 R
 >>
 startxref
-807
+809
 %%EOF
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTickSml.imageset/IconTickSml.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTickSml.imageset/IconTickSml.pdf
index 4359e0ae34..e1b433b799 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTickSml.imageset/IconTickSml.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconTickSml.imageset/IconTickSml.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconUnobscure.imageset/IconUnobscure.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconUnobscure.imageset/IconUnobscure.pdf
index 77452cf7b2..ec2d68e3a2 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconUnobscure.imageset/IconUnobscure.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/IconUnobscure.imageset/IconUnobscure.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.pdf
index 7da89ac1fd..ccfb321cac 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.pdf
index 0e87b6ec41..e407bb352a 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/LogoIcon.imageset/LogoIcon.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/LogoIcon.imageset/LogoIcon.pdf
index 1846892f30..71201faeb9 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/LogoIcon.imageset/LogoIcon.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/LogoIcon.imageset/LogoIcon.pdf
diff --git a/ios/MullvadVPN/Supporting Files/Assets.xcassets/LogoText.imageset/LogoText.pdf b/ios/MullvadVPN/Supporting Files/Assets.xcassets/LogoText.imageset/LogoText.pdf
index e00c9c6c4d..90f2c0a132 100644
--- a/ios/MullvadVPN/Supporting Files/Assets.xcassets/LogoText.imageset/LogoText.pdf
+++ b/ios/MullvadVPN/Supporting Files/Assets.xcassets/LogoText.imageset/LogoText.pdf
diff --git a/ios/convert-assets.rb b/ios/convert-assets.rb
index 21feaf7c99..41fd7a7919 100755
--- a/ios/convert-assets.rb
+++ b/ios/convert-assets.rb
@@ -66,6 +66,9 @@ SVG_CONVERT_ENVIRONMENT_VARIABLES = {
   "SOURCE_DATE_EPOCH" => "1596022781"
 }
 
+# Fix DPI at 72 to produce the same size assets as defined in SVG files (in pixels)
+SVG_CONVERT_DEFAULT_OPTIONS = ["--dpi-x=72", "--dpi-y=72"]
+
 # Functions
 
 def generate_graphical_assets()
@@ -82,7 +85,7 @@ def generate_graphical_assets()
     output_file = File.join(output_dir, "#{image_name}.pdf")
 
     puts "Convert #{svg_file} -> #{output_file}"
-    system(SVG_CONVERT_ENVIRONMENT_VARIABLES, "rsvg-convert", "--format=pdf", svg_file, "--output", output_file)
+    rsvg_convert("--format=pdf", svg_file, "--output", output_file)
   end
 end
 
@@ -102,14 +105,14 @@ def generate_resized_assets()
     output_file = File.join(output_dir, "#{image_name}.pdf")
 
     puts "Convert and resize #{svg_file} -> #{output_file} (#{width} x #{height})"
-    system(SVG_CONVERT_ENVIRONMENT_VARIABLES, "rsvg-convert", "--width=#{width}", "--height=#{height}", "--format=pdf", svg_file, "--output", output_file)
+    rsvg_convert("--width=#{width}", "--height=#{height}", "--format=pdf", svg_file, "--output", output_file)
   end
 end
 
 def generate_app_icon()
   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)
+  rsvg_convert("--width=#{XCASSETS_APPICON_SIZE}", "--height=#{XCASSETS_APPICON_SIZE}", "--format=png", APPICON_PATH, "--output", XCASSETS_APPICON_PATH)
 end
 
 def generate_additional_assets()
@@ -125,16 +128,17 @@ def generate_additional_assets()
     end
 
     puts "Generate #{image_name} -> #{output_file}"
-    system(SVG_CONVERT_ENVIRONMENT_VARIABLES, "rsvg-convert", "--format=pdf", svg_file, "--output", output_file)
+    rsvg_convert("--format=pdf", svg_file, "--output", output_file)
   end
 end
 
-def pascal_case(str)
-  return str.split('-').collect(&:capitalize).join
+def rsvg_convert(*args)
+  command = ["rsvg-convert", *SVG_CONVERT_DEFAULT_OPTIONS, *args]
+  system(SVG_CONVERT_ENVIRONMENT_VARIABLES, *command)
 end
 
-def retina_scale_suffix(retina_scale)
-  return retina_scale == 1 ? "" : "@#{retina_scale}x"
+def pascal_case(str)
+  return str.split('-').collect(&:capitalize).join
 end
 
 def command?(name)