ヘッダからインスタンス変数を削除

Author: UQ Times

GestureRecognizers/GestureRecognizers.xcodeproj/project.pbxproj

@@ -219,6 +219,9 @@
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_THUMB_SUPPORT = NO;
+				"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
+				"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -240,6 +243,9 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_THUMB_SUPPORT = NO;
+				"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
+				"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -257,6 +263,7 @@
 			buildSettings = {
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "GestureRecognizers/GestureRecognizers-Prefix.pch";
+				"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
 				INFOPLIST_FILE = "GestureRecognizers/GestureRecognizers-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -269,6 +276,7 @@
 			buildSettings = {
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "GestureRecognizers/GestureRecognizers-Prefix.pch";
+				"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
 				INFOPLIST_FILE = "GestureRecognizers/GestureRecognizers-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
 				PRODUCT_NAME = "$(TARGET_NAME)";

GestureRecognizers/GestureRecognizers/ViewController.h

@@ -9,18 +9,11 @@
 #import <UIKit/UIKit.h>
 
 @interface ViewController : UIViewController
-{
-    UIView *allGesturesView; // 全てのジェスチャーを設定する
-    UIView *panGestureView; // ドラッグジェスチャのみを設定する
-    UIView *swipeGestureView; // スワイプジェスチャのみを設定する
-    UILabel *showGestureName; // どのようなジェスチャを検知したかを出力する
-    UILabel *showSubInfomation; // それに付随する情報を出力する
-}
 
-@property (nonatomic, retain) IBOutlet UIView *allGesturesView;
-@property (nonatomic, retain) IBOutlet UIView *panGestureView;
-@property (nonatomic, retain) IBOutlet UIView *swipeGestureView;
-@property (nonatomic, retain) IBOutlet UILabel *showGestureName;
-@property (nonatomic, retain) IBOutlet UILabel *showSubInformation;
+@property (nonatomic, retain) IBOutlet UIView *allGesturesView;  // 全てのジェスチャーを設定する
+@property (nonatomic, retain) IBOutlet UIView *panGestureView;  // ドラッグジェスチャのみを設定する
+@property (nonatomic, retain) IBOutlet UIView *swipeGestureView;  // スワイプジェスチャのみを設定する
+@property (nonatomic, retain) IBOutlet UILabel *gestureNameLabel;  // 検出したジェスチャを出力する
+@property (nonatomic, retain) IBOutlet UILabel *subInformationLabel;  // それに付随する情報を出力する
 
 @end

GestureRecognizers/GestureRecognizers/ViewController.m

@@ -14,34 +14,29 @@ @interface ViewController ()
 
 @implementation ViewController
 
-@synthesize allGesturesView;
-@synthesize panGestureView;
-@synthesize swipeGestureView;
-@synthesize showGestureName;
-@synthesize showSubInformation;
+@synthesize allGesturesView = _allGesturesView;
+@synthesize panGestureView = _panGestureView;
+@synthesize swipeGestureView = _swipeGestureView;
+@synthesize gestureNameLabel = _gestureNameLabel;
+@synthesize subInformationLabel = _subInformationLabel;
 
-- (void)loadView {
-    [super loadView];
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
 
     // 全てのジェスチャを設定
-    [self addTagGestureRecognizer:allGesturesView];
-    [self addPinchGestureRecognizer:allGesturesView];
-    [self addPanGestureRecognizer:allGesturesView];
-    [self addSwipeGestureRecognizer:allGesturesView];
-    [self addRotationGestureRecognizer:allGesturesView];
-    [self addLongPressGestureRecognizer:allGesturesView];
+    [self addTagGestureRecognizer:_allGesturesView];
+    [self addPinchGestureRecognizer:_allGesturesView];
+    [self addPanGestureRecognizer:_allGesturesView];
+    [self addSwipeGestureRecognizer:_allGesturesView];
+    [self addRotationGestureRecognizer:_allGesturesView];
+    [self addLongPressGestureRecognizer:_allGesturesView];
 
     // スワイプと同じ動作なので、ドラッグジェスチャのみを設定
-    [self addPanGestureRecognizer:panGestureView];
+    [self addPanGestureRecognizer:_panGestureView];
 
     // ドラッグと同じ動作なので、スワイプジェスチャのみを設定
-    [self addSwipeGestureRecognizer:swipeGestureView];
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-	// Do any additional setup after loading the view, typically from a nib.
+    [self addSwipeGestureRecognizer:_swipeGestureView];
 }
 
 - (void)viewDidUnload
@@ -51,16 +46,17 @@ - (void)viewDidUnload
     self.allGesturesView = nil;
     self.panGestureView = nil;
     self.swipeGestureView = nil;
-    self.showGestureName = nil;
-    self.showSubInformation = nil;
+    self.gestureNameLabel = nil;
+    self.subInformationLabel = nil;
 }
 
-- (void)dealloc {
-    [allGesturesView release];
-    [panGestureView release];
-    [swipeGestureView release];
-    [showGestureName release];
-    [showSubInformation release];
+- (void)dealloc
+{
+    [_allGesturesView release];
+    [_panGestureView release];
+    [_swipeGestureView release];
+    [_gestureNameLabel release];
+    [_subInformationLabel release];
 
     [super dealloc];
 }
@@ -71,7 +67,7 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
 }
 
 #pragma mark -
-#pragma mark add gestrue recognizer
+#pragma mark addGestrueRecognizers
 
 - (void)addTagGestureRecognizer:(UIView *)view
 {
@@ -165,95 +161,95 @@ - (void)addLongPressGestureRecognizer:(UIView *)view
 }
 
 #pragma mark -
-#pragma mark touch handler
+#pragma mark GestureRecognizer handlers
 
 // 一本指でシングルタップ
 - (void)handleSingleFingerSingleTap:(UITapGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UITapGestureRecognizer"];
-    [showSubInformation setText:@"[Single finger, Single tap]"];
+    [self.gestureNameLabel setText:@"UITapGestureRecognizer"];
+    [self.subInformationLabel setText:@"[Single finger, Single tap]"];
 }
 
 // 一本指でダブルタップ
 - (void)handleSingleFingerDoubleTap:(UITapGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UITapGestureRecognizer"];
-    [showSubInformation setText:@"[Single finger, Double tap]"];
+    [self.gestureNameLabel setText:@"UITapGestureRecognizer"];
+    [self.subInformationLabel setText:@"[Single finger, Double tap]"];
 }
 
 // 二本指でシングルタップ
 - (void)handleTwoFingerSingleTap:(UITapGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UITapGestureRecognizer"];
-    [showSubInformation setText:@"[Two finger, Single tap]"];
+    [self.gestureNameLabel setText:@"UITapGestureRecognizer"];
+    [self.subInformationLabel setText:@"[Two finger, Single tap]"];
 }
 
 // 二本指でダブルタップ
 - (void)handleTwoFingerDoubleTap:(UITapGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UITapGestureRecognizer"];
-    [showSubInformation setText:@"[Two finger, Double tap]"];
+    [self.gestureNameLabel setText:@"UITapGestureRecognizer"];
+    [self.subInformationLabel setText:@"[Two finger, Double tap]"];
 }
 
 // ピンチイン・ピンチアウト
 - (void)handlePinchGesture:(UIPinchGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UIPinchGestureRecognizer"];
-    [showSubInformation setText:[NSString stringWithFormat:@"[scale:%f, velocity:%f]", recognizer.scale, recognizer.velocity]];
+    [self.gestureNameLabel setText:@"UIPinchGestureRecognizer"];
+    [self.subInformationLabel setText:[NSString stringWithFormat:@"[scale:%f, velocity:%f]", recognizer.scale, recognizer.velocity]];
 }
 
 // ドラッグ
 - (void)handlePanGesture:(UIPanGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UIPanGestureRecognizer"];
+    [self.gestureNameLabel setText:@"UIPanGestureRecognizer"];
     UIView *targetView = [recognizer view];
     CGPoint translationPoint = [recognizer translationInView:targetView];
     CGPoint velocityPoint = [recognizer velocityInView:targetView];
-    [showSubInformation setText:[NSString stringWithFormat:@"[translation:(%f,%f), velocity:(%f,%f)]", translationPoint.x, translationPoint.y, velocityPoint.x, velocityPoint.y]];
+    [self.subInformationLabel setText:[NSString stringWithFormat:@"[translation:(%f,%f), velocity:(%f,%f)]", translationPoint.x, translationPoint.y, velocityPoint.x, velocityPoint.y]];
 }
 
 // スワイプ
 - (void)handleSwipeGesture:(UISwipeGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UISwipeGestureRecognizer"];
-    NSString *directionName = nil;
+    [self.gestureNameLabel setText:@"UISwipeGestureRecognizer"];
+    NSString *directionString = nil;
     switch ([recognizer direction]) {
         case UISwipeGestureRecognizerDirectionRight:
-            directionName = @"UISwipeGestureRecognizerDirectionRight";
+            directionString = @"UISwipeGestureRecognizerDirectionRight";
             break;
         case UISwipeGestureRecognizerDirectionLeft:
-            directionName = @"UISwipeGestureRecognizerDirectionLeft";
+            directionString = @"UISwipeGestureRecognizerDirectionLeft";
             break;
         case UISwipeGestureRecognizerDirectionUp:
-            directionName = @"UISwipeGestureRecognizerDirectionUp";        
+            directionString = @"UISwipeGestureRecognizerDirectionUp";        
             break;
         case UISwipeGestureRecognizerDirectionDown:
-            directionName = @"UISwipeGestureRecognizerDirectionDown";
+            directionString = @"UISwipeGestureRecognizerDirectionDown";
             break;
     }
-    [showSubInformation setText:[NSString stringWithFormat:@"[%@]", directionName]];
+    [self.subInformationLabel setText:[NSString stringWithFormat:@"[%@]", directionString]];
 }
 
 // 回転
 - (void)handleRotationGesture:(UIRotationGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UIRotationGestureRecognizer"];
-    [showSubInformation setText:[NSString stringWithFormat:@"[rotation:%f, velocity:%f]", recognizer.rotation, recognizer.velocity]];
+    [self.gestureNameLabel setText:@"UIRotationGestureRecognizer"];
+    [self.subInformationLabel setText:[NSString stringWithFormat:@"[rotation:%f, velocity:%f]", recognizer.rotation, recognizer.velocity]];
 }
 
 // 長押し
 - (void)handleLongPressGesture:(UILongPressGestureRecognizer *)recognizer {
-    [showGestureName setText:@"UILongPressGestureRecognizer"];
-    NSString *actionName = nil;
+    [self.gestureNameLabel setText:@"UILongPressGestureRecognizer"];
+    NSString *stateString = nil;
     switch ([recognizer state]) {
         case UIGestureRecognizerStateBegan:
-            actionName = @"UIGestureRecognizerStateBegan";
+            stateString = @"UIGestureRecognizerStateBegan";
             break;
         case UIGestureRecognizerStateChanged:
-            actionName = @"UIGestureRecognizerStateChanged";
+            stateString = @"UIGestureRecognizerStateChanged";
             break;
         case UIGestureRecognizerStateEnded:
-            actionName = @"UIGestureRecognizerStateEnd";
+            stateString = @"UIGestureRecognizerStateEnd";
             break;
         case UIGestureRecognizerStateCancelled:
-            actionName = @"UIGestureRecognizerStateCancelled";
+            stateString = @"UIGestureRecognizerStateCancelled";
             break;
         default:
             break;
     }
-    [showSubInformation setText:[NSString stringWithFormat:@"[%@]", actionName]];
+    [self.subInformationLabel setText:[NSString stringWithFormat:@"[%@]", stateString]];
 }
 
 @end