[Bookmarks] Move Functionality into BookmarkService

Author: Ben-G

SwiftFlowGitHubBrowser.xcodeproj/project.pbxproj

@@ -20,6 +20,7 @@
 		254B3BA21D3ABC1300B1E4F0 /* ReSwiftRouter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B401D3ABBAB00B1E4F0 /* ReSwiftRouter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		254B3BA51D3ABC1E00B1E4F0 /* SSKeychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B251D3ABB9400B1E4F0 /* SSKeychain.framework */; };
 		254B3BA61D3ABC1E00B1E4F0 /* SSKeychain.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B251D3ABB9400B1E4F0 /* SSKeychain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		2574204D1D4421410002D020 /* BookmarkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2574204C1D4421410002D020 /* BookmarkService.swift */; };
 		258184351C3CC710008E200A /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 258184341C3CC710008E200A /* State.swift */; };
 		2581843A1C3CC912008E200A /* Routes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 258184391C3CC912008E200A /* Routes.swift */; };
 		25BB76211C3CB8CB008EA13B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25BB76201C3CB8CB008EA13B /* AppDelegate.swift */; };
@@ -503,6 +504,7 @@
 		254B3B4D1D3ABBB400B1E4F0 /* ReSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReSwift.xcodeproj; path = Carthage/Checkouts/ReSwift/ReSwift.xcodeproj; sourceTree = SOURCE_ROOT; };
 		254B3B651D3ABBC400B1E4F0 /* RequestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RequestKit.xcodeproj; path = Carthage/Checkouts/RequestKit/RequestKit.xcodeproj; sourceTree = SOURCE_ROOT; };
 		254B3B7D1D3ABBCE00B1E4F0 /* OctoKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OctoKit.xcodeproj; path = Carthage/Checkouts/octokit.swift/OctoKit.xcodeproj; sourceTree = SOURCE_ROOT; };
+		2574204C1D4421410002D020 /* BookmarkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkService.swift; sourceTree = "<group>"; };
 		258184341C3CC710008E200A /* State.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = State.swift; sourceTree = "<group>"; };
 		258184391C3CC912008E200A /* Routes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Routes.swift; sourceTree = "<group>"; };
 		25BB761D1C3CB8CB008EA13B /* SwiftFlowGitHubBrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftFlowGitHubBrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -701,6 +703,7 @@
 			isa = PBXGroup;
 			children = (
 				25BE03E01C7C07E6005EBB09 /* AuthenticationService.swift */,
+				2574204C1D4421410002D020 /* BookmarkService.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -1362,6 +1365,7 @@
 				62EF0A701C700AD500D13711 /* MainViewController.swift in Sources */,
 				6296CA0E1C4D777800A60ECD /* Credentials.swift in Sources */,
 				25BE03E11C7C07E6005EBB09 /* AuthenticationService.swift in Sources */,
+				2574204D1D4421410002D020 /* BookmarkService.swift in Sources */,
 				62C9357B1C8CDBDE00887A23 /* RepositoryDetailViewController.swift in Sources */,
 				25C00E9C1C3CDAAC0074655A /* AuthenticationState.swift in Sources */,
 				25C00E9E1C3CDB5D0074655A /* AppReducer.swift in Sources */,

SwiftFlowGitHubBrowser/Services/BookmarkService.swift

@@ -0,0 +1,24 @@
+//
+//  BookmarkService.swift
+//  SwiftFlowGitHubBrowser
+//
+//  Created by Benji Encz on 7/23/16.
+//  Copyright © 2016 Benji Encz. All rights reserved.
+//
+
+import Foundation
+import OctoKit
+import ReSwiftRouter
+
+class BookmarkService {
+    static func isRepositoryBookmarked(state: State, currentRepository: Repository) -> Bool {
+        let bookmarkActive = !state.bookmarks.contains { route, data in
+            guard let repository = data as? Repository else { return false }
+
+            return RouteHash(route: route) == RouteHash(route: [mainViewRoute, repositoryDetailRoute])
+                && repository.name == currentRepository.name
+        }
+        
+        return bookmarkActive
+    }
+}

SwiftFlowGitHubBrowser/ViewControllers/RepositoryDetailViewController.swift

@@ -32,9 +32,17 @@ class RepositoryDetailViewController: UIViewController, StoreSubscriber {
         super.viewWillAppear(animated)
 
         store.subscribe(self) { state in
-            (
-                state.navigationState.getRouteSpecificState(state.navigationState.route),
-                state.bookmarks
+            let currentRepository: Repository? = state.navigationState.getRouteSpecificState(
+                state.navigationState.route
+            )
+
+            let isCurrentRepositoryBookmarked = currentRepository.map {
+                BookmarkService.isRepositoryBookmarked(state, currentRepository: $0)
+            } ?? false
+
+            return (
+                currentRepository,
+                isCurrentRepositoryBookmarked
             )
         }
     }
@@ -45,7 +53,7 @@ class RepositoryDetailViewController: UIViewController, StoreSubscriber {
         store.unsubscribe(self)
     }
 
-    func newState(state: (selectedRepository: Repository?, bookmarks: [Bookmark])) {
+    func newState(state: (selectedRepository: Repository?, isBookmarked: Bool)) {
         // Only perform repository related updates if the repository actually changed
         if self.repository?.gitURL != state.selectedRepository?.gitURL {
             self.repository = state.selectedRepository
@@ -57,14 +65,7 @@ class RepositoryDetailViewController: UIViewController, StoreSubscriber {
             }
         }
 
-        let bookmarkActive = !state.bookmarks.contains { route, data in
-            guard let repository = data as? Repository else { return false }
-
-            return RouteHash(route: route) == RouteHash(route: [mainViewRoute, repositoryDetailRoute])
-                && repository.name == self.repository?.name
-        }
-
-        self.bookmarkButton.enabled = bookmarkActive
+        self.bookmarkButton.enabled = state.isBookmarked
     }
 
     @IBAction func bookmarkButtonTapped(sender: AnyObject) {