profile, save selection

coach-plus · May 11, 2017 · 4833268 · 4833268
1 parent e94ad96
commit 4833268
Show file tree

Hide file tree

Showing 28 changed files with 584 additions and 128 deletions.
diff --git a/CoachPlus.xcodeproj/project.pbxproj b/CoachPlus.xcodeproj/project.pbxproj
@@ -50,6 +50,12 @@
 		473A5F891E8A9224002FD833 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473A5F871E8A9224002FD833 /* User.swift */; };
 		473A5F8B1E8A92D1002FD833 /* Membership.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473A5F8A1E8A92D1002FD833 /* Membership.swift */; };
 		473A5F8C1E8A92D1002FD833 /* Membership.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473A5F8A1E8A92D1002FD833 /* Membership.swift */; };
+		473DCE1B1EC3A6A000A42F51 /* User.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 473DCE1A1EC3A6A000A42F51 /* User.storyboard */; };
+		473DCE1C1EC3A6A000A42F51 /* User.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 473DCE1A1EC3A6A000A42F51 /* User.storyboard */; };
+		473DCE1E1EC3B9BB00A42F51 /* UserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473DCE1D1EC3B9BB00A42F51 /* UserViewController.swift */; };
+		473DCE1F1EC3B9BB00A42F51 /* UserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473DCE1D1EC3B9BB00A42F51 /* UserViewController.swift */; };
+		473DCE211EC3BFE500A42F51 /* UIImageViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473DCE201EC3BFE500A42F51 /* UIImageViewExtension.swift */; };
+		473DCE221EC3BFE500A42F51 /* UIImageViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473DCE201EC3BFE500A42F51 /* UIImageViewExtension.swift */; };
 		474144D11E8428A9009788E2 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 474144D01E8428A9009788E2 /* Login.storyboard */; };
 		474144D61E8429AD009788E2 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 474144D51E8429AD009788E2 /* LoginViewController.swift */; };
 		474144D81E842D30009788E2 /* CoachPlus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 474144D71E842D30009788E2 /* CoachPlus.swift */; };
@@ -206,6 +212,9 @@
 		473A5F7E1E8A749A002FD833 /* CoachPlus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CoachPlus.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		473A5F871E8A9224002FD833 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = User.swift; path = models/User.swift; sourceTree = "<group>"; };
 		473A5F8A1E8A92D1002FD833 /* Membership.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Membership.swift; path = models/Membership.swift; sourceTree = "<group>"; };
+		473DCE1A1EC3A6A000A42F51 /* User.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = User.storyboard; path = app/user/User.storyboard; sourceTree = "<group>"; };
+		473DCE1D1EC3B9BB00A42F51 /* UserViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserViewController.swift; path = app/user/UserViewController.swift; sourceTree = "<group>"; };
+		473DCE201EC3BFE500A42F51 /* UIImageViewExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UIImageViewExtension.swift; path = helperclasses/UIImageViewExtension.swift; sourceTree = "<group>"; };
 		474144D01E8428A9009788E2 /* Login.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
 		474144D51E8429AD009788E2 /* LoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoginViewController.swift; path = login/LoginViewController.swift; sourceTree = "<group>"; };
 		474144D71E842D30009788E2 /* CoachPlus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoachPlus.swift; sourceTree = "<group>"; };
@@ -353,6 +362,15 @@
 			name = models;
 			sourceTree = "<group>";
 		};
+		473DCE191EC3A68700A42F51 /* user */ = {
+			isa = PBXGroup;
+			children = (
+				473DCE1A1EC3A6A000A42F51 /* User.storyboard */,
+				473DCE1D1EC3B9BB00A42F51 /* UserViewController.swift */,
+			);
+			name = user;
+			sourceTree = "<group>";
+		};
 		474144CF1E84289F009788E2 /* login */ = {
 			isa = PBXGroup;
 			children = (
@@ -458,6 +476,7 @@
 				61CA9C851EA404C4004AFAC7 /* UIViewControllerExtension.swift */,
 				61CA9C881EA406A7004AFAC7 /* CoachPlusNavigationViewController.swift */,
 				61D5F55E1EC0D4F600974EBD /* UIApplicationExtension.swift */,
+				473DCE201EC3BFE500A42F51 /* UIImageViewExtension.swift */,
 			);
 			name = helperclasses;
 			sourceTree = "<group>";
@@ -484,6 +503,7 @@
 		47A9B9141E8561D000DC8247 /* app */ = {
 			isa = PBXGroup;
 			children = (
+				473DCE191EC3A68700A42F51 /* user */,
 				61CA9C7E1EA227B7004AFAC7 /* events */,
 				616616EF1E9F9DE900E8D8D5 /* shared */,
 				47F041F51E8E5C850020D78E /* team */,
@@ -840,6 +860,7 @@
 				61CA9C9D1EA52211004AFAC7 /* TitleView.xib in Resources */,
 				61CA9C961EA51EA2004AFAC7 /* EventDetail.storyboard in Resources */,
 				473A5F731E8A749A002FD833 /* Login.storyboard in Resources */,
+				473DCE1B1EC3A6A000A42F51 /* User.storyboard in Resources */,
 				473A5F741E8A749A002FD833 /* Verification.storyboard in Resources */,
 				47F041EC1E8E59540020D78E /* MembershipTableViewCell.xib in Resources */,
 				61ACB7201EA0D6D600A7A1D2 /* MemberTableViewCell.xib in Resources */,
@@ -871,6 +892,7 @@
 				61CA9C9E1EA52211004AFAC7 /* TitleView.xib in Resources */,
 				473483251EC20A2000F60110 /* Assets.xcassets in Resources */,
 				61CA9C971EA51EA2004AFAC7 /* EventDetail.storyboard in Resources */,
+				473DCE1C1EC3A6A000A42F51 /* User.storyboard in Resources */,
 				474144D11E8428A9009788E2 /* Login.storyboard in Resources */,
 				478DE2321E8537A600DCF74A /* Verification.storyboard in Resources */,
 				47F041ED1E8E59540020D78E /* MembershipTableViewCell.xib in Resources */,
@@ -1128,6 +1150,7 @@
 				473A5F641E8A749A002FD833 /* ViewController.swift in Sources */,
 				61CA9C8C1EA407E8004AFAC7 /* CoachPlusViewController.swift in Sources */,
 				473A5F651E8A749A002FD833 /* Authentication.swift in Sources */,
+				473DCE211EC3BFE500A42F51 /* UIImageViewExtension.swift in Sources */,
 				473A5F661E8A749A002FD833 /* MailSentViewController.swift in Sources */,
 				61CA9CB11EA535D7004AFAC7 /* EventDetailViewController.swift in Sources */,
 				473A5F671E8A749A002FD833 /* ApiResponse.swift in Sources */,
@@ -1145,6 +1168,7 @@
 				473A5F6C1E8A749A002FD833 /* AppDelegate.swift in Sources */,
 				477A27591E8C3775005516ED /* InviteResponse.swift in Sources */,
 				61CA9CA41EA52575004AFAC7 /* ParticipationView.swift in Sources */,
+				473DCE1E1EC3B9BB00A42F51 /* UserViewController.swift in Sources */,
 				61D5F55C1EC0C58100974EBD /* HomeDrawerController.swift in Sources */,
 				473A5F6D1E8A749A002FD833 /* FlowManager.swift in Sources */,
 				473A5F8B1E8A92D1002FD833 /* Membership.swift in Sources */,
@@ -1187,6 +1211,7 @@
 				4749C5021E81B7FE0068B0FA /* ViewController.swift in Sources */,
 				61CA9C8D1EA407E8004AFAC7 /* CoachPlusViewController.swift in Sources */,
 				47B1B6221E87265500F80101 /* Authentication.swift in Sources */,
+				473DCE221EC3BFE500A42F51 /* UIImageViewExtension.swift in Sources */,
 				472B9C0C1E86C35A00706E6B /* MailSentViewController.swift in Sources */,
 				61CA9CB21EA535D7004AFAC7 /* EventDetailViewController.swift in Sources */,
 				47B1B62E1E8815F500F80101 /* ApiResponse.swift in Sources */,
@@ -1204,6 +1229,7 @@
 				4749C5001E81B7FE0068B0FA /* AppDelegate.swift in Sources */,
 				477A275A1E8C40A3005516ED /* InviteResponse.swift in Sources */,
 				61CA9CA51EA52575004AFAC7 /* ParticipationView.swift in Sources */,
+				473DCE1F1EC3B9BB00A42F51 /* UserViewController.swift in Sources */,
 				61D5F55D1EC0C58100974EBD /* HomeDrawerController.swift in Sources */,
 				47B1B6261E87C81B00F80101 /* FlowManager.swift in Sources */,
 				473A5F8C1E8A92D1002FD833 /* Membership.swift in Sources */,

diff --git a/CoachPlus/CoachPlusInfoDev.plist b/CoachPlus/CoachPlusInfoDev.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/CoachPlus/app/events/CreateEventViewController.swift b/CoachPlus/app/events/CreateEventViewController.swift
@@ -41,7 +41,7 @@ class CreateEventViewController: CoachPlusViewController {
             "end": end.toString()
         ]
 
-        DataHandler.def.createEvent(team: self.team!, createEvent: createEvent, successHandler: { response in
+        DataHandler.def.createEvent(team: (self.membership?.team!)!, createEvent: createEvent, successHandler: { response in
             self.navigationController?.popViewController(animated: true)
         }, failHandler: { error in
             print(error)

diff --git a/CoachPlus/app/events/EventDetail.storyboard b/CoachPlus/app/events/EventDetail.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="xIY-BV-OUp">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="xIY-BV-OUp">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,11 +19,11 @@
                         <viewControllerLayoutGuide type="bottom" id="W8f-os-z9n"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ysw-Qv-GBj">
-                        <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OXG-OV-c6E">
-                                <rect key="frame" x="41" y="20" width="278" height="18"/>
+                                <rect key="frame" x="41" y="40" width="278" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18" id="bmo-dp-RJL"/>
                                 </constraints>
@@ -32,15 +32,15 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qnJ-Jg-j2x">
-                                <rect key="frame" x="327" y="22" width="20" height="20"/>
+                                <rect key="frame" x="327" y="42" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="Hvc-oy-f8l"/>
                                     <constraint firstAttribute="width" constant="20" id="auR-78-Ohh"/>
                                 </constraints>
                                 <state key="normal" title="E"/>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bo2-0I-Le4">
-                                <rect key="frame" x="41" y="43" width="310" height="15"/>
+                                <rect key="frame" x="41" y="63" width="310" height="15"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="15" id="mLV-Cu-zgY"/>
                                 </constraints>
@@ -49,7 +49,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xet-c3-g2b">
-                                <rect key="frame" x="41" y="63" width="310" height="15"/>
+                                <rect key="frame" x="41" y="83" width="310" height="15"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="15" id="axs-4b-IYT"/>
                                 </constraints>
@@ -58,7 +58,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="Px1-Ag-0qB">
-                                <rect key="frame" x="41" y="98" width="293" height="60"/>
+                                <rect key="frame" x="41" y="118" width="293" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="S4h-Uj-JN2"/>
                                 </constraints>
@@ -67,7 +67,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rlW-i4-csX" customClass="TitleView" customModule="CoachPlus" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="178" width="375" height="45"/>
+                                <rect key="frame" x="0.0" y="198" width="375" height="45"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="45" id="XjG-wW-PcX"/>
@@ -77,7 +77,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="5YT-0M-Fny">
-                                <rect key="frame" x="0.0" y="223" width="375" height="380"/>
+                                <rect key="frame" x="0.0" y="243" width="375" height="424"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <connections>
                                     <outlet property="dataSource" destination="xIY-BV-OUp" id="WMg-OC-tZA"/>
@@ -109,8 +109,10 @@
                             <constraint firstItem="rlW-i4-csX" firstAttribute="leading" secondItem="Ysw-Qv-GBj" secondAttribute="leading" id="uyh-YU-UKb"/>
                             <constraint firstItem="rlW-i4-csX" firstAttribute="top" secondItem="Px1-Ag-0qB" secondAttribute="bottom" constant="20" id="vDz-D0-QhK"/>
                         </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="heroID" value="eventTableViewCell"/>
+                        </userDefinedRuntimeAttributes>
                     </view>
-                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" translucent="NO" prompted="NO"/>
                     <connections>
                         <outlet property="dateTimeLbl" destination="bo2-0I-Le4" id="6nX-mE-8cF"/>
                         <outlet property="descriptionLbl" destination="Px1-Ag-0qB" id="WiW-Zd-Tcv"/>

diff --git a/CoachPlus/app/events/EventDetailViewController.swift b/CoachPlus/app/events/EventDetailViewController.swift
@@ -24,6 +24,7 @@ class EventDetailViewController: CoachPlusViewController, UITableViewDelegate, U
         self.tableView.register(nib: "ParticipationTableViewCell", reuseIdentifier: "ParticipationTableViewCell")
         self.tableView.rowHeight = UITableViewAutomaticDimension
         self.tableView.estimatedRowHeight = 70
+        super.viewDidLoad()
     }
 
     override func viewWillAppear(_ animated: Bool) {