removing sad faces and adding scroll for i5/4s

sachabest · sachabest · commit bcd7defca465 · 2015-01-20T23:46:42.000-05:00
diff --git a/Crashlytics.framework/Crashlytics b/Crashlytics.framework/Crashlytics
diff --git a/Crashlytics.framework/Crashlytics b/Crashlytics.framework/Crashlytics
@@ -0,0 +1 @@
+Versions/Current/Crashlytics
diff --git a/Crashlytics.framework/Headers b/Crashlytics.framework/Headers
diff --git a/Crashlytics.framework/Headers b/Crashlytics.framework/Headers
@@ -0,0 +1 @@
+Versions/Current/Headers
diff --git a/Crashlytics.framework/Resources b/Crashlytics.framework/Resources
diff --git a/Crashlytics.framework/Resources b/Crashlytics.framework/Resources
@@ -0,0 +1 @@
+Versions/Current/Resources
diff --git a/Crashlytics.framework/run b/Crashlytics.framework/run
diff --git a/PennMobile.xcodeproj/xcuserdata/sachabest.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/PennMobile.xcodeproj/xcuserdata/sachabest.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -536,11 +536,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PennMobile/RegistrarTableViewController.m"
-            timestampString = "443505373.493423"
+            timestampString = "443507844.535153"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "93"
-            endingLineNumber = "93"
+            startingLineNumber = "99"
+            endingLineNumber = "99"
             landmarkName = "-importData:"
             landmarkType = "5">
             <Locations>
@@ -582,11 +582,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PennMobile/RegistrarTableViewController.m"
-            timestampString = "443505373.493423"
+            timestampString = "443507844.535153"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "95"
-            endingLineNumber = "95"
+            startingLineNumber = "101"
+            endingLineNumber = "101"
             landmarkName = "-importData:"
             landmarkType = "5">
          </BreakpointContent>
@@ -614,11 +614,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PennMobile/RegistrarTableViewController.m"
-            timestampString = "443505373.493423"
+            timestampString = "443507844.535153"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "126"
-            endingLineNumber = "126"
+            startingLineNumber = "132"
+            endingLineNumber = "132"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -646,11 +646,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PennMobile/RegistrarTableViewController.m"
-            timestampString = "443505373.493423"
+            timestampString = "443507844.535153"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "114"
-            endingLineNumber = "114"
+            startingLineNumber = "120"
+            endingLineNumber = "120"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -662,11 +662,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PennMobile/DetailViewController.m"
-            timestampString = "443502747.567405"
+            timestampString = "443507708.783103"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "122"
-            endingLineNumber = "122"
+            startingLineNumber = "123"
+            endingLineNumber = "123"
             landmarkName = "-configureUsingCover:title:sub:number:credits:detail:"
             landmarkType = "5">
          </BreakpointContent>
@@ -678,11 +678,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PennMobile/DetailViewController.m"
-            timestampString = "443502747.567405"
+            timestampString = "443507708.783103"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "123"
-            endingLineNumber = "123"
+            startingLineNumber = "124"
+            endingLineNumber = "124"
             landmarkName = "-configureUsingCover:title:sub:number:credits:detail:"
             landmarkType = "5">
          </BreakpointContent>
diff --git a/PennMobile/Base.lproj/Main.storyboard b/PennMobile/Base.lproj/Main.storyboard
@@ -434,7 +434,7 @@
                                     <action selector="back:" destination="HKG-NO-KBC" eventType="touchUpInside" id="Ccv-vv-MRF"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Location Available " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="ZYQ-Wn-Ste">
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Location Available " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="ZYQ-Wn-Ste">
                                 <rect key="frame" x="70" y="103" width="235" height="40"/>
                                 <color key="backgroundColor" red="0.039215686270000001" green="0.1450980392" blue="0.27058823529999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
@@ -1270,7 +1270,7 @@ and the rest of Labs + UA</string>
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="50" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="nEE-Hs-eIk">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="50" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="nEE-Hs-eIk">
                                 <rect key="frame" x="0.0" y="64" width="375" height="523"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
diff --git a/PennMobile/DetailViewController.m b/PennMobile/DetailViewController.m
@@ -64,10 +64,11 @@ - (void)dealWithAppleMaps {
         CLLocation *user = [[CLLocation alloc] initWithLatitude:39.9520689 longitude:-75.1910786];
         _mapCover.region = MKCoordinateRegionMakeWithDistance(user.coordinate, kMapSize, kMapSize);
         if (info.building) {
-            _noLoc.hidden = YES;
             [_mapCover setCenterCoordinate:info.point.coordinate animated:YES];
             [_mapCover addAnnotation:info.point];
+            [_mapCover selectAnnotation:info.point animated:YES];
         } else {
+            _noLoc.hidden = NO;
             CLLocation *user = _mapCover.userLocation.location;
             if (!user) {
                 user = [[CLLocation alloc] initWithLatitude:39.9520689 longitude:-75.1910786];
diff --git a/PennMobile/DiningViewController.m b/PennMobile/DiningViewController.m
@@ -258,7 +258,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     _selectedVenue = venueName;
     _dataForNextView = [self getMealsForVenue:venueName forDate:_selectedDate atMeal:[self isOpen:venueName]];
     if (!_dataForNextView || _dataForNextView.count == 0) {
-        UIAlertView *new = [[UIAlertView alloc] initWithTitle:@"Menu Unavailable" message:@"The menu you requested is not currently available. Please note that we do not get menus for Express and Retail locations :(" delegate:self cancelButtonTitle:@"OK" otherButtonTitles:@"Call", nil];
+        UIAlertView *new = [[UIAlertView alloc] initWithTitle:@"Menu Unavailable" message:@"The menu you requested is not currently available. Please note that we do not get menus for Express and Retail locations." delegate:self cancelButtonTitle:@"OK" otherButtonTitles:@"Call", nil];
         [new show];
         [tableView deselectRowAtIndexPath:indexPath animated:YES];
        }
@@ -341,7 +341,7 @@ - (NSDictionary *)loadMealsForVenueIndex:(int)index {
     NSError *error = [NSError alloc];
     NSDictionary *raw = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:&error];
     if (!raw || error.code != 0) {
-        UIAlertView *new = [[UIAlertView alloc] initWithTitle:@"Couldn't Connect to API" message:@"We couldn't connect to Penn's API. Please try again later. :(" delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil, nil];
+        UIAlertView *new = [[UIAlertView alloc] initWithTitle:@"Couldn't Connect to API" message:@"We couldn't connect to Penn's API. Please try again later." delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil, nil];
         NSLog(@"JSON Parse error code: %ld", (long)error.code);
         [new show];
         return nil;
diff --git a/PennMobile/Info.plist b/PennMobile/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>105</string>
+	<string>110</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>
diff --git a/PennMobile/RegistrarTableViewController.m b/PennMobile/RegistrarTableViewController.m
@@ -68,10 +68,11 @@ -(void)importData:(NSArray *)raw {
             new.building = courseData[@"meetings"][0][@"building_name"];
             new.buildingCode = courseData[@"meetings"][0][@"building_code"];
             new.roomBum = courseData[@"meetings"][0][@"room_number"];
-            if (new.buildingCode || ![new.buildingCode isEqualToString:@""]) {
+            if (new.buildingCode && ![new.buildingCode isEqualToString:@""]) {
                 NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@%@", SERVER_ROOT, BUILDING_PATH, new.buildingCode]];
                 NSData *result = [NSData dataWithContentsOfURL:url];
                 NSError *error;
+                @try {
                 NSDictionary *returned = [NSJSONSerialization JSONObjectWithData:result options:NSJSONReadingMutableLeaves error:&error];
                 if (error) {
                     [NSException raise:@"JSON parse error" format:@"%@", error];
@@ -83,6 +84,10 @@ -(void)importData:(NSArray *)raw {
                     pt.title = [[new.building stringByAppendingString:@" "]     stringByAppendingString:new.roomBum];
                     new.point = pt;
                 }
+                }
+                @catch (NSException *e) {
+                    NSLog(@"No building found for %@", new.buildingCode);
+                }
             }
         }
         NSMutableArray *profs = [[NSMutableArray alloc] init];
