Removed the mask file.

arturgrigor · Feb 12, 2012 · 9e364c2 · 9e364c2
1 parent 9de80d6
commit 9e364c2
Show file tree

Hide file tree

Showing 9 changed files with 202 additions and 47 deletions.
diff --git a/AGMedallionView Demo/AGMedallionView Demo.xcodeproj/project.pbxproj b/AGMedallionView Demo/AGMedallionView Demo.xcodeproj/project.pbxproj
@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		FE7FA03714E834C800B31FD8 /* sample.png in Resources */ = {isa = PBXBuildFile; fileRef = FE7FA03614E834C800B31FD8 /* sample.png */; };
+		FE7FA03C14E83BC300B31FD8 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = FE7FA03B14E83BC300B31FD8 /* icon.png */; };
+		FE7FA03E14E83BDF00B31FD8 /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FE7FA03D14E83BDF00B31FD8 /* icon@2x.png */; };
 		FE8B044B14E83146007F6625 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE8B044A14E83146007F6625 /* UIKit.framework */; };
 		FE8B044D14E83146007F6625 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE8B044C14E83146007F6625 /* Foundation.framework */; };
 		FE8B044F14E83146007F6625 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE8B044E14E83146007F6625 /* CoreGraphics.framework */; };
@@ -17,11 +19,12 @@
 		FE8B045E14E83146007F6625 /* AGViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE8B045D14E83146007F6625 /* AGViewController.m */; };
 		FE8B046114E83146007F6625 /* AGViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FE8B045F14E83146007F6625 /* AGViewController.xib */; };
 		FE8B046B14E83176007F6625 /* AGMedallionView.m in Sources */ = {isa = PBXBuildFile; fileRef = FE8B046914E83176007F6625 /* AGMedallionView.m */; };
-		FE8B046C14E83176007F6625 /* medallionShineMask.png in Resources */ = {isa = PBXBuildFile; fileRef = FE8B046A14E83176007F6625 /* medallionShineMask.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		FE7FA03614E834C800B31FD8 /* sample.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sample.png; sourceTree = "<group>"; };
+		FE7FA03B14E83BC300B31FD8 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../icon.png; sourceTree = "<group>"; };
+		FE7FA03D14E83BDF00B31FD8 /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon@2x.png"; path = "../icon@2x.png"; sourceTree = "<group>"; };
 		FE8B044614E83146007F6625 /* AGMedallionView Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "AGMedallionView Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		FE8B044A14E83146007F6625 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		FE8B044C14E83146007F6625 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -37,7 +40,6 @@
 		FE8B046014E83146007F6625 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/AGViewController.xib; sourceTree = "<group>"; };
 		FE8B046814E83176007F6625 /* AGMedallionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AGMedallionView.h; sourceTree = "<group>"; };
 		FE8B046914E83176007F6625 /* AGMedallionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AGMedallionView.m; sourceTree = "<group>"; };
-		FE8B046A14E83176007F6625 /* medallionShineMask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = medallionShineMask.png; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -98,6 +100,8 @@
 		FE8B045114E83146007F6625 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				FE7FA03D14E83BDF00B31FD8 /* icon@2x.png */,
+				FE7FA03B14E83BC300B31FD8 /* icon.png */,
 				FE8B045214E83146007F6625 /* AGMedallionView Demo-Info.plist */,
 				FE8B045314E83146007F6625 /* InfoPlist.strings */,
 				FE8B045614E83146007F6625 /* main.m */,
@@ -112,7 +116,6 @@
 				FE7FA03614E834C800B31FD8 /* sample.png */,
 				FE8B046814E83176007F6625 /* AGMedallionView.h */,
 				FE8B046914E83176007F6625 /* AGMedallionView.m */,
-				FE8B046A14E83176007F6625 /* medallionShineMask.png */,
 			);
 			name = Classes;
 			path = ../Classes;
@@ -171,8 +174,9 @@
 			files = (
 				FE8B045514E83146007F6625 /* InfoPlist.strings in Resources */,
 				FE8B046114E83146007F6625 /* AGViewController.xib in Resources */,
-				FE8B046C14E83176007F6625 /* medallionShineMask.png in Resources */,
 				FE7FA03714E834C800B31FD8 /* sample.png in Resources */,
+				FE7FA03C14E83BC300B31FD8 /* icon.png in Resources */,
+				FE7FA03E14E83BDF00B31FD8 /* icon@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/AGMedallionView Demo/AGMedallionView Demo/AGMedallionView Demo-Info.plist b/AGMedallionView Demo/AGMedallionView Demo/AGMedallionView Demo-Info.plist
@@ -9,7 +9,23 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFiles</key>
-	<array/>
+	<array>
+		<string>icon.png</string>
+		<string>icon@2x.png</string>
+	</array>
+	<key>CFBundleIcons</key>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>icon.png</string>
+				<string>icon@2x.png</string>
+			</array>
+			<key>UIPrerenderedIcon</key>
+			<false/>
+		</dict>
+	</dict>
 	<key>CFBundleIdentifier</key>
 	<string>ro.arturgrigor.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

diff --git a/AGMedallionView Demo/AGMedallionView Demo/AGViewController.m b/AGMedallionView Demo/AGMedallionView Demo/AGViewController.m
@@ -37,6 +37,9 @@ - (void)viewDidLoad
 	// Do any additional setup after loading the view, typically from a nib.
 
     self.medallionView.image = [UIImage imageNamed:@"sample.png"];
+    self.medallionView.borderColor = [UIColor blackColor];
+    self.medallionView.borderWidth = 6.f;
+    self.medallionView.dropShadowColor = [UIColor redColor];
 }
 
 - (void)viewDidUnload

diff --git a/AGMedallionView Demo/AGMedallionView Demo/en.lproj/AGViewController.xib b/AGMedallionView Demo/AGMedallionView Demo/en.lproj/AGViewController.xib
@@ -40,7 +40,6 @@
 						<string key="NSFrame">{{96, 166}, {128, 128}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:196</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -75,6 +74,14 @@
 					</object>
 					<int key="connectionID">7</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">medallionView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="148758202"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -124,7 +131,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">8</int>
+			<int key="maxID">10</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -139,6 +146,17 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">AGViewController</string>
 					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">medallionView</string>
+						<string key="NS.object.0">AGMedallionView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">medallionView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">medallionView</string>
+							<string key="candidateClassName">AGMedallionView</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/AGViewController.h</string>

diff --git a/AGMedallionView Demo/icon.png b/AGMedallionView Demo/icon.png
diff --git a/AGMedallionView Demo/icon@2x.png b/AGMedallionView Demo/icon@2x.png
diff --git a/Classes/AGMedallionView.h b/Classes/AGMedallionView.h
@@ -10,23 +10,36 @@
 
 @class AGMedallionView;
 
-@protocol AGMedallionViewDelegate <NSObject>
+@protocol AGMedallionViewDelegate<NSObject>
 
+@optional
 - (void)didTouchMedallionView:(AGMedallionView *)medallionView;
 
 @end
 
 @interface AGMedallionView : UIView
 {
     UIImage *image;
-    UIControl *touchableControl;
-
-    CGGradientRef _alphaGradient;
+    UIColor *borderColor;
+    CGFloat borderWidth;
+    UIColor *dropShadowColor;
+    CGSize dropShadowOffset;
+    CGFloat dropShadowBlur;
 
     id<AGMedallionViewDelegate> delegate;
+
+    // Private
+    UIControl *touchableControl;
+    CGGradientRef alphaGradient;
 }
 
 @property (nonatomic, assign) id<AGMedallionViewDelegate> delegate;
+
 @property (nonatomic, retain) UIImage *image;
+@property (nonatomic, retain) UIColor *borderColor;
+@property (nonatomic, assign) CGFloat borderWidth;
+@property (nonatomic, retain) UIColor *dropShadowColor;
+@property (nonatomic, assign) CGSize dropShadowOffset;
+@property (nonatomic, assign) CGFloat dropShadowBlur;
 
 @end