Mhurd has submitted this change and it was merged. Change subject: Create environment specific icons at build time Bug T94534 ......................................................................
Create environment specific icons at build time Bug T94534 Add new script for adding overlay on icons with Build Type (Alpha, Beta) and Build number. IMPORTANT - there are new project dependencies - see the read me and make file for instructions!! Clean up read me file - adding new dependencies and spruce up the overall organization. Since I was cleaning up the read me file, I updated the git hook scripts, make file, and gem file. Fix npm and node check in make file. To test, build and check the icon in the simulator - depending on the scheme you picked you will see the icon overlaid with the build type and number. Change-Id: I18311828f7182f8f1a45fa1f5101c98f0b5c4d8c --- D AlphaConfig.xcconfig D DebugConfig.xcconfig M Makefile M README.md D ReleaseConfig.xcconfig M Wikipedia.xcodeproj/project.pbxproj R scripts/git-uncrustify-all-pre-flight-check.sh A scripts/process-icons.sh M scripts/setup_git_hooks.sh R svgs/icon-prod.svg M wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/Icon-72.png A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/Icon-76.png A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Small.png A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-40.png A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] A wikipedia/Images.xcassets/AppIcon.appiconset/Icon.png A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] D wikipedia/Images.xcassets/AppIcon.appiconset/icon-alpha.svg D wikipedia/Images.xcassets/AppIcon.appiconset/icon-beta.svg D wikipedia/Images.xcassets/AppIcon.appiconset/icon-dev.svg D wikipedia/Images.xcassets/AppIcon.appiconset/icon.svg D wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon120-1.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon180.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png D wikipedia/Images.xcassets/AppIcon.appiconset/icon87.png A wikipedia/Images.xcassets/AppIcon.appiconset/ios7_app_icon_iphone.png A wikipedia/Images.xcassets/AppIcon.appiconset/ios7_settings_icon.png A wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] 50 files changed, 264 insertions(+), 344 deletions(-) Approvals: Mhurd: Looks good to me, approved Bgerstle: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/AlphaConfig.xcconfig b/AlphaConfig.xcconfig deleted file mode 100644 index ed88272..0000000 --- a/AlphaConfig.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ - -APP_ID_SUFFIX = .tfalpha diff --git a/DebugConfig.xcconfig b/DebugConfig.xcconfig deleted file mode 100644 index 21a6a4e..0000000 --- a/DebugConfig.xcconfig +++ /dev/null @@ -1,3 +0,0 @@ - -APP_ID_SUFFIX = .debug - diff --git a/Makefile b/Makefile index 744cf5d..c934e23 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ #!!!!! # Append additional dependencies as quoted strings (i.e. EXEC_DEPS = "dep1" "dep2" ...) -EXEC_DEPS = "uncrustify" +EXEC_DEPS = "uncrustify" "convert" "gs" exec-deps: ##Check that executable dependencies are installed @for dep in $(EXEC_DEPS); do \ @@ -75,7 +75,7 @@ npm: ##TODO, run npm install node: # Make sure node is installed - @if [[ $(NODE_VERSION) =~ "v0.10" && $(NPM_VERSION) =~ "1.4" ]]; then \ + @if [[ $(NODE_VERSION) > "v0.10" && $(NPM_VERSION) > "1.4" ]]; then \ echo "node and npm are installed!" ; \ else \ echo "Missing node v0.10 and/or higher and npm 1.4 or higher." ; \ @@ -95,6 +95,7 @@ bundle-install: ##Install gems using Bundler bundle-install: bundler + @$(BUNDLER) config build.nokogiri --use-system-libraries @$(BUNDLER) install bundler: ##Make sure Bundler is installed @@ -112,4 +113,4 @@ exit 1 ; \ else \ echo "Ruby is installed!" ; \ - fi \ No newline at end of file + fi diff --git a/README.md b/README.md index 91a65b2..e43452d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -# Wikipedia-iOS -Native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +Wikipedia for iOS +----- +# Meta * OS target: iOS 6.0 or higher * Device target: iPhone, iPod, iPad * License: MIT-style @@ -9,47 +10,73 @@ * Browse: https://git.wikimedia.org/summary/apps%2Fios%2Fwikipedia * Github mirror: https://github.com/wikimedia/apps-ios-wikipedia * Code review: https://gerrit.wikimedia.org/r/#/q/project:apps/ios/wikipedia,n,z -* Bugs: https://bugzilla.wikimedia.org/enter_bug.cgi?product=Wikipedia%20App +* Bugs: https://phabricator.wikimedia.org/project/profile/782/ * IRC chat: #wikimedia-mobile on irc.freenode.net +* Team page: https://www.mediawiki.org/wiki/Wikimedia_Apps/Team/iOS # Setup -Many tasks associated with project dependencies or building are implemented in the `Makefile`. Run `make` or `make help` to see a list of available tasks (or targets). The TL;DR; one liner to sanity check the project's build status is: `make build-sim`. Read on for more information about our dependencies and setting up the project. +Because of the nature of the project (read: lots of HTML), we have several layers of dependencies. Having said that, we have automated much of the setup so it's not too bad to set the project up and start contributing. + +Specifically, many tasks have been implemented in the `Makefile`. Run `make` or `make help` to see a list of available tasks (or targets). For instance, simply run `make build-sim` to see if your machine is setup and ready to go. + +Read on to get started… ## Dependencies -Run `make get-deps` to check for and/or install the following dependencies: -- [Xcode 6 or higher](https://itunes.apple.com/us/app/xcode/id497799835) on Mac OS X, available on the App Store or [developer.apple.com](https://developer.apple.com/) after signing in with your Apple ID. -- Xcode Command Line Tools: On newer OS X versions, you can run `xcode-select --install` to install them. If that doesn't work, you can find instructions online for downloading the them via Xcode or the Apple developer portal. -- Ruby: comes bundled with OS X (this project only requires the system version). +### Before you start +#### Homebrew +Many of the dependencies below are installed easiest via [Homebrew](http://brew.sh). it is recommended that you install it before proceeding. If you run into issues installing dependencies with homebrew, run `brew doctor` to get hints on how to fix them. +#### Bundler +[Bundler](http://bundler.io/) is optional, but **required** for using the Make File and is recommended for installing CocoaPods, along with any other RubyGem dependencies declared in the project's `Gemfile`. +#### Make File +Once Bundler is installed, you can run `make get-deps` to check for the dependencies below (it will also install any gems and pods for you automatically) -> _[rbenv](https://github.com/sstephenson/rbenv) is nice for managing mulitple Ruby versions._ +### Build Dependencies +These tools are needed for building and running the app. +- [Xcode 6 or higher](https://itunes.apple.com/us/app/xcode/id497799835) on Mac OS X, available on the App Store or [developer.apple.com](https://developer.apple.com/) after signing in with your Apple ID. +- [Ruby](https://www.ruby-lang.org/en/): comes bundled with OS X (this project only requires the system version). +- [CocoaPods](cocoapods.org) is a Ruby gem that the project uses to download and integrate third-party iOS components. +- [NodeJS](https://nodejs.org): The web assets which are bundled in the app are built using a Node toolchain, specifically [grunt](http://gruntjs.com) which is installed using [npm](npmjs.com). +- [ImageMagick](http://www.imagemagick.org) and [Ghostscript](http://www.ghostscript.com): We generate environment specific icons at build time using these tools. You can install them via homebrew by running `brew install imagemagick` and `brew install ghostscript`, respectively. -- [CocoaPods](cocoapods.org) is a Ruby gem that the project uses to download and integrate third-party iOS components. - -> _[Bundler](http://bundler.io/) is recommended for installing CocoaPods, along with any other RubyGem dependencies declared in the project's `Gemfile`._ - -- NodeJS: The web assets which are bundled in the app are built using a Node toolchain, specifically [grunt](http://gruntjs.com) which is installed using [npm](npmjs.com). - -> _[nodenv](https://github.com/OiNutter/nodenv) is recommended for managing multiple node versions._ - +### Patch Submission Dependencies +These tools are required when you intend on submitting a patch. - [uncrustify](http://uncrustify.sourceforge.net) for formatting source code to conform to our [Style Guide](https://www.mediawiki.org/wiki/Wikimedia_Apps/Team/iOS/ObjectiveCStyleGuide). You can install it using homebrew by running: `brew install uncrustify`. +> _[BBUncrustifyPlugin](https://github.com/benoitsan/BBUncrustifyPlugin-Xcode) is an easy way to uncrustify files within the Xcode UI. You can install it from source or by first installing [Alcatraz](http://alcatraz.io)_ -> _[BBUncrustifyPlugin](https://github.com/benoitsan/BBUncrustifyPlugin-Xcode) is an easy way to uncrustify files within the Xcode UI._ +### CI Dependencies +These tools are required if you want to work on the build system. +- Xcode Command Line Tools: You can install via the Xcode UI or run `xcode-select --install` in Terminal. You can find instructions online for downloading the them via Xcode or the Apple developer portal. +- [Fastlane](https://github.com/KrauseFx/fastlane) is a Ruby gem that automates build tasks. We use Fastlane in conjunction with [Jenkins](https://jenkins-ci.org) to support our [continuous integration workflow](https://www.mediawiki.org/wiki/Wikimedia_Apps/Team/iOS/CI). + +### Advanced Tools +These tools are for managing multiple environments and dependencies. If you plan on modifying Pods or need this project's dependencies to coexist along side other projects, try these: +- [rbenv](https://github.com/sstephenson/rbenv) is nice for managing mulitple Ruby versions. +- [nodenv](https://github.com/OiNutter/nodenv) is recommended for managing multiple node versions. ## Building -Once all the dependencies are installed (via `make get-deps`), you should be able to run `make build-sim`, which compiles the project for the iOS simulator. If this step doesn't succeed, please file a bug and/or bug us via IRC or email. See the top of this file for our contact information. Please include any console logs and/or Xcode screenshots along with a description of your environment. +Once all the dependencies are installed, you can run from build the following ways: +- **Xcode UI** - just open the `Wikipedia.workspace` file and click build. +- **xcodebuild** - you can build from the command line with the Apple provided tool. +- **Make file** - just type `make build-sim` in the Terminal and it will compile the project for the iOS simulator. +- **Fastlane** - just type `fastlane lane_name` to build the app for the specified lane. + +### Problems? +If you are unable to build, please file a bug and/or contact us via IRC or email. See the top of this file for our contact information. Please include any console logs and/or Xcode screenshots along with a description of your environment. ## Running -Use Xcode to run the **Wikipedia** scheme and target for the destination of your choosing (i.e. simulator or device). Keep in mind that you'll need to provision iOS hardware with an active [developer account](https://developer.apple.com/devcenter/ios/index.action) in order to build and run the app on it. +Use Xcode to run the **WikipediaDebug** scheme and target for the destination of your choosing (i.e. simulator or device). Keep in mind that you'll need to provision iOS hardware with an active [developer account](https://developer.apple.com/devcenter/ios/index.action) in order to build and run the app on a device. ## Testing -Use the Xcode **Product -> Test** menu-bar action (or `Cmd + U` for hotkey fanatics) to run the **WikipediaUnitTests** target in the **Wikipedia** scheme. Tests can also be executed from the command line by running `make test`. +Use the Xcode **Product -> Test** menu-bar action (or `Cmd + U` for hotkey fanatics) to run the **WikipediaUnitTests** target in any scheme. Tests can also be executed from the command line by running `make test`. # Filing Bugs -Please file bugs at [bugzilla.wikimedia.org](https://bugzilla.wikimedia.org/enter_bug.cgi?product=Wikipedia%20App); use the "iOS App" component. +Please file bugs on [Phabricator](https://phabricator.wikimedia.org/project/profile/782/) and be sure to use the `Wikipedia-App-iOS-App ` tag. # Submitting patches -Before submitting a patch be sure to use Uncrustify to format your code (See installation instructions above). To make it easy, you can install a pre commit hook by running the script ```/scripts/setup_git_hooks.sh``` or by using the BBUncrustifyPlugin as mentioned above. +Before submitting a patch be sure to use Uncrustify to format your code (See installation instructions above). + +> _To ease the process, you can install a pre-push hook by running the script ```/scripts/setup_git_hooks.sh``` or by using the BBUncrustifyPlugin as mentioned above._ See [mediawiki.org's Gerrit page](https://www.mediawiki.org/wiki/Gerrit) for general information about contributing to Wikimedia project source code hosted in Gerrit -- use the project name "apps/ios/wikipedia" in place of "mediawiki/core" etc. @@ -58,17 +85,17 @@ Please include unit tests with any new code where possible. # Architecture -This generation of the Wikipedia reader app is built around native UI chrome (menus, toolbars, search UI, preferences, caching, etc) to improve startup time, responsiveness and "nativey" look-n-feel versus a previous HTML-based approach using PhoneGap/Apache Cordova. +This generation of the Wikipedia app is built around native UI chrome (menus, toolbars, search UI, preferences, caching, etc) to improve startup time, responsiveness and "nativey" look-n-feel versus a previous HTML-based approach using PhoneGap/Apache Cordova. The majority of app logic and UI will be in the native layer; we expect to use the WebView component as a relatively dumb content display & event trigger layer. -Components of the app will be relatively self-contained, communicating via NSNotificationCenter as a messaging bus to avoid over-close coupling of parts and to make test-driven development more feasible. - # Development team -The app is primarily being developed by the Wikimedia Foundation's [Mobile Apps team](https://www.mediawiki.org/wiki/Wikimedia_Apps/Team), starting at the end of October 2013. The team operates on an "agile"-style process with 2-week sprints, and checkin scrums on Monday/Wednesday/Friday at 10:15am US Pacific Time. - -In addition to a general bug pool in Bugzilla, we'll be tracking ongoing work on the [backlog board](https://trello.com/b/h0B6QYBo/mobile-app-backlog) and active sprint boards on Trello. +The app is primarily being developed by the Wikimedia Foundation's [Mobile Apps team](https://www.mediawiki.org/wiki/Wikimedia_Apps/Team), starting at the end of October 2013. We maintain iOS specific documentation [here](https://www.mediawiki.org/wiki/Wikimedia_Apps/Team/iOS). The team operates on an "agile"-style process with 2-week sprints and daily stand-ups on at 10:15am US Pacific Time. Volunteer contributions are welcome! -We can be reached during California office hours (and sometimes outside them) in IRC: #wikimedia-mobile on irc.freenode.net. +We can be reached during Eastern and Pacific office hours (and sometimes outside them) in IRC: #wikimedia-mobile on irc.freenode.net. + +# Previous Source +This is a native rewrite of the original [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. + diff --git a/ReleaseConfig.xcconfig b/ReleaseConfig.xcconfig deleted file mode 100644 index 8b13789..0000000 --- a/ReleaseConfig.xcconfig +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Wikipedia.xcodeproj/project.pbxproj b/Wikipedia.xcodeproj/project.pbxproj index e767d36..28ef1d6 100644 --- a/Wikipedia.xcodeproj/project.pbxproj +++ b/Wikipedia.xcodeproj/project.pbxproj @@ -2572,10 +2572,10 @@ 04272E75193FF7F000CC682F /* make-css-assets */, D4C16A621970946900CD91AD /* update-storyboard-strings */, D4C16A631970949A00CD91AD /* update-qqq */, - 046F268119C387BD00D7ACB3 /* icon-svgs-to-pngs */, D4991433181D51DE00E6073C /* Resources */, 04E0C2771A7750AB00FE22DA /* copy-wmflogo-to-assets */, 45FA417DEEAE18B42A662320 /* Copy Pods Resources */, + 0EB312441ACB96C300C7F7A6 /* Process Icons */, ); buildRules = ( ); @@ -2832,21 +2832,6 @@ shellPath = /bin/sh; shellScript = "scripts/run-grunt.sh"; }; - 046F268119C387BD00D7ACB3 /* icon-svgs-to-pngs */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/wikipedia/Images.xcassets/AppIcon.appiconset/icon.svg", - ); - name = "icon-svgs-to-pngs"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "echo \"Uncomment the following line to run this automatically when building.\"\n# scripts/icon-svgs-to-pngs.sh"; - }; 04E0C2771A7750AB00FE22DA /* copy-wmflogo-to-assets */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2861,6 +2846,20 @@ shellPath = /bin/sh; shellScript = "scripts/copy-wmflogo-to-assets.sh"; }; + 0EB312441ACB96C300C7F7A6 /* Process Icons */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Process Icons"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "./scripts/process-icons.sh"; + }; 3E12E9E666E87AE6E3CA45E3 /* Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/scripts/pre-commit.sh b/scripts/git-uncrustify-all-pre-flight-check.sh similarity index 100% rename from scripts/pre-commit.sh rename to scripts/git-uncrustify-all-pre-flight-check.sh diff --git a/scripts/process-icons.sh b/scripts/process-icons.sh new file mode 100755 index 0000000..8e1664e --- /dev/null +++ b/scripts/process-icons.sh @@ -0,0 +1,107 @@ +#This script will overlay version, git, and build configuration information over the icon for non-app store builds +#Inspiration: http://www.merowing.info/2013/03/overlaying-application-version-on-top-of-your-icon/ + +#Info to overlay on Icon +commit=`git rev-parse --short HEAD` +branch=`git rev-parse --abbrev-ref HEAD` +version=`agvtool what-marketing-version -terse1` +build=`/usr/libexec/PlistBuddy -c "Print CFBundleVersion" "${INFOPLIST_FILE}"` + +#Where to save the files +target_path="${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/" + +function processIconSet() { + + export PATH=$PATH:/usr/local/bin + + #Don't do this for App Store or Instore Release + if [ "$CONFIGURATION" == "Release" ]; then + exit 0 + fi + + #Make path to existing icons + source_icon_set=$1 + source_icon_set_folder_name=$source_icon_set".appiconset" + echo $source_icon_set_folder_name + + #Find existing icons + source_icon_set_directory=`find . -name $source_icon_set_folder_name -type d` + echo "Source icon directory: "$source_icon_set_directory + + #Make target base file name - same as asset collection name + target_base_file_name=$source_icon_set + echo "Target base file name: "$target_base_file_name + + #Loop through icons + for source_icon_path in $(find $source_icon_set_directory -name "*.png" -type f); do + + #Image meta + minimum_width="" + retina_suffix="" + width="" + height="" + icon_size_suffix="" + width_suffix="" + height_suffix="" + + overlay_height="" + overlay_color="#0008" + + #Populate the image meta based on retina and size + if [[ $source_icon_path == *"@3x"* ]]; then + minimum_width=114 + retina_suffix="@3x" + width=`identify -format %w "$source_icon_path"` + height=`identify -format %h "$source_icon_path"` + width_suffix=$width + height_suffix=$height + let "width_suffix/=3" + let "height_suffix/=3" + overlay_height=60 + elif [[ $source_icon_path == *"@2x"* ]]; then + minimum_width=114 + retina_suffix="@2x" + width=`identify -format %w "$source_icon_path"` + height=`identify -format %h "$source_icon_path"` + width_suffix=$width + height_suffix=$height + let "width_suffix/=2" + let "height_suffix/=2" + overlay_height=40 + else + minimum_width=57 + retina_suffix="" + width=`identify -format %w "$source_icon_path"` + height=`identify -format %h "$source_icon_path"` + width_suffix=$width + height_suffix=$height + overlay_height=20 + fi + + icon_size_suffix=$width_suffix"x"$height_suffix + + #Only process icons that show on home screens (larger ones) + if [ $width -ge $minimum_width ]; then + + echo "Overlaying source Image "$source_icon_path + + #Assemble the final file path + target_icon_file_name=$target_base_file_name$icon_size_suffix$retina_suffix".png" + target_icon_path=$target_path$target_icon_file_name + echo $source_icon_path" = "$target_icon_path + + #Overlay Image + convert -background $overlay_color -fill white -gravity center -size ${width}x${overlay_height}\ + caption:"${CONFIGURATION}\n(${build})"\ + "${source_icon_path}" +swap -gravity south -composite "${target_icon_path}" + + else + + echo "Not overlaying source Image "$source_icon_path" because its width ("$width") is smaller than minimum size ("$minimum_width")" + + fi + + done + +} +processIconSet "AppIcon" diff --git a/scripts/setup_git_hooks.sh b/scripts/setup_git_hooks.sh index 0d3d2a3..cca7c76 100755 --- a/scripts/setup_git_hooks.sh +++ b/scripts/setup_git_hooks.sh @@ -4,15 +4,15 @@ exit 2 fi -echo "Installing the git pre-commit hook" -GIT_PRECOMMIT_HOOK_INSTALL_PATH="./.git/hooks/pre-commit" -GIT_PRECOMMIT_HOOK_SCRIPT_PATH="./scripts/pre-commit.sh" -GIT_PRECOMMIT_HOOK_SCRIPT_PATH_REL_HOOKS="../../$GIT_PRECOMMIT_HOOK_SCRIPT_PATH" +echo "Installing the git hook" +GIT_HOOK_INSTALL_PATH="./.git/hooks/pre-push" +GIT_HOOK_SCRIPT_PATH="./scripts/git-uncrustify-all-pre-flight-check.sh" +GIT_HOOK_SCRIPT_PATH_REL_HOOKS="../../$GIT_HOOK_SCRIPT_PATH" -if [[ -L "$GIT_PRECOMMIT_HOOK_INSTALL_PATH" ]]; then +if [[ -L "$GIT_HOOK_INSTALL_PATH" ]]; then echo "Backed up previous commit-hook" - mv -f "$GIT_PRECOMMIT_HOOK_INSTALL_PATH" "${GIT_PRECOMMIT_HOOK_INSTALL_PATH}.bak" + mv -f "$GIT_HOOK_INSTALL_PATH" "${GIT_HOOK_INSTALL_PATH}.bak" fi -ln -s "$GIT_PRECOMMIT_HOOK_SCRIPT_PATH_REL_HOOKS" "$GIT_PRECOMMIT_HOOK_INSTALL_PATH" -echo "Installed pre-commit hook at $GIT_PRECOMMIT_HOOK_INSTALL_PATH" +ln -s "$GIT_HOOK_SCRIPT_PATH_REL_HOOKS" "$GIT_HOOK_INSTALL_PATH" +echo "Installed git hook at $GIT_HOOK_INSTALL_PATH" diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon-prod.svg b/svgs/icon-prod.svg similarity index 100% rename from wikipedia/Images.xcassets/AppIcon.appiconset/icon-prod.svg rename to svgs/icon-prod.svg diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json b/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json index c6ce380..ab3b114 100644 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json @@ -3,116 +3,170 @@ { "size" : "29x29", "idiom" : "iphone", - "filename" : "icon29.png", + "filename" : "ios7_settings_icon.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "icon58.png", + "filename" : "[email protected]", "scale" : "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "icon87.png", + "filename" : "[email protected]", "scale" : "3x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "icon80.png", + "filename" : "[email protected]", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "icon120-1.png", + "filename" : "[email protected]", "scale" : "3x" }, { "size" : "57x57", "idiom" : "iphone", - "filename" : "icon57.png", + "filename" : "Icon.png", "scale" : "1x" }, { "size" : "57x57", "idiom" : "iphone", - "filename" : "icon114.png", + "filename" : "[email protected]", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "icon120.png", + "filename" : "[email protected]", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "icon180.png", + "filename" : "[email protected]", "scale" : "3x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "icon29.png", + "filename" : "Icon-Small.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "icon58.png", + "filename" : "ios7_app_icon_iphone.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "icon40.png", + "filename" : "Icon-Spotlight-40.png", "scale" : "1x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "icon80.png", + "filename" : "[email protected]", "scale" : "2x" }, { "size" : "50x50", "idiom" : "ipad", - "filename" : "icon50.png", + "filename" : "Icon-Small-50.png", "scale" : "1x" }, { "size" : "50x50", "idiom" : "ipad", - "filename" : "icon100.png", + "filename" : "[email protected]", "scale" : "2x" }, { "size" : "72x72", "idiom" : "ipad", - "filename" : "icon72.png", + "filename" : "Icon-72.png", "scale" : "1x" }, { "size" : "72x72", "idiom" : "ipad", - "filename" : "icon144.png", + "filename" : "[email protected]", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "icon76.png", + "filename" : "Icon-76.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "icon152.png", + "filename" : "[email protected]", "scale" : "2x" + }, + { + "size" : "24x24", + "idiom" : "watch", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "38mm" + }, + { + "size" : "27.5x27.5", + "idiom" : "watch", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "42mm" + }, + { + "size" : "29x29", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "watch", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "38mm" + }, + { + "size" : "44x44", + "idiom" : "watch", + "scale" : "2x", + "role" : "longLook", + "subtype" : "42mm" + }, + { + "size" : "86x86", + "idiom" : "watch", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "38mm" + }, + { + "size" : "98x98", + "idiom" : "watch", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "42mm" } ], "info" : { diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..4860ecc --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..e0857df --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-72.png b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-72.png new file mode 100644 index 0000000..8c444c7 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-72.png Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..da386de --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-76.png b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 0000000..75954d6 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-76.png Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..0931cf0 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png new file mode 100644 index 0000000..0019ddf --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..146fdf0 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Small.png new file mode 100644 index 0000000..ad4ff6b --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Small.png Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..7746e63 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-40.png b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-40.png new file mode 100644 index 0000000..3ed49c3 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-40.png Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..e08162c --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..e08162c --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..27340a7 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Icon.png b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon.png new file mode 100644 index 0000000..a916daf --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Icon.png Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..1a68013 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon-alpha.svg b/wikipedia/Images.xcassets/AppIcon.appiconset/icon-alpha.svg deleted file mode 100644 index 76c3a17..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon-alpha.svg +++ /dev/null @@ -1,64 +0,0 @@ -<?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.4 r9939" - width="100%" - height="100%" - sodipodi:docname="icon-alpha.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"; /></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="1157" - inkscape:window-height="805" - id="namedview11" - showgrid="false" - inkscape:zoom="0.23046875" - inkscape:cx="-548.88136" - inkscape:cy="512" - inkscape:window-x="152" - inkscape:window-y="34" - 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><text - xml:space="preserve" - style="font-size:144px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="275.89062" - y="934.13562" - id="text2992" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan2994" - x="275.89062" - y="934.13562">ALPHA</tspan></text> -</svg> \ No newline at end of file diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon-beta.svg b/wikipedia/Images.xcassets/AppIcon.appiconset/icon-beta.svg deleted file mode 100644 index fd41eb1..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon-beta.svg +++ /dev/null @@ -1,70 +0,0 @@ -<?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="icon.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"; /></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="1157" - inkscape:window-height="805" - id="namedview11" - showgrid="false" - inkscape:zoom="0.23046875" - inkscape:cx="-32.542373" - inkscape:cy="512" - inkscape:window-x="152" - inkscape:window-y="0" - 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> - -<text - xml:space="preserve" - style="font-size:144px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="330.87585" - y="934.13562" - id="text2992" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan2994" - x="330.87585" - y="934.13562">BETA</tspan></text> -</svg> \ No newline at end of file diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon-dev.svg b/wikipedia/Images.xcassets/AppIcon.appiconset/icon-dev.svg deleted file mode 100644 index 473d5da..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon-dev.svg +++ /dev/null @@ -1,64 +0,0 @@ -<?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.4 r9939" - width="100%" - height="100%" - sodipodi:docname="icon-dev.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"; /></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="1089" - inkscape:window-height="805" - id="namedview11" - showgrid="false" - inkscape:zoom="0.23046875" - inkscape:cx="-1065.2203" - inkscape:cy="512" - inkscape:window-x="65" - inkscape:window-y="34" - 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><text - xml:space="preserve" - style="font-size:144px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="355.30859" - y="934.13562" - id="text2992" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan2994" - x="355.30859" - y="934.13562">DEV</tspan></text> -</svg> \ No newline at end of file diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon.svg b/wikipedia/Images.xcassets/AppIcon.appiconset/icon.svg deleted file mode 100644 index 473d5da..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon.svg +++ /dev/null @@ -1,64 +0,0 @@ -<?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.4 r9939" - width="100%" - height="100%" - sodipodi:docname="icon-dev.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"; /></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="1089" - inkscape:window-height="805" - id="namedview11" - showgrid="false" - inkscape:zoom="0.23046875" - inkscape:cx="-1065.2203" - inkscape:cy="512" - inkscape:window-x="65" - inkscape:window-y="34" - 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><text - xml:space="preserve" - style="font-size:144px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="355.30859" - y="934.13562" - id="text2992" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan2994" - x="355.30859" - y="934.13562">DEV</tspan></text> -</svg> \ No newline at end of file diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png deleted file mode 100644 index fbf9984..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png deleted file mode 100644 index 2c15497..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon120-1.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon120-1.png deleted file mode 100644 index 6d5d913..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon120-1.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png deleted file mode 100644 index 6d5d913..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png deleted file mode 100644 index 5f47b7c..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png deleted file mode 100644 index 8e2facb..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon180.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon180.png deleted file mode 100644 index 68aa2cf..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon180.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png deleted file mode 100644 index 8bc9806..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png deleted file mode 100644 index ffe370c..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png deleted file mode 100644 index 4f9f077..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png deleted file mode 100644 index 9d93133..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png deleted file mode 100644 index 204738c..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png deleted file mode 100644 index 2e3dda6..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png deleted file mode 100644 index fa36c69..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png deleted file mode 100644 index c62efe4..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon87.png b/wikipedia/Images.xcassets/AppIcon.appiconset/icon87.png deleted file mode 100644 index 2a725cf..0000000 --- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon87.png +++ /dev/null Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/ios7_app_icon_iphone.png b/wikipedia/Images.xcassets/AppIcon.appiconset/ios7_app_icon_iphone.png new file mode 100644 index 0000000..2486728 --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/ios7_app_icon_iphone.png Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/ios7_settings_icon.png b/wikipedia/Images.xcassets/AppIcon.appiconset/ios7_settings_icon.png new file mode 100644 index 0000000..db253bb --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/ios7_settings_icon.png Binary files differ diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] new file mode 100644 index 0000000..be2178d --- /dev/null +++ b/wikipedia/Images.xcassets/AppIcon.appiconset/[email protected] Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/201351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18311828f7182f8f1a45fa1f5101c98f0b5c4d8c Gerrit-PatchSet: 7 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Fjalapeno <[email protected]> Gerrit-Reviewer: Bgerstle <[email protected]> Gerrit-Reviewer: Dr0ptp4kt <[email protected]> Gerrit-Reviewer: Fjalapeno <[email protected]> Gerrit-Reviewer: Mhurd <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
