Skip to content

Commit b3c55e2

Browse files
NatashaTheRobotNatashaTheRobot
committed
extended workshops
1 parent 7b19c91 commit b3c55e2

File tree

12 files changed

+967
-782
lines changed

12 files changed

+967
-782
lines changed

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ EXTERNAL SOURCES:
3131

3232
CHECKOUT OPTIONS:
3333
TrySwiftData:
34-
:commit: a3a1c59a3dc8ea2cb44b7f42a2ac6991c1d98f04
34+
:commit: f7097efa101bf7c200dea24f67003335335e854a
3535
:git: https://github.com/tryswift/trySwiftData.git
3636

3737
SPEC CHECKSUMS:

‎Pods/Manifest.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 769 additions & 757 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/TrySwiftData/TrySwiftData/Assets/Conferences/TKO-2018/Sponsors/individual/atsushi_nagase.jpg‎

9.86 KB
Loading

‎Pods/TrySwiftData/TrySwiftData/Assets/Conferences/TKO-2018/Sponsors/individual/yoshikuni_kato.jpg‎

19.5 KB
Loading

‎Pods/TrySwiftData/TrySwiftData/Assets/Conferences/tryswift.realm‎

0 Bytes
Binary file not shown.

‎Pods/TrySwiftData/TrySwiftData/Models/Sponsor.swift‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/TrySwiftData/TrySwiftData/ViewModels/SessionViewModel/SessionTypeViewModels/SessionDisplayableTypes/WorkshopSessionViewModel.swift‎

Lines changed: 21 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎trySwift.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
FAA54F141D9130F900EC9E80 /* UITableViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAA54F131D9130F900EC9E80 /* UITableViewExtension.swift */; };
8080
FABA73BE1D6D9ABB0081D887 /* OfficeHoursDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABA73BD1D6D9ABB0081D887 /* OfficeHoursDetailViewController.swift */; };
8181
FAC488181F5719BF00CFA660 /* Logo_BLR.png in Resources */ = {isa = PBXBuildFile; fileRef = FAC488171F5719BF00CFA660 /* Logo_BLR.png */; };
82+
FAE089A02033EBDE00A5B560 /* WorkshopDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE0899F2033EBDE00A5B560 /* WorkshopDetailViewController.swift */; };
8283
FAF1DE121D5FDBD600D710C3 /* VenueTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF1DE111D5FDBD600D710C3 /* VenueTableViewController.swift */; };
8384
FAF1DE151D5FDD3700D710C3 /* VenueHeaderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF1DE131D5FDD3700D710C3 /* VenueHeaderTableViewCell.swift */; };
8485
FAF1DE161D5FDD3700D710C3 /* VenueHeaderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = FAF1DE141D5FDD3700D710C3 /* VenueHeaderTableViewCell.xib */; };
@@ -255,6 +256,7 @@
255256
FAA54F131D9130F900EC9E80 /* UITableViewExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITableViewExtension.swift; sourceTree = "<group>"; };
256257
FABA73BD1D6D9ABB0081D887 /* OfficeHoursDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OfficeHoursDetailViewController.swift; sourceTree = "<group>"; };
257258
FAC488171F5719BF00CFA660 /* Logo_BLR.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Logo_BLR.png; path = "try! Today/Logo_BLR.png"; sourceTree = SOURCE_ROOT; };
259+
FAE0899F2033EBDE00A5B560 /* WorkshopDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkshopDetailViewController.swift; sourceTree = "<group>"; };
258260
FAF1DE111D5FDBD600D710C3 /* VenueTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueTableViewController.swift; sourceTree = "<group>"; };
259261
FAF1DE131D5FDD3700D710C3 /* VenueHeaderTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueHeaderTableViewCell.swift; sourceTree = "<group>"; };
260262
FAF1DE141D5FDD3700D710C3 /* VenueHeaderTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VenueHeaderTableViewCell.xib; sourceTree = "<group>"; };
@@ -434,6 +436,7 @@
434436
FA39E8FB1C6C26150074B6BE /* Schedule */,
435437
FA39E9061C6C43480074B6BE /* Speakers */,
436438
FABA73BF1D6D9ACE0081D887 /* OfficeHours */,
439+
FAE0899E2033EB9A00A5B560 /* Workshops */,
437440
FA39E9111C6C81940074B6BE /* SponsorsViewController */,
438441
FA65B57D1C6D7AFC00DCAF0B /* More */,
439442
FA65B57E1C6D7B0900DCAF0B /* Shared */,
@@ -614,6 +617,14 @@
614617
name = OfficeHours;
615618
sourceTree = "<group>";
616619
};
620+
FAE0899E2033EB9A00A5B560 /* Workshops */ = {
621+
isa = PBXGroup;
622+
children = (
623+
FAE0899F2033EBDE00A5B560 /* WorkshopDetailViewController.swift */,
624+
);
625+
name = Workshops;
626+
sourceTree = "<group>";
627+
};
617628
FAF1DE171D5FDD3B00D710C3 /* VenueHeaderTableViewCell */ = {
618629
isa = PBXGroup;
619630
children = (
@@ -1153,6 +1164,7 @@
11531164
FA39E8D21C6AFCCA0074B6BE /* SessionsTableViewController.swift in Sources */,
11541165
FAF1DE121D5FDBD600D710C3 /* VenueTableViewController.swift in Sources */,
11551166
FA39E9341C6D59890074B6BE /* SessionHeaderTableViewCell.swift in Sources */,
1167+
FAE089A02033EBDE00A5B560 /* WorkshopDetailViewController.swift in Sources */,
11561168
FA39E90B1C6C45FD0074B6BE /* SpeakerTableViewCell.swift in Sources */,
11571169
FA65B5911C6DA53600DCAF0B /* AboutTableViewController.swift in Sources */,
11581170
FA65B58D1C6D8B0600DCAF0B /* OrganizerTableViewCell.swift in Sources */,

‎trySwift/Base.lproj/Main.storyboard‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Xe8-8h-xaI">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Xe8-8h-xaI">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1010
</dependencies>
1111
<scenes>
@@ -34,7 +34,7 @@
3434
<objects>
3535
<navigationController id="CXx-dj-nRA" sceneMemberID="viewController">
3636
<navigationBar key="navigationBar" contentMode="scaleToFill" id="1LC-js-BVE">
37-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
37+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
3838
<autoresizingMask key="autoresizingMask"/>
3939
</navigationBar>
4040
<connections>
@@ -64,7 +64,7 @@
6464
<objects>
6565
<navigationController id="LWn-BJ-yu0" sceneMemberID="viewController">
6666
<navigationBar key="navigationBar" contentMode="scaleToFill" id="f5q-Av-p1w">
67-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
67+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
6868
<autoresizingMask key="autoresizingMask"/>
6969
</navigationBar>
7070
<connections>
@@ -94,7 +94,7 @@
9494
<objects>
9595
<navigationController id="EE6-ej-He8" sceneMemberID="viewController">
9696
<navigationBar key="navigationBar" contentMode="scaleToFill" id="Jai-qS-Vy3">
97-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
97+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
9898
<autoresizingMask key="autoresizingMask"/>
9999
</navigationBar>
100100
<connections>
@@ -124,7 +124,7 @@
124124
<objects>
125125
<navigationController id="Jtx-au-xk5" sceneMemberID="viewController">
126126
<navigationBar key="navigationBar" contentMode="scaleToFill" id="kGR-0y-ad1">
127-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
127+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
128128
<autoresizingMask key="autoresizingMask"/>
129129
</navigationBar>
130130
<connections>
@@ -155,7 +155,7 @@
155155
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="Yjh-n4-lg9" sceneMemberID="viewController">
156156
<toolbarItems/>
157157
<navigationBar key="navigationBar" contentMode="scaleToFill" id="mA7-4G-2cJ">
158-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
158+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
159159
<autoresizingMask key="autoresizingMask"/>
160160
</navigationBar>
161161
<nil name="viewControllers"/>
@@ -209,6 +209,24 @@
209209
</objects>
210210
<point key="canvasLocation" x="2906" y="456"/>
211211
</scene>
212+
<!--Workshop Detail View Controller-->
213+
<scene sceneID="8d6-9h-dze">
214+
<objects>
215+
<tableViewController storyboardIdentifier="WorkshopDetailViewController" id="fFf-p3-YZt" customClass="WorkshopDetailViewController" customModule="trySwift" customModuleProvider="target" sceneMemberID="viewController">
216+
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="jeD-IU-e1s">
217+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
218+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
219+
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
220+
<connections>
221+
<outlet property="dataSource" destination="fFf-p3-YZt" id="3pa-jw-cQK"/>
222+
<outlet property="delegate" destination="fFf-p3-YZt" id="hL1-sU-hXx"/>
223+
</connections>
224+
</tableView>
225+
</tableViewController>
226+
<placeholder placeholderIdentifier="IBFirstResponder" id="YUo-6C-aNV" userLabel="First Responder" sceneMemberID="firstResponder"/>
227+
</objects>
228+
<point key="canvasLocation" x="2905" y="-1701"/>
229+
</scene>
212230
<!--Schedule View Controller-->
213231
<scene sceneID="Nx8-r3-tSj">
214232
<objects>
@@ -242,15 +260,15 @@
242260
</viewController>
243261
<placeholder placeholderIdentifier="IBFirstResponder" id="gxd-EV-6QF" userLabel="First Responder" sceneMemberID="firstResponder"/>
244262
</objects>
245-
<point key="canvasLocation" x="2911" y="-1701"/>
263+
<point key="canvasLocation" x="2886" y="-2409"/>
246264
</scene>
247265
<!--Navigation Controller-->
248266
<scene sceneID="JMg-ae-6HJ">
249267
<objects>
250268
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="gdL-JW-XVB" sceneMemberID="viewController">
251269
<toolbarItems/>
252270
<navigationBar key="navigationBar" contentMode="scaleToFill" id="tMM-cw-Cmc">
253-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
271+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
254272
<autoresizingMask key="autoresizingMask"/>
255273
</navigationBar>
256274
<nil name="viewControllers"/>
@@ -262,10 +280,10 @@
262280
<!--Session Details View Controller-->
263281
<scene sceneID="oly-PJ-Qfl">
264282
<objects>
265-
<placeholder placeholderIdentifier="IBFirstResponder" id="w8o-SM-icU" userLabel="First Responder" sceneMemberID="firstResponder"/>
266283
<tableViewController storyboardIdentifier="SessionDetailsViewController" id="SCK-qS-CCS" customClass="SessionDetailsViewController" customModule="trySwift" customModuleProvider="target" sceneMemberID="viewController">
267284
<navigationItem key="navigationItem" id="Dkd-Zs-wTN"/>
268285
</tableViewController>
286+
<placeholder placeholderIdentifier="IBFirstResponder" id="w8o-SM-icU" userLabel="First Responder" sceneMemberID="firstResponder"/>
269287
</objects>
270288
<point key="canvasLocation" x="2911" y="-1046"/>
271289
</scene>
@@ -297,7 +315,7 @@
297315
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="yeD-gi-eKj" sceneMemberID="viewController">
298316
<toolbarItems/>
299317
<navigationBar key="navigationBar" contentMode="scaleToFill" id="9NV-3l-Pha">
300-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
318+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
301319
<autoresizingMask key="autoresizingMask"/>
302320
</navigationBar>
303321
<nil name="viewControllers"/>
@@ -319,11 +337,11 @@
319337
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
320338
<autoresizingMask key="autoresizingMask"/>
321339
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RTQ-JH-Oas" id="wYS-yg-Bgc">
322-
<rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
340+
<rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
323341
<autoresizingMask key="autoresizingMask"/>
324342
<subviews>
325343
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IWs-3u-Qph">
326-
<rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
344+
<rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
327345
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
328346
<fontDescription key="fontDescription" type="system" pointSize="16"/>
329347
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -353,7 +371,7 @@
353371
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="1NO-37-OgN" sceneMemberID="viewController">
354372
<toolbarItems/>
355373
<navigationBar key="navigationBar" contentMode="scaleToFill" id="kvs-UQ-fLb">
356-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
374+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
357375
<autoresizingMask key="autoresizingMask"/>
358376
</navigationBar>
359377
<nil name="viewControllers"/>
@@ -370,9 +388,9 @@
370388
<image name="sponsors" width="25" height="25"/>
371389
</resources>
372390
<inferredMetricsTieBreakers>
373-
<segue reference="rbS-gA-mmX"/>
374-
<segue reference="46X-xX-8dv"/>
375391
<segue reference="xqb-Xk-gRL"/>
376392
<segue reference="eRf-GQ-R9p"/>
393+
<segue reference="rbS-gA-mmX"/>
394+
<segue reference="46X-xX-8dv"/>
377395
</inferredMetricsTieBreakers>
378396
</document>

0 commit comments

Comments
 (0)