Make naming of symbols consistent

This commit is contained in:
David Langley
2021-09-07 23:02:26 +01:00
parent 372da7cdde
commit a09028c4e5
12 changed files with 35 additions and 35 deletions
@@ -18,7 +18,7 @@ import Foundation
import Combine
@available(iOS 14.0, *)
class MXTemplateUserService: TemplateUserServiceProtocol {
class MXTemplateUserProfileService: TemplateUserProfileServiceProtocol {
// MARK: - Properties
@@ -26,7 +26,7 @@ class MXTemplateUserService: TemplateUserServiceProtocol {
private let session: MXSession
private var listenerReference: Any!
@Published private var presence: TemplatePresence = .offline
@Published private var presence: TemplateUserProfilePresence = .offline
// MARK: Public
@@ -42,7 +42,7 @@ class MXTemplateUserService: TemplateUserServiceProtocol {
session.myUser.avatarUrl
}
var presencePublisher: AnyPublisher<TemplatePresence, Never> {
var presencePublisher: AnyPublisher<TemplateUserProfilePresence, Never> {
$presence.eraseToAnyPublisher()
}
@@ -56,7 +56,7 @@ class MXTemplateUserService: TemplateUserServiceProtocol {
let event = event,
case .presence = MXEventType(identifier: event.eventId)
else { return }
self.presence = TemplatePresence(mxPresence: self.session.myUser.presence)
self.presence = TemplateUserProfilePresence(mxPresence: self.session.myUser.presence)
}
self.listenerReference = listenerReference
}
@@ -66,7 +66,7 @@ class MXTemplateUserService: TemplateUserServiceProtocol {
}
}
fileprivate extension TemplatePresence {
fileprivate extension TemplateUserProfilePresence {
init(mxPresence: MXPresence) {
switch mxPresence {
@@ -18,11 +18,11 @@ import Foundation
import Combine
@available(iOS 14.0, *)
class MockTemplateUserService: TemplateUserServiceProtocol {
class MockTemplateUserProfileService: TemplateUserProfileServiceProtocol {
static let example = MockTemplateUserService()
@Published var presence: TemplatePresence = .online
var presencePublisher: AnyPublisher<TemplatePresence, Never> {
static let example = MockTemplateUserProfileService()
@Published var presence: TemplateUserProfilePresence = .online
var presencePublisher: AnyPublisher<TemplateUserProfilePresence, Never> {
$presence.eraseToAnyPublisher()
}
let userId: String = "123"
@@ -18,15 +18,15 @@ import Foundation
import Combine
@available(iOS 14.0, *)
protocol TemplateUserServiceProtocol: Avatarable {
protocol TemplateUserProfileServiceProtocol: Avatarable {
var userId: String { get }
var displayName: String? { get }
var avatarUrl: String? { get }
var presencePublisher: AnyPublisher<TemplatePresence, Never> { get }
var presencePublisher: AnyPublisher<TemplateUserProfilePresence, Never> { get }
}
@available(iOS 14.0, *)
extension TemplateUserServiceProtocol {
extension TemplateUserProfileServiceProtocol {
var mxContentUri: String? {
avatarUrl
}