Added ability to close keyboard with swipe gesture

Eric Millin · Eric Millin · commit e0fb7fb39dc6 · 2014-11-04T20:00:55.000-05:00
diff --git a/sample-code/apps/TestApp/Test App 2/MyViewControllerViewController.m b/sample-code/apps/TestApp/Test App 2/MyViewControllerViewController.m
@@ -68,10 +68,21 @@ - (void)viewDidLoad
     [computeSumButton setAccessibilityIdentifier:@"ComputeSumButton"];
     [answerLabel setAccessibilityIdentifier:@"Answer"];
     [locationStatus setAccessibilityIdentifier:@"locationStatus"];
+    
+    UISwipeGestureRecognizer * swipe =[[UISwipeGestureRecognizer alloc]initWithTarget:self action:@selector(swipeUp:)];
+    swipe.direction = UISwipeGestureRecognizerDirectionUp;
+    [self.view addGestureRecognizer:swipe];
+    [swipe release];
 
     computeSumButton.titleLabel.text = NSLocalizedString(@"main.button.computeSum", @"Compute Sum button");
 }
 
+-(void)swipeUp:(UISwipeGestureRecognizer*)gestureRecognizer
+{
+    [secondArg resignFirstResponder];
+}
+
+
 - (void)logLocationAuthFromTimer:(NSTimer *)timer
 {
     [self logLocationAuth];
diff --git a/sample-code/apps/TestApp/Test App 2/en.lproj/MyViewControllerViewController.xib b/sample-code/apps/TestApp/Test App 2/en.lproj/MyViewControllerViewController.xib
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< HEAD
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+=======
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+>>>>>>> Added ability to close keyboard with swipe gesture
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
     </dependencies>
