Skip to content
This repository has been archived by the owner on Jan 4, 2024. It is now read-only.

Feature/#15 #17

Merged
merged 3 commits into from
May 31, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Philly Bike Share.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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)";
Expand All @@ -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)";
Expand Down
70 changes: 57 additions & 13 deletions Philly Bike Share/Base.lproj/Main.storyboard

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#import "PhillyBikeShareLocationManager.h"
@import MapKit;

#define iPhone4Width 320

@interface PhillyBikeShareMainViewController () <CLLocationManagerDelegate, MKMapViewDelegate>

@property (strong, nonatomic) CLLocationManager *locationManager;
Expand Down Expand Up @@ -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;
Expand All @@ -51,7 +57,6 @@ - (void)revealFullMapView;
- (void)hideFullMapView;
- (void)moveFooterAndHeaderViewByxOffset:(CGFloat)xOffset;


@end

@implementation PhillyBikeShareMainViewController {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion Philly Bike Share/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down