Brion VIBBER has submitted this change and it was merged.
Change subject: Launch icon set.
......................................................................
Launch icon set.
Change-Id: Ie9c6769900c893099854acd4bca22a3d7131014b
---
M wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
A wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png
A wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png
A wikipedia/Images.xcassets/AppIcon.appiconset/svg and notes/icon.svg
A wikipedia/Images.xcassets/AppIcon.appiconset/svg and notes/notes.txt
M wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
M wikipedia/Wikipedia-Info.plist
18 files changed, 198 insertions(+), 9 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
b/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
index 91bf9c1..3f6a890 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,53 +1,107 @@
{
"images" : [
{
- "idiom" : "iphone",
"size" : "29x29",
+ "idiom" : "iphone",
+ "filename" : "icon29.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "29x29",
+ "idiom" : "iphone",
+ "filename" : "icon58.png",
"scale" : "2x"
},
{
- "idiom" : "iphone",
"size" : "40x40",
+ "idiom" : "iphone",
+ "filename" : "icon80.png",
"scale" : "2x"
},
{
+ "size" : "57x57",
"idiom" : "iphone",
+ "filename" : "icon57.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "57x57",
+ "idiom" : "iphone",
+ "filename" : "icon114.png",
+ "scale" : "2x"
+ },
+ {
"size" : "60x60",
+ "idiom" : "iphone",
+ "filename" : "icon120.png",
"scale" : "2x"
},
{
- "idiom" : "ipad",
"size" : "29x29",
+ "idiom" : "ipad",
+ "filename" : "icon29.png",
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "29x29",
+ "idiom" : "ipad",
+ "filename" : "icon58.png",
"scale" : "2x"
},
{
- "idiom" : "ipad",
"size" : "40x40",
+ "idiom" : "ipad",
+ "filename" : "icon40.png",
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "40x40",
+ "idiom" : "ipad",
+ "filename" : "icon80.png",
"scale" : "2x"
},
{
+ "size" : "50x50",
"idiom" : "ipad",
- "size" : "76x76",
+ "filename" : "icon50.png",
"scale" : "1x"
},
{
+ "size" : "50x50",
"idiom" : "ipad",
+ "filename" : "icon100.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "72x72",
+ "idiom" : "ipad",
+ "filename" : "icon72.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "72x72",
+ "idiom" : "ipad",
+ "filename" : "icon144.png",
+ "scale" : "2x"
+ },
+ {
"size" : "76x76",
+ "idiom" : "ipad",
+ "filename" : "icon76.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "76x76",
+ "idiom" : "ipad",
+ "filename" : "icon152.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
+ },
+ "properties" : {
+ "pre-rendered" : true
}
}
\ No newline at end of file
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png
new file mode 100644
index 0000000..46e9221
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png
new file mode 100644
index 0000000..b57549f
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png
new file mode 100644
index 0000000..c3f36ec
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png
new file mode 100644
index 0000000..c4ee216
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png
new file mode 100644
index 0000000..be33d7f
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png
new file mode 100644
index 0000000..fef8e60
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png
new file mode 100644
index 0000000..10efbc9
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png
new file mode 100644
index 0000000..ba7cb55
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png
new file mode 100644
index 0000000..7b3387e
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png
new file mode 100644
index 0000000..0c177aa
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png
new file mode 100644
index 0000000..0104e38
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png
new file mode 100644
index 0000000..6e662e4
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png
new file mode 100644
index 0000000..cb3e8da
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/svg and
notes/icon.svg b/wikipedia/Images.xcassets/AppIcon.appiconset/svg and
notes/icon.svg
new file mode 100644
index 0000000..c89a70a
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/svg and notes/icon.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 1024 1024"
+ style="enable-background:new 0 0 1024 1024;"
+ xml:space="preserve"
+ inkscape:version="0.48.2 r9819"
+ width="100%"
+ height="100%"
+ sodipodi:docname="wp_iOS_launchIcon.svg"><metadata
+ id="metadata15"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs13" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="672"
+ inkscape:window-height="605"
+ id="namedview11"
+ showgrid="false"
+ inkscape:zoom="0.23046875"
+ inkscape:cx="512"
+ inkscape:cy="512"
+ inkscape:window-x="203"
+ inkscape:window-y="64"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="Layer_1" />
+<rect
+ style="fill:#EEEEEE;"
+ width="1024"
+ height="1024"
+ id="rect3" />
+<g
+ id="g5">
+ <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"
+ id="path7" />
+</g>
+
+</svg>
\ No newline at end of file
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/svg and
notes/notes.txt b/wikipedia/Images.xcassets/AppIcon.appiconset/svg and
notes/notes.txt
new file mode 100644
index 0000000..46d7484
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/svg and notes/notes.txt
@@ -0,0 +1,7 @@
+from:
+
+
http://throwachair.com/2013/10/26/generate-all-your-ios-app-icons-with-svg-and-inkscape/
+
+cd to this dir then run:
+
+ ruby -e '[29,40,50,57,58,72,76,80,100,114,120,144,152].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
icon#{x}.png -w #{x} icon.svg` }'
\ No newline at end of file
diff --git a/wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
b/wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
index 6f870a4..82fb390 100644
--- a/wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -10,9 +10,9 @@
{
"orientation" : "portrait",
"idiom" : "iphone",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
"subtype" : "retina4",
- "extent" : "full-screen",
- "minimum-system-version" : "7.0",
"scale" : "2x"
},
{
@@ -42,6 +42,73 @@
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "subtype" : "retina4",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "scale" : "2x"
}
],
"info" : {
diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist
index 4c53fd6..e6d5934 100644
--- a/wikipedia/Wikipedia-Info.plist
+++ b/wikipedia/Wikipedia-Info.plist
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
<plist version="1.0">
<dict>
+ <key>UIPrerenderedIcon</key>
+ <true/>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>UIStatusBarHidden</key>
--
To view, visit https://gerrit.wikimedia.org/r/129343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9c6769900c893099854acd4bca22a3d7131014b
Gerrit-PatchSet: 3
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
