Skip to content

Commit ab0bc23

Browse files
committed
Fix bar indicator, 1.1x fav button
Chagnes on Timeline fork include making the text a bit smaller and wrappable on the Schedule
1 parent 550db00 commit ab0bc23

5 files changed

Lines changed: 51 additions & 14 deletions

File tree

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
},
6+
"colors" : [
7+
{
8+
"idiom" : "universal",
9+
"color" : {
10+
"color-space" : "srgb",
11+
"components" : {
12+
"red" : "0x38",
13+
"alpha" : "1.000",
14+
"blue" : "0x59",
15+
"green" : "0x48"
16+
}
17+
}
18+
},
19+
{
20+
"idiom" : "universal",
21+
"appearances" : [
22+
{
23+
"appearance" : "luminosity",
24+
"value" : "dark"
25+
}
26+
],
27+
"color" : {
28+
"color-space" : "srgb",
29+
"components" : {
30+
"red" : "1.000",
31+
"alpha" : "1.000",
32+
"blue" : "1.000",
33+
"green" : "1.000"
34+
}
35+
}
36+
}
37+
]
38+
}

BrickHack-Mobile/Controllers/ScheduleTableViewController.swift

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ class ScheduleTableViewController: UITableViewController {
148148
// Set images
149149
favButton.addTarget(self, action: #selector(favoriteTapped(sender:)), for: .touchUpInside)
150150
cell.accessoryView = favButton
151+
// Make "favorite" star a bit bigger
152+
cell.accessoryView?.transform = CGAffineTransform(scaleX: 1.1, y: 1.1)
151153
// Set custom properties
152154
favButton.section = indexPath.section
153155
favButton.row = indexPath.row
@@ -253,12 +255,7 @@ class ScheduleTableViewController: UITableViewController {
253255

254256
// Defined height for the time header slot (e.g., "9am")
255257
override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
256-
// If first element, set its header height to 0
257-
// (to make "Schedule" view text not seem too far away)
258-
if section == 0 {
259-
return tableView.sectionHeaderHeight
260-
}
261-
return 50.0
258+
return 40.0
262259
}
263260

264261
// Remove margin between sections

BrickHack-Mobile/Controllers/TabViewController.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,17 @@ class TabViewController: TabmanViewController, PageboyViewControllerDataSource,
4444
let bar = TMBar.LineBar()
4545
bar.layout.contentInset.top = 30.0
4646
bar.layout.transitionStyle = .progressive
47-
bar.backgroundColor = .white
4847
bar.indicator.cornerStyle = .rounded
49-
if self.traitCollection.userInterfaceStyle == .dark {
50-
bar.indicator.tintColor = UIColor.init(named: "quadColor")
48+
bar.indicator.tintColor = UIColor.init(named: "tabBarIndicatorColor")
49+
if #available(iOS 13.0, *) {
50+
bar.backgroundView.style = .flat(color: .systemBackground)
5151
} else {
52-
bar.indicator.tintColor = UIColor.init(named: "tertiaryColor")
52+
bar.backgroundView.style = .flat(color: .white)
5353
}
5454

5555

56+
57+
5658
// Add to view
5759
self.addBar(bar, dataSource: self, at: .top)
5860

BrickHack-Mobile/Launch Screen.storyboard

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<rect key="frame" x="0.0" y="0.0" width="375" height="487"/>
2222
<subviews>
2323
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="brickHack6Logo" translatesAutoresizingMaskIntoConstraints="NO" id="baO-lg-ues">
24-
<rect key="frame" x="36" y="104" width="296" height="279"/>
24+
<rect key="frame" x="36" y="174" width="148" height="139.5"/>
2525
</imageView>
2626
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="loginShapes" translatesAutoresizingMaskIntoConstraints="NO" id="Vz7-XO-8iH">
27-
<rect key="frame" x="-47" y="-105.5" width="422" height="698"/>
27+
<rect key="frame" x="164" y="69" width="211" height="349"/>
2828
</imageView>
2929
</subviews>
3030
<color key="backgroundColor" name="primaryColor"/>
@@ -42,7 +42,7 @@
4242
<constraint firstItem="4bi-QB-vgu" firstAttribute="bottom" secondItem="W8h-cH-efN" secondAttribute="bottom" constant="180" id="C9d-xx-mM5"/>
4343
<constraint firstItem="4bi-QB-vgu" firstAttribute="trailing" secondItem="W8h-cH-efN" secondAttribute="trailing" id="Q01-OU-a8Z"/>
4444
<constraint firstItem="W8h-cH-efN" firstAttribute="leading" secondItem="4bi-QB-vgu" secondAttribute="leading" id="W4n-x5-hM4"/>
45-
<constraint firstItem="W8h-cH-efN" firstAttribute="top" secondItem="4bi-QB-vgu" secondAttribute="top" id="jJ4-es-EWb"/>
45+
<constraint firstItem="W8h-cH-efN" firstAttribute="top" secondItem="hIc-I3-XMI" secondAttribute="top" id="jJ4-es-EWb"/>
4646
</constraints>
4747
<viewLayoutGuide key="safeArea" id="4bi-QB-vgu"/>
4848
</view>

Podfile.lock

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

6262
CHECKOUT OPTIONS:
6363
TimelineTableViewCell:
64-
:commit: ac296d1ea14936040e5dfdf80634b9c7e7e8fb13
64+
:commit: cb02fcce4a31978cf430db47066a6fbb6e276e90
6565
:git: https://github.com/peterkos/TimelineTableViewCell.git
6666

6767
SPEC CHECKSUMS:

0 commit comments

Comments
 (0)