Merge pull request #143 from ZeusWPI/ios/ios-7

There you go

iOS/Hydra-Info.plist

@@ -56,6 +56,29 @@
 	<array>
 		<string>audio</string>
 	</array>
+	<key>UILaunchImages</key>
+	<array>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>7.0</string>
+			<key>UILaunchImageName</key>
+			<string>ios7-Default</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{320, 568}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>7.0</string>
+			<key>UILaunchImageName</key>
+			<string>ios7-Default</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{320, 480}</string>
+		</dict>
+	</array>
 	<key>UIPrerenderedIcon</key>
 	<true/>
 	<key>UIStatusBarHidden</key>

iOS/Hydra.xcodeproj/project.pbxproj

@@ -29,6 +29,8 @@
 		90B1029717A85E9200669CCD /* kalender.css in Resources */ = {isa = PBXBuildFile; fileRef = 90B1029617A85E9200669CCD /* kalender.css */; };
 		90BAB266162749BD0043BA92 /* SchamperDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90BAB265162749BC0043BA92 /* SchamperDetailViewController.m */; };
 		90C532AB16A325A200857EB0 /* FacebookEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C532AA16A325A200857EB0 /* FacebookEvent.m */; };
+		90E814F31854C76C00075F96 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 90E814F11854C76C00075F96 /* [email protected] */; };
+		90E814F41854C76C00075F96 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 90E814F21854C76C00075F96 /* [email protected] */; };
 		90EB7BE31688BCC700A9582D /* RestoInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 90EB7BE21688BCC700A9582D /* RestoInfoView.m */; };
 		90EB7BEA1688ECE300A9582D /* RestoLegendItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 90EB7BE91688ECE300A9582D /* RestoLegendItem.m */; };
 		90F0525E168C663F004CAFFC /* RestoMapController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F0525C168C663F004CAFFC /* RestoMapController.m */; };
@@ -254,6 +256,8 @@
 		90BAB265162749BC0043BA92 /* SchamperDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SchamperDetailViewController.m; sourceTree = "<group>"; };
 		90C532A916A325A200857EB0 /* FacebookEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FacebookEvent.h; sourceTree = "<group>"; };
 		90C532AA16A325A200857EB0 /* FacebookEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FacebookEvent.m; sourceTree = "<group>"; };
+		90E814F11854C76C00075F96 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		90E814F21854C76C00075F96 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		90EB7BE11688BCC700A9582D /* RestoInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RestoInfoView.h; sourceTree = "<group>"; };
 		90EB7BE21688BCC700A9582D /* RestoInfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RestoInfoView.m; sourceTree = "<group>"; };
 		90EB7BE81688ECE300A9582D /* RestoLegendItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RestoLegendItem.h; sourceTree = "<group>"; };
@@ -864,6 +868,8 @@
 				F5BC3D8D162EBB5100E4A902 /* [email protected] */,
 				F5D36BB315B5BD2A00B6E017 /* Default.png */,
 				F5D36BB415B5BD2A00B6E017 /* [email protected] */,
+				90E814F11854C76C00075F96 /* [email protected] */,
+				90E814F21854C76C00075F96 /* [email protected] */,
 				F5BAEC921518868200F6A1B1 /* Hydra-Info.plist */,
 				F5D36BD815B5CD1500B6E017 /* Hydra-Prefix.pch */,
 				F5CE522016C2BDA70033A52B /* Errors.strings */,
@@ -1071,6 +1077,7 @@
 				F5CFAA3D15BD9B87008E75B0 /* info-fietsen.html in Resources */,
 				F50527CE15BDC1E600A697F8 /* info-kalender.html in Resources */,
 				F50527D015BDC5F600A697F8 /* info-studentenartsen.html in Resources */,
+				90E814F31854C76C00075F96 /* [email protected] in Resources */,
 				90410B101848DF9100331F6C /* info-guide.png in Resources */,
 				F5A81CBE15CF1BA700FE033B /* external-link.png in Resources */,
 				F5A81CC215CF1CC500FE033B /* external-link-active.png in Resources */,
@@ -1093,6 +1100,7 @@
 				F533DABA16315E87001269A8 /* schamper.css in Resources */,
 				F533DABC163163E2001269A8 /* schamper-bg.png in Resources */,
 				F557EA46163431FC00635CDD /* [email protected] in Resources */,
+				90E814F41854C76C00075F96 /* [email protected] in Resources */,
 				F5EBF0E0164BE583002C14BF /* SORelativeDateTransformer.bundle in Resources */,
 				F5C4618F166E442000874D79 /* navigation-down.png in Resources */,
 				F5C46190166E442000874D79 /* [email protected] in Resources */,

iOS/Hydra/ActivitiesController.m

@@ -198,7 +198,7 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
     static NSDateFormatter *dateFormatter = nil;
     if (!dateFormatter) {
         dateFormatter = [NSDateFormatter H_dateFormatterWithAppLocale];
-        dateFormatter.dateFormat = @"d MMMM";
+        dateFormatter.dateFormat = @"E d MMMM";
     }
     return [dateFormatter stringFromDate:self.days[section]];
 }

iOS/Hydra/ActivityDetailController.m

@@ -245,6 +245,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
                     break;
 
                 case kGuestsRow: {
+                    width -= 40;
                     FacebookEvent *fbEvent = self.activity.facebookEvent;
                     if (fbEvent.friendsAttending.count > 0) {
                         spacing += 40;
@@ -255,10 +256,37 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
                     // Different calculation for UITextView
                     if (!self.descriptionView) {
                         self.descriptionView = [self createDescriptionView];
-                        width = tableView.frame.size.width - 20;
+                        if (IOS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) {
+                            width = tableView.frame.size.width;
+                        } else {
+                            width = tableView.frame.size.width - 20;
+                        }
                         self.descriptionView.frame = CGRectMake(0, 0, width, 0);
                     }
-                    return self.descriptionView.contentSize.height + 4;
+                    if (IOS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")){
+                        UIEdgeInsets textContainerInsets = self.descriptionView.textContainerInset;
+                        UIEdgeInsets contentInsets = self.descriptionView.contentInset;
+
+                        CGFloat leftRightPadding = textContainerInsets.left + textContainerInsets.right + contentInsets.left + contentInsets.right +
+                                                    self.descriptionView.textContainer.lineFragmentPadding * 2;
+                        CGFloat topBottomPadding = textContainerInsets.top + textContainerInsets.bottom + contentInsets.top + contentInsets.bottom;
+
+                        width -= leftRightPadding;
+
+                        NSDictionary *attributes = @{ NSFontAttributeName: self.descriptionView.font};
+
+                        CGRect size = [self.descriptionView.text boundingRectWithSize:CGSizeMake(width, MAXFLOAT)
+                                                                  options:NSStringDrawingUsesLineFragmentOrigin
+                                                               attributes:attributes
+                                                                  context:nil];
+
+                        CGFloat height = ceilf(CGRectGetHeight(size) + topBottomPadding + 1);
+
+                        return height;
+                    }
+                    else {
+                        return self.descriptionView.contentSize.height + 4;
+                    }
                     break;
             }
             break;
@@ -424,8 +452,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView infoCellForRowAtIndex:(N
         case kGuestsRow: {
             cell.textLabel.text = @"Gasten";
             cell.alignToTop = YES;
-            // TODO: should be UITableViewCellAccessoryDetailButton on iOS7
-            cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton;
+
+            if (IOS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")){
+                cell.accessoryType = UITableViewCellAccessoryDetailButton;
+            } else {
+                cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton;
+            }
 
             FacebookEvent *event = self.activity.facebookEvent;
             if (event.friendsAttending.count > 0) {