Brion VIBBER has submitted this change and it was merged.
Change subject: Cleared out some icon cruft.
......................................................................
Cleared out some icon cruft.
Images.xcassets was referencing some icon resolutions which it said were unused.
Removed them and updated the icon generation script to no longer make them.
Change-Id: I9db18a0b1bf385b89fca142d190ec96134c343be
---
M scripts/icon-svgs-to-pngs.sh
M wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
D wikipedia/Images.xcassets/AppIcon.appiconset/icon180-1.png
D wikipedia/Images.xcassets/AppIcon.appiconset/icon87-1.png
D wikipedia/Images.xcassets/AppIcon.appiconset/icon90.png
5 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
Bgerstle: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/scripts/icon-svgs-to-pngs.sh b/scripts/icon-svgs-to-pngs.sh
index e4bf258..6c6fca9 100755
--- a/scripts/icon-svgs-to-pngs.sh
+++ b/scripts/icon-svgs-to-pngs.sh
@@ -1,8 +1,8 @@
#!/bin/sh
-ruby -e '[29,40,50,57,58,72,76,80,87,90,100,114,120,144,152,180].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
"wikipedia/Images.xcassets/AppIcon.appiconset/icon#{x}.png" -w #{x}
'"$SCRIPT_INPUT_FILE_0"'` }'
+ruby -e '[29,40,50,57,58,72,76,80,87,100,114,120,144,152,180].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
"wikipedia/Images.xcassets/AppIcon.appiconset/icon#{x}.png" -w #{x}
'"$SCRIPT_INPUT_FILE_0"'` }'
-ruby -e '[87,120,180].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
"wikipedia/Images.xcassets/AppIcon.appiconset/icon#{x}-1.png" -w #{x}
'"$SCRIPT_INPUT_FILE_0"'` }'
+ruby -e '[120].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
"wikipedia/Images.xcassets/AppIcon.appiconset/icon#{x}-1.png" -w #{x}
'"$SCRIPT_INPUT_FILE_0"'` }'
ruby -e '[120,240,360].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
"wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent#{x}.png" -w #{x}
'"$SCRIPT_INPUT_FILE_1"'` }'
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
b/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
index ce7c064..c6ce380 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -15,7 +15,7 @@
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "icon87-1.png",
+ "filename" : "icon87.png",
"scale" : "3x"
},
{
@@ -51,7 +51,7 @@
{
"size" : "60x60",
"idiom" : "iphone",
- "filename" : "icon180-1.png",
+ "filename" : "icon180.png",
"scale" : "3x"
},
{
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon180-1.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon180-1.png
deleted file mode 100644
index 907203d..0000000
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon180-1.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon87-1.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon87-1.png
deleted file mode 100644
index 42a94b5..0000000
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon87-1.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon90.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon90.png
deleted file mode 100644
index 5aab3f4..0000000
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon90.png
+++ /dev/null
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/184555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9db18a0b1bf385b89fca142d190ec96134c343be
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Bgerstle <bgers...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
