Merge pull request #17 from RappidDevelopment/feature/#15

Feature/#15
RappidDevelopment · May 31, 2015 · 242f377 · 242f377
2 parents ef1ef41 + a2bda72
commit 242f377
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 15 deletions.
diff --git a/Philly Bike Share.xcodeproj/project.pbxproj b/Philly Bike Share.xcodeproj/project.pbxproj
@@ -542,6 +542,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Philly Bike Share/Common/PhillyBikeSharePrefixHeader.pch";
 				INFOPLIST_FILE = "Philly Bike Share/Info.plist";
+				INSTALL_GROUP = "";
+				INSTALL_OWNER = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -557,6 +559,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Philly Bike Share/Common/PhillyBikeSharePrefixHeader.pch";
 				INFOPLIST_FILE = "Philly Bike Share/Info.plist";
+				INSTALL_GROUP = "";
+				INSTALL_OWNER = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Philly Bike Share/Base.lproj/Main.storyboard b/Philly Bike Share/Base.lproj/Main.storyboard
diff --git a/Philly Bike Share/Controllers/PhillyBikeShareMainViewController.m b/Philly Bike Share/Controllers/PhillyBikeShareMainViewController.m
@@ -11,6 +11,8 @@
 #import "PhillyBikeShareLocationManager.h"
 @import MapKit;
 
+#define iPhone4Width 320
+
 @interface PhillyBikeShareMainViewController () <CLLocationManagerDelegate, MKMapViewDelegate>
 
 @property (strong, nonatomic) CLLocationManager *locationManager;
@@ -42,6 +44,10 @@ @interface PhillyBikeShareMainViewController () <CLLocationManagerDelegate, MKMa
 @property (strong, nonatomic) IBOutlet NSLayoutConstraint *fullMapCenterYConstraint;
 @property (strong, nonatomic) IBOutlet NSLayoutConstraint *fullMapBottomSpaceConstraint;
 @property (weak, nonatomic) IBOutlet MKMapView *mapView;
+@property (weak, nonatomic) IBOutlet UIButton *swipeRightArrow;
+@property (weak, nonatomic) IBOutlet UIButton *swipeLeftArrow;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *arrowHeight;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *arrowWidth;
 
 - (void)checkForLocationServices;
 - (void)calculateConstraints;
@@ -51,7 +57,6 @@ - (void)revealFullMapView;
 - (void)hideFullMapView;
 - (void)moveFooterAndHeaderViewByxOffset:(CGFloat)xOffset;
 
-
 @end
 
 @implementation PhillyBikeShareMainViewController {
@@ -101,6 +106,10 @@ - (void)viewDidLoad {
         [self.footerView removeConstraint:self.fullMapCenterYConstraint];
     }
 
+    //Handle iPhone 4 case.
+    if (ScreenHeight == 480.0f) {
+        self.milesAwayTopSpaceConstraint.constant = 8;
+    }
     _bikeViewInitialHeight = self.bikeViewHeight.constant;
     self.bikeView.clipsToBounds = YES;
     self.docksView.clipsToBounds = YES;
@@ -317,6 +326,19 @@ - (void)pinLocaitonsToMapView {
 
 }
 
+- (IBAction)swipeLeftArrow:(id)sender {
+    UISwipeGestureRecognizer *swipeLeft = [[UISwipeGestureRecognizer alloc]init];
+    swipeLeft.direction = UISwipeGestureRecognizerDirectionRight;
+    [self swipe:swipeLeft];
+}
+
+- (IBAction)swipeRightArrow:(id)sender {
+    UISwipeGestureRecognizer *swipeRight = [[UISwipeGestureRecognizer alloc]init];
+    swipeRight.direction = UISwipeGestureRecognizerDirectionLeft;
+    [self swipe:swipeRight];
+}
+
+
 - (IBAction)fullMapButtonPressed:(id)sender {
 
     if (self.fullMapButton.selected == NO) {

diff --git a/Philly Bike Share/Images.xcassets/Swipe Left Arrow.imageset/Arrow Left 3x.png b/Philly Bike Share/Images.xcassets/Swipe Left Arrow.imageset/Arrow Left 3x.png
diff --git a/Philly Bike Share/Images.xcassets/Swipe Left Arrow.imageset/Contents.json b/Philly Bike Share/Images.xcassets/Swipe Left Arrow.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Arrow Left 3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Philly Bike Share/Images.xcassets/Swipe Right Arrow.imageset/Arrow Right 3x.png b/Philly Bike Share/Images.xcassets/Swipe Right Arrow.imageset/Arrow Right 3x.png
diff --git a/Philly Bike Share/Images.xcassets/Swipe Right Arrow.imageset/Contents.json b/Philly Bike Share/Images.xcassets/Swipe Right Arrow.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Arrow Right 3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Philly Bike Share/Info.plist b/Philly Bike Share/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.rappiddevelopment.phllybikeshare</string>
+	<string>com.rappiddevelopment.phillybikeshare</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>