mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
Update templates: remove iOS 14 availability checks and stateActions + reducer.
This commit is contained in:
committed by
Stefan Ceriu
parent
b4d9c72e6f
commit
f2fe39eca7
@@ -29,7 +29,6 @@ import Combine
|
|||||||
/// A similar approach is taken in libraries like [CombineFeedback](https://github.com/sergdort/CombineFeedback).
|
/// A similar approach is taken in libraries like [CombineFeedback](https://github.com/sergdort/CombineFeedback).
|
||||||
/// It provides a nice layer of consistency and also safety. As we are not passing the `ViewModel` to the view directly, shortcuts/hacks
|
/// It provides a nice layer of consistency and also safety. As we are not passing the `ViewModel` to the view directly, shortcuts/hacks
|
||||||
/// can't be made into the `ViewModel`.
|
/// can't be made into the `ViewModel`.
|
||||||
@available(iOS 14, *)
|
|
||||||
@dynamicMemberLookup
|
@dynamicMemberLookup
|
||||||
class ViewModelContext<ViewState: BindableState, ViewAction>: ObservableObject {
|
class ViewModelContext<ViewState: BindableState, ViewAction>: ObservableObject {
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
@@ -65,14 +64,13 @@ class ViewModelContext<ViewState: BindableState, ViewAction>: ObservableObject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A common ViewModel implementation for handling of `State`, `StateAction`s and `ViewAction`s
|
/// A common ViewModel implementation for handling of `State` and `ViewAction`s
|
||||||
///
|
///
|
||||||
/// Generic type State is constrained to the BindableState protocol in that it may contain (but doesn't have to)
|
/// Generic type State is constrained to the BindableState protocol in that it may contain (but doesn't have to)
|
||||||
/// a specific portion of state that can be safely bound to.
|
/// a specific portion of state that can be safely bound to.
|
||||||
/// If we decide to add more features to our state management (like doing state processing off the main thread)
|
/// If we decide to add more features to our state management (like doing state processing off the main thread)
|
||||||
/// we can do it in this centralised place.
|
/// we can do it in this centralised place.
|
||||||
@available(iOS 14, *)
|
class StateStoreViewModel<State: BindableState, ViewAction> {
|
||||||
class StateStoreViewModel<State: BindableState, StateAction, ViewAction> {
|
|
||||||
|
|
||||||
typealias Context = ViewModelContext<State, ViewAction>
|
typealias Context = ViewModelContext<State, ViewAction>
|
||||||
|
|
||||||
@@ -104,34 +102,6 @@ class StateStoreViewModel<State: BindableState, StateAction, ViewAction> {
|
|||||||
.store(in: &cancellables)
|
.store(in: &cancellables)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Send state actions to modify the state within the reducer.
|
|
||||||
/// - Parameter action: The state action to send to the reducer.
|
|
||||||
@available(*, deprecated, message: "Mutate state directly instead")
|
|
||||||
func dispatch(action: StateAction) {
|
|
||||||
Self.reducer(state: &context.viewState, action: action)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Send state actions from a publisher to modify the state within the reducer.
|
|
||||||
/// - Parameter actionPublisher: The publisher that produces actions to be sent to the reducer
|
|
||||||
@available(*, deprecated, message: "Mutate state directly instead")
|
|
||||||
func dispatch(actionPublisher: AnyPublisher<StateAction, Never>) {
|
|
||||||
actionPublisher.sink { [weak self] action in
|
|
||||||
guard let self = self else { return }
|
|
||||||
Self.reducer(state: &self.context.viewState, action: action)
|
|
||||||
}
|
|
||||||
.store(in: &cancellables)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Override to handle mutations to the `State`
|
|
||||||
///
|
|
||||||
/// A redux style reducer, all modifications to state happen here.
|
|
||||||
/// - Parameters:
|
|
||||||
/// - state: The `inout` state to be modified,
|
|
||||||
/// - action: The action that defines which state modification should take place.
|
|
||||||
class func reducer(state: inout State, action: StateAction) {
|
|
||||||
// Default implementation, -no-op
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Override to handles incoming `ViewAction`s from the `ViewModel`.
|
/// Override to handles incoming `ViewAction`s from the `ViewModel`.
|
||||||
/// - Parameter viewAction: The `ViewAction` to be processed in `ViewModel` implementation.
|
/// - Parameter viewAction: The `ViewAction` to be processed in `ViewModel` implementation.
|
||||||
func process(viewAction: ViewAction) {
|
func process(viewAction: ViewAction) {
|
||||||
|
|||||||
@@ -17,11 +17,9 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
import Combine
|
import Combine
|
||||||
|
|
||||||
@available(iOS 14, *)
|
|
||||||
typealias HomeScreenViewModelType = StateStoreViewModel<HomeScreenViewState,
|
typealias HomeScreenViewModelType = StateStoreViewModel<HomeScreenViewState,
|
||||||
Never,
|
|
||||||
HomeScreenViewAction>
|
HomeScreenViewAction>
|
||||||
@available(iOS 14, *)
|
|
||||||
class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol {
|
class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol {
|
||||||
|
|
||||||
private let attributedStringBuilder: AttributedStringBuilderProtocol
|
private let attributedStringBuilder: AttributedStringBuilderProtocol
|
||||||
|
|||||||
@@ -16,11 +16,9 @@
|
|||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
@available(iOS 14, *)
|
|
||||||
typealias LoginScreenViewModelType = StateStoreViewModel<LoginScreenViewState,
|
typealias LoginScreenViewModelType = StateStoreViewModel<LoginScreenViewState,
|
||||||
Never,
|
|
||||||
LoginScreenViewAction>
|
LoginScreenViewAction>
|
||||||
@available(iOS 14, *)
|
|
||||||
class LoginScreenViewModel: LoginScreenViewModelType, LoginScreenViewModelProtocol {
|
class LoginScreenViewModel: LoginScreenViewModelType, LoginScreenViewModelProtocol {
|
||||||
|
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
|
|||||||
@@ -17,8 +17,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
protocol LoginScreenViewModelProtocol {
|
protocol LoginScreenViewModelProtocol {
|
||||||
|
|
||||||
var completion: ((LoginScreenViewModelResult) -> Void)? { get set }
|
var completion: ((LoginScreenViewModelResult) -> Void)? { get set }
|
||||||
@available(iOS 14, *)
|
|
||||||
var context: LoginScreenViewModelType.Context { get }
|
var context: LoginScreenViewModelType.Context { get }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,11 +16,9 @@
|
|||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
@available(iOS 14, *)
|
|
||||||
typealias RoomScreenViewModelType = StateStoreViewModel<RoomScreenViewState,
|
typealias RoomScreenViewModelType = StateStoreViewModel<RoomScreenViewState,
|
||||||
Never,
|
|
||||||
RoomScreenViewAction>
|
RoomScreenViewAction>
|
||||||
@available(iOS 14, *)
|
|
||||||
class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol {
|
class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol {
|
||||||
|
|
||||||
private struct Constants {
|
private struct Constants {
|
||||||
|
|||||||
+1
-3
@@ -16,11 +16,9 @@
|
|||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
@available(iOS 14, *)
|
|
||||||
typealias TemplateSimpleScreenViewModelType = StateStoreViewModel<TemplateSimpleScreenViewState,
|
typealias TemplateSimpleScreenViewModelType = StateStoreViewModel<TemplateSimpleScreenViewState,
|
||||||
Never,
|
|
||||||
TemplateSimpleScreenViewAction>
|
TemplateSimpleScreenViewAction>
|
||||||
@available(iOS 14, *)
|
|
||||||
class TemplateSimpleScreenViewModel: TemplateSimpleScreenViewModelType, TemplateSimpleScreenViewModelProtocol {
|
class TemplateSimpleScreenViewModel: TemplateSimpleScreenViewModelType, TemplateSimpleScreenViewModelProtocol {
|
||||||
|
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
|
|||||||
-2
@@ -17,8 +17,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
protocol TemplateSimpleScreenViewModelProtocol {
|
protocol TemplateSimpleScreenViewModelProtocol {
|
||||||
|
|
||||||
var completion: ((TemplateSimpleScreenViewModelResult) -> Void)? { get set }
|
var completion: ((TemplateSimpleScreenViewModelResult) -> Void)? { get set }
|
||||||
@available(iOS 14, *)
|
|
||||||
var context: TemplateSimpleScreenViewModelType.Context { get }
|
var context: TemplateSimpleScreenViewModelType.Context { get }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user