Merge pull request #3 from honishi/feature/minor-update

minor updates
joecarney · Sep 25, 2013 · 6ef9422 · 6ef9422
2 parents 1e35c04 + f9c6dc8
commit 6ef9422
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+.DS_Store
+JCGridMenu/*.xcodeproj/*
+!JCGridMenu/*.xcodeproj/project.pbxproj
+!JCGridMenu/*.xcworkspace/contents.xcworkspacedata
diff --git a/JCGridMenu/.DS_Store b/JCGridMenu/.DS_Store
diff --git a/JCGridMenu/JCGridMenu.xcodeproj/project.pbxproj b/JCGridMenu/JCGridMenu.xcodeproj/project.pbxproj
@@ -739,6 +739,7 @@
 		80B3D48415B945930069C6C2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_ENUM_CONVERSION = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "JCGridMenu/JCGridMenu-Prefix.pch";
 				INFOPLIST_FILE = "JCGridMenu/JCGridMenu-Info.plist";
@@ -750,6 +751,7 @@
 		80B3D48515B945930069C6C2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_ENUM_CONVERSION = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "JCGridMenu/JCGridMenu-Prefix.pch";
 				INFOPLIST_FILE = "JCGridMenu/JCGridMenu-Info.plist";

diff --git a/Universal/.DS_Store b/Universal/.DS_Store
diff --git a/Universal/Images/.DS_Store b/Universal/Images/.DS_Store
diff --git a/Universal/Library/UILabel+JCUI.m b/Universal/Library/UILabel+JCUI.m
@@ -15,7 +15,7 @@ - (UILabel *)buttonText:(NSString *)text withFrame:(CGRect)frame
     [label setNumberOfLines:1];
     [label setValue:text forKey:@"text"];
     [label setTextColor:[UIColor colorWithWhite:1.0 alpha:0.9]];
-    [label setTextAlignment:UITextAlignmentLeft];
+    [label setTextAlignment:NSTextAlignmentLeft];
     [label setBackgroundColor:[UIColor clearColor]];
     [label setFont:[UIFont systemFontOfSize:13.0f]];
     [label setShadowColor:[UIColor colorWithWhite:0.0f alpha:0.2f]];
@@ -29,7 +29,7 @@ - (UILabel *)demoTitle:(NSString *)text frame:(CGRect)frame
     [label setNumberOfLines:1000];
     [label setValue:text forKey:@"text"];
     [label setTextColor:[UIColor colorWithWhite:0.0 alpha:0.9]];
-    [label setTextAlignment:UITextAlignmentLeft];
+    [label setTextAlignment:NSTextAlignmentLeft];
     [label setBackgroundColor:[UIColor clearColor]];
     [label setFont:[UIFont systemFontOfSize:24.0f]];
     [label setShadowColor:[UIColor colorWithWhite:1.0f alpha:0.4f]];
@@ -44,7 +44,7 @@ - (UILabel *)demoText:(NSString *)text frame:(CGRect)frame
     [label setNumberOfLines:1000];
     [label setValue:text forKey:@"text"];
     [label setTextColor:[UIColor colorWithWhite:0.0 alpha:0.7]];
-    [label setTextAlignment:UITextAlignmentLeft];
+    [label setTextAlignment:NSTextAlignmentLeft];
     [label setBackgroundColor:[UIColor clearColor]];
     [label setFont:[UIFont systemFontOfSize:14.0f]];
     [label setShadowColor:[UIColor colorWithWhite:1.0f alpha:0.4f]];

diff --git a/Universal/Views/JCGridMenuView.m b/Universal/Views/JCGridMenuView.m
@@ -83,7 +83,7 @@ - (void)show
 
     [UIView animateWithDuration:0.2
                           delay:0.0
-                        options: UIViewAnimationCurveEaseIn
+                        options: UIViewAnimationOptionCurveEaseIn
                      animations:^{
                          [self.layer setPosition:CGPointMake(xStart+44, yStart)];
                          [_button setSelected:[_row isSelected]];
@@ -96,7 +96,7 @@ - (void)show
 
                          [UIView animateWithDuration:0.2
                                                delay:0.0
-                                             options: UIViewAnimationCurveLinear
+                                             options: UIViewAnimationOptionCurveLinear
                                           animations:^{
                                               [self.layer setPosition:CGPointMake(xEnd, yEnd)];
                                           } 
@@ -112,7 +112,7 @@ - (void)hide
 
     [UIView animateWithDuration:0.4
                           delay:0.0
-                        options: UIViewAnimationCurveEaseIn
+                        options: UIViewAnimationOptionCurveEaseIn
                      animations:^{
                          [self.layer setPosition:CGPointMake(_hideX, _hideY)];
                      } 
@@ -225,7 +225,7 @@ - (void)expand:(NSInteger)indexRow
 
         [UIView animateWithDuration:0.2
                               delay:0.0
-                            options: UIViewAnimationCurveEaseIn
+                            options: UIViewAnimationOptionCurveEaseIn
                          animations:^{
                              [self.layer setPosition:CGPointMake((centerX -_expandWidth) +44, centerY)];
                          } 
@@ -254,7 +254,7 @@ - (void)seperate:(BOOL)isSeperate
 
     [UIView animateWithDuration:0.2
                           delay:0.0
-                        options: UIViewAnimationCurveEaseIn
+                        options: UIViewAnimationOptionCurveEaseIn
                      animations:^{
                          [self.layer setPosition:CGPointMake(centerX, centerY)];
                      } 
@@ -278,7 +278,7 @@ - (void)reset
     if (needsReset) {
         [UIView animateWithDuration:0.2
                               delay:0.0
-                            options: UIViewAnimationCurveEaseIn
+                            options: UIViewAnimationOptionCurveEaseIn
                          animations:^{
 
                              if ([_row hideOnExpand]) {