felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-19 08:03:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do avatar placeholder in SwiftUI, Add AvatarViewModel, Add dependency injection for MxMediaManager dependency.

Browse Source
This commit is contained in:
David Langley
2021-08-15 00:36:15 +01:00
parent 90e686efd0
commit 807dfdfce2
28 changed files with 490 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/NotificationSettings/Mocks/MockRoomNotificationSettingsService.swift → Riot/Modules/Room/NotificationSettings/Mock/MockRoomNotificationSettingsService.swift
View File
Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinator.swift
+6 -7
View File
@@ -39,14 +39,12 @@ final class RoomNotificationSettingsCoordinator: RoomNotificationSettingsCoordin
init(room: MXRoom, presentedModally: Bool = true) {
let roomNotificationService = RoomNotificationSettingsService(room: room)
let avatarService = AvatarService(avatarGenerator: AvatarGenerator(), mediaManager: room.mxSession.mediaManager)
let avatarData: AvatarInputOption?
let showAvatar = presentedModally
if #available(iOS 14.0.0, *) {
avatarData = showAvatar ? .swiftUI(AvatarInput(
mxContentUri: room.summary.avatar,
itemId: room.roomId,
matrixItemId: room.roomId,
displayName: room.summary.displayname
)) : nil
} else {
@@ -60,15 +58,16 @@ final class RoomNotificationSettingsCoordinator: RoomNotificationSettingsCoordin
let roomNotificationSettingsViewModel = RoomNotificationSettingsViewModel(
roomNotificationService: roomNotificationService,
avatarService: avatarService,
avatarData: avatarData,
displayName: room.summary.displayname,
roomEncrypted: room.summary.isEncrypted)
let viewController: UIViewController
if #available(iOS 14.0.0, *) {
let view = RoomNotificationSettingsView(viewModel: roomNotificationSettingsViewModel, presentedModally: presentedModally)
.vectorContent()
viewController = VectorHostingViewController(rootView: view)
let view = RoomNotificationSettings(viewModel: roomNotificationSettingsViewModel, presentedModally: presentedModally)
let host = VectorHostingController(rootView: view)
host.add(dependency: AvatarService(mediaManager: room.mxSession.mediaManager))
viewController = host
} else {
viewController = RoomNotificationSettingsViewController.instantiate(with: roomNotificationSettingsViewModel)
}
Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModel.swift
+8 -17
View File
@@ -27,7 +27,6 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
// MARK: Private
private let roomNotificationService: RoomNotificationSettingsServiceType
private let avatarService: AvatarServiceType
private var state: RoomNotificationSettingsViewState {
willSet {
update(viewState: newValue)
@@ -48,15 +47,20 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
init(
roomNotificationService: RoomNotificationSettingsServiceType,
avatarService: AvatarServiceType,
avatarData: AvatarInputOption?,
displayName: String?,
roomEncrypted: Bool
) {
self.roomNotificationService = roomNotificationService
self.avatarService = avatarService
let notificationState = Self.mapNotificationStateOnRead(encrypted: roomEncrypted, state: roomNotificationService.notificationState)
let initialState = RoomNotificationSettingsViewState(roomEncrypted: roomEncrypted, saving: false, notificationState: notificationState, avatar: nil)
let initialState = RoomNotificationSettingsViewState(
roomEncrypted: roomEncrypted,
saving: false,
notificationState: notificationState,
avatarData: avatarData,
displayName: displayName
)
self.state = initialState
if #available(iOS 14.0, *) {
@@ -67,19 +71,6 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
guard let self = self else { return }
self.state.notificationState = Self.mapNotificationStateOnRead(encrypted: roomEncrypted, state: state)
}
if #available(iOS 14.0, *),
let avatarData = avatarData,
case let AvatarInputOption.swiftUI(data) = avatarData {
avatarService.avatarImage(inputData: data)
.sink { image in
var newState = self.state
newState.avatar = image
newState.displayName = data.displayName
self.state = newState
}
.store(in: &cancellables)
}
}
// MARK: - Public
Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewStateType.swift
+9 -4
View File
@@ -23,9 +23,8 @@ struct RoomNotificationSettingsViewState: RoomNotificationSettingsViewStateType
let roomEncrypted: Bool
var saving: Bool
var notificationState: RoomNotificationState
var avatar: UIImage?
var avatarData: AvatarInputOption?
var displayName: String?
var legacyAvatarData: AvatarViewDataProtocol?
}
extension RoomNotificationSettingsViewState {
@@ -43,6 +42,12 @@ protocol RoomNotificationSettingsViewStateType {
var roomEncrypted: Bool { get }
var notificationOptions: [RoomNotificationState] { get }
var notificationState: RoomNotificationState { get }
var avatar: UIImage? { get }
var legacyAvatarData: AvatarViewDataProtocol? { get }
var avatarData: AvatarInputOption? { get }
var displayName: String? { get }
}
extension RoomNotificationSettingsViewState {
var roomEncryptedString: String {
roomEncrypted ? VectorL10n.roomNotifsSettingsEncryptedRoomNotice : ""
}
}
Riot/Modules/Room/NotificationSettings/RoomNotificationState.swift
+13
View File
@@ -27,3 +27,16 @@ extension RoomNotificationState: CaseIterable { }
extension RoomNotificationState: Identifiable {
var id: Int { self.rawValue }
}
extension RoomNotificationState {
var title: String {
switch self {
case .all:
return VectorL10n.roomNotifsSettingsAllMessages
case .mentionsAndKeywordsOnly:
return VectorL10n.roomNotifsSettingsMentionsAndKeywords
case .mute:
return VectorL10n.roomNotifsSettingsNone
}
}
}
Riot/Modules/Room/NotificationSettings/SwiftUI/VectorFormItemButtonStyle.swift → Riot/Modules/Room/NotificationSettings/SwiftUI/FormItemButtonStyle.swift
+1 -1
View File
@@ -18,7 +18,7 @@ import Foundation
import SwiftUI
@available(iOS 14.0, *)
struct VectorFormItemButtonStyle: ButtonStyle {
struct FormItemButtonStyle: ButtonStyle {
@Environment(\.theme) var theme: Theme
func makeBody(configuration: Self.Configuration) -> some View {
configuration.label
Riot/Modules/Room/NotificationSettings/SwiftUI/FormPickerItemView.swift → Riot/Modules/Room/NotificationSettings/SwiftUI/FormPickerItem.swift
+8 -8
View File
@@ -17,19 +17,19 @@
import SwiftUI
@available(iOS 14.0, *)
struct FormPickerItemView: View {
struct FormPickerItem: View {
typealias ClickCallback = () -> Void
typealias TapCallback = () -> Void
@Environment(\.theme) var theme: Theme
var title: String
var selected: Bool
var onClick: ClickCallback?
var onTap: TapCallback?
var body: some View {
Button {
onClick?()
onTap?()
} label: {
VStack {
Spacer()
@@ -47,20 +47,20 @@ struct FormPickerItemView: View {
}
.padding(.leading)
}
.buttonStyle(VectorFormItemButtonStyle())
.buttonStyle(FormItemButtonStyle())
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, idealHeight: 44, alignment: .leading)
.fixedSize(horizontal: false, vertical: true)
}
}
@available(iOS 14.0, *)
struct FormPickerCell_Previews: PreviewProvider {
struct FormPickerItem_Previews: PreviewProvider {
static let items = ["Item 1", "Item 2", "Item 3"]
static var selected: String = items[0]
static var previews: some View {
VectorFormView {
VectorForm {
ForEach(items, id: \.self) { item in
FormPickerItemView(title: item, selected: selected == item)
FormPickerItem(title: item, selected: selected == item)
}
}
}
Riot/Modules/Room/NotificationSettings/SwiftUI/FormSectionFooterView.swift → Riot/Modules/Room/NotificationSettings/SwiftUI/FormSectionFooter.swift
+6 -6
View File
@@ -17,7 +17,7 @@
import SwiftUI
@available(iOS 14.0, *)
struct FormSectionFooterView: View {
struct FormSectionFooter: View {
@Environment(\.theme) var theme: Theme
var text: String
@@ -35,11 +35,11 @@ struct FormSectionFooterView: View {
@available(iOS 14.0, *)
struct FormSectionFooter_Previews: PreviewProvider {
static var previews: some View {
VectorFormView {
SwiftUI.Section(footer: FormSectionFooterView(text: "Please note that mentions & keyword notifications are not available in encrypted rooms on mobile.")) {
FormPickerItemView(title: "Item 1", selected: false)
FormPickerItemView(title: "Item 2", selected: false)
FormPickerItemView(title: "Item 3", selected: false)
VectorForm {
SwiftUI.Section(footer: FormSectionFooter(text: "Please note that mentions & keyword notifications are not available in encrypted rooms on mobile.")) {
FormPickerItem(title: "Item 1", selected: false)
FormPickerItem(title: "Item 2", selected: false)
FormPickerItem(title: "Item 3", selected: false)
}
}
}
Riot/Modules/Room/NotificationSettings/SwiftUI/FormSectionHeaderView.swift → Riot/Modules/Room/NotificationSettings/SwiftUI/FormSectionHeader.swift
+7 -6
View File
@@ -17,7 +17,7 @@
import SwiftUI
@available(iOS 14.0, *)
struct FormSectionHeaderView: View {
struct FormSectionHeader: View {
@Environment(\.theme) var theme: Theme
var text: String
@@ -30,17 +30,18 @@ struct FormSectionHeaderView: View {
.padding(.bottom, 8)
.font(Font(theme.fonts.subheadline))
.textCase(.uppercase)
.frame(maxWidth: .infinity, alignment: .leading)
}
}
@available(iOS 14.0, *)
struct FormSectionHeader_Previews: PreviewProvider {
static var previews: some View {
VectorFormView {
SwiftUI.Section(header: FormSectionHeaderView(text: "Section Header")) {
FormPickerItemView(title: "Item 1", selected: false)
FormPickerItemView(title: "Item 2", selected: false)
FormPickerItemView(title: "Item 3", selected: false)
VectorForm {
SwiftUI.Section(header: FormSectionHeader(text: "Section Header")) {
FormPickerItem(title: "Item 1", selected: false)
FormPickerItem(title: "Item 2", selected: false)
FormPickerItem(title: "Item 3", selected: false)
}
}
}
Riot/Modules/Room/NotificationSettings/SwiftUI/RoomNotificationSettingsView.swift → Riot/Modules/Room/NotificationSettings/SwiftUI/RoomNotificationSettings.swift
+30 -42
View File
@@ -1,4 +1,4 @@
//
//
// Copyright 2021 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
import SwiftUI
@available(iOS 14.0.0, *)
struct RoomNotificationSettingsView: View {
struct RoomNotificationSettings: View {
@Environment(\.theme) var theme: Theme
@ObservedObject var viewModel: RoomNotificationSettingsViewModel
@@ -32,7 +32,8 @@ struct RoomNotificationSettingsView: View {
}
}
}
@ViewBuilder
private var rightButton: some View {
Button(VectorL10n.save) {
viewModel.process(viewAction: .save)
@@ -40,70 +41,57 @@ struct RoomNotificationSettingsView: View {
}
var body: some View {
VectorFormView {
if let image = viewModel.viewState.avatar {
RoomNotificationSettingsHeaderView(image: image, displayName: viewModel.viewState.displayName)
VectorForm {
if case let .swiftUI(avatarData) = viewModel.viewState.avatarData {
RoomNotificationSettingsHeader(
avatarData: avatarData,
displayName: viewModel.viewState.displayName
)
}
SwiftUI.Section(
header: FormSectionHeaderView(text: VectorL10n.roomNotifsSettingsNotifyMeFor),
footer: FormSectionFooterView(text: viewModel.viewState.roomEncryptedString)
header: FormSectionHeader(text: VectorL10n.roomNotifsSettingsNotifyMeFor),
footer: FormSectionFooter(text: viewModel.viewState.roomEncryptedString)
) {
ForEach(viewModel.viewState.notificationOptions) { option in
FormPickerItemView(title: option.title, selected: viewModel.viewState.notificationState == option) {
FormPickerItem(title: option.title, selected: viewModel.viewState.notificationState == option) {
viewModel.process(viewAction: .selectNotificationState(option))
}
}
}
.navigationBarTitle(VectorL10n.roomDetailsNotifs)
.navigationBarItems(
leading: leftButton,
trailing: rightButton
)
.onAppear {
viewModel.process(viewAction: .load)
}
}
.navigationBarTitle(VectorL10n.roomDetailsNotifs)
.navigationBarItems(
leading: leftButton,
trailing: rightButton
).onAppear {
viewModel.process(viewAction: .load)
}
}
}
fileprivate extension RoomNotificationState {
var title: String {
switch self {
case .all:
return VectorL10n.roomNotifsSettingsAllMessages
case .mentionsAndKeywordsOnly:
return VectorL10n.roomNotifsSettingsMentionsAndKeywords
case .mute:
return VectorL10n.roomNotifsSettingsNone
}
}
}
fileprivate extension RoomNotificationSettingsViewState {
var roomEncryptedString: String {
roomEncrypted ? VectorL10n.roomNotifsSettingsEncryptedRoomNotice : ""
}
}
@available(iOS 14.0, *)
struct RoomNotificationSettingsView_Previews: PreviewProvider {
struct RoomNotificationSettings_Previews: PreviewProvider {
static let mockViewModel = RoomNotificationSettingsViewModel(
roomNotificationService: MockRoomNotificationSettingsService.example,
avatarService: MockAvatarService.example,
avatarData: .swiftUI(AvatarInput(mxContentUri: nil, itemId: "", displayName: "Alice")),
avatarData: .swiftUI(MockAvatarInput.example),
displayName: MockAvatarInput.example.displayName,
roomEncrypted: true
)
static var previews: some View {
Group {
NavigationView {
RoomNotificationSettingsView(viewModel: mockViewModel, presentedModally: true)
RoomNotificationSettings(viewModel: mockViewModel, presentedModally: true)
.navigationBarTitleDisplayMode(.inline)
.addDependency(MockAvatarService.example)
}
NavigationView {
RoomNotificationSettingsView(viewModel: mockViewModel, presentedModally: true)
RoomNotificationSettings(viewModel: mockViewModel, presentedModally: true)
.navigationBarTitleDisplayMode(.inline)
.theme(ThemeIdentifier.dark.theme)
.addDependency(MockAvatarService.example)
}
}
}
Riot/Modules/Room/NotificationSettings/SwiftUI/RoomNotificationSettingsHeaderView.swift → Riot/Modules/Room/NotificationSettings/SwiftUI/RoomNotificationSettingsHeader.swift
+6 -5
View File
@@ -17,17 +17,17 @@
import SwiftUI
@available(iOS 14.0, *)
struct RoomNotificationSettingsHeaderView: View {
struct RoomNotificationSettingsHeader: View {
@Environment(\.theme) var theme: Theme
var image: UIImage
var avatarData: AvatarInputType
var displayName: String?
var body: some View {
HStack {
Spacer()
VStack(alignment: .center) {
VectorAvatarView(image: image, size: .xxLarge)
AvatarImage(avatarData: avatarData, size: .xxLarge)
if let displayName = displayName {
Text(displayName)
.font(Font(theme.fonts.title3SB))
@@ -43,10 +43,11 @@ struct RoomNotificationSettingsHeaderView: View {
}
@available(iOS 14.0, *)
struct RoomNotificationSettingsHeaderView_Previews: PreviewProvider {
struct RoomNotificationSettingsHeader_Previews: PreviewProvider {
static let image = UIImage(imageLiteralResourceName: "app_symbol")
static let name = "Element"
static var previews: some View {
RoomNotificationSettingsHeaderView(image: image, displayName: name)
RoomNotificationSettingsHeader(avatarData: MockAvatarInput.example, displayName: name)
.addDependency(MockAvatarService.example)
}
}
Riot/Modules/Room/NotificationSettings/SwiftUI/VectorAvatarView.swift
-44
View File
@@ -1,44 +0,0 @@
//
// Copyright 2021 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import SwiftUI
import DesignKit
@available(iOS 14.0, *)
struct VectorAvatarView: View {
var image: UIImage
var size: AvatarSize
var body: some View {
Image(uiImage: image)
.resizable()
.frame(width: CGFloat(size.rawValue), height: CGFloat(size.rawValue), alignment: .center)
.clipShape(Circle())
}
}
@available(iOS 14.0, *)
struct AvatarView_Previews: PreviewProvider {
static let image = UIImage(imageLiteralResourceName: "app_symbol")
static var previews: some View {
VStack {
VectorAvatarView(image: image, size: .xSmall)
VectorAvatarView(image: image, size: .medium)
VectorAvatarView(image: image, size: .xLarge)
}
}
}
Riot/Modules/Room/NotificationSettings/SwiftUI/VectorFormView.swift → Riot/Modules/Room/NotificationSettings/SwiftUI/VectorForm.swift
+8 -8
View File
@@ -17,7 +17,7 @@
import SwiftUI
@available(iOS 14.0, *)
struct VectorFormView<Content: View>: View {
struct VectorForm<Content: View>: View {
@Environment(\.theme) var theme: Theme
var content: () -> Content
@@ -48,15 +48,15 @@ struct VectorForm_Previews: PreviewProvider {
static var previews: some View {
Group {
VectorFormView {
SwiftUI.Section(header: FormSectionHeaderView(text: "Section Header")) {
FormPickerItemView(title: "Item 1", selected: true)
FormPickerItemView(title: "Item 2", selected: false)
FormPickerItemView(title: "Item 3", selected: false)
VectorForm {
SwiftUI.Section(header: FormSectionHeader(text: "Section Header")) {
FormPickerItem(title: "Item 1", selected: true)
FormPickerItem(title: "Item 2", selected: false)
FormPickerItem(title: "Item 3", selected: false)
}
}
VectorFormView {
FormPickerItemView(title: "Item 1", selected: true)
VectorForm {
FormPickerItem(title: "Item 1", selected: true)
}.theme(ThemeIdentifier.dark.theme)
}
}
Riot/Modules/Room/NotificationSettings/UIKit/RoomNotificationSettingsViewController.swift
+1 -1
View File
@@ -144,7 +144,7 @@ final class RoomNotificationSettingsViewController: UIViewController {
activityPresenter.removeCurrentActivityIndicator(animated: true)
}
self.viewState = viewState
if let avatarData = viewState.legacyAvatarData {
if case let .uiKit(avatarData) = viewState.avatarData {
mainTableView.tableHeaderView = avatarView
avatarView.configure(viewData: avatarData)
avatarView.update(theme: theme)
Riot/Modules/Room/NotificationSettings/UIKit/RoomNotificationsSettingsCell.swift
-13
View File
@@ -41,16 +41,3 @@ extension RoomNotificationSettingsCell: Themable {
selectedBackgroundView?.backgroundColor = theme.selectedBackgroundColor
}
}
fileprivate extension RoomNotificationState {
var title: String {
switch self {
case .all:
return VectorL10n.roomNotifsSettingsAllMessages
case .mentionsAndKeywordsOnly:
return VectorL10n.roomNotifsSettingsMentionsAndKeywords
case .mute:
return VectorL10n.roomNotifsSettingsNone
}
}
}