Remove RxRelay dependency

pakerwreah · Nov 27, 2022 · 74eae43 · 74eae43
1 parent b425d37
commit 74eae43
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 41 deletions.
diff --git a/Calendr.xcodeproj/project.pbxproj b/Calendr.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		341692C225F1AA570019E8A8 /* WallTimeScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 341692C125F1AA570019E8A8 /* WallTimeScheduler.swift */; };
 		3418207E26755CC80075B3DC /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 3418207D26755CC80075B3DC /* RxSwift */; };
 		3418208026755CC80075B3DC /* RxTest in Frameworks */ = {isa = PBXBuildFile; productRef = 3418207F26755CC80075B3DC /* RxTest */; };
-		3418208226755CC80075B3DC /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = 3418208126755CC80075B3DC /* RxRelay */; };
 		3418208426755CC80075B3DC /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 3418208326755CC80075B3DC /* RxCocoa */; };
 		341B2B3E25D06A6F00336342 /* Dropdown.swift in Sources */ = {isa = PBXBuildFile; fileRef = 341B2B3D25D06A6F00336342 /* Dropdown.swift */; };
 		341B2B4225D0B19500336342 /* StatusItemViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 341B2B4125D0B19500336342 /* StatusItemViewModelTests.swift */; };
@@ -304,7 +303,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				3418208426755CC80075B3DC /* RxCocoa in Frameworks */,
-				3418208226755CC80075B3DC /* RxRelay in Frameworks */,
 				3418207E26755CC80075B3DC /* RxSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -671,7 +669,6 @@
 			name = Calendr;
 			packageProductDependencies = (
 				3418207D26755CC80075B3DC /* RxSwift */,
-				3418208126755CC80075B3DC /* RxRelay */,
 				3418208326755CC80075B3DC /* RxCocoa */,
 			);
 			productName = Calendr;
@@ -1280,11 +1277,6 @@
 			package = 3418207C26755CC80075B3DC /* XCRemoteSwiftPackageReference "RxSwift" */;
 			productName = RxTest;
 		};
-		3418208126755CC80075B3DC /* RxRelay */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 3418207C26755CC80075B3DC /* XCRemoteSwiftPackageReference "RxSwift" */;
-			productName = RxRelay;
-		};
 		3418208326755CC80075B3DC /* RxCocoa */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 3418207C26755CC80075B3DC /* XCRemoteSwiftPackageReference "RxSwift" */;

diff --git a/Calendr/Extensions/Rx+Helpers.swift b/Calendr/Extensions/Rx+Helpers.swift
@@ -6,7 +6,6 @@
 //
 
 import RxSwift
-import RxRelay
 
 extension ObservableType {
 
@@ -51,17 +50,6 @@ extension BehaviorSubject {
     }
 }
 
-extension PublishRelay {
-
-    func asObserver() -> AnyObserver<Element> {
-        AnyObserver { [weak self] event in
-            if let value = event.element {
-                self?.accept(value)
-            }
-        }
-    }
-}
-
 extension Bool {
     var isFalse: Bool { !self }
     var isTrue: Bool { self }

diff --git a/Calendr/MenuBar/NextEventViewModel.swift b/Calendr/MenuBar/NextEventViewModel.swift
@@ -7,7 +7,6 @@
 
 import Cocoa
 import RxSwift
-import RxRelay
 
 class NextEventViewModel {
 
@@ -20,7 +19,7 @@ class NextEventViewModel {
     let isInProgress: Observable<Bool>
 
     private let disposeBag = DisposeBag()
-    private let event = BehaviorRelay<EventModel?>(value: nil)
+    private let event = BehaviorSubject<EventModel?>(value: nil)
 
     private let isShowingDetails: AnyObserver<Bool>
 
@@ -161,7 +160,7 @@ class NextEventViewModel {
     }
 
     func makeDetails() -> EventDetailsViewModel? {
-        guard let event = event.value else { return nil }
+        guard let event = try? event.value() else { return nil }
         return .init(
             event: event,
             dateProvider: dateProvider,

diff --git a/Calendr/Settings/CalendarPickerViewModel.swift b/Calendr/Settings/CalendarPickerViewModel.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import RxSwift
-import RxRelay
 
 class CalendarPickerViewModel {
 
@@ -19,7 +18,7 @@ class CalendarPickerViewModel {
     let enabledCalendars: Observable<[String]>
 
     private let userDefaults: UserDefaults
-    private let toggleCalendarSubject = PublishRelay<String>()
+    private let toggleCalendarSubject = PublishSubject<String>()
     private let disposeBag = DisposeBag()
 
     init(

diff --git a/CalendrTests/CalendarPickerViewModelTests.swift b/CalendrTests/CalendarPickerViewModelTests.swift
@@ -154,20 +154,4 @@ class CalendarPickerViewModelTests: XCTestCase {
 
         XCTAssertEqual(enabled, ["2", "3"])
     }
-
-    func testToggleCalendar_ignoresOnCompleted() {
-
-        var enabled: [String]?
-
-        viewModel.enabledCalendars
-            .bind { enabled = $0 }
-            .disposed(by: disposeBag)
-
-        calendarService.changeObserver.onNext(())
-
-        viewModel.toggleCalendar.onCompleted()
-
-        viewModel.toggleCalendar.onNext("2")
-        XCTAssertEqual(enabled, ["1", "3"])
-    }
 }