Bgerstle has submitted this change and it was merged.
Change subject: Update icon.
......................................................................
Update icon.
Used ruby script which is most easily run in ubuntu for creating
various icon resolutions from icon svg.
Renamed items in icon plist to use names generated by script.
Bug: T97783
Change-Id: I3a69ef974b210de3698874fe40c343d3dfcde4b3
---
M Wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
M Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Contents.json
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@3x.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-72.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-76.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small-50.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-small...@2x.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-sm...@3x.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Spotlight-40.png
D
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x-1.png
D
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x.png
D
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@3x.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/i...@2x.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_100.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_114.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_120.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_120_copy.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_144.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_152.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_180.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_29.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_29_copy.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_40.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_50.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_57.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_58.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_58_copy.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_72.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_76.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_80.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_80_copy.png
A Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_87.png
D
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_app_icon_iphone.png
D Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_icon.png
D
Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_i...@2x.png
D scripts/icon-svgs-to-pngs.sh
A scripts/make-icons-from-svg.sh
M svgs/icon-prod.svg
43 files changed, 75 insertions(+), 61 deletions(-)
Approvals:
Bgerstle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
b/Wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
index bdf34f6..ee06e88 100644
--- a/Wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -3,115 +3,115 @@
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "ios7_settings_icon.png",
+ "filename" : "icon_29.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "ios7_settings_i...@2x.png",
+ "filename" : "icon_58.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "icon-sm...@3x.png",
+ "filename" : "icon_87.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
- "filename" : "icon-spotlight...@2x-1.png",
+ "filename" : "icon_80.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
- "filename" : "icon-spotlight...@3x.png",
+ "filename" : "icon_120.png",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
- "filename" : "Icon.png",
+ "filename" : "icon_57.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
- "filename" : "i...@2x.png",
+ "filename" : "icon_114.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
- "filename" : "icon...@2x.png",
+ "filename" : "icon_120_copy.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
- "filename" : "icon...@3x.png",
+ "filename" : "icon_180.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "ipad",
- "filename" : "Icon-Small.png",
+ "filename" : "icon_29_copy.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
- "filename" : "ios7_app_icon_iphone.png",
+ "filename" : "icon_58_copy.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
- "filename" : "Icon-Spotlight-40.png",
+ "filename" : "icon_40.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
- "filename" : "icon-spotlight...@2x.png",
+ "filename" : "icon_80_copy.png",
"scale" : "2x"
},
{
"size" : "50x50",
"idiom" : "ipad",
- "filename" : "Icon-Small-50.png",
+ "filename" : "icon_50.png",
"scale" : "1x"
},
{
"size" : "50x50",
"idiom" : "ipad",
- "filename" : "icon-small...@2x.png",
+ "filename" : "icon_100.png",
"scale" : "2x"
},
{
"size" : "72x72",
"idiom" : "ipad",
- "filename" : "Icon-72.png",
+ "filename" : "icon_72.png",
"scale" : "1x"
},
{
"size" : "72x72",
"idiom" : "ipad",
- "filename" : "icon...@2x.png",
+ "filename" : "icon_144.png",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
- "filename" : "Icon-76.png",
+ "filename" : "icon_76.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
- "filename" : "icon...@2x.png",
+ "filename" : "icon_152.png",
"scale" : "2x"
},
{
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Contents.json
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Contents.json
index bdf34f6..ee06e88 100644
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Contents.json
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Contents.json
@@ -3,115 +3,115 @@
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "ios7_settings_icon.png",
+ "filename" : "icon_29.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "ios7_settings_i...@2x.png",
+ "filename" : "icon_58.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "icon-sm...@3x.png",
+ "filename" : "icon_87.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
- "filename" : "icon-spotlight...@2x-1.png",
+ "filename" : "icon_80.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
- "filename" : "icon-spotlight...@3x.png",
+ "filename" : "icon_120.png",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
- "filename" : "Icon.png",
+ "filename" : "icon_57.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
- "filename" : "i...@2x.png",
+ "filename" : "icon_114.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
- "filename" : "icon...@2x.png",
+ "filename" : "icon_120_copy.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
- "filename" : "icon...@3x.png",
+ "filename" : "icon_180.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "ipad",
- "filename" : "Icon-Small.png",
+ "filename" : "icon_29_copy.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
- "filename" : "ios7_app_icon_iphone.png",
+ "filename" : "icon_58_copy.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
- "filename" : "Icon-Spotlight-40.png",
+ "filename" : "icon_40.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
- "filename" : "icon-spotlight...@2x.png",
+ "filename" : "icon_80_copy.png",
"scale" : "2x"
},
{
"size" : "50x50",
"idiom" : "ipad",
- "filename" : "Icon-Small-50.png",
+ "filename" : "icon_50.png",
"scale" : "1x"
},
{
"size" : "50x50",
"idiom" : "ipad",
- "filename" : "icon-small...@2x.png",
+ "filename" : "icon_100.png",
"scale" : "2x"
},
{
"size" : "72x72",
"idiom" : "ipad",
- "filename" : "Icon-72.png",
+ "filename" : "icon_72.png",
"scale" : "1x"
},
{
"size" : "72x72",
"idiom" : "ipad",
- "filename" : "icon...@2x.png",
+ "filename" : "icon_144.png",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
- "filename" : "Icon-76.png",
+ "filename" : "icon_76.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
- "filename" : "icon...@2x.png",
+ "filename" : "icon_152.png",
"scale" : "2x"
},
{
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
deleted file mode 100644
index 4860ecc..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@3x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@3x.png
deleted file mode 100644
index e0857df..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@3x.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-72.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-72.png
deleted file mode 100644
index 8c444c7..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-72.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
deleted file mode 100644
index da386de..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-76.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-76.png
deleted file mode 100644
index 75954d6..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-76.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
deleted file mode 100644
index 0931cf0..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon...@2x.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small-50.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small-50.png
deleted file mode 100644
index 0019ddf..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small-50.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-small...@2x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-small...@2x.png
deleted file mode 100644
index 146fdf0..0000000
---
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-small...@2x.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small.png
deleted file mode 100644
index ad4ff6b..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Small.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-sm...@3x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-sm...@3x.png
deleted file mode 100644
index 7746e63..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-sm...@3x.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Spotlight-40.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Spotlight-40.png
deleted file mode 100644
index 3ed49c3..0000000
---
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon-Spotlight-40.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x-1.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x-1.png
deleted file mode 100644
index e08162c..0000000
---
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x-1.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x.png
deleted file mode 100644
index e08162c..0000000
---
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@2x.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@3x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@3x.png
deleted file mode 100644
index 27340a7..0000000
---
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon-spotlight...@3x.png
+++ /dev/null
Binary files differ
diff --git a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon.png
deleted file mode 100644
index a916daf..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/Icon.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/i...@2x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/i...@2x.png
deleted file mode 100644
index 1a68013..0000000
--- a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/i...@2x.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_100.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_100.png
new file mode 100644
index 0000000..1427430
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_100.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_114.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_114.png
new file mode 100644
index 0000000..448b774
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_114.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_120.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_120.png
new file mode 100644
index 0000000..a373636
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_120.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_120_copy.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_120_copy.png
new file mode 100644
index 0000000..a373636
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_120_copy.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_144.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_144.png
new file mode 100644
index 0000000..1607f96
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_144.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_152.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_152.png
new file mode 100644
index 0000000..0ac349c
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_152.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_180.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_180.png
new file mode 100644
index 0000000..be1995e
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_180.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_29.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_29.png
new file mode 100644
index 0000000..84b3354
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_29.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_29_copy.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_29_copy.png
new file mode 100644
index 0000000..84b3354
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_29_copy.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_40.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_40.png
new file mode 100644
index 0000000..77cf6bb
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_40.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_50.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_50.png
new file mode 100644
index 0000000..9c24a74
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_50.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_57.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_57.png
new file mode 100644
index 0000000..449ebc7
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_57.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_58.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_58.png
new file mode 100644
index 0000000..ff5dbf3
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_58.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_58_copy.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_58_copy.png
new file mode 100644
index 0000000..ff5dbf3
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_58_copy.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_72.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_72.png
new file mode 100644
index 0000000..cc1ba10
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_72.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_76.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_76.png
new file mode 100644
index 0000000..e8db265
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_76.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_80.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_80.png
new file mode 100644
index 0000000..9e206f9
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_80.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_80_copy.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_80_copy.png
new file mode 100644
index 0000000..9e206f9
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_80_copy.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_87.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_87.png
new file mode 100644
index 0000000..9426f7f
--- /dev/null
+++ b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/icon_87.png
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_app_icon_iphone.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_app_icon_iphone.png
deleted file mode 100644
index 2486728..0000000
---
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_app_icon_iphone.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_icon.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_icon.png
deleted file mode 100644
index db253bb..0000000
---
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_icon.png
+++ /dev/null
Binary files differ
diff --git
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_i...@2x.png
b/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_i...@2x.png
deleted file mode 100644
index be2178d..0000000
---
a/Wikipedia/SourceIcons.xcassets/AppIconSource.appiconset/ios7_settings_i...@2x.png
+++ /dev/null
Binary files differ
diff --git a/scripts/icon-svgs-to-pngs.sh b/scripts/icon-svgs-to-pngs.sh
deleted file mode 100755
index 7277ddc..0000000
--- a/scripts/icon-svgs-to-pngs.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-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 '[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"'` }'
diff --git a/scripts/make-icons-from-svg.sh b/scripts/make-icons-from-svg.sh
new file mode 100755
index 0000000..eb3c672
--- /dev/null
+++ b/scripts/make-icons-from-svg.sh
@@ -0,0 +1,12 @@
+# This script takes icon-prod.svg and creates pngs used for AppIcon assets.
+#
+# Note: it's much easier to just run this in Ubuntu:
+# - copy this script and icon-prod.svg to a folder
+# - with terminal change to that folder
+# - then run './make-icons-from-svg.sh'
+# - the various png resolutions specified below will be output to the folder
+
+ruby -e '[29,40,50,57,58,80,100,72,76,87,114,120,144,152,180].each { |x|
`inkscape --export-png ./icon_#{x}.png -w #{x} icon-prod.svg` }'
+
+ruby -e '[29,58,80,120].each { |x| `inkscape --export-png ./icon_#{x}_copy.png
-w #{x} icon-prod.svg` }'
+
diff --git a/svgs/icon-prod.svg b/svgs/icon-prod.svg
index aa00507..7201bbf 100644
--- a/svgs/icon-prod.svg
+++ b/svgs/icon-prod.svg
@@ -1,23 +1,30 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;"
xml:space="preserve">
-<rect style="fill:#EEEEEE;" width="1024" height="1024"/>
+ width="512px" height="512px" viewBox="50 140 512 512"
enable-background="new 50 140 512 512" xml:space="preserve">
<g>
- <path style="fill:#333333;"
d="M565.62,300.771c19.821,0.734,41.11,1.469,57.994,1.469c16.885,0,35.238-0.735,53.59-1.469
-
c4.405,4.405,4.405,19.821,0,24.225c-38.174,5.874-54.324,33.769-72.163,68.272l-53.663,102.115l93.892,194.464h3.377
-
l139.408-301.718c17.398-39.715,16.15-59.462-31.568-63.133c-4.404-4.404-4.404-19.82,0-24.225
-
c27.163,0.734,55.793,1.469,72.677,1.469c16.885,0,41.11-0.735,64.602-1.469c4.405,4.405,4.405,19.821,0,24.225
-
c-41.844,4.405-55.865,33.108-72.163,68.272L647.841,767.664c-5.139,11.011-9.544,16.884-17.619,16.884
-
c-7.341,0-12.994-5.946-16.884-16.884L514.6,554.552L406.319,767.664c-4.404,11.011-9.543,16.884-17.619,16.884
-
c-7.34,0-12.479-5.872-16.884-16.884L212.148,391.801c-22.39-52.122-27.749-64.088-65.702-66.804
-
c-4.405-4.404-5.139-19.82-0.735-24.225c25.694,0.734,51.902,1.469,76.348,1.469c22.243,0,52.122-0.735,81.486-1.469
-
c4.405,4.405,4.405,19.821,0,24.225c-46.249,5.139-48.451,16.885-29.805,58.729l134.414,306.122h3.377l82-166.789l-61.885-131.258
-
c-24.592-52.122-30.465-62.399-62.032-66.804c-4.404-4.404-5.139-19.82-0.734-24.225c21.289,0.734,43.826,1.469,65.335,1.469
-
c23.272,0,45.514-0.735,66.804-1.469c4.404,4.405,4.404,19.821,0,24.225c-30.833,4.405-27.896,16.885-7.782,58.729l36.118,74.144
-
l3.23,3.304l38.908-73.044c22.757-42.578,25.693-58.728-5.874-63.133C561.216,320.592,561.216,305.176,565.62,300.771z"/>
+ <rect x="50" y="140" fill="#EEEEEE" width="512" height="512"/>
+ <path id="letterw" fill="#333333"
d="M475.763,312.302c0,1.28-0.376,2.334-1.129,3.388c-0.753,0.979-1.581,1.506-2.56,1.506
+
c-7.529,0.753-13.779,3.162-18.522,7.304c-4.819,4.141-9.788,12.047-14.908,23.642L360.413,524.33
+
c-0.527,1.656-1.958,2.485-4.292,2.485c-1.882,0-3.238-0.828-4.292-2.485l-43.821-91.633l-50.447,91.708
+
c-1.054,1.656-2.485,2.485-4.292,2.485c-2.259,0-3.765-0.828-4.442-2.485l-76.8-176.188c-4.819-10.918-9.864-18.598-15.209-22.889
+
c-5.271-4.367-12.725-7.002-22.212-8.056c-0.828,0-1.581-0.452-2.334-1.28c-0.753-0.828-1.054-1.882-1.054-2.936
+
c0-2.861,0.828-4.292,2.485-4.292c6.852,0,14.005,0.301,21.459,0.904c6.927,0.602,13.478,0.904,19.576,0.904
+
c6.249,0,13.628-0.301,22.061-0.904c8.885-0.602,16.791-0.904,23.642-0.904c1.656,0,2.485,1.431,2.485,4.292
+
s-0.527,4.292-1.506,4.292c-6.852,0.527-12.273,2.259-16.188,5.195s-5.873,6.852-5.873,11.671c0,2.485,0.828,5.496,2.485,9.186
+
l63.473,143.36l36.066-68.066l-33.581-70.4c-6.024-12.574-10.993-20.706-14.908-24.32s-9.788-5.873-17.619-6.701
+
c-0.753,0-1.431-0.452-2.033-1.28c-0.678-0.828-0.979-1.882-0.979-2.936c0-2.861,0.678-4.292,2.184-4.292
+
c6.852,0,13.101,0.301,18.824,0.904c5.496,0.602,11.369,0.904,17.619,0.904c6.099,0,12.574-0.301,19.426-0.904
+
c7.078-0.602,14.005-0.904,20.856-0.904c1.656,0,2.485,1.431,2.485,4.292c0,2.861-0.452,4.292-1.506,4.292
+
c-13.704,0.904-20.555,4.819-20.555,11.671c0,3.087,1.581,7.831,4.744,14.231l22.212,45.101l22.061-41.261
+
c3.087-5.798,4.593-10.767,4.593-14.758c0-9.412-6.852-14.381-20.555-15.059c-1.28,0-1.882-1.431-1.882-4.292
+
c0-1.054,0.301-2.033,0.904-2.936c0.602-0.904,1.28-1.431,1.882-1.431c4.894,0,10.918,0.301,18.071,0.904
+
c6.852,0.602,12.499,0.904,16.866,0.904c3.162,0,7.831-0.301,13.929-0.753c7.755-0.678,14.306-1.054,19.501-1.054
+
c1.205,0,1.807,1.205,1.807,3.689c0,3.238-1.129,4.894-3.388,4.894c-7.981,0.828-14.381,3.012-19.275,6.626
+
c-4.894,3.614-10.918,11.671-18.146,24.395l-29.44,54.438l39.906,81.242l58.88-136.96c2.033-4.969,3.087-9.638,3.087-13.779
+
c0-10.014-6.852-15.36-20.555-15.962c-1.28,0-1.882-1.431-1.882-4.292s0.904-4.292,2.786-4.292c4.969,0,10.918,0.301,17.769,0.904
+
c6.325,0.602,11.671,0.904,15.962,0.904c4.518,0,9.713-0.301,15.661-0.904c6.174-0.602,11.671-0.904,16.565-0.904
+ C475.086,308.613,475.763,309.818,475.763,312.302z"/>
</g>
-<path style="fill:#CCCCCC;"
d="M0,1024h1024V791.284c-0.036-0.987-0.054-1.961-0.054-2.921v-42.004
-
c0,122.534-99.333,221.867-221.867,221.867H221.812C100.719,968.226,2.297,871.211,0,750.667V1024z"/>
</svg>
--
To view, visit https://gerrit.wikimedia.org/r/210607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a69ef974b210de3698874fe40c343d3dfcde4b3
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: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
