Skip to content

#35: Use IBOutletCollection to simplify code #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olivaresf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#35: Use IBOutletCollection to simplify code #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 11 additions & 34 deletions Emojical/Emojical/Application Pages/Today/Implementation/TodayViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,7 @@ class TodayViewController: UIViewController {
@IBOutlet var prevWeek: UIBarButtonItem!
@IBOutlet var nextWeek: UIBarButtonItem!

@IBOutlet weak var day0: DayColumnView!
@IBOutlet weak var day1: DayColumnView!
@IBOutlet weak var day2: DayColumnView!
@IBOutlet weak var day3: DayColumnView!
@IBOutlet weak var day4: DayColumnView!
@IBOutlet weak var day5: DayColumnView!
@IBOutlet weak var day6: DayColumnView!
@IBOutlet var dayCollectionViewsArray: [DayColumnView]!

@IBOutlet weak var stampSelector: StampSelectorView!
@IBOutlet weak var stampSelectorBottomContstraint: NSLayoutConstraint!
Expand Down Expand Up @@ -172,13 +166,18 @@ class TodayViewController: UIViewController {
}

private func configureViews() {
let dayViews: [DayColumnView] = [day0, day1, day2, day3, day4, day5, day6]

// We want to pass exact same width to all daily columns. Otherwise,
// if we just rely on the auto-layout, there will be some fraction difference
// between them, and that would make vertical spacing between stickers
// not even and visible for the user.
for day in dayViews {
day.stickerSize = floor(day0.bounds.width)
// not even and visible for the user.

let width = dayCollectionViewsArray.first!.bounds.width
for (index, day) in dayCollectionViewsArray.enumerated() {
day.stickerSize = floor(width)
day.onDayTapped = { () in
self.onDayHeaderTapped?(index)
}
}

// Hide buttons initially
Expand All @@ -193,27 +192,6 @@ class TodayViewController: UIViewController {
daysHeader.onDayTapped = { (index) in
self.onDayHeaderTapped?(index)
}
day0.onDayTapped = { () in
self.onDayHeaderTapped?(0)
}
day1.onDayTapped = { () in
self.onDayHeaderTapped?(1)
}
day2.onDayTapped = { () in
self.onDayHeaderTapped?(2)
}
day3.onDayTapped = { () in
self.onDayHeaderTapped?(3)
}
day4.onDayTapped = { () in
self.onDayHeaderTapped?(4)
}
day5.onDayTapped = { () in
self.onDayHeaderTapped?(5)
}
day6.onDayTapped = { () in
self.onDayHeaderTapped?(6)
}
stampSelector.onStampTapped = { (stampId) in
self.onStampInSelectorTapped?(stampId)
}
Expand Down Expand Up @@ -254,9 +232,8 @@ extension TodayViewController: TodayView {
func loadDays(data: [[StickerData]]) {
guard data.count == 7 else { return }

let dayViews: [DayColumnView] = [day0, day1, day2, day3, day4, day5, day6]
// Mapping 7 data objects to 7 day views
for (day, view) in zip(data, dayViews) {
for (day, view) in zip(data, dayCollectionViewsArray) {
view.loadData(day)
}
}
Expand Down
14 changes: 7 additions & 7 deletions Emojical/Emojical/Application Pages/Today/Today.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,6 @@
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
<connections>
<outlet property="awards" destination="50g-Iv-28T" id="rJg-33-0R6"/>
<outlet property="day0" destination="dJ0-of-a5u" id="KGk-pN-C4M"/>
<outlet property="day1" destination="1lM-26-t9b" id="4Ap-si-crK"/>
<outlet property="day2" destination="EOr-jo-VtK" id="p15-0A-47v"/>
<outlet property="day3" destination="M3W-1S-Mqu" id="Snk-FM-nRH"/>
<outlet property="day4" destination="Rbx-OB-6HF" id="vND-cb-n9Y"/>
<outlet property="day5" destination="QaH-jB-lBK" id="Gb3-gk-prC"/>
<outlet property="day6" destination="bby-Z3-Ggw" id="vsI-HB-IxC"/>
<outlet property="daysHeader" destination="FnJ-i2-3rh" id="9ye-5U-Bie"/>
<outlet property="nextWeek" destination="ep7-Zj-mBI" id="WYu-5Y-dOU"/>
<outlet property="plusButton" destination="xsj-3c-kfw" id="EFH-o9-Jia"/>
Expand All @@ -392,6 +385,13 @@
<outlet property="separatorTopConstraint" destination="8kH-5r-qKy" id="bhD-eH-rfJ"/>
<outlet property="stampSelector" destination="kD0-4R-gft" id="NT0-8X-QK3"/>
<outlet property="stampSelectorBottomContstraint" destination="be8-Zf-eJO" id="Qtl-Fj-ZqD"/>
<outletCollection property="dayCollectionViewsArray" destination="dJ0-of-a5u" collectionClass="NSMutableArray" id="JpK-ow-9eY"/>
<outletCollection property="dayCollectionViewsArray" destination="1lM-26-t9b" collectionClass="NSMutableArray" id="ues-KX-zAU"/>
<outletCollection property="dayCollectionViewsArray" destination="EOr-jo-VtK" collectionClass="NSMutableArray" id="uZD-AB-zIY"/>
<outletCollection property="dayCollectionViewsArray" destination="M3W-1S-Mqu" collectionClass="NSMutableArray" id="iSJ-LM-HW0"/>
<outletCollection property="dayCollectionViewsArray" destination="Rbx-OB-6HF" collectionClass="NSMutableArray" id="32P-zM-JXe"/>
<outletCollection property="dayCollectionViewsArray" destination="QaH-jB-lBK" collectionClass="NSMutableArray" id="6VF-FW-YJg"/>
<outletCollection property="dayCollectionViewsArray" destination="bby-Z3-Ggw" collectionClass="NSMutableArray" id="cFP-Vx-YYo"/>
<segue destination="DIf-UA-VLm" kind="presentation" identifier="newSticker" id="TSB-6g-cKh"/>
</connections>
</viewController>
Expand Down