Fix naming of Repository -> Service, Impl -> Type

This commit is contained in:
langleyd
2021-07-02 10:39:27 +01:00
parent 7392bdbe83
commit ffa6b73945
6 changed files with 14 additions and 14 deletions
@@ -22,7 +22,7 @@ enum RoomNotificationState: CaseIterable {
case mute
}
protocol RoomNotificationRepository {
protocol RoomNotificationSettingsServiceType {
typealias Completion = () -> Void
typealias NotificationSettingCallback = (RoomNotificationState) -> Void
@@ -31,7 +31,7 @@ protocol RoomNotificationRepository {
var notificationState: RoomNotificationState { get }
}
final class RoomNotificationRepositoryImpl: RoomNotificationRepository {
final class RoomNotificationSettingsService: RoomNotificationSettingsServiceType {
// MARK: - Properties
@@ -37,7 +37,7 @@ final class RoomNotificationSettingsCoordinator: RoomNotificationSettingsCoordin
// MARK: - Setup
init(room: MXRoom) {
let repository = RoomNotificationRepositoryImpl(room: room)
let repository = RoomNotificationSettingsService(room: room)
let roomNotificationSettingsViewModel = RoomNotificationSettingsViewModel(roomNotificationRepository: repository, roomEncrypted: room.summary.isEncrypted)
let roomNotificationSettingsViewController = RoomNotificationSettingsViewController.instantiate(with: roomNotificationSettingsViewModel)
self.roomNotificationSettingsViewModel = roomNotificationSettingsViewModel
@@ -60,7 +60,7 @@ final class RoomNotificationSettingsViewController: UIViewController {
}
}
private var viewState: RoomNotificationSettingsViewState!
private var viewState: RoomNotificationSettingsViewStateType!
// MARK: - Setup
@@ -129,7 +129,7 @@ final class RoomNotificationSettingsViewController: UIViewController {
navigationItem.rightBarButtonItem = doneBarButtonItem
}
private func render(viewState: RoomNotificationSettingsViewState) {
private func render(viewState: RoomNotificationSettingsViewStateType) {
if viewState.saving {
activityPresenter.presentActivityIndicator(on: view, animated: true)
@@ -261,7 +261,7 @@ extension RoomNotificationSettingsViewController: UITableViewDelegate {
// MARK: - RoomNotificationSettingsViewModelViewDelegate
extension RoomNotificationSettingsViewController: RoomNotificationSettingsViewModelViewDelegate {
func roomNotificationSettingsViewModel(_ viewModel: RoomNotificationSettingsViewModelType, didUpdateViewState viewSate: RoomNotificationSettingsViewState) {
func roomNotificationSettingsViewModel(_ viewModel: RoomNotificationSettingsViewModelType, didUpdateViewState viewSate: RoomNotificationSettingsViewStateType) {
render(viewState: viewSate)
}
}
@@ -25,8 +25,8 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
// MARK: Private
private let roomNotificationRepository: RoomNotificationRepository
private var state: RoomNotificationSettingsViewStateImpl {
private let roomNotificationRepository: RoomNotificationSettingsServiceType
private var state: RoomNotificationSettingsViewState {
willSet {
update(viewState: newValue)
}
@@ -39,11 +39,11 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
// MARK: - Setup
init(roomNotificationRepository: RoomNotificationRepository, roomEncrypted: Bool) {
init(roomNotificationRepository: RoomNotificationSettingsServiceType, roomEncrypted: Bool) {
self.roomNotificationRepository = roomNotificationRepository
let notificationState = Self.mapNotificationStateOnRead(encrypted: roomEncrypted, state: roomNotificationRepository.notificationState)
self.state = RoomNotificationSettingsViewStateImpl(roomEncrypted: roomEncrypted, saving: false, notificationState: notificationState)
self.state = RoomNotificationSettingsViewState(roomEncrypted: roomEncrypted, saving: false, notificationState: notificationState)
self.roomNotificationRepository.observeNotificationState { [weak self] state in
guard let self = self else { return }
@@ -92,7 +92,7 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
}
}
private func update(viewState: RoomNotificationSettingsViewState) {
private func update(viewState: RoomNotificationSettingsViewStateType) {
self.viewDelegate?.roomNotificationSettingsViewModel(self, didUpdateViewState: viewState)
}
@@ -19,7 +19,7 @@
import Foundation
protocol RoomNotificationSettingsViewModelViewDelegate: AnyObject {
func roomNotificationSettingsViewModel(_ viewModel: RoomNotificationSettingsViewModelType, didUpdateViewState viewSate: RoomNotificationSettingsViewState)
func roomNotificationSettingsViewModel(_ viewModel: RoomNotificationSettingsViewModelType, didUpdateViewState viewSate: RoomNotificationSettingsViewStateType)
}
protocol RoomNotificationSettingsViewModelCoordinatorDelegate: AnyObject {
@@ -19,7 +19,7 @@
import Foundation
/// RoomNotificationSettingsViewController view state
struct RoomNotificationSettingsViewStateImpl: RoomNotificationSettingsViewState {
struct RoomNotificationSettingsViewState: RoomNotificationSettingsViewStateType {
let roomEncrypted: Bool
var saving: Bool
var notificationState: RoomNotificationState
@@ -32,7 +32,7 @@ struct RoomNotificationSettingsViewStateImpl: RoomNotificationSettingsViewState
}
}
protocol RoomNotificationSettingsViewState {
protocol RoomNotificationSettingsViewStateType {
var saving: Bool { get }
var roomEncrypted: Bool { get }
var notificationOptions: [RoomNotificationState] { get }