Merge lp:~dude-from-by/openlp/my-ios-remote into lp:~danielborges93/openlp/ios-remote

[andrei]

Added ReactiveCocoa to the project, latest version and moved several services and search screen to it.
The main purpose of this changes is to ease testing. ReactiveCocoa provides bindings so we can rewrite project with MVVM paradigm and add tests to model and viewModel, where the main business logics lives. I've added SearchViewModel as an illustration. I am new to the swift version of this framework, so code might be clumsy. Added tests to searchviewmodel. Moved SearchResultsViewController to MVVM.

[Daniel Borges (danielborges93)]

Hi Andrei. Sorry for delay.
Follows some things that can be fixed:

- The search is not working on iOS 8;
- Keep te search button aways enabled. Search with empty textfield will do a full search.

review: Needs Fixing

[andrei (dude-from-by)]

> Hi Andrei. Sorry for delay.
> Follows some things that can be fixed:
>
> - The search is not working on iOS 8;
> - Keep te search button aways enabled. Search with empty textfield will do a
> full search.

- fixed for ios8
- made search button enabled.

I don't like an option to keep it enabled - it is counter-intuitive. I've looked through many apps, most Apple apps I use - none of them uses such solution. Some of them display full list initially and non of them enables search button if there is nothing in the input field. As for now I will rollback to your solution, but in the future we may come up with one that is easier to understand for user.

[andrei (dude-from-by)]

> Hi Andrei. Sorry for delay.
> Follows some things that can be fixed:
>
> - The search is not working on iOS 8;
> - Keep te search button aways enabled. Search with empty textfield will do a
> full search.

- fixed for ios8
- made search button enabled.

I don't like an option to keep it enabled - it is counter-intuitive. I've looked through many apps, most Apple apps I use - none of them uses such solution. Some of them display full list initially and non of them enables search button if there is nothing in the input field. As for now I will rollback to your solution, but in the future we may come up with one that is easier to understand for user.

[Daniel Borges (danielborges93)]

I agree with you, but I prefer keep it working in this way before to enhance the usability of the search screen.

review: Approve

[lp:~dude-from-by/openlp/my-ios-remote]

63. By andrei on 2017-04-20

Added ReactiveCocoa to the project; Added tests to searchviewmodel; Moved SearchResultsViewController to MVVM.

=== removed file 'OLP RemoteTests/PollAPITests.swift'
--- OLP RemoteTests/PollAPITests.swift	2017-01-25 15:10:27 +0000
+++ OLP RemoteTests/PollAPITests.swift	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-/******************************************************************************
- * OpenLP iOS Remote                                                           *
- * --------------------------------------------------------------------------- *
- * Copyright (c) 2008-2016 OpenLP Developers                                   *
- * --------------------------------------------------------------------------- *
- * Permission is hereby granted, free of charge, to any person obtaining a     *
- * copy of this software and associated documentation files (the "Software"),  *
- * to deal in the Software without restriction, including without limitation   *
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,    *
- * and/or sell copies of the Software, and to permit persons to whom the       *
- * Software is furnished to do so, subject to the following conditions:        *
- *                                                                             *
- * The above copyright notice and this permission notice shall be included in  *
- * all copies or substantial portions of the Software.                         *
- *                                                                             *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  *
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,    *
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE *
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      *
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING     *
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER         *
- * DEALINGS IN THE SOFTWARE.                                                   *
- ******************************************************************************/
-
-import XCTest
-import Nimble
-import OHHTTPStubs
-
-@testable import Remote
-
-class PollAPITests: XCTestCase {
-
-    override func setUp() {
-        super.setUp()
-
-        stub(condition: isPath("/api/poll")) { _ in
-            guard let path = OHPathForFile("poll_response.json", type(of: self)) else {
-                preconditionFailure("Could not find expected file in test bundle")
-            }
-
-            return OHHTTPStubsResponse(
-                fileAtPath: path,
-                statusCode: 200,
-                headers: [ "ContentType": "application/json" ]
-            )
-        }
-        stub(condition: isPath("/api/service/list")) { _ in
-            guard let path = OHPathForFile("service_response.json", type(of: self)) else {
-                preconditionFailure("Could not find expected file in test bundle")
-            }
-
-            return OHHTTPStubsResponse(
-                fileAtPath: path,
-                statusCode: 200,
-                headers: [ "ContentType": "application/json" ]
-            )
-
-        }
-    }
-    
-    override func tearDown() {
-
-        super.tearDown()
-    }
-
-    class PollAPIServiceDelegateMock: PollAPIServiceDelegate {
-        var serviceList : [ItemModel]?
-        var selectedItem : String?
-        var projectionState: ProjectionState?
-
-        func updateServiceList(_ items: [ItemModel]) {
-            serviceList = items
-        }
-
-        func updateSelectedItem(itemId id: String) {
-            selectedItem = id
-        }
-
-        func updateProjectionState(_ state: ProjectionState) {
-            projectionState = state
-        }
-    }
-
-    class PollAPISlidesDelegateMock: PollAPISlidesDelegate {
-
-        var model: [SlideModel]?
-        var selectedSlide: Int?
-        var projectionState: ProjectionState?
-
-        func updateSlides(_ slides: [SlideModel]) {
-            model = slides
-        }
-
-        func updateSelectedSlide(_ row: Int) {
-            selectedSlide = row
-        }
-
-        func updateProjectionState(_ state: ProjectionState) {
-            projectionState = state
-        }
-    }
-
-    func getPollAPI(_ serviceDelegate: PollAPIServiceDelegate, slidesDelegate: PollAPISlidesDelegate) -> PollAPI {
-        let defaults = TestUtils.defaults()
-        defaults.set(true, forKey:"server.useHTTPS")
-        let settings = UserSettings(defaults: defaults)
-        let controllerAPI = ControllerAPI(settings: settings)
-        let serviceAPI = ServiceAPI(settings: settings)
-        let pollAPI = PollAPI(settings: settings, controllerAPI:controllerAPI, serviceAPI: serviceAPI)
-        pollAPI.serviceDelegate = serviceDelegate
-        pollAPI.slidesDelegate = slidesDelegate
-        return pollAPI
-    }
-
-    func test_emptyPollResponse() {
-        let serviceDelegate: PollAPIServiceDelegateMock = PollAPIServiceDelegateMock()
-        let slidesDelegate: PollAPISlidesDelegateMock = PollAPISlidesDelegateMock()
-        getPollAPI(serviceDelegate, slidesDelegate: slidesDelegate).poll()
-        expect(serviceDelegate.projectionState).toEventually(equal(ProjectionState.desktop))
-    }
-
-    func test_pollSelectedItem() {
-        let serviceDelegate: PollAPIServiceDelegateMock = PollAPIServiceDelegateMock()
-        let slidesDelegate: PollAPISlidesDelegateMock = PollAPISlidesDelegateMock()
-        getPollAPI(serviceDelegate, slidesDelegate: slidesDelegate).poll()
-        expect(serviceDelegate.selectedItem).toEventually(equal("item1"))
-    }
-}

=== added file 'OLP RemoteTests/SearchViewModelTests.swift'
--- OLP RemoteTests/SearchViewModelTests.swift	1970-01-01 00:00:00 +0000
+++ OLP RemoteTests/SearchViewModelTests.swift	2017-04-17 16:13:16 +0000
@@ -0,0 +1,134 @@
+/******************************************************************************
+ * OpenLP iOS Remote                                                           *
+ * --------------------------------------------------------------------------- *
+ * Copyright (c) 2008-2016 OpenLP Developers                                   *
+ * --------------------------------------------------------------------------- *
+ * Permission is hereby granted, free of charge, to any person obtaining a     *
+ * copy of this software and associated documentation files (the "Software"),  *
+ * to deal in the Software without restriction, including without limitation   *
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,    *
+ * and/or sell copies of the Software, and to permit persons to whom the       *
+ * Software is furnished to do so, subject to the following conditions:        *
+ *                                                                             *
+ * The above copyright notice and this permission notice shall be included in  *
+ * all copies or substantial portions of the Software.                         *
+ *                                                                             *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  *
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,    *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE *
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      *
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING     *
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER         *
+ * DEALINGS IN THE SOFTWARE.                                                   *
+ ******************************************************************************/
+import XCTest
+
+import Result
+import ReactiveCocoa
+import ReactiveSwift
+
+class SearchAPIMock: SearchAPI {
+    var returnValue: [ItemModel]?
+    var testSearchTerm: String?
+    override func searchSignalProducer(plugin: Plugin, text: String?) -> SignalProducer<[ItemModel], AnyError> {
+        testSearchTerm = text
+        return SignalProducer( { (observer, disposable) in
+            observer.send(value: self.returnValue!)
+        })
+    }
+}
+
+
+class ServiceDelegateMock: PollAPIServiceDelegate {
+    func updateServiceList(_ items: [ItemModel]) {
+
+    }
+
+    func updateSelectedItem(itemId id: String) {
+
+    }
+
+    func updateProjectionState(_ state: ProjectionState) {
+
+    }
+}
+
+
+class SlidesDelegateMock: PollAPISlidesDelegate {
+    func updateSlides(_ slides: [SlideModel]) {
+
+    }
+
+    func updateSelectedSlide(_ row: Int) {
+
+    }
+
+    func updateProjectionState(_ state: ProjectionState) {
+
+    }
+}
+
+
+class ServiceMock: ServiceProtocol {
+    var searchAPIMock: SearchAPIMock
+    let settings: UserSettings
+    let serviceDelegateMock: ServiceDelegateMock
+    let slidesDelegateMock: SlidesDelegateMock
+    init(searchAPI: SearchAPIMock) {
+        self.searchAPIMock = searchAPI
+        let userDefaults = UserDefaults()
+        let userSettings = UserSettings(defaults: userDefaults)
+        settings = userSettings
+        serviceDelegateMock = ServiceDelegateMock()
+        slidesDelegateMock = SlidesDelegateMock()
+    }
+
+    var searchAPI: SearchAPI { get { return self.searchAPIMock } }
+
+    var serviceAPI: ServiceAPI { get { return ServiceAPI(settings: self.settings) } }
+    var pollAPI: PollAPI { get { return PollAPI(settings: self.settings) } }
+    var displayAPI: DisplayAPI { get { return DisplayAPI(settings: self.settings) } }
+    var controllerAPI: ControllerAPI { get { return ControllerAPI(settings: self.settings) } }
+    var alertAPI: AlertAPI { get { return AlertAPI(settings: self.settings) } }
+    var liveAPI: LiveAPI { get { return LiveAPI(settings: self.settings) } }
+    var addAPI: AddAPI { get { return AddAPI(settings: self.settings) } }
+    var pauseLoopPolling: Bool { get { return false } set { } }
+
+    var serviceDelegate: PollAPIServiceDelegate? { get { return serviceDelegateMock } }
+    var slidesDelegate: PollAPISlidesDelegate? { get { return slidesDelegateMock } }
+}
+
+
+class SearchViewModelTests: XCTestCase {
+    
+    override func setUp() {
+        super.setUp()
+    }
+    
+    override func tearDown() {
+        super.tearDown()
+    }
+
+    func searchApiMock()->SearchAPIMock {
+        let userDefaults = UserDefaults()
+        let userSettings = UserSettings(defaults: userDefaults)
+        let apiMock = SearchAPIMock(settings: userSettings)
+        return apiMock
+    }
+
+
+    func testSearchResultsUpdate() {
+        let api = searchApiMock()
+        let service = ServiceMock(searchAPI:api)
+        let model = SearchViewModel(service: service)
+        let item1 = ItemModel()
+        item1.title = "title"
+        item1.plugin = "Songs"
+        api.returnValue = [item1]
+        model.searchTerm.value = "find something new"
+        model.search()
+        XCTAssert(model.searchResult.value.count == 1, "should be only one result")
+        XCTAssertEqual(model.searchResult.value[0].title, item1.title, "result should be updated")
+        XCTAssertEqual(api.testSearchTerm, model.searchTerm.value, "Should search correct value")
+    }
+}

=== modified file 'Podfile'
--- Podfile	2017-01-25 15:10:27 +0000
+++ Podfile	2017-04-17 16:13:16 +0000
@@ -11,6 +11,7 @@
     pod 'UITextView+Placeholder'
     pod 'BlockLooper', :git=>'https://github.com/ashender/BlockLooper.git'
     pod 'CWStatusBarNotification'
+    pod 'ReactiveCocoa'
 end
 
 target 'OLP RemoteTests' do
@@ -23,5 +24,6 @@
     pod 'Nimble'
     pod 'AlamofireObjectMapper'
     pod 'OHHTTPStubs/Swift'
+    pod 'ReactiveCocoa'
 end
 

=== modified file 'Podfile.lock'
--- Podfile.lock	2017-01-25 15:10:27 +0000
+++ Podfile.lock	2017-04-17 16:13:16 +0000
@@ -23,6 +23,11 @@
   - OHHTTPStubs/OHPathHelpers (5.2.3)
   - OHHTTPStubs/Swift (5.2.3):
     - OHHTTPStubs/Core
+  - ReactiveCocoa (5.0.0):
+    - ReactiveSwift (~> 1.0.0)
+  - ReactiveSwift (1.0.0):
+    - Result (~> 3.1)
+  - Result (3.1.0)
   - TPKeyboardAvoiding (1.3.1)
   - UITextView+Placeholder (1.2.0)
 
@@ -35,6 +40,7 @@
   - Nimble
   - OHHTTPStubs
   - OHHTTPStubs/Swift
+  - ReactiveCocoa
   - TPKeyboardAvoiding
   - UITextView+Placeholder
 
@@ -56,9 +62,12 @@
   Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
   ObjectMapper: 9e385c2295bcc4e16eabbcfc85db801442bba545
   OHHTTPStubs: e238cd5b66d8efa51c861db45895de8fe079f4a7
+  ReactiveCocoa: 60ef0da915b4f70c34ebecc3f4fb8f96af0e53d6
+  ReactiveSwift: f391724ee318a2cfd3e37dfb041cd49ecf4e7869
+  Result: 4e3ed5995ed94d0cd6a09be9a431fce3f3624bbf
   TPKeyboardAvoiding: 0d6af20e95e2850f4c621841225b59ec7d8dd852
   UITextView+Placeholder: 77680995fcdd07c3f52ec92fe1150874a2ac89ff
 
-PODFILE CHECKSUM: 33c246100fdb079469ba0c7b05499d31b72d3722
+PODFILE CHECKSUM: 8bcb0a7a00d7e61acff50967f2778c47912a0880
 
 COCOAPODS: 1.1.1

=== modified file 'Remote.xcodeproj/project.pbxproj'
--- Remote.xcodeproj/project.pbxproj	2017-02-19 05:21:00 +0000
+++ Remote.xcodeproj/project.pbxproj	2017-04-17 16:13:16 +0000
@@ -51,10 +51,10 @@
 		750831BD1CFF597D00CA9299 /* slides_response.json in Resources */ = {isa = PBXBuildFile; fileRef = 750831BC1CFF597D00CA9299 /* slides_response.json */; };
 		75219D021E276111001B6BC8 /* TabSwitchingToRightAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75219D011E276111001B6BC8 /* TabSwitchingToRightAnimationController.swift */; };
 		755A61C91E04878F00D035D4 /* ServiceViewControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 755A61C81E04878F00D035D4 /* ServiceViewControllerDelegate.swift */; };
+		755B3FE21E8CFEE000DA570C /* SearchResultsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 755B3FE11E8CFEE000DA570C /* SearchResultsViewModel.swift */; };
 		755C78CE1CCE9080001CF70D /* Service.swift in Sources */ = {isa = PBXBuildFile; fileRef = 755C78CD1CCE9080001CF70D /* Service.swift */; };
 		75667B281CFCA8B1008FDFE0 /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4640F2901BE4274A00E2AA61 /* API.swift */; };
 		75667B291CFCA8C9008FDFE0 /* UserSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46CC0CEC1BE6972300423EB4 /* UserSettings.swift */; };
-		75667B2B1CFCAE44008FDFE0 /* PollAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75667B2A1CFCAE44008FDFE0 /* PollAPITests.swift */; };
 		75667B4C1CFEE85A008FDFE0 /* TestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75667B4B1CFEE85A008FDFE0 /* TestUtils.swift */; };
 		75667B4D1CFEE92C008FDFE0 /* ControllerAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4623B69B1C07C569007FFE2B /* ControllerAPI.swift */; };
 		75667B4E1CFEE930008FDFE0 /* PollAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4640F2921BE429B900E2AA61 /* PollAPI.swift */; };
@@ -76,8 +76,13 @@
 		75667B5E1CFEFF86008FDFE0 /* ErrorUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46FD378E1C79867C00DED423 /* ErrorUtil.swift */; };
 		75667B5F1CFEFFA7008FDFE0 /* DisplayAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4623B6921C078F70007FFE2B /* DisplayAPI.swift */; };
 		756FA0FD1E28FF060011AE6F /* SlideCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756FA0FC1E28FF060011AE6F /* SlideCell.swift */; };
+		757326FD1E8C04CD001E618B /* SearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757326FC1E8C04CD001E618B /* SearchViewModel.swift */; };
+		757326FE1E8C060F001E618B /* LocalizationUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46753A9A1E593EAC007872C0 /* LocalizationUtil.swift */; };
+		757327001E8C06B7001E618B /* SearchViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757326FF1E8C06B7001E618B /* SearchViewModelTests.swift */; };
+		757327011E8C09BB001E618B /* SearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757326FC1E8C04CD001E618B /* SearchViewModel.swift */; };
 		759464A51CEB8493001A56BF /* SettingsControllerPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759464A41CEB8493001A56BF /* SettingsControllerPresenter.swift */; };
 		759778AE1CF83AC400C2E4B4 /* APITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759778AD1CF83AC400C2E4B4 /* APITest.swift */; };
+		75AF930F1E9297220051EB82 /* SearchResultsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 755B3FE11E8CFEE000DA570C /* SearchResultsViewModel.swift */; };
 		863574EB78CF355A8463055D /* Pods_Remote.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3194E32378DD6BB8E273BB47 /* Pods_Remote.framework */; };
 /* End PBXBuildFile section */
 
@@ -132,10 +137,12 @@
 		750831BC1CFF597D00CA9299 /* slides_response.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = slides_response.json; sourceTree = "<group>"; };
 		75219D011E276111001B6BC8 /* TabSwitchingToRightAnimationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabSwitchingToRightAnimationController.swift; sourceTree = "<group>"; };
 		755A61C81E04878F00D035D4 /* ServiceViewControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceViewControllerDelegate.swift; sourceTree = "<group>"; };
+		755B3FE11E8CFEE000DA570C /* SearchResultsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchResultsViewModel.swift; sourceTree = "<group>"; };
 		755C78CD1CCE9080001CF70D /* Service.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Service.swift; sourceTree = "<group>"; };
-		75667B2A1CFCAE44008FDFE0 /* PollAPITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollAPITests.swift; sourceTree = "<group>"; };
 		75667B4B1CFEE85A008FDFE0 /* TestUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestUtils.swift; sourceTree = "<group>"; };
 		756FA0FC1E28FF060011AE6F /* SlideCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlideCell.swift; sourceTree = "<group>"; };
+		757326FC1E8C04CD001E618B /* SearchViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchViewModel.swift; sourceTree = "<group>"; };
+		757326FF1E8C06B7001E618B /* SearchViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchViewModelTests.swift; sourceTree = "<group>"; };
 		759464A41CEB8493001A56BF /* SettingsControllerPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsControllerPresenter.swift; sourceTree = "<group>"; };
 		759778A31CF839C200C2E4B4 /* OLP RemoteTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OLP RemoteTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		759778A71CF839C200C2E4B4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -341,9 +348,11 @@
 		46C133421C0A39E80093579F /* Search */ = {
 			isa = PBXGroup;
 			children = (
+				757326FC1E8C04CD001E618B /* SearchViewModel.swift */,
 				46C133431C0A3A0F0093579F /* SearchViewController.swift */,
 				46C133441C0A3A0F0093579F /* SearchViewController.xib */,
 				46FD37881C796C9B00DED423 /* SearchResultViewController.swift */,
+				755B3FE11E8CFEE000DA570C /* SearchResultsViewModel.swift */,
 			);
 			path = Search;
 			sourceTree = "<group>";
@@ -353,11 +362,11 @@
 			children = (
 				759778A71CF839C200C2E4B4 /* Info.plist */,
 				759778AD1CF83AC400C2E4B4 /* APITest.swift */,
-				75667B2A1CFCAE44008FDFE0 /* PollAPITests.swift */,
 				75667B4B1CFEE85A008FDFE0 /* TestUtils.swift */,
 				750831B81CFF44FC00CA9299 /* poll_response.json */,
 				750831BA1CFF594400CA9299 /* service_response.json */,
 				750831BC1CFF597D00CA9299 /* slides_response.json */,
+				757326FF1E8C06B7001E618B /* SearchViewModelTests.swift */,
 			);
 			path = "OLP RemoteTests";
 			sourceTree = "<group>";
@@ -582,6 +591,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				46FD378B1C79770900DED423 /* LiveAPI.swift in Sources */,
+				757326FD1E8C04CD001E618B /* SearchViewModel.swift in Sources */,
 				4623B6971C07BC2E007FFE2B /* SlidesViewController.swift in Sources */,
 				46A9EED81BFD89DF00E8D520 /* ServiceAPI.swift in Sources */,
 				46FD37871C7959EF00DED423 /* SearchAPI.swift in Sources */,
@@ -591,6 +601,7 @@
 				46CC0CED1BE6972300423EB4 /* UserSettings.swift in Sources */,
 				46FD37891C796C9B00DED423 /* SearchResultViewController.swift in Sources */,
 				463A918D1C093DD500D572E6 /* AlertsViewController.swift in Sources */,
+				755B3FE21E8CFEE000DA570C /* SearchResultsViewModel.swift in Sources */,
 				4640F2951BE42B6E00E2AA61 /* PollModel.swift in Sources */,
 				75219D021E276111001B6BC8 /* TabSwitchingToRightAnimationController.swift in Sources */,
 				46753A9B1E593EAC007872C0 /* LocalizationUtil.swift in Sources */,
@@ -626,19 +637,22 @@
 				75667B591CFEE949008FDFE0 /* LiveModel.swift in Sources */,
 				75667B521CFEE938008FDFE0 /* AddAPI.swift in Sources */,
 				75667B5C1CFEFF7E008FDFE0 /* DictionaryUtil.swift in Sources */,
+				757327001E8C06B7001E618B /* SearchViewModelTests.swift in Sources */,
 				75667B5E1CFEFF86008FDFE0 /* ErrorUtil.swift in Sources */,
 				75667B5A1CFEE949008FDFE0 /* ServiceListModel.swift in Sources */,
 				75667B571CFEE949008FDFE0 /* PollModel.swift in Sources */,
 				75667B581CFEE949008FDFE0 /* SlideModel.swift in Sources */,
 				75667B281CFCA8B1008FDFE0 /* API.swift in Sources */,
-				75667B2B1CFCAE44008FDFE0 /* PollAPITests.swift in Sources */,
 				75667B4D1CFEE92C008FDFE0 /* ControllerAPI.swift in Sources */,
+				75AF930F1E9297220051EB82 /* SearchResultsViewModel.swift in Sources */,
+				757326FE1E8C060F001E618B /* LocalizationUtil.swift in Sources */,
 				75667B5F1CFEFFA7008FDFE0 /* DisplayAPI.swift in Sources */,
 				75667B4E1CFEE930008FDFE0 /* PollAPI.swift in Sources */,
 				75667B541CFEE93D008FDFE0 /* AlertAPI.swift in Sources */,
 				75667B531CFEE938008FDFE0 /* Service.swift in Sources */,
 				75667B291CFCA8C9008FDFE0 /* UserSettings.swift in Sources */,
 				75667B4C1CFEE85A008FDFE0 /* TestUtils.swift in Sources */,
+				757327011E8C09BB001E618B /* SearchViewModel.swift in Sources */,
 				75667B5D1CFEFF83008FDFE0 /* ColorUtil.swift in Sources */,
 				75667B551CFEE949008FDFE0 /* SuccessModel.swift in Sources */,
 				75667B4F1CFEE938008FDFE0 /* ServiceAPI.swift in Sources */,
@@ -755,7 +769,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 20B750141C8B3B45881386FA /* Pods-Remote.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -774,7 +788,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6B75984BB421CA7AAB01F229 /* Pods-Remote.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -793,8 +807,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 2AEEA392DC2D08B9EAF00B32 /* Pods-OLP RemoteTests.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				CLANG_ANALYZER_NONNULL = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "OLP RemoteTests/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -808,8 +823,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BF194B8FEA335C68D241C125 /* Pods-OLP RemoteTests.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				CLANG_ANALYZER_NONNULL = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "OLP RemoteTests/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

=== modified file 'Remote/AppDelegate.swift'
--- Remote/AppDelegate.swift	2017-01-21 18:35:49 +0000
+++ Remote/AppDelegate.swift	2017-04-17 16:13:16 +0000
@@ -57,15 +57,15 @@
         let slidesViewController = SlidesViewController(settings: settings, service: service)
         navigationController = UINavigationController(rootViewController: slidesViewController)
         rootViewControllers.append(navigationController)
-        
-        service.pollAPI.serviceDelegate = serviceViewController
-        service.pollAPI.slidesDelegate = slidesViewController
+
         
         let alertsViewController = AlertsViewController(settings: settings, service: service)
         navigationController = UINavigationController(rootViewController: alertsViewController)
         rootViewControllers.append(navigationController)
-        
-        let searchViewController = SearchViewController(settings: settings, service: service)
+
+        let searchViewModel = SearchViewModel(service: service)
+
+        let searchViewController = SearchViewController(viewModel:searchViewModel, settings: settings, service: service)
         navigationController = UINavigationController(rootViewController: searchViewController)
         rootViewControllers.append(navigationController)
         
@@ -81,15 +81,9 @@
         
         settings.resetDefaultsIfNeeded()
 
-        BlockLooper.executeBlockWithRate(2.0) {
-            if self.settings.validateURL() {
-                if self.service.pauseLoopPolling == false {
-                    self.service.pollAPI.poll()
-                }
-            }
-            return false
-        }
-
+        service.serviceDelegate = serviceViewController
+        service.slidesDelegate = slidesViewController
+       
         return true
     }
 

=== modified file 'Remote/Classes/Controller/Search/SearchResultViewController.swift'
--- Remote/Classes/Controller/Search/SearchResultViewController.swift	2017-02-19 05:21:00 +0000
+++ Remote/Classes/Controller/Search/SearchResultViewController.swift	2017-04-17 16:13:16 +0000
@@ -24,20 +24,45 @@
 
 import UIKit
 
-class SearchResultViewController: UITableViewController {
-    
-    fileprivate var items: [ItemModel]!
-    fileprivate let service: Service!
-    
-    init(items: [ItemModel], service: Service) {
-        self.items = items
-        self.service = service
-        super.init(style: .plain)
+class SearchResultViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
+    
+    fileprivate let viewModel: SearchResultsViewModel!
+    fileprivate var tableView: UITableView?
+
+    init(viewModel: SearchResultsViewModel) {
+        self.viewModel = viewModel
+        super.init(nibName: nil, bundle: nil)
+
+        viewModel.errorNotification.producer.skipNil().startWithValues { (error) in
+            self.showErrorNotification(error)
+        }
+
+        viewModel.notification.producer.skip(first: 1).startWithValues { (notificationText) in
+            self.displayNotification(notificationText)
+        }
+
+        viewModel.goToService.producer.skip(first: 1).startWithValues { (value) in
+            self.tabBarController?.selectedIndex = 0
+        }
+
+        viewModel.goToLive.producer.skip(first: 1).startWithValues { (value) in
+            self.tabBarController?.selectedIndex = 1
+        }
     }
-    
+
     required init?(coder aDecoder: NSCoder) {
-        self.service = nil
+        self.viewModel = nil
         super.init(coder: aDecoder)
+        fatalError("Not implemented")
+    }
+
+
+    override func loadView() {
+        super.loadView()
+        self.tableView = UITableView(frame:self.view.bounds, style:.plain)
+        self.view.addSubview(self.tableView!)
+        self.tableView?.delegate = self
+        self.tableView?.dataSource = self
     }
 
     override func viewDidLoad() {
@@ -53,73 +78,53 @@
     }
     
     fileprivate func setupTableView() {
-        self.tableView.estimatedRowHeight = 44
-        self.tableView.rowHeight = UITableViewAutomaticDimension
+        self.tableView?.estimatedRowHeight = 44
+        self.tableView?.rowHeight = UITableViewAutomaticDimension
     }
 
     // MARK: Table view data source
-    
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return self.items.count
+
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.viewModel.items.count
     }
     
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         var cell = tableView.dequeueReusableCell(withIdentifier: "Cell")
         if cell == nil {
             cell = UITableViewCell(style: .default, reuseIdentifier: "Cell")
             cell!.textLabel?.numberOfLines = 0
         }
-        let item = self.items[indexPath.row]
+        let item = self.viewModel.items[indexPath.row]
         cell!.textLabel?.text = item.title
         return cell!
     }
     
     // MARK: Table view delegate
-    
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        func showErrorNotification(_ error: NSError) {
-            if let message = verifyError(error) {
-                self.displayNotification(message, isError: true)
-            }
-        }
-        func itemAddedNotification() {
-            let message = Localizable.Search.itemAdded
-            self.displayNotification(message)
-        }
-        let item = self.items[indexPath.row]
+
+
+    func showErrorNotification(_ error: NSError) {
+        if let message = verifyError(error) {
+            self.displayNotification(message, isError: true)
+        }
+    }
+
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+                let item = self.viewModel.items[indexPath.row]
         let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
         let goLiveStr = Localizable.Search.goLive
         let goLiveAction = UIAlertAction(title: goLiveStr, style: .default) { _ in
             tableView.deselectRow(at: indexPath, animated: true)
-            self.service.liveAPI.goItemToLive(item, plugin: Plugin(rawValue: item.plugin!)!) { error in
-                if let error = error {
-                    showErrorNotification(error as NSError)
-                    return
-                }
-                self.tabBarController?.selectedIndex = 1
-            }
+            self.viewModel.goLive(item: item, plugin: Plugin(rawValue: item.plugin!)!)
         }
         let addStr = Localizable.Search.addToService
         let addAction = UIAlertAction(title: addStr, style: .default) { _ in
             tableView.deselectRow(at: indexPath, animated: true)
-            self.service.addAPI.addItem(item, plugin: Plugin(rawValue: item.plugin!)!) { error in
-                if let error = error {
-                    showErrorNotification(error as NSError)
-                } else {
-                    itemAddedNotification()
-                }
-            }
+            self.viewModel.addItem(item: item, plugin: Plugin(rawValue: item.plugin!)!, goToService: false)
         }
         let addAndGoStr = Localizable.Search.addGoToService
         let addAndGoAction = UIAlertAction(title: addAndGoStr, style: .default) { _ in
             tableView.deselectRow(at: indexPath, animated: true)
-            self.service.addAPI.addItem(item, plugin: Plugin(rawValue: item.plugin!)!) { error in
-                if let error = error {
-                    showErrorNotification(error as NSError)
-                    return
-                }
-                self.tabBarController?.selectedIndex = 0
-            }
+            self.viewModel.addItem(item: item, plugin: Plugin(rawValue: item.plugin!)!, goToService: true)
         }
         let cancelStr = Localizable.cancel
         let cancelAction = UIAlertAction(title: cancelStr, style: .cancel) { _ in

=== added file 'Remote/Classes/Controller/Search/SearchResultsViewModel.swift'
--- Remote/Classes/Controller/Search/SearchResultsViewModel.swift	1970-01-01 00:00:00 +0000
+++ Remote/Classes/Controller/Search/SearchResultsViewModel.swift	2017-04-17 16:13:16 +0000
@@ -0,0 +1,58 @@
+//
+//  SearchResultsViewModel.swift
+//  Remote
+//
+//  Created by andrei shender on 3/30/17.
+//  Copyright © 2017 OpenLP. All rights reserved.
+//
+
+import UIKit
+
+import ReactiveCocoa
+import Result
+import ReactiveSwift
+
+class SearchResultsViewModel: NSObject {
+    var items: [ItemModel]
+
+    var notification = MutableProperty<String>("")
+    var errorNotification = MutableProperty<NSError?>(nil)
+    var goToService = MutableProperty<Bool>(false)
+    var goToLive = MutableProperty<Bool>(false)
+
+    let service: ServiceProtocol
+
+    init(searchReulsts:[ItemModel], service: ServiceProtocol) {
+        items = searchReulsts
+        self.service = service
+        super.init()
+    }
+
+    func addItem(item: ItemModel, plugin: Plugin, goToService: Bool) {
+        self.service.addAPI.addSignalProducer(item: item, plugin: plugin).startWithResult { (result) in
+            switch result {
+            case .success(_):
+                if goToService {
+                    self.goToService.value = true
+                }
+                else {
+                    self.notification.value = Localizable.Search.itemAdded
+                }
+            case let .failure(error):
+                self.errorNotification.value = error.error as NSError
+            }
+        }
+    }
+
+    func goLive(item: ItemModel, plugin: Plugin) {
+        self.service.liveAPI.goLiveSignalProducer(item: item, plugin: plugin).startWithResult { (result) in
+            switch result {
+            case .success(_):
+                self.goToLive.value = true
+            case let .failure(error):
+                self.errorNotification.value = error.error as NSError
+            }
+        }
+
+    }
+}

=== modified file 'Remote/Classes/Controller/Search/SearchViewController.swift'
--- Remote/Classes/Controller/Search/SearchViewController.swift	2017-02-19 05:21:00 +0000
+++ Remote/Classes/Controller/Search/SearchViewController.swift	2017-04-17 16:13:16 +0000
@@ -24,33 +24,59 @@
 
 import UIKit
 import CWStatusBarNotification
+import ReactiveSwift
+import ReactiveCocoa
+import Result
 
 // MARK: - SearchViewController
 
 class SearchViewController: UIViewController {
-    
+
+    let viewModel: SearchViewModel!
+
     @IBOutlet weak var lbTitle: UILabel!
     @IBOutlet weak var pickerView: UIPickerView!
     
     fileprivate var notifications: CWStatusBarNotification!
     fileprivate var textField: UITextField!
-    fileprivate var plugins: [Plugin]!
     fileprivate let service: Service!
     fileprivate var settingsPresenter: SettingsControllerPresenter!
     
     // MARK: Init
     
-    init(settings: UserSettings, service: Service) {
+    init(viewModel: SearchViewModel, settings: UserSettings, service: Service) {
+        self.viewModel = viewModel
         self.service = service
         self.settingsPresenter = SettingsControllerPresenter(settings: settings, pollAPI: service.pollAPI)
         super.init(nibName: "SearchViewController", bundle: nil)
         self.setupNavigationBar()
         self.setupTabBar()
-        self.setupOptions()
         self.setupNotifications()
+
+        self.viewModel.searchTerm <~ self.textField.reactive.continuousTextValues
+
+        self.viewModel.searchResult.producer.startWithResult({ (result) in
+            if let error = result.error {
+                let message = Localizable.Error.tryAgain
+                self.notifications.notificationLabelBackgroundColor = kRedColor
+                self.notifications.display(withMessage: message, forDuration: 3)
+                print(error)
+                return
+            } else if result.value?.count == 0 {
+                let message = Localizable.Search.noResults
+                self.notifications.notificationLabelBackgroundColor = kBlueColor
+                self.notifications.display(withMessage: message, forDuration: 3)
+                return
+            }
+            let resultsViewModel = self.viewModel.getSearchResultsViewModel()
+            let resultsViewController = SearchResultViewController(viewModel: resultsViewModel)
+            self.navigationController?.pushViewController(resultsViewController, animated: true)
+        })
+
     }
-    
+
     required init?(coder aDecoder: NSCoder) {
+        self.viewModel = nil
         self.service = nil
         self.settingsPresenter = nil
         super.init(coder: aDecoder)
@@ -81,6 +107,10 @@
         
         let btSearch = UIBarButtonItem(barButtonSystemItem: .search, target: self, action: #selector(SearchViewController.search))
         self.navigationItem.rightBarButtonItem = btSearch
+
+        self.viewModel.searchButtonEnabled.producer.startWithValues { (isEnabled) in
+            self.navigationItem.rightBarButtonItem?.isEnabled = isEnabled
+        }
     }
     
     fileprivate func setupPickerView() {
@@ -89,17 +119,7 @@
         self.pickerView.layer.borderWidth = 0.7
     }
     
-    fileprivate func setupOptions() {
-        self.plugins = [
-            .Songs,
-            .Bibles,
-            .Presentations,
-            .Images,
-            .Media,
-            .Custom
-        ]
-    }
-    
+        
     fileprivate func setupGestures() {
         var gesture: UIGestureRecognizer
         gesture = UITapGestureRecognizer(target: self, action: #selector(SearchViewController.dismissKeyboard))
@@ -125,26 +145,9 @@
     
     @objc fileprivate func search() {
         self.dismissKeyboard()
-        let plugin = self.plugins[self.pickerView.selectedRow(inComponent: 0)]
-        let text = self.textField.text!
-        service.searchAPI.search(plugin: plugin, text: text) { items, error in
-            if let error = error {
-                let message = Localizable.Error.tryAgain
-                self.notifications.notificationLabelBackgroundColor = kRedColor
-                self.notifications.display(withMessage: message, forDuration: 3)
-                print(error)
-                return
-            } else if items?.count == 0 {
-                let message = Localizable.Search.noResults
-                self.notifications.notificationLabelBackgroundColor = kBlueColor
-                self.notifications.display(withMessage: message, forDuration: 3)
-                return
-            }
-            let resultsViewController = SearchResultViewController(items: items!, service: self.service)
-            self.navigationController?.pushViewController(resultsViewController, animated: true)
-        }
+        self.viewModel.search()
     }
-    
+
     @objc fileprivate func dismissKeyboard() {
         self.textField.resignFirstResponder()
     }
@@ -160,7 +163,7 @@
     }
     
     func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-        return self.plugins.count
+        return self.viewModel.plugins.count
     }
     
 }
@@ -170,10 +173,13 @@
 extension SearchViewController: UIPickerViewDelegate {
     
     func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-        let option = self.plugins[row]
+        let option = self.viewModel.plugins[row]
         return option.name()
     }
-    
+
+    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+        self.viewModel.plugin = self.viewModel.plugins[row]
+    }
 }
 
 // MARK: - UIGestureRecognizerDelegate
@@ -192,7 +198,7 @@
 extension SearchViewController: UITextFieldDelegate {
     
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
-        self.search()
+        self.viewModel.search()
         return true
     }
     

=== added file 'Remote/Classes/Controller/Search/SearchViewModel.swift'
--- Remote/Classes/Controller/Search/SearchViewModel.swift	1970-01-01 00:00:00 +0000
+++ Remote/Classes/Controller/Search/SearchViewModel.swift	2017-04-17 16:13:16 +0000
@@ -0,0 +1,62 @@
+/******************************************************************************
+ * OpenLP iOS Remote                                                           *
+ * --------------------------------------------------------------------------- *
+ * Copyright (c) 2008-2016 OpenLP Developers                                   *
+ * --------------------------------------------------------------------------- *
+ * Permission is hereby granted, free of charge, to any person obtaining a     *
+ * copy of this software and associated documentation files (the "Software"),  *
+ * to deal in the Software without restriction, including without limitation   *
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,    *
+ * and/or sell copies of the Software, and to permit persons to whom the       *
+ * Software is furnished to do so, subject to the following conditions:        *
+ *                                                                             *
+ * The above copyright notice and this permission notice shall be included in  *
+ * all copies or substantial portions of the Software.                         *
+ *                                                                             *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  *
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,    *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE *
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      *
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING     *
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER         *
+ * DEALINGS IN THE SOFTWARE.                                                   *
+ ******************************************************************************/
+import UIKit
+import Result
+import ReactiveSwift
+
+class SearchViewModel: NSObject {
+    let service: ServiceProtocol
+
+    let searchTerm = MutableProperty(String?(""))
+    var searchResult = MutableProperty([ItemModel]())
+
+    let searchButtonEnabled = MutableProperty(true)
+    var plugins: [Plugin]
+    var plugin: Plugin = .Songs
+
+    func search() -> Void {
+        self.service.searchAPI.searchSignalProducer(plugin: self.plugin, text: self.searchTerm.value).startWithResult { result in
+            self.searchResult.value = result.value!
+        }
+    }
+
+    init(service: ServiceProtocol) {
+        self.service = service
+        plugins = [
+            .Songs,
+            .Bibles,
+            .Presentations,
+            .Images,
+            .Media,
+            .Custom
+        ]
+
+        super.init()
+
+    }
+
+    func getSearchResultsViewModel() -> SearchResultsViewModel {
+        return SearchResultsViewModel(searchReulsts: self.searchResult.value, service: service)
+    }
+}

=== modified file 'Remote/Classes/Network/AddAPI.swift'
--- Remote/Classes/Network/AddAPI.swift	2017-01-21 18:35:49 +0000
+++ Remote/Classes/Network/AddAPI.swift	2017-04-17 16:13:16 +0000
@@ -24,29 +24,41 @@
 
 import UIKit
 import Alamofire
+import ReactiveCocoa
+import Result
+import ReactiveSwift
+
 
 class AddAPI: API {
-    
-    func addItem(_ item: ItemModel, plugin: Plugin, completion: @escaping (Error?) -> Void) {
-        let url = self.base + "/" + plugin.rawValue + "/add"
-        var params: [String: Any] = [
-            "request": [
-                "id": (item.id == nil ? String(item.idInt!) : item.id!)
+
+    func addSignalProducer(item: ItemModel, plugin: Plugin) -> SignalProducer<Bool, AnyError> {
+        return SignalProducer({ (observer, disposable) in
+            let url = self.base + "/" + plugin.rawValue + "/add"
+            var params: [String: Any] = [
+                "request": [
+                    "id": (item.id == nil ? String(item.idInt!) : item.id!)
+                ]
             ]
-        ]
-        if let jsonString = jsonString(fromDictionary: params) {
-            params = ["data": jsonString as Any]
-            let request = Alamofire.request(url, parameters: params).validate(statusCode: 200...200)
-            if settings.needsAuth {
-                request.authenticate(user: settings.userID, password: settings.password, persistence: .none)
-            }
-
-            let responseHandler: (Alamofire.DefaultDataResponse) -> Swift.Void = { response in
-                completion(response.error)
-            }
-
-            request.response(completionHandler: responseHandler)
-        }
+            if let jsonString = jsonString(fromDictionary: params) {
+                params = ["data": jsonString as Any]
+                let request = Alamofire.request(url, parameters: params).validate(statusCode: 200...200)
+                if self.settings.needsAuth {
+                    request.authenticate(user: self.settings.userID, password: self.settings.password, persistence: .none)
+                }
+
+                let responseHandler: (Alamofire.DefaultDataResponse) -> Swift.Void = { response in
+                    if let error = response.error {
+                        observer.send(error: AnyError(error))
+                    }
+                    else {
+                        observer.send(value:true)
+                    }
+                }
+
+                request.response(completionHandler: responseHandler)
+            }
+            
+        })
     }
-    
+
 }

=== modified file 'Remote/Classes/Network/LiveAPI.swift'
--- Remote/Classes/Network/LiveAPI.swift	2017-01-21 18:35:49 +0000
+++ Remote/Classes/Network/LiveAPI.swift	2017-04-17 16:13:16 +0000
@@ -24,29 +24,38 @@
 
 import UIKit
 import Alamofire
+import ReactiveSwift
+import Result
 
 class LiveAPI: API {
-    
-    func goItemToLive(_ item: ItemModel, plugin: Plugin, completion: @escaping (Error?) -> Void) {
-        let url = self.base + "/" + plugin.rawValue + "/live"
-        var params: [String: Any] = [
-            "request": [
-                "id": (item.id == nil ? String(item.idInt!) : item.id!)
+
+    func goLiveSignalProducer(item: ItemModel, plugin: Plugin) -> SignalProducer<Bool, AnyError> {
+        return SignalProducer({ (observer, disposable) in
+            let url = self.base + "/" + plugin.rawValue + "/live"
+            var params: [String: Any] = [
+                "request": [
+                    "id": (item.id == nil ? String(item.idInt!) : item.id!)
+                ]
             ]
-        ]
-        if let jsonString = jsonString(fromDictionary: params) {
-            params = ["data": jsonString as Any]
-            let request = Alamofire.request(url, parameters: params).validate(statusCode: 200...200)
-            if settings.needsAuth {
-                request.authenticate(user: settings.userID, password: settings.password, persistence: .none)
-            }
-
-            let responseHandler: (Alamofire.DefaultDataResponse) -> Swift.Void = { response in
-                completion(response.error)
-            }
-
-            request.response(completionHandler: responseHandler)
-        }
+            if let jsonString = jsonString(fromDictionary: params) {
+                params = ["data": jsonString as Any]
+                let request = Alamofire.request(url, parameters: params).validate(statusCode: 200...200)
+                if self.settings.needsAuth {
+                    request.authenticate(user: self.settings.userID, password: self.settings.password, persistence: .none)
+                }
+
+                let responseHandler: (Alamofire.DefaultDataResponse) -> Swift.Void = { response in
+                    if let error = response.error {
+                        observer.send(error: AnyError(error))
+                    }
+                    else {
+                        observer.send(value: true)
+                    }
+                }
+                
+                request.response(completionHandler: responseHandler)
+            }
+
+        })
     }
-    
 }

=== modified file 'Remote/Classes/Network/PollAPI.swift'
--- Remote/Classes/Network/PollAPI.swift	2017-01-21 18:35:49 +0000
+++ Remote/Classes/Network/PollAPI.swift	2017-04-17 16:13:16 +0000
@@ -25,108 +25,29 @@
 import Foundation
 import Alamofire
 import AlamofireObjectMapper
-
-protocol PollAPIServiceDelegate {
-    func updateServiceList(_ items: [ItemModel])
-    func updateSelectedItem(itemId id: String)
-    func updateProjectionState(_ state: ProjectionState)
-}
-
-protocol PollAPISlidesDelegate {
-    func updateSlides(_ slides: [SlideModel])
-    func updateSelectedSlide(_ row: Int)
-    func updateProjectionState(_ state: ProjectionState)
-}
+import ReactiveSwift
+import Result
+
 
 class PollAPI: API {
-    
-    fileprivate var poll: PollModel = PollModel()
-    var serviceDelegate: PollAPIServiceDelegate?
-    var slidesDelegate: PollAPISlidesDelegate?
-    fileprivate let controllerAPI: ControllerAPI
-    fileprivate let serviceAPI: ServiceAPI
-
-    init(settings: UserSettings, controllerAPI: ControllerAPI, serviceAPI: ServiceAPI) {
-        self.controllerAPI = controllerAPI
-        self.serviceAPI = serviceAPI
-        super.init(settings: settings)
-    }
-    
-    func poll(_ completion: ((PollModel?, Error?) -> Void)? = nil) {
-        let url = self.base + "/poll"
-        let request = Alamofire.request(url).validate(statusCode: 200...200)
-        if settings.needsAuth {
-            request.authenticate(user: settings.userID, password: settings.password, persistence: .none)
-        }
-        request.responseObject { (response: DataResponse<PollModel>) in
-            let error = response.result.error
-            let poll = response.result.value
-            
-            if let completion = completion {
-                completion(poll, error)
-            }
-
-            self.handlePollResponse(poll)
-         }
-    }
-
-
-    fileprivate func updateService(_ completion: ((Void) -> Void)? = nil) {
-        self.serviceAPI.list { items, error in
-            if let items = items {
-                self.serviceDelegate?.updateServiceList(items)
-            }
-
-            if let completion = completion {
-                completion()
-            }
-        }
-    }
-
-
-    fileprivate func updateSlides(_ completion: ((Void) -> Void)? = nil) {
-        self.controllerAPI.liveText { slides, error in
-            if let slides = slides {
-                self.slidesDelegate?.updateSlides(slides)
-            }
-
-            if let completion = completion {
-                completion()
-            }
-        }
-    }
-
-
-    fileprivate func updateProjectionState(_ projectionState: ProjectionState) {
-        self.serviceDelegate?.updateProjectionState(projectionState)
-        self.slidesDelegate?.updateProjectionState(projectionState)
-    }
-
-
-    fileprivate func handlePollResponse(_ poll: PollModel?) {
-        if let poll = poll {
-            if self.poll.service != poll.service {
-                self.updateService({
-                    self.serviceDelegate?.updateSelectedItem(itemId: poll.item)
-                })
-            }
-            else {
-                self.serviceDelegate?.updateSelectedItem(itemId: poll.item)
-            }
-
-            if self.poll.item != poll.item {
-                self.updateSlides({
-                    self.slidesDelegate?.updateSelectedSlide(poll.slide)
-                })
-            }
-            else {
-                self.slidesDelegate?.updateSelectedSlide(poll.slide)
-            }
-
-            updateProjectionState(poll.projectionState)
-
-            self.poll = poll
-        }
-    }
-
+
+    func pollSignalProducer() -> SignalProducer<PollModel?, AnyError> {
+        return SignalProducer({ (observer, disposable) in
+            let url = self.base + "/poll"
+            let request = Alamofire.request(url).validate(statusCode: 200...200)
+            if self.settings.needsAuth {
+                request.authenticate(user: self.settings.userID, password: self.settings.password, persistence: .none)
+            }
+            request.responseObject { (response: DataResponse<PollModel>) in
+                switch response.result {
+                case .success(let value):
+                    observer.send(value: value)
+                    break
+                case .failure(let error):
+                    observer.send(error: AnyError(error))
+                    break
+                }
+            }
+        })
+    }
 }

=== modified file 'Remote/Classes/Network/SearchAPI.swift'
--- Remote/Classes/Network/SearchAPI.swift	2017-01-21 18:35:49 +0000
+++ Remote/Classes/Network/SearchAPI.swift	2017-04-17 16:13:16 +0000
@@ -24,27 +24,31 @@
 
 import UIKit
 import Alamofire
+import ReactiveCocoa
+import ReactiveSwift
+import Result
 
 class SearchAPI: API {
-    
-    func search(plugin: Plugin, text: String, completion: @escaping ([ItemModel]?, Error?) -> Void) {
-        let url = self.base + "/" + plugin.rawValue + "/search"
-        var params: [String: Any] = [
-            "request": [
-                "text": text
+
+    func searchSignalProducer(plugin: Plugin, text: String?) -> SignalProducer<[ItemModel], AnyError> {
+        return SignalProducer({ (observer, disposable) in
+            let url = self.base + "/" + plugin.rawValue + "/search"
+            var params: [String: Any] = [
+                "request": [
+                    "text": text
+                ]
             ]
-        ]
-        if let jsonString = jsonString(fromDictionary: params) {
-            params = ["data": jsonString as Any]
-            let request = Alamofire.request(url, parameters: params).validate(statusCode: 200...200)
-            if settings.needsAuth {
-                request.authenticate(user: settings.userID, password: settings.password, persistence: .none)
-            }
-            request.responseJSON { (response: DataResponse<Any>) in
-                var result = [ItemModel]()
-                if let value = response.result.value as? NSDictionary,
-                    let results = value["results"] as? NSDictionary,
-                    let items = results["items"] as? NSArray {
+            if let jsonString = jsonString(fromDictionary: params) {
+                params = ["data": jsonString as Any]
+                let request = Alamofire.request(url, parameters: params).validate(statusCode: 200...200)
+                if self.settings.needsAuth {
+                    request.authenticate(user: self.settings.userID, password: self.settings.password, persistence: .none)
+                }
+                request.responseJSON { (response: DataResponse<Any>) in
+                    var result = [ItemModel]()
+                    if let value = response.result.value as? NSDictionary,
+                        let results = value["results"] as? NSDictionary,
+                        let items = results["items"] as? NSArray {
                         for item in items {
                             let item = item as! NSArray
                             let i = ItemModel()
@@ -58,11 +62,17 @@
                             i.plugin = plugin.rawValue
                             result.append(i)
                         }
+                    }
+
+                    if let error = response.result.error {
+                        observer.send(error: AnyError(error))
+                    }
+                    else {
+                        observer.send(value: result)
+                    }
                 }
-                let error = response.result.error
-                completion(result, error)
             }
-        }
+        })
+        
     }
-    
 }

=== modified file 'Remote/Classes/Network/Service.swift'
--- Remote/Classes/Network/Service.swift	2017-01-16 17:16:09 +0000
+++ Remote/Classes/Network/Service.swift	2017-04-17 16:13:16 +0000
@@ -23,8 +23,44 @@
  ******************************************************************************/
 
 import Foundation
-
-class Service {
+import ReactiveSwift
+import Result
+import ReactiveCocoa
+import BlockLooper
+
+
+protocol PollAPIServiceDelegate {
+    func updateServiceList(_ items: [ItemModel])
+    func updateSelectedItem(itemId id: String)
+    func updateProjectionState(_ state: ProjectionState)
+}
+
+protocol PollAPISlidesDelegate {
+    func updateSlides(_ slides: [SlideModel])
+    func updateSelectedSlide(_ row: Int)
+    func updateProjectionState(_ state: ProjectionState)
+}
+
+
+protocol ServiceProtocol {
+    var serviceAPI: ServiceAPI { get }
+    var pollAPI: PollAPI { get }
+    var displayAPI: DisplayAPI { get }
+    var controllerAPI: ControllerAPI { get }
+    var alertAPI: AlertAPI { get }
+    var searchAPI: SearchAPI { get }
+    var liveAPI: LiveAPI { get }
+    var addAPI: AddAPI { get }
+    var pauseLoopPolling: Bool { get set}
+    var settings: UserSettings { get }
+
+    var serviceDelegate: PollAPIServiceDelegate? { get }
+    var slidesDelegate: PollAPISlidesDelegate? { get }
+
+}
+
+
+class Service : ServiceProtocol {
     let serviceAPI: ServiceAPI
     let pollAPI: PollAPI
     let displayAPI: DisplayAPI
@@ -34,15 +70,115 @@
     let liveAPI: LiveAPI
     let addAPI: AddAPI
     var pauseLoopPolling = false
+    let settings: UserSettings
+
+    var serviceDelegate: PollAPIServiceDelegate?
+    var slidesDelegate: PollAPISlidesDelegate?
+    fileprivate var poll: PollModel = PollModel()
+
+    let pollSignalObserver: Observer<Result<PollModel?, AnyError>, NoError>
+    var pollSignal: Signal<Result<PollModel?, AnyError>, NoError>
 
     init(settings: UserSettings) {
+        self.settings = settings
         serviceAPI = ServiceAPI(settings: settings)
         controllerAPI = ControllerAPI(settings :settings)
-        pollAPI = PollAPI(settings: settings, controllerAPI:controllerAPI, serviceAPI: serviceAPI)
+        pollAPI = PollAPI(settings: settings)
         displayAPI = DisplayAPI(settings: settings)
         alertAPI = AlertAPI(settings :settings)
         searchAPI = SearchAPI(settings :settings)
         liveAPI = LiveAPI(settings: settings)
         addAPI = AddAPI(settings: settings)
-    }
+
+        let (pollSignal, pollObserver) = Signal<Result<PollModel?, AnyError>, NoError>.pipe()
+        self.pollSignal = pollSignal
+        self.pollSignalObserver = pollObserver
+
+        BlockLooper.executeBlockWithRate(2.0) {
+            if self.settings.validateURL() == false {
+                return false
+            }
+            if self.pauseLoopPolling == true {
+                return false
+            }
+            self.pollAPI.pollSignalProducer().startWithResult({ (result) in
+                self.pollSignalObserver.send(value: result)
+            })
+            return false
+        }
+
+
+        pollSignal
+            .filter({ (result) -> Bool in
+                switch result {
+                case .success:
+                    return true
+                default:
+                    return false
+                }
+            })
+            .observe { (event) in
+                self.handlePollResponse((event.value?.value)!)
+            }
+    }
+
+
+    fileprivate func updateService(_ completion: ((Void) -> Void)? = nil) {
+        self.serviceAPI.list { items, error in
+            if let items = items {
+                self.serviceDelegate?.updateServiceList(items)
+            }
+
+            if let completion = completion {
+                completion()
+            }
+        }
+    }
+
+
+    fileprivate func updateSlides(_ completion: ((Void) -> Void)? = nil) {
+        self.controllerAPI.liveText { slides, error in
+            if let slides = slides {
+                self.slidesDelegate?.updateSlides(slides)
+            }
+
+            if let completion = completion {
+                completion()
+            }
+        }
+    }
+
+
+    fileprivate func updateProjectionState(_ projectionState: ProjectionState) {
+        self.serviceDelegate?.updateProjectionState(projectionState)
+        self.slidesDelegate?.updateProjectionState(projectionState)
+    }
+
+
+    fileprivate func handlePollResponse(_ poll: PollModel?) {
+        if let poll = poll {
+            if self.poll.service != poll.service {
+                self.updateService({
+                    self.serviceDelegate?.updateSelectedItem(itemId: poll.item)
+                })
+            }
+            else {
+                self.serviceDelegate?.updateSelectedItem(itemId: poll.item)
+            }
+
+            if self.poll.item != poll.item {
+                self.updateSlides({
+                    self.slidesDelegate?.updateSelectedSlide(poll.slide)
+                })
+            }
+            else {
+                self.slidesDelegate?.updateSelectedSlide(poll.slide)
+            }
+
+            updateProjectionState(poll.projectionState)
+            
+            self.poll = poll
+        }
+    }
+
 }