Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Update routing lib and wire up new repo route #2344

Merged
merged 1 commit into from
Oct 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Classes/Systems/AppRouter/AppController+SetupRoutes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ extension AppController {
register(route: BookmarkShortcutRoute.self)
register(route: SwitchAccountShortcutRoute.self)
register(route: SearchShortcutRoute.self)
register(route: IssueNotificationRoute.self)
register(route: IssueRoute.self)
register(route: RepoRoute.self)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import GitHubSession
import GitHawkRoutes

extension IssueNotificationRoute: RoutePerformable {
extension IssueRoute: RoutePerformable {
func perform(
sessionManager: GitHubSessionManager,
splitViewController: AppSplitViewController,
Expand Down
30 changes: 30 additions & 0 deletions Classes/Systems/AppRouter/RepoRoute+RoutePerformable.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//
// RepoRoute+RoutePerformable.swift
// Freetime
//
// Created by Ryan Nystrom on 10/21/18.
// Copyright © 2018 Ryan Nystrom. All rights reserved.
//

import Foundation
import GitHawkRoutes
import GitHubSession

extension RepoRoute: RoutePerformable {
func perform(
sessionManager: GitHubSessionManager,
splitViewController: AppSplitViewController,
client: GithubClient
) -> Bool {
// TODO issues enabled should be fetched in the VC
let model = RepositoryDetails(
owner: owner,
name: repo,
defaultBranch: branch,
hasIssuesEnabled: true
)
let controller = RepositoryViewController(client: client, repo: model)
splitViewController.showDetailViewController(controller, sender: nil)
return true
}
}
2 changes: 1 addition & 1 deletion Classes/Systems/BadgeNotifications.swift
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ final class BadgeNotifications {
// currently only handling issues
if let identifier = $0.subject.identifier,
case .number(let n) = identifier {
content.set(route: IssueNotificationRoute(
content.set(route: IssueRoute(
owner: $0.repository.owner.login,
repo: $0.repository.name,
number: n
Expand Down
44 changes: 24 additions & 20 deletions Freetime.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
290CA7642169799600DE04F8 /* AppController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA7632169799600DE04F8 /* AppController.swift */; };
290CA76621697A7900DE04F8 /* AppSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA76521697A7900DE04F8 /* AppSplitViewController.swift */; };
290CA768216984F000DE04F8 /* Client+GithubUserSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA767216984F000DE04F8 /* Client+GithubUserSession.swift */; };
290CA76A216AC82700DE04F8 /* SearchShortcutRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA769216AC82700DE04F8 /* SearchShortcutRoute.swift */; };
290CA76A216AC82700DE04F8 /* SearchShortcutRoute+RoutePerformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA769216AC82700DE04F8 /* SearchShortcutRoute+RoutePerformable.swift */; };
290CA770216AE91300DE04F8 /* UITabBarController+SelectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA76F216AE91300DE04F8 /* UITabBarController+SelectType.swift */; };
290CA772216AE93E00DE04F8 /* SwitchAccountShortcutRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA771216AE93E00DE04F8 /* SwitchAccountShortcutRoute.swift */; };
290CA774216AE94D00DE04F8 /* BookmarkShortcutRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA773216AE94D00DE04F8 /* BookmarkShortcutRoute.swift */; };
290CA778216AFAE600DE04F8 /* RoutePerformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA777216AFAE600DE04F8 /* RoutePerformable.swift */; };
290CA772216AE93E00DE04F8 /* SwitchAccountShortcutRoute+RoutePerformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA771216AE93E00DE04F8 /* SwitchAccountShortcutRoute+RoutePerformable.swift */; };
290CA774216AE94D00DE04F8 /* BookmarkShortcutRoute+RoutePerformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA773216AE94D00DE04F8 /* BookmarkShortcutRoute+RoutePerformable.swift */; };
290CA778216AFAE600DE04F8 /* RoutePerformable+RoutePerformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA777216AFAE600DE04F8 /* RoutePerformable+RoutePerformable.swift */; };
290CA77A216AFC1300DE04F8 /* AppController+SetupRoutes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290CA779216AFC1300DE04F8 /* AppController+SetupRoutes.swift */; };
290D2A3D1F044CB20082E6CC /* UIViewController+SmartDeselection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290D2A3C1F044CB20082E6CC /* UIViewController+SmartDeselection.swift */; };
290D2A421F04D3470082E6CC /* IssueStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290D2A411F04D3470082E6CC /* IssueStatus.swift */; };
Expand Down Expand Up @@ -206,6 +206,7 @@
295C31D11F0AA72000521CED /* IssueStatusEvent+ButtonState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 295C31D01F0AA72000521CED /* IssueStatusEvent+ButtonState.swift */; };
295F52AA1EF1BB86000B53CF /* Test.md in Resources */ = {isa = PBXBuildFile; fileRef = 295F52A61EF1B9D2000B53CF /* Test.md */; };
29622B45210520E6000C428D /* CardCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29622B44210520E6000C428D /* CardCollectionViewCell.swift */; };
29625060217D53C000EA6164 /* RepoRoute+RoutePerformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2962505F217D53C000EA6164 /* RepoRoute+RoutePerformable.swift */; };
2963A9321EE1EBE20066509C /* UIMenuController+Reactions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2963A9311EE1EBE20066509C /* UIMenuController+Reactions.swift */; };
2963A9341EE2118E0066509C /* ResponderButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2963A9331EE2118E0066509C /* ResponderButton.swift */; };
2963A93B1EE25F6F0066509C /* LabelableFields+IssueLabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2963A93A1EE25F6F0066509C /* LabelableFields+IssueLabelModel.swift */; };
Expand Down Expand Up @@ -301,7 +302,7 @@
29A08FBE1F12EF7C00C5368E /* IssueReferencedCommitModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A08FBB1F12EF7C00C5368E /* IssueReferencedCommitModel.swift */; };
29A08FBF1F12EF7C00C5368E /* IssueReferencedCommitSectionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A08FBC1F12EF7C00C5368E /* IssueReferencedCommitSectionController.swift */; };
29A1053F216D9062004734A0 /* UNNotificationContent+Routable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A1053E216D9062004734A0 /* UNNotificationContent+Routable.swift */; };
29A10541216D912F004734A0 /* IssueNotificationRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A10540216D912F004734A0 /* IssueNotificationRoute.swift */; };
29A10541216D912F004734A0 /* IssueRoute+RoutePerformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A10540216D912F004734A0 /* IssueRoute+RoutePerformable.swift */; };
29A10543216D9381004734A0 /* UNMutableNotificationContent+Routable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A10542216D9381004734A0 /* UNMutableNotificationContent+Routable.swift */; };
29A10545216D9515004734A0 /* AppController+UNUserNotificationCenterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A10544216D9515004734A0 /* AppController+UNUserNotificationCenterDelegate.swift */; };
29A195021EC66B8B00C3E289 /* UIColor+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A195011EC66B8B00C3E289 /* UIColor+Hex.swift */; };
Expand Down Expand Up @@ -565,11 +566,11 @@
290CA7632169799600DE04F8 /* AppController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppController.swift; sourceTree = "<group>"; };
290CA76521697A7900DE04F8 /* AppSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSplitViewController.swift; sourceTree = "<group>"; };
290CA767216984F000DE04F8 /* Client+GithubUserSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Client+GithubUserSession.swift"; sourceTree = "<group>"; };
290CA769216AC82700DE04F8 /* SearchShortcutRoute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchShortcutRoute.swift; sourceTree = "<group>"; };
290CA769216AC82700DE04F8 /* SearchShortcutRoute+RoutePerformable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchShortcutRoute+RoutePerformable.swift"; sourceTree = "<group>"; };
290CA76F216AE91300DE04F8 /* UITabBarController+SelectType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBarController+SelectType.swift"; sourceTree = "<group>"; };
290CA771216AE93E00DE04F8 /* SwitchAccountShortcutRoute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchAccountShortcutRoute.swift; sourceTree = "<group>"; };
290CA773216AE94D00DE04F8 /* BookmarkShortcutRoute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkShortcutRoute.swift; sourceTree = "<group>"; };
290CA777216AFAE600DE04F8 /* RoutePerformable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoutePerformable.swift; sourceTree = "<group>"; };
290CA771216AE93E00DE04F8 /* SwitchAccountShortcutRoute+RoutePerformable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SwitchAccountShortcutRoute+RoutePerformable.swift"; sourceTree = "<group>"; };
290CA773216AE94D00DE04F8 /* BookmarkShortcutRoute+RoutePerformable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BookmarkShortcutRoute+RoutePerformable.swift"; sourceTree = "<group>"; };
290CA777216AFAE600DE04F8 /* RoutePerformable+RoutePerformable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RoutePerformable+RoutePerformable.swift"; sourceTree = "<group>"; };
290CA779216AFC1300DE04F8 /* AppController+SetupRoutes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppController+SetupRoutes.swift"; sourceTree = "<group>"; };
290D2A3C1F044CB20082E6CC /* UIViewController+SmartDeselection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+SmartDeselection.swift"; sourceTree = "<group>"; };
290D2A411F04D3470082E6CC /* IssueStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssueStatus.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -747,6 +748,7 @@
295F52A61EF1B9D2000B53CF /* Test.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = Test.md; sourceTree = "<group>"; };
295F52D91EF1C0C7000B53CF /* MMMarkdown.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MMMarkdown.framework; sourceTree = BUILT_PRODUCTS_DIR; };
29622B44210520E6000C428D /* CardCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCollectionViewCell.swift; sourceTree = "<group>"; };
2962505F217D53C000EA6164 /* RepoRoute+RoutePerformable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RepoRoute+RoutePerformable.swift"; sourceTree = "<group>"; };
2963A9311EE1EBE20066509C /* UIMenuController+Reactions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIMenuController+Reactions.swift"; sourceTree = "<group>"; };
2963A9331EE2118E0066509C /* ResponderButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResponderButton.swift; sourceTree = "<group>"; };
2963A93A1EE25F6F0066509C /* LabelableFields+IssueLabelModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "LabelableFields+IssueLabelModel.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -849,7 +851,7 @@
29A08FBB1F12EF7C00C5368E /* IssueReferencedCommitModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssueReferencedCommitModel.swift; sourceTree = "<group>"; };
29A08FBC1F12EF7C00C5368E /* IssueReferencedCommitSectionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssueReferencedCommitSectionController.swift; sourceTree = "<group>"; };
29A1053E216D9062004734A0 /* UNNotificationContent+Routable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNNotificationContent+Routable.swift"; sourceTree = "<group>"; };
29A10540216D912F004734A0 /* IssueNotificationRoute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssueNotificationRoute.swift; sourceTree = "<group>"; };
29A10540216D912F004734A0 /* IssueRoute+RoutePerformable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IssueRoute+RoutePerformable.swift"; sourceTree = "<group>"; };
29A10542216D9381004734A0 /* UNMutableNotificationContent+Routable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNMutableNotificationContent+Routable.swift"; sourceTree = "<group>"; };
29A10544216D9515004734A0 /* AppController+UNUserNotificationCenterDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppController+UNUserNotificationCenterDelegate.swift"; sourceTree = "<group>"; };
29A195011EC66B8B00C3E289 /* UIColor+Hex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Hex.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1123,11 +1125,12 @@
290CA779216AFC1300DE04F8 /* AppController+SetupRoutes.swift */,
29A10544216D9515004734A0 /* AppController+UNUserNotificationCenterDelegate.swift */,
290CA76521697A7900DE04F8 /* AppSplitViewController.swift */,
290CA773216AE94D00DE04F8 /* BookmarkShortcutRoute.swift */,
29A10540216D912F004734A0 /* IssueNotificationRoute.swift */,
290CA777216AFAE600DE04F8 /* RoutePerformable.swift */,
290CA769216AC82700DE04F8 /* SearchShortcutRoute.swift */,
290CA771216AE93E00DE04F8 /* SwitchAccountShortcutRoute.swift */,
290CA773216AE94D00DE04F8 /* BookmarkShortcutRoute+RoutePerformable.swift */,
29A10540216D912F004734A0 /* IssueRoute+RoutePerformable.swift */,
2962505F217D53C000EA6164 /* RepoRoute+RoutePerformable.swift */,
290CA777216AFAE600DE04F8 /* RoutePerformable+RoutePerformable.swift */,
290CA769216AC82700DE04F8 /* SearchShortcutRoute+RoutePerformable.swift */,
290CA771216AE93E00DE04F8 /* SwitchAccountShortcutRoute+RoutePerformable.swift */,
29A10542216D9381004734A0 /* UNMutableNotificationContent+Routable.swift */,
29A1053E216D9062004734A0 /* UNNotificationContent+Routable.swift */,
);
Expand Down Expand Up @@ -2817,6 +2820,7 @@
291929611F3FD2960012067B /* DiffString.swift in Sources */,
290744B51F250A6800FD9E48 /* EmojiAutocomplete.swift in Sources */,
29C167691ECA016500439D62 /* EmptyView.swift in Sources */,
29625060217D53C000EA6164 /* RepoRoute+RoutePerformable.swift in Sources */,
29F3A18420CADA3A00645CB7 /* NotificationsViewController.swift in Sources */,
2957777B200129EB00DDD785 /* Int+Abbreviated.swift in Sources */,
29C1677A1ECA14F700439D62 /* Feed.swift in Sources */,
Expand Down Expand Up @@ -2870,7 +2874,7 @@
2967DC56211751CB00FD3683 /* UIContentSizeCategory+Preferred.swift in Sources */,
7BBFEE5B1F8A8A0400C68E47 /* SearchBarSectionController.swift in Sources */,
292FCAFA1EDFCC510026635E /* IssueCommentDetailsViewModel.swift in Sources */,
29A10541216D912F004734A0 /* IssueNotificationRoute.swift in Sources */,
29A10541216D912F004734A0 /* IssueRoute+RoutePerformable.swift in Sources */,
2949674E1EF9719300B1CF1A /* IssueCommentHrCell.swift in Sources */,
2949674C1EF9716400B1CF1A /* IssueCommentHrModel.swift in Sources */,
294967531EFC1EDB00B1CF1A /* IssueCommentHtmlCell.swift in Sources */,
Expand Down Expand Up @@ -2976,7 +2980,7 @@
2928C78C1F15D80E0000D06D /* IssueRenamedSectionController.swift in Sources */,
2928C78E1F15DF1B0000D06D /* IssueRenamedString.swift in Sources */,
297A372E1F17018F0081C04E /* IssueRequestCell.swift in Sources */,
290CA774216AE94D00DE04F8 /* BookmarkShortcutRoute.swift in Sources */,
290CA774216AE94D00DE04F8 /* BookmarkShortcutRoute+RoutePerformable.swift in Sources */,
297A372C1F1700BC0081C04E /* IssueRequestModel.swift in Sources */,
297A37301F1704C10081C04E /* IssueRequestSectionController.swift in Sources */,
29F7F05C1F2A751B00F6075D /* IssueResult.swift in Sources */,
Expand Down Expand Up @@ -3094,13 +3098,13 @@
2905AFAF1F7357FA0015AE32 /* RepositoryViewController.swift in Sources */,
2963A9341EE2118E0066509C /* ResponderButton.swift in Sources */,
BDB6AA69215FBC35009BB73C /* RepositoryBranchesViewController.swift in Sources */,
290CA772216AE93E00DE04F8 /* SwitchAccountShortcutRoute.swift in Sources */,
290CA772216AE93E00DE04F8 /* SwitchAccountShortcutRoute+RoutePerformable.swift in Sources */,
293189281F5391F700EF0911 /* Result.swift in Sources */,
290CA778216AFAE600DE04F8 /* RoutePerformable.swift in Sources */,
290CA778216AFAE600DE04F8 /* RoutePerformable+RoutePerformable.swift in Sources */,
295B51421FC26B8100C3993B /* PeopleCell.swift in Sources */,
29316DBF1ECC95DB007CAE3F /* RootViewControllers.swift in Sources */,
29DA1E791F5DEE8F0050C64B /* SearchLoadingView.swift in Sources */,
290CA76A216AC82700DE04F8 /* SearchShortcutRoute.swift in Sources */,
290CA76A216AC82700DE04F8 /* SearchShortcutRoute+RoutePerformable.swift in Sources */,
986B872D1F2C846700AAB55C /* SearchNoResultsCell.swift in Sources */,
DC60C6DC1F99414E00241271 /* IsCancellationError.swift in Sources */,
29CC29311FF421DC006B6DE7 /* PullRequestReviewCommentsViewController.swift in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ CHECKOUT OPTIONS:
:commit: beb697643eea11f40bb66683d1576a2772080d9d
:git: https://github.com/GitHawkApp/FlatCache.git
GitHawkRoutes:
:commit: 33ecf4eaba9f472e307421a5b23a596b2fd93821
:commit: 1947e45203b81c1bfed2c8427a395afb7917e6ca
:git: https://github.com/GitHawkApp/GitHawkRoutes.git
Highlightr:
:commit: 4f7e90477619b8dc4b9e641efd10952c22150c5c
Expand Down Expand Up @@ -204,7 +204,7 @@ SPEC CHECKSUMS:
FlatCache: e67d3d45a0f76b93e66883b802051dcbf9d50649
FLEX: bd1a39e55b56bb413b6f1b34b3c10a0dc44ef079
FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa
GitHawkRoutes: 9cfcc0f40d1971e5ee649e62b1f2c222461698a5
GitHawkRoutes: 6a2a20e756143cb1c87bdf1d7f33a7256cfc6722
GitHubAPI: 44a907f9699210536d65179d3d0dc0dc70dde7a1
GitHubSession: 60c7bbd84fb915a0bd911a367c9661418ccfd7ae
Highlightr: 70c4df19e4aa55aa1b4387fb98182abce1dec9da
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading