Merge branch 'assets'

Author: mattrubin

Authenticator.xcodeproj/project.pbxproj

@@ -81,6 +81,8 @@
 		C958CC4F182A1FDD00DD47D0 /* OTPTokenType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPTokenType.h; sourceTree = "<group>"; };
 		C958CC50182A1FDD00DD47D0 /* OTPTokenType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPTokenType.m; sourceTree = "<group>"; };
 		C958CC53183043A600DD47D0 /* OTPTokenSerializationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPTokenSerializationTests.m; sourceTree = "<group>"; };
+		C959A63C190A69120042DEC0 /* Icon.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Icon.svg; sourceTree = "<group>"; };
+		C959A63E190A69E60042DEC0 /* GenerateIcons.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = GenerateIcons.sh; sourceTree = "<group>"; };
 		C9745D0917DA5861008B6E23 /* UIAlertView+Blocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIAlertView+Blocks.h"; sourceTree = "<group>"; };
 		C9745D0A17DA5861008B6E23 /* UIAlertView+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertView+Blocks.m"; sourceTree = "<group>"; };
 		C9776E3318518801003D53CB /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
@@ -181,8 +183,8 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				C9F75C921843CFFD00B6FA14 /* App Icon */,
 				C9C6CCA11842E331000100C2 /* Images.xcassets */,
-				C9F75C921843CFFD00B6FA14 /* iTunes Artwork */,
 				C97B68C617D9226D005D1FE0 /* Settings.bundle */,
 			);
 			path = Resources;
@@ -320,13 +322,15 @@
 			name = Cells;
 			sourceTree = "<group>";
 		};
-		C9F75C921843CFFD00B6FA14 /* iTunes Artwork */ = {
+		C9F75C921843CFFD00B6FA14 /* App Icon */ = {
 			isa = PBXGroup;
 			children = (
+				C959A63C190A69120042DEC0 /* Icon.svg */,
+				C959A63E190A69E60042DEC0 /* GenerateIcons.sh */,
 				C9F75C931843D01500B6FA14 /* iTunesArtwork */,
 				C9F75C941843D01500B6FA14 /* iTunesArtwork@2x */,
 			);
-			name = "iTunes Artwork";
+			name = "App Icon";
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -337,6 +341,7 @@
 			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Authenticator" */;
 			buildPhases = (
 				7D745802100A4933AC7F63D5 /* Check Pods Manifest.lock */,
+				C959A63F190A6CB10042DEC0 /* Generate Icons */,
 				1D60588D0D05DD3D006BFB54 /* Resources */,
 				1D60588E0D05DD3D006BFB54 /* Sources */,
 				1D60588F0D05DD3D006BFB54 /* Frameworks */,
@@ -453,6 +458,21 @@
 			shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		C959A63F190A6CB10042DEC0 /* Generate Icons */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Generate Icons";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "PATH=/usr/local/bin:${PATH}\ncd \"${SRCROOT}/Authenticator/Resources/\"\n./GenerateIcons.sh";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

Authenticator/Resources/GenerateIcons.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+hash inkscape 2>/dev/null || { echo >&2 "Icon generation requires inkscape. Using existing icons instead."; exit 0; }
+hash pngcrush 2>/dev/null || { echo >&2 "Icon generation requires pngcrush. Using existing icons instead."; exit 0; }
+
+# Generate App Icons
+inkscape -z -e "Icon-29@2x.png" -w 58 "Icon.svg";
+inkscape -z -e "Icon-40@2x.png" -w 80 "Icon.svg";
+inkscape -z -e "Icon-60@2x.png" -w 120 "Icon.svg";
+
+for file in Icon-*.png; do
+  pngcrush -rem alla -ow -res 144 "$file" "_$file";
+done
+
+mv Icon-*.png "Images.xcassets/AppIcon.appiconset/"
+
+# Generate iTunes Artwork
+inkscape -z -e "iTunesArtwork" -w 512 "Icon.svg";
+inkscape -z -e "iTunesArtwork@2x" -w 1024 "Icon.svg";
+
+pngcrush -rem alla -ow -res 144 "iTunesArtwork@2x" "_iTunesArtwork@2x";
+pngcrush -rem alla -ow "iTunesArtwork" "_iTunesArtwork";