Added presentLabels extension to UIViewController

BrianLitwin · BrianLitwin · commit ad95a7f21a75 · 2018-10-19T16:43:38.000-04:00
diff --git a/Classes/Issues/IssuesViewController.swift b/Classes/Issues/IssuesViewController.swift
@@ -636,8 +636,8 @@ final class IssuesViewController: MessageViewController,
     
     // MARK: IssueLabelsSectionControllerDelegate
     
-    func didTapLabel(owner: String, repo: String, label: String) {
-        print("Label tapped! \(owner) \(repo) \(label)" )
+    func didTapIssueLabel(owner: String, repo: String, label: String) {
+        presentLabels(client: client, owner: owner, repo: repo, label: label)
     }
 
 }
diff --git a/Classes/Issues/Labeled/IssueLabeledSectionController.swift b/Classes/Issues/Labeled/IssueLabeledSectionController.swift
@@ -38,7 +38,7 @@ final class IssueLabeledSectionController: ListGenericSectionController<IssueLab
     
     func didTap(cell: MarkdownStyledTextView, attribute: DetectedMarkdownAttribute) {
         guard case .label(let label) = attribute else { return }
-        tapDelegate?.didTapLabel(owner: label.owner, repo: label.repo, label: label.label)
+        tapDelegate?.didTapIssueLabel(owner: label.owner, repo: label.repo, label: label.label)
     }
     
 }
diff --git a/Classes/Issues/Labels/IssueLabelsSectionController.swift b/Classes/Issues/Labels/IssueLabelsSectionController.swift
@@ -11,7 +11,7 @@ import IGListKit
 
 
 protocol IssueLabelTapSectionControllerDelegate: class {
-    func didTapLabel(owner: String, repo: String, label: String)
+    func didTapIssueLabel(owner: String, repo: String, label: String)
 }
 
 final class IssueLabelsSectionController: ListBindingSectionController<IssueLabelsModel>,
@@ -104,7 +104,7 @@ ListBindingSectionControllerSelectionDelegate {
 
     func sectionController(_ sectionController: ListBindingSectionController<ListDiffable>, didSelectItemAt index: Int, viewModel: Any) {
         guard let viewModel = viewModel as? RepositoryLabel else { return }
-        tapDelegate?.didTapLabel(owner: issue.owner, repo: issue.repo, label: viewModel.name)
+        tapDelegate?.didTapIssueLabel(owner: issue.owner, repo: issue.repo, label: viewModel.name)
     }
 
 }
diff --git a/Classes/Repository/RepositoryIssuesViewController.swift b/Classes/Repository/RepositoryIssuesViewController.swift
@@ -26,12 +26,17 @@ SearchBarSectionControllerDelegate {
     private let searchKey: ListDiffable = "searchKey" as ListDiffable
     private let debouncer = Debouncer()
     private var previousSearchString = "is:open "
+    private var label: String?
 
-    init(client: GithubClient, owner: String, repo: String, type: RepositoryIssuesType) {
+    init(client: GithubClient, owner: String, repo: String, type: RepositoryIssuesType, label: String? = nil) {
         self.owner = owner
         self.repo = repo
         self.client = RepositoryClient(githubClient: client, owner: owner, name: repo)
         self.type = type
+        self.label = label
+        if let label = label {
+            previousSearchString += "label:\(label) "
+        }
 
         super.init(
             emptyErrorMessage: NSLocalizedString("Cannot load issues.", comment: "")
@@ -53,10 +58,13 @@ SearchBarSectionControllerDelegate {
         super.viewDidLoad()
 
         makeBackBarItemEmpty()
-
-        // set the frame in -viewDidLoad is required when working with TabMan
-        feed.collectionView.frame = view.bounds
-        feed.collectionView.contentInsetAdjustmentBehavior = .never
+        
+        let presentingInTabMan = label == nil
+        if presentingInTabMan {
+            // set the frame in -viewDidLoad is required when working with TabMan
+            feed.collectionView.frame = view.bounds
+            feed.collectionView.contentInsetAdjustmentBehavior = .never
+        }
     }
 
     // MARK: Overrides
diff --git a/Classes/View Controllers/UIViewController+PresentLabels.swift b/Classes/View Controllers/UIViewController+PresentLabels.swift
@@ -0,0 +1,28 @@
+//
+//  UIViewController+PresentLabels.swift
+//  Freetime
+//
+//  Created by B_Litwin on 10/19/18.
+//  Copyright © 2018 Ryan Nystrom. All rights reserved.
+//
+
+import UIKit
+import GitHubAPI
+
+extension UIViewController {
+    func presentLabels(client: GithubClient, owner: String, repo: String, label: String) {
+        let repositoryIssuesViewController =
+            RepositoryIssuesViewController(
+                client: client,
+                owner: owner,
+                repo: repo,
+                type: .issues,
+                label: label
+        )
+        
+        navigationController?.pushViewController(
+            repositoryIssuesViewController,
+            animated: true
+        )
+    }
+}
diff --git a/Classes/View Controllers/UIViewController+Safari.swift b/Classes/View Controllers/UIViewController+Safari.swift
@@ -30,11 +30,6 @@ extension UIViewController {
         presentSafari(url: url)
     }
 
-    func presentLabels(owner: String, repo: String, label: String) {
-        guard let url = URL(string: "https://github.com/\(owner)/\(repo)/labels/\(label)") else { return }
-        presentSafari(url: url)
-    }
-
     func presentMilestone(owner: String, repo: String, milestone: Int) {
         guard let url = URL(string: "https://github.com/\(owner)/\(repo)/milestone/\(milestone)") else { return }
         presentSafari(url: url)
diff --git a/Freetime.xcodeproj/project.pbxproj b/Freetime.xcodeproj/project.pbxproj
@@ -449,6 +449,7 @@
 		98F9F4011F9CCFFE005A0266 /* ImgurClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F9F3FE1F9CCFFE005A0266 /* ImgurClient.swift */; };
 		98F9F4031F9CD006005A0266 /* Image+Base64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F9F4021F9CD006005A0266 /* Image+Base64.swift */; };
 		BD3761B0209E032500401DFB /* BookmarkNavigationItemTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3761AF209E032500401DFB /* BookmarkNavigationItemTests.swift */; };
+		BD67495C217A47BC00E8E4FD /* UIViewController+PresentLabels.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD67495B217A47BC00E8E4FD /* UIViewController+PresentLabels.swift */; };
 		BD89007E20B8844B0026013F /* NetworkingURLPathTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD89007D20B8844B0026013F /* NetworkingURLPathTests.swift */; };
 		BDB6AA66215FBC35009BB73C /* RepositoryBranchesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDB6AA5F215FBC35009BB73C /* RepositoryBranchesViewModel.swift */; };
 		BDB6AA67215FBC35009BB73C /* RepositoryBranchUpdatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDB6AA60215FBC35009BB73C /* RepositoryBranchUpdatable.swift */; };
@@ -999,6 +1000,7 @@
 		ACAE4A11E9671879046F0CE7 /* Pods-FreetimeWatch.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreetimeWatch.testflight.xcconfig"; path = "Pods/Target Support Files/Pods-FreetimeWatch/Pods-FreetimeWatch.testflight.xcconfig"; sourceTree = "<group>"; };
 		B3C439BE890EECD7C0C692C5 /* Pods-Freetime.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Freetime.testflight.xcconfig"; path = "Pods/Target Support Files/Pods-Freetime/Pods-Freetime.testflight.xcconfig"; sourceTree = "<group>"; };
 		BD3761AF209E032500401DFB /* BookmarkNavigationItemTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkNavigationItemTests.swift; sourceTree = "<group>"; };
+		BD67495B217A47BC00E8E4FD /* UIViewController+PresentLabels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+PresentLabels.swift"; sourceTree = "<group>"; };
 		BD89007D20B8844B0026013F /* NetworkingURLPathTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkingURLPathTests.swift; sourceTree = "<group>"; };
 		BDB6AA5F215FBC35009BB73C /* RepositoryBranchesViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RepositoryBranchesViewModel.swift; sourceTree = "<group>"; };
 		BDB6AA60215FBC35009BB73C /* RepositoryBranchUpdatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RepositoryBranchUpdatable.swift; sourceTree = "<group>"; };
@@ -1743,6 +1745,7 @@
 				290056F2210028B20046EAE5 /* UIViewController+MenuDone.swift */,
 				29792B181FFB10A3007A0C57 /* UIViewController+MessageAutocompleteControllerLayoutDelegate.swift */,
 				292CD3D11F0DBEC000D3D57B /* UIViewController+Safari.swift */,
+				BD67495B217A47BC00E8E4FD /* UIViewController+PresentLabels.swift */,
 				290D2A3C1F044CB20082E6CC /* UIViewController+SmartDeselection.swift */,
 				299F63E3205E1CAB0015D901 /* UIViewController+StyledTextViewCellDelegate.swift */,
 				4920F1A71F72E27200131E9D /* UIViewController+UserActivity.swift */,
@@ -2762,6 +2765,7 @@
 				29459A6F1FE61E0500034A04 /* MarkdownCheckboxModel.swift in Sources */,
 				299997302031227E00995FFD /* IssueMergeButtonModel.swift in Sources */,
 				29CEA5CD1F84DB1B009827DB /* BaseListViewController.swift in Sources */,
+				BD67495C217A47BC00E8E4FD /* UIViewController+PresentLabels.swift in Sources */,
 				299F63E0205DDF6B0015D901 /* UIViewController+Routing.swift in Sources */,
 				98835BD41F1A17EE005BA24F /* Bundle+Version.swift in Sources */,
 				29316DB51ECC7DEB007CAE3F /* ButtonCell.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -636,8 +636,8 @@ final class IssuesViewController: MessageViewController,`
`636`	`636`
`637`	`637`	`// MARK: IssueLabelsSectionControllerDelegate`
`638`	`638`
`639`		`- func didTapLabel(owner: String, repo: String, label: String) {`
`640`		`- print("Label tapped! \(owner) \(repo) \(label)" )`
	`639`	`+ func didTapIssueLabel(owner: String, repo: String, label: String) {`
	`640`	`+ presentLabels(client: client, owner: owner, repo: repo, label: label)`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ final class IssueLabeledSectionController: ListGenericSectionController<IssueLab`
`38`	`38`
`39`	`39`	`func didTap(cell: MarkdownStyledTextView, attribute: DetectedMarkdownAttribute) {`
`40`	`40`	`guard case .label(let label) = attribute else { return }`
`41`		`- tapDelegate?.didTapLabel(owner: label.owner, repo: label.repo, label: label.label)`
	`41`	`+ tapDelegate?.didTapIssueLabel(owner: label.owner, repo: label.repo, label: label.label)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import IGListKit`
`11`	`11`
`12`	`12`
`13`	`13`	`protocol IssueLabelTapSectionControllerDelegate: class {`
`14`		`- func didTapLabel(owner: String, repo: String, label: String)`
	`14`	`+ func didTapIssueLabel(owner: String, repo: String, label: String)`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`final class IssueLabelsSectionController: ListBindingSectionController<IssueLabelsModel>,`
`@@ -104,7 +104,7 @@ ListBindingSectionControllerSelectionDelegate {`
`104`	`104`
`105`	`105`	`func sectionController(_ sectionController: ListBindingSectionController<ListDiffable>, didSelectItemAt index: Int, viewModel: Any) {`
`106`	`106`	`guard let viewModel = viewModel as? RepositoryLabel else { return }`
`107`		`- tapDelegate?.didTapLabel(owner: issue.owner, repo: issue.repo, label: viewModel.name)`
	`107`	`+ tapDelegate?.didTapIssueLabel(owner: issue.owner, repo: issue.repo, label: viewModel.name)`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`}`