Skip to content

Commit 8812a2a

Browse files
committed
Refactor film clutter view model
1 parent 24c8ea7 commit 8812a2a

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

CountdownFlimClutter/ViewModels/FilmClutterViewModel.swift

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ class FilmClutterViewModel: ObservableObject {
99
func start() {
1010
reset()
1111

12-
let just = Just(())
13-
.tryMap { _ in }
14-
.eraseToAnyPublisher()
15-
16-
let timer = Timer.publish(every: time, on: .main, in: .common)
12+
let timer: AnyPublisher<Void, Never> = Timer
13+
.publish(every: time, on: .main, in: .common)
1714
.autoconnect()
18-
.tryMap { _ in }
15+
.map { _ in }
16+
.catch { _ in Empty() }
1917
.eraseToAnyPublisher()
2018

21-
timerCancellable = Publishers.Merge(just, timer)
19+
timerCancellable = Publishers.Merge(Just(()), timer)
2220
.sink { [weak self] in self?.changeValue() }
2321
}
2422

@@ -57,10 +55,10 @@ class FilmClutterViewModel: ObservableObject {
5755

5856
}
5957

60-
private extension Publisher {
61-
62-
func sink(receiveValue: @escaping ((Self.Output) -> Void)) -> AnyCancellable {
63-
self.sink(receiveCompletion: { _ in }, receiveValue: receiveValue)
64-
}
65-
66-
}
58+
//private extension Publisher {
59+
//
60+
// func sink(receiveValue: @escaping ((Self.Output) -> Void)) -> AnyCancellable {
61+
// self.sink(receiveCompletion: { _ in }, receiveValue: receiveValue)
62+
// }
63+
//
64+
//}

0 commit comments

Comments
 (0)