Skip to content

Commit 0a709a0

Browse files
authored
Merge pull request #13 from codeRIT/peter-resources
[merge Navigation before this] Resources Page complete
2 parents 94311cb + 5f1a741 commit 0a709a0

File tree

13 files changed

+463
-170
lines changed

13 files changed

+463
-170
lines changed

BrickHack-Mobile.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
D706937323E8F86B004FA788 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = D706937223E8F86B004FA788 /* User.swift */; };
1818
D706937523E905FF004FA788 /* TabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D706937423E905FF004FA788 /* TabViewController.swift */; };
1919
D750E81823DF67360075C639 /* FavoriteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D750E81723DF67360075C639 /* FavoriteButton.swift */; };
20+
D757301223EA236900343DDE /* ResourcesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D757301123EA236900343DDE /* ResourcesTableViewController.swift */; };
2021
D772876C23DFF92800C2D541 /* ScheduleParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = D772876B23DFF92800C2D541 /* ScheduleParser.swift */; };
2122
D789978223D652ED0058060A /* ScheduleTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D789978123D652ED0058060A /* ScheduleTableViewController.swift */; };
22-
D789978523D6A4DC0058060A /* ProfileTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D789978423D6A4DC0058060A /* ProfileTableViewController.swift */; };
2323
D79AA2B823425DFA009C469D /* APIRoutes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D79AA2B723425DFA009C469D /* APIRoutes.swift */; };
2424
D7C07885233EDBA300089193 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C07884233EDBA300089193 /* LoginViewController.swift */; };
2525
D7C41E2523637D650091C480 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C41E2423637D650091C480 /* MainTabBarController.swift */; };
@@ -56,9 +56,9 @@
5656
D706937223E8F86B004FA788 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
5757
D706937423E905FF004FA788 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = "<group>"; };
5858
D750E81723DF67360075C639 /* FavoriteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FavoriteButton.swift; path = "BrickHack-Mobile/Views/FavoriteButton.swift"; sourceTree = SOURCE_ROOT; };
59+
D757301123EA236900343DDE /* ResourcesTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesTableViewController.swift; sourceTree = "<group>"; };
5960
D772876B23DFF92800C2D541 /* ScheduleParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleParser.swift; sourceTree = "<group>"; };
6061
D789978123D652ED0058060A /* ScheduleTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleTableViewController.swift; sourceTree = "<group>"; };
61-
D789978423D6A4DC0058060A /* ProfileTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ProfileTableViewController.swift; path = "/Users/peterkos/Code/Github/brickhack-mobile-ios/BrickHack-Mobile/Controllers/ProfileTableViewController.swift"; sourceTree = "<absolute>"; };
6262
D79AA2B723425DFA009C469D /* APIRoutes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIRoutes.swift; sourceTree = "<group>"; };
6363
D7C07884233EDBA300089193 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
6464
D7C41E2423637D650091C480 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
@@ -135,8 +135,8 @@
135135
D7C41E2423637D650091C480 /* MainTabBarController.swift */,
136136
31602384220A116000F73F58 /* EventsViewController.swift */,
137137
D789978123D652ED0058060A /* ScheduleTableViewController.swift */,
138-
D789978423D6A4DC0058060A /* ProfileTableViewController.swift */,
139138
D7C41E26236383300091C480 /* ResourcesViewController.swift */,
139+
D757301123EA236900343DDE /* ResourcesTableViewController.swift */,
140140
);
141141
path = Controllers;
142142
sourceTree = "<group>";
@@ -297,12 +297,12 @@
297297
D789978223D652ED0058060A /* ScheduleTableViewController.swift in Sources */,
298298
D772876C23DFF92800C2D541 /* ScheduleParser.swift in Sources */,
299299
D7C07885233EDBA300089193 /* LoginViewController.swift in Sources */,
300+
D757301223EA236900343DDE /* ResourcesTableViewController.swift in Sources */,
300301
D7C41E2523637D650091C480 /* MainTabBarController.swift in Sources */,
301302
D706937523E905FF004FA788 /* TabViewController.swift in Sources */,
302303
D750E81823DF67360075C639 /* FavoriteButton.swift in Sources */,
303304
D7D4B037234813A70001DFC5 /* AlertMessage.swift in Sources */,
304305
D7C41E27236383300091C480 /* ResourcesViewController.swift in Sources */,
305-
D789978523D6A4DC0058060A /* ProfileTableViewController.swift in Sources */,
306306
D706937323E8F86B004FA788 /* User.swift in Sources */,
307307
31C5F541219B29CD00E3E1AF /* AppDelegate.swift in Sources */,
308308
D79AA2B823425DFA009C469D /* APIRoutes.swift in Sources */,

BrickHack-Mobile.xcworkspace/contents.xcworkspacedata

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BrickHack-Mobile/AlertMessage.swift

+7
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,11 @@ class MessageHandler {
9696
body: "Please try again later.",
9797
type: .error)
9898
}
99+
100+
static func showUnableToOpenURLError(url: URL) {
101+
print("ERROR: URL \(url.absoluteString) cannot be opened.")
102+
showAlertMessage(withTitle: "URL cannot be opened.",
103+
body: "Please try again later.",
104+
type: .error)
105+
}
99106
}

BrickHack-Mobile/Assets.xcassets/quadColor.colorset/Contents.json

+13
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,19 @@
1515
"green" : "0xF5"
1616
}
1717
}
18+
},
19+
{
20+
"idiom" : "universal",
21+
"appearances" : [
22+
{
23+
"appearance" : "luminosity",
24+
"value" : "dark"
25+
}
26+
],
27+
"color" : {
28+
"platform" : "ios",
29+
"reference" : "systemGray5Color"
30+
}
1831
}
1932
]
2033
}

BrickHack-Mobile/Assets.xcassets/timelineBackColor.colorset/Contents.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"color" : {
2828
"color-space" : "srgb",
2929
"components" : {
30-
"red" : "0.754",
30+
"red" : "0xC0",
3131
"alpha" : "1.000",
32-
"blue" : "0.754",
33-
"green" : "0.754"
32+
"blue" : "0xC0",
33+
"green" : "0xC0"
3434
}
3535
}
3636
}

0 commit comments

Comments
 (0)