diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2020-04-01 14:43:43 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2020-04-01 15:00:33 +0200 |
| commit | 60fc9c9af8cd641235f4f01fc74825db0d2d4f7b (patch) | |
| tree | 504b9b701557f612c649e1ae828fcf2d2e5c7523 | |
| parent | ef840c1a1df363587c37943210e98f9deea95bde (diff) | |
| download | mullvadvpn-60fc9c9af8cd641235f4f01fc74825db0d2d4f7b.tar.xz mullvadvpn-60fc9c9af8cd641235f4f01fc74825db0d2d4f7b.zip | |
Convert to using vector PDF vs. raster
99 files changed, 440 insertions, 267 deletions
diff --git a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/Contents.json index 9ec05af935..e63f9e602d 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconAlert.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconAlert@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconAlert@3x.png", - "scale" : "3x" + "filename" : "IconAlert.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert.pdf b/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert.pdf Binary files differnew file mode 100644 index 0000000000..93a79619f3 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert.png b/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert.png Binary files differdeleted file mode 100644 index 2e7f89f7e8..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert@2x.png b/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert@2x.png Binary files differdeleted file mode 100644 index 7e3b808250..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert@3x.png b/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert@3x.png Binary files differdeleted file mode 100644 index 1e5a99a4c2..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconAlert.imageset/IconAlert@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/Contents.json index 094776d80f..6001465c6c 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconArrow.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconArrow@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconArrow@3x.png", - "scale" : "3x" + "filename" : "IconArrow.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow.pdf b/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow.pdf Binary files differnew file mode 100644 index 0000000000..8ed65412c9 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow.png b/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow.png Binary files differdeleted file mode 100644 index 051f9c7d8d..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow@2x.png b/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow@2x.png Binary files differdeleted file mode 100644 index 277a1ab36e..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow@3x.png b/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow@3x.png Binary files differdeleted file mode 100644 index 3b2ba8e32f..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconArrow.imageset/IconArrow@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/Contents.json index 7eaaad29b4..5be7d993e8 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconBack.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconBack@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconBack@3x.png", - "scale" : "3x" + "filename" : "IconBack.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack.pdf b/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack.pdf Binary files differnew file mode 100644 index 0000000000..980b2e9b32 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack.png b/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack.png Binary files differdeleted file mode 100644 index 82197cc9d5..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack@2x.png b/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack@2x.png Binary files differdeleted file mode 100644 index caac853142..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack@3x.png b/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack@3x.png Binary files differdeleted file mode 100644 index 0938917563..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconBack.imageset/IconBack@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/Contents.json index 23a2f2387b..54dbef6863 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconChevron.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconChevron@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconChevron@3x.png", - "scale" : "3x" + "filename" : "IconChevron.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron.pdf b/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron.pdf new file mode 100644 index 0000000000..19e3cdbf05 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron.pdf @@ -0,0 +1,70 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmPA +!&j<O(BCC*."$0$a {[`uw/G^z'X?0*vCb62=kRP
f5(Wdټ-JV UEI+)`8 ˘i;Ǹ} ~=ֿ +2;TsD +endstream +endobj +5 0 obj + 181 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 7 12 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20200401142059+02'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000582 00000 n +0000000367 00000 n +0000000295 00000 n +0000000015 00000 n +0000000273 00000 n +0000000647 00000 n +0000000763 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +815 +%%EOF diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron.png b/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron.png Binary files differdeleted file mode 100644 index 9a2d764f26..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron@2x.png b/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron@2x.png Binary files differdeleted file mode 100644 index 82c524b419..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron@3x.png b/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron@3x.png Binary files differdeleted file mode 100644 index 7cbfa8304f..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevron.imageset/IconChevron@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/Contents.json index e62426b668..3171396241 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconChevronDown.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconChevronDown@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconChevronDown@3x.png", - "scale" : "3x" + "filename" : "IconChevronDown.pdf" } ], "info" : { @@ -21,6 +10,7 @@ "author" : "xcode" }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "template", + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.pdf b/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.pdf new file mode 100644 index 0000000000..55d353ac95 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xeA1E=-#I3m:iB 휨ΰH=W8_#@
HƵCc5(ک +w̝TPdK@K,6h5;'RCم6b/:w0e"@TI~QF[q&]KynR.-.
~$Kc +endstream +endobj +5 0 obj + 185 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 24 24 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20200401142059+02'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000587 00000 n +0000000371 00000 n +0000000299 00000 n +0000000015 00000 n +0000000277 00000 n +0000000652 00000 n +0000000768 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +820 +%%EOF diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.png b/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.png Binary files differdeleted file mode 100644 index 82a19f7740..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown@2x.png b/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown@2x.png Binary files differdeleted file mode 100644 index a26570821b..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown@3x.png b/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown@3x.png Binary files differdeleted file mode 100644 index 6bf3cfcbed..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevronDown.imageset/IconChevronDown@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/Contents.json index d3ab732193..1539b29215 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconChevronUp.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconChevronUp@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconChevronUp@3x.png", - "scale" : "3x" + "filename" : "IconChevronUp.pdf" } ], "info" : { @@ -21,6 +10,7 @@ "author" : "xcode" }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "template", + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.pdf b/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.pdf Binary files differnew file mode 100644 index 0000000000..35e04ce766 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.png b/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.png Binary files differdeleted file mode 100644 index a0e5f6caae..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp@2x.png b/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp@2x.png Binary files differdeleted file mode 100644 index efcd4d7232..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp@3x.png b/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp@3x.png Binary files differdeleted file mode 100644 index 1fa11f16a4..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconChevronUp.imageset/IconChevronUp@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/Contents.json index 483e927f99..1c86538987 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconClose.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconClose@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconClose@3x.png", - "scale" : "3x" + "filename" : "IconClose.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose.pdf b/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose.pdf Binary files differnew file mode 100644 index 0000000000..8d82b9acc9 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose.png b/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose.png Binary files differdeleted file mode 100644 index 9e4162b5f6..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose@2x.png b/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose@2x.png Binary files differdeleted file mode 100644 index f51727f570..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose@3x.png b/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose@3x.png Binary files differdeleted file mode 100644 index 9c8e18f244..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconClose.imageset/IconClose@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/Contents.json index 83221941d2..8054dc854b 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconCloseSml.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconCloseSml@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconCloseSml@3x.png", - "scale" : "3x" + "filename" : "IconCloseSml.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.pdf b/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.pdf Binary files differnew file mode 100644 index 0000000000..d6260c1f98 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.png b/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.png Binary files differdeleted file mode 100644 index 21d229beb6..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml@2x.png b/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml@2x.png Binary files differdeleted file mode 100644 index 7fb6cc7cb6..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml@3x.png b/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml@3x.png Binary files differdeleted file mode 100644 index 1b3ef67a7e..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconCloseSml.imageset/IconCloseSml@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/Contents.json index a5f30fcb66..fa42250c83 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconExtlink.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconExtlink@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconExtlink@3x.png", - "scale" : "3x" + "filename" : "IconExtlink.pdf" } ], "info" : { @@ -21,6 +10,7 @@ "author" : "xcode" }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "template", + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink.pdf b/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink.pdf Binary files differnew file mode 100644 index 0000000000..757d079901 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink.png b/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink.png Binary files differdeleted file mode 100644 index 19c0777787..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink@2x.png b/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink@2x.png Binary files differdeleted file mode 100644 index d34e3f9349..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink@3x.png b/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink@3x.png Binary files differdeleted file mode 100644 index 6c552a8dd6..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconExtlink.imageset/IconExtlink@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/Contents.json index 1f51a9467e..cb95467b59 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconFail.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconFail@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconFail@3x.png", - "scale" : "3x" + "filename" : "IconFail.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail.pdf b/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail.pdf Binary files differnew file mode 100644 index 0000000000..341f7c7604 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail.png b/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail.png Binary files differdeleted file mode 100644 index 5220441ee5..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail@2x.png b/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail@2x.png Binary files differdeleted file mode 100644 index 811fc85dcf..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail@3x.png b/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail@3x.png Binary files differdeleted file mode 100644 index 428e7ea542..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconFail.imageset/IconFail@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/Contents.json index 65c53b777e..b1383ae268 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconFastest.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconFastest@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconFastest@3x.png", - "scale" : "3x" + "filename" : "IconFastest.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest.pdf b/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest.pdf Binary files differnew file mode 100644 index 0000000000..e2cccf59b5 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest.png b/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest.png Binary files differdeleted file mode 100644 index 435d9e3da3..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest@2x.png b/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest@2x.png Binary files differdeleted file mode 100644 index d6099c087d..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest@3x.png b/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest@3x.png Binary files differdeleted file mode 100644 index e8a372a929..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconFastest.imageset/IconFastest@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/Contents.json index e16c1d4e59..1a4836090c 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconNearest.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconNearest@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconNearest@3x.png", - "scale" : "3x" + "filename" : "IconNearest.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest.pdf b/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest.pdf Binary files differnew file mode 100644 index 0000000000..40b6736680 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest.png b/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest.png Binary files differdeleted file mode 100644 index 21bf1912e9..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest@2x.png b/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest@2x.png Binary files differdeleted file mode 100644 index 612085d214..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest@3x.png b/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest@3x.png Binary files differdeleted file mode 100644 index 7882424be9..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconNearest.imageset/IconNearest@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/Contents.json index e7c51be6ee..82d4cfeb72 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconSettings.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconSettings@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconSettings@3x.png", - "scale" : "3x" + "filename" : "IconSettings.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings.pdf b/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings.pdf Binary files differnew file mode 100644 index 0000000000..b17cda0023 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings.png b/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings.png Binary files differdeleted file mode 100644 index 04036aee49..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings@2x.png b/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings@2x.png Binary files differdeleted file mode 100644 index 82e21d1735..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings@3x.png b/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings@3x.png Binary files differdeleted file mode 100644 index 6c938e39a9..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSettings.imageset/IconSettings@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/Contents.json index 363748ee3c..6cfa4fdda5 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconSpinner.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconSpinner@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconSpinner@3x.png", - "scale" : "3x" + "filename" : "IconSpinner.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner.pdf b/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner.pdf new file mode 100644 index 0000000000..5b915cf5ad --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner.pdf @@ -0,0 +1,71 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmRIn$!?*ɞ3ɑՒUR! bA{Z-BJvn5y>N1I]xIpQk(1ᘲ8d}&\e߽ ?E{>V`X&+6ȄcTt ߦA + +*7*q~Э$Fm1u<)Gy}̝UcޔU&!Vks#GlH@hB-!-:bb7)sV(aoPd=6HA˼D#CBlN1X%^u4Lþb$$hre`q(2X܌+[mu42\X3B;{֑uV}
P +endstream +endobj +5 0 obj + 406 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 0.2 /ca 0.2 >> + /a1 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 60 60 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20200401142100+02'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000840 00000 n +0000000624 00000 n +0000000520 00000 n +0000000015 00000 n +0000000498 00000 n +0000000905 00000 n +0000001021 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1073 +%%EOF diff --git a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner.png b/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner.png Binary files differdeleted file mode 100644 index 2faa618718..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner@2x.png b/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner@2x.png Binary files differdeleted file mode 100644 index ebdcd693cc..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner@3x.png b/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner@3x.png Binary files differdeleted file mode 100644 index 9f53def221..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSpinner.imageset/IconSpinner@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/Contents.json index d75e7e0c18..a0b7acfdf3 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconSuccess.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconSuccess@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconSuccess@3x.png", - "scale" : "3x" + "filename" : "IconSuccess.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess.pdf b/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess.pdf new file mode 100644 index 0000000000..3a21420319 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess.pdf @@ -0,0 +1,68 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +x]P[n0\{*~t?_*'G0 z:/h$>PF⿺c6+f}DE5Lېo-==N.:xPC۔`YOe'8$T}v&C'2'jV.mZNihO{^3+i8l$Ɛ';˄`J +endstream +endobj +5 0 obj + 230 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 60 60 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20200401142100+02'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000632 00000 n +0000000416 00000 n +0000000344 00000 n +0000000015 00000 n +0000000322 00000 n +0000000697 00000 n +0000000813 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +865 +%%EOF diff --git a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess.png b/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess.png Binary files differdeleted file mode 100644 index d90b8e3240..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess@2x.png b/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess@2x.png Binary files differdeleted file mode 100644 index 6cc39be253..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess@3x.png b/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess@3x.png Binary files differdeleted file mode 100644 index e622078494..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconSuccess.imageset/IconSuccess@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/Contents.json index 50bd9a5567..9dd11aed54 100644 --- a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "IconTick.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "IconTick@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "IconTick@3x.png", - "scale" : "3x" + "filename" : "IconTick.pdf" } ], "info" : { @@ -21,6 +10,7 @@ "author" : "xcode" }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "template", + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick.pdf b/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick.pdf new file mode 100644 index 0000000000..072e04a937 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick.pdf @@ -0,0 +1,70 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +x]K +1D9E_I'"]{hxW9Hu<˫ot<3>E10b=I/(f$ >2mi +FDQmLנlRgX5!zĒE5hYT_߬<3YStfy'ײ̎$
6jƵ]> +endstream +endobj +5 0 obj + 176 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 24 24 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20200401142100+02'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000578 00000 n +0000000362 00000 n +0000000290 00000 n +0000000015 00000 n +0000000268 00000 n +0000000643 00000 n +0000000759 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +811 +%%EOF diff --git a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick.png b/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick.png Binary files differdeleted file mode 100644 index d090b1837f..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick@2x.png b/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick@2x.png Binary files differdeleted file mode 100644 index 3f8df67842..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick@3x.png b/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick@3x.png Binary files differdeleted file mode 100644 index 5c3f2a9195..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/IconTick.imageset/IconTick@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/Contents.json index aac19236ab..5f66d5e4af 100644 --- a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "LocationMarkerSecure.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LocationMarkerSecure@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LocationMarkerSecure@3x.png", - "scale" : "3x" + "filename" : "LocationMarkerSecure.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.pdf b/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.pdf Binary files differnew file mode 100644 index 0000000000..37598ad995 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.png b/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.png Binary files differdeleted file mode 100644 index 08f8601c35..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure@2x.png b/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure@2x.png Binary files differdeleted file mode 100644 index df7bfeb4e6..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure@3x.png b/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure@3x.png Binary files differdeleted file mode 100644 index 6c0bd519bd..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LocationMarkerSecure.imageset/LocationMarkerSecure@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/Contents.json index e1548e8632..c877c5f83c 100644 --- a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "LocationMarkerUnsecure.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LocationMarkerUnsecure@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LocationMarkerUnsecure@3x.png", - "scale" : "3x" + "filename" : "LocationMarkerUnsecure.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.pdf b/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.pdf Binary files differnew file mode 100644 index 0000000000..da2e87e4fd --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.png b/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.png Binary files differdeleted file mode 100644 index 109b5ede07..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure@2x.png b/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure@2x.png Binary files differdeleted file mode 100644 index 6564a3a341..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure@3x.png b/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure@3x.png Binary files differdeleted file mode 100644 index bb7d63a426..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LocationMarkerUnsecure.imageset/LocationMarkerUnsecure@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/Contents.json index 74e5c9dba2..4199af9556 100644 --- a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/Contents.json +++ b/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/Contents.json @@ -2,22 +2,14 @@ "images" : [ { "idiom" : "universal", - "filename" : "LogoIcon.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LogoIcon@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LogoIcon@3x.png", - "scale" : "3x" + "filename" : "LogoIcon.pdf" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true } }
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon.pdf b/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon.pdf Binary files differnew file mode 100644 index 0000000000..87f35ecae0 --- /dev/null +++ b/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon.pdf diff --git a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon.png b/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon.png Binary files differdeleted file mode 100644 index d082423b0b..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon@2x.png b/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon@2x.png Binary files differdeleted file mode 100644 index 89e31ce99d..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon@2x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon@3x.png b/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon@3x.png Binary files differdeleted file mode 100644 index fe7dc555ba..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/LogoIcon.imageset/LogoIcon@3x.png +++ /dev/null diff --git a/ios/MullvadVPN/Assets.xcassets/NewLogoIcon.imageset/Contents.json b/ios/MullvadVPN/Assets.xcassets/NewLogoIcon.imageset/Contents.json deleted file mode 100644 index 9e9f4e465b..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/NewLogoIcon.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "NewLogoIcon.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "preserves-vector-representation" : true - } -}
\ No newline at end of file diff --git a/ios/MullvadVPN/Assets.xcassets/NewLogoIcon.imageset/NewLogoIcon.pdf b/ios/MullvadVPN/Assets.xcassets/NewLogoIcon.imageset/NewLogoIcon.pdf Binary files differdeleted file mode 100644 index a3200ee169..0000000000 --- a/ios/MullvadVPN/Assets.xcassets/NewLogoIcon.imageset/NewLogoIcon.pdf +++ /dev/null diff --git a/ios/MullvadVPN/Base.lproj/Main.storyboard b/ios/MullvadVPN/Base.lproj/Main.storyboard index 8c2c4c3811..032472749a 100644 --- a/ios/MullvadVPN/Base.lproj/Main.storyboard +++ b/ios/MullvadVPN/Base.lproj/Main.storyboard @@ -40,7 +40,11 @@ <rect key="frame" x="0.0" y="0.0" width="375" height="93"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LogoIcon" translatesAutoresizingMaskIntoConstraints="NO" id="cKg-hE-JsS"> - <rect key="frame" x="12" y="31.5" width="49.000000000000014" height="50"/> + <rect key="frame" x="12" y="34.5" width="44.000000000000057" height="44.000000000000057"/> + <constraints> + <constraint firstAttribute="width" secondItem="cKg-hE-JsS" secondAttribute="height" multiplier="1:1" id="jln-Ze-Hhl"/> + <constraint firstAttribute="width" constant="44" id="u6D-kY-AyW"/> + </constraints> </imageView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uXv-Tf-PET"> <rect key="frame" x="335" y="44.5" width="24" height="24"/> @@ -51,7 +55,7 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MULLVAD VPN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dqy-A0-TdV"> - <rect key="frame" x="69" y="42" width="168" height="29"/> + <rect key="frame" x="64" y="42" width="168" height="29"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="24"/> <color key="textColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> @@ -91,7 +95,7 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="nyE-nN-nlq" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="-430" y="27"/> + <point key="canvasLocation" x="-431.19999999999999" y="26.53673163418291"/> </scene> <!--Login View Controller--> <scene sceneID="tne-QT-ifu"> @@ -964,7 +968,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JYh-33-d0O"> - <rect key="frame" x="0.0" y="0.0" width="375" height="597"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="598"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N9k-cQ-tlw" userLabel="Content view"> <rect key="frame" x="0.0" y="0.0" width="375" height="558"/> @@ -972,19 +976,19 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wnl-L9-JqG" userLabel="Logo header"> <rect key="frame" x="0.0" y="0.0" width="375" height="100"/> <subviews> - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="NewLogoIcon" translatesAutoresizingMaskIntoConstraints="NO" id="WSx-4V-zIk"> - <rect key="frame" x="137.5" y="0.0" width="100" height="100"/> + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LogoIcon" translatesAutoresizingMaskIntoConstraints="NO" id="WSx-4V-zIk"> + <rect key="frame" x="157.5" y="20" width="60.000000000000057" height="60.000000000000057"/> <constraints> <constraint firstAttribute="width" secondItem="WSx-4V-zIk" secondAttribute="height" multiplier="1:1" id="ZtE-hc-rs8"/> - <constraint firstAttribute="width" constant="100" id="qGt-Am-MHR"/> + <constraint firstAttribute="width" constant="60" id="qGt-Am-MHR"/> </constraints> </imageView> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstItem="WSx-4V-zIk" firstAttribute="centerX" secondItem="Wnl-L9-JqG" secondAttribute="centerX" id="30b-jz-Tpk"/> - <constraint firstAttribute="bottom" secondItem="WSx-4V-zIk" secondAttribute="bottom" id="3FY-d7-yKL"/> - <constraint firstItem="WSx-4V-zIk" firstAttribute="top" secondItem="Wnl-L9-JqG" secondAttribute="top" id="ekz-Kj-ng1"/> + <constraint firstAttribute="bottom" secondItem="WSx-4V-zIk" secondAttribute="bottom" constant="20" id="3FY-d7-yKL"/> + <constraint firstItem="WSx-4V-zIk" firstAttribute="top" secondItem="Wnl-L9-JqG" secondAttribute="top" constant="20" id="ekz-Kj-ng1"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Do you agree to remaining anonymous?" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KiF-h3-6a4"> @@ -1003,7 +1007,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Cas-Tk-gcz" customClass="LinkButton" customModule="MullvadVPN" customModuleProvider="target"> - <rect key="frame" x="20" y="516" width="128" height="22"/> + <rect key="frame" x="20" y="516" width="20" height="22"/> <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="18"/> <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <state key="normal" title="Privacy Policy" image="IconExtlink"/> @@ -1039,10 +1043,10 @@ </constraints> </scrollView> <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" translatesAutoresizingMaskIntoConstraints="NO" id="16P-Q0-ZO9" userLabel="Footer"> - <rect key="frame" x="0.0" y="597" width="375" height="70"/> + <rect key="frame" x="0.0" y="598" width="375" height="69"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ttw-7B-1MM" customClass="AppButton" customModule="MullvadVPN" customModuleProvider="target"> - <rect key="frame" x="16" y="24" width="343" height="22"/> + <rect key="frame" x="16" y="24" width="343" height="21"/> <accessibility key="accessibilityConfiguration" identifier="AgreeButton"/> <state key="normal" title="Agree and continue" backgroundImage="DefaultButton"> <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> @@ -1453,8 +1457,7 @@ <image name="IconSettings" width="24" height="24"/> <image name="IconSuccess" width="60" height="60"/> <image name="IconTick" width="24" height="24"/> - <image name="LogoIcon" width="49" height="50"/> - <image name="NewLogoIcon" width="400" height="400"/> + <image name="LogoIcon" width="253" height="253"/> <image name="SuccessButton" width="9" height="9"/> <image name="TranslucentDangerButton" width="9" height="9"/> <image name="TranslucentNeutralButton" width="9" height="9"/> diff --git a/ios/convert-assets.rb b/ios/convert-assets.rb index 266e52d777..c0238848f0 100755 --- a/ios/convert-assets.rb +++ b/ios/convert-assets.rb @@ -92,13 +92,10 @@ def generate_graphical_assets() Dir.mkdir(output_dir) end - for retina_scale in (1..3) do - scale_suffix = retina_scale_suffix(retina_scale) - output_file = File.join(output_dir, "#{image_name}#{scale_suffix}.png") + output_file = File.join(output_dir, "#{image_name}.pdf") - puts "Convert #{svg_file} -> #{output_file}" - system("rsvg-convert", "--zoom=#{retina_scale}", "--format=png", svg_file, "--output", output_file) - end + puts "Convert #{svg_file} -> #{output_file}" + system("rsvg-convert", "--format=pdf", svg_file, "--output", output_file) end end |
