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

Cleanup from comments

Browse Source
This commit is contained in:
David Langley
2021-08-12 16:57:19 +01:00
parent 77144980e3
commit 82b0361647
9 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsCoordinator.swift
+5 -4
View File
@@ -44,10 +44,11 @@ final class RoomNotificationSettingsCoordinator: RoomNotificationSettingsCoordin
let avatarData: AvatarInputOption?
let showAvatar = presentedModally
if #available(iOS 14.0.0, *) {
avatarData = showAvatar ? .swiftUI(AvatarInput(mxContentUri: room.summary.avatar,
itemId: room.roomId,
displayName: room.summary.displayname
)) : nil
avatarData = showAvatar ? .swiftUI(AvatarInput(
mxContentUri: room.summary.avatar,
itemId: room.roomId,
displayName: room.summary.displayname
)) : nil
} else {
avatarData = showAvatar ? .uiKit(RoomAvatarViewData(
roomId: room.roomId,
Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModel.swift
+3 -3
View File
@@ -36,7 +36,7 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
@available(iOS 14.0, *)
@Published var viewState: RoomNotificationSettingsViewState!
@available(iOS 14.0, *)
lazy var bag = Set<AnyCancellable>()
lazy var cancelables = Set<AnyCancellable>()
// MARK: Public
@@ -72,13 +72,13 @@ final class RoomNotificationSettingsViewModel: RoomNotificationSettingsViewModel
let avatarData = avatarData,
case let AvatarInputOption.swiftUI(data) = avatarData {
avatarService.avatarImage(inputData: data)
.sink{ image in
.sink { image in
var newState = self.state
newState.avatar = image
newState.displayName = data.displayName
self.state = newState
}
.store(in: &bag)
.store(in: &cancelables)
}
}
Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsViewModelType.swift
-1
View File
@@ -17,7 +17,6 @@
*/
import Foundation
import SwiftUI
protocol RoomNotificationSettingsViewModelViewDelegate: AnyObject {
func roomNotificationSettingsViewModel(_ viewModel: RoomNotificationSettingsViewModelType, didUpdateViewState viewState: RoomNotificationSettingsViewStateType)
Riot/Modules/Room/NotificationSettings/SwiftUI/FormSectionHeaderView.swift
-1
View File
@@ -29,7 +29,6 @@ struct FormSectionHeaderView: View {
.padding(.leading)
.padding(.bottom, 8)
.font(Font(theme.fonts.footnote))
.autocapitalization(.allCharacters)
.textCase(.uppercase)
}
}
Riot/Modules/Room/NotificationSettings/SwiftUI/RoomNotificationSettingsView.swift
+1 -1
View File
@@ -27,7 +27,7 @@ struct RoomNotificationSettingsView: View {
@ViewBuilder
private var leftButton: some View {
if presentedModally {
SwiftUI.Button(VectorL10n.cancel) {
Button(VectorL10n.cancel) {
viewModel.process(viewAction: .cancel)
}
}