mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
268d6c8ead
* Store the notifications switch per account Adds AccountSettings.enableNotifications and moves the app-wide value into the signed in accounts before they're restored: the first account takes it out of the app settings and the others get the same switch, so someone who turned notifications off keeps them off. * Add a notification service to every user session Each account's NotificationService sets its pusher when its notifications are on and deletes it when they're off (appending with multiple accounts), keeps the account's unread count and decides which of its delivered notifications to clear. It asks the NotificationManager, the only owner of the notification center, through actions: remove the notifications matching a rule, request authorization and the unread count. The UserSessionManager connects every live session's service to the manager, and flows and screens use the session's service instead of the manager, which leaves the flow parameters. * Route notifications by account Taps only open rooms of the active account for now, a tap made while restoring only opens once its account is the active one, replies are sent from the account they were made for, and signing out only clears that account's notifications unless it was the last one. The notification extension hides pushes for an account that signed out while other accounts are still signed in. * Turn notifications on and off for each account The notification settings switch is now saved per account, and each account's NotificationService sets or deletes its pusher when it changes, asking for permission when it's turned on. * Apply review suggestions to multi-account notifications Migration - Move the notifications switch with a single per-account migration, like 26.10.1 and 26.10.2, and drop its dedicated test. Notification manager and service - Follow each account's badge count publisher directly, removing the badge count action and the stored counts. - Only reset the badge and unregister from APNs when the last account signs out, as each account already clears its own notifications. - Set up the service's subscriptions in a single setupSubscriptions(). - Rename switchChanged(to:) to enableNotificationsChanged(to:) and pusherConfiguration(identifiers:) to pusherConfiguration(for:). - Build the service without hopping to the main actor, it already runs there. Notification service extension - Check the account's switch in NotificationHandler using the session's settings, and log an error when a push arrives for an account that's turned off. - Always show pushes that match no signed-in account and log an error, so a broken setup stays visible. Other - Store a pending inline reply in a PendingInlineReplyDetails struct. - Assign the chats tab badge with weakAssign. - Make PusherConfiguration Equatable so the pusher test checks it in one expectation. - Clarify the comment about notifications without a receiver. * Print instead of logging before the app hooks run in the NSE A push that matches no signed-in account goes back to printing, as MXLog shouldn't be used before the app hooks have run. The push is still shown so a broken setup stays visible.
282 lines
11 KiB
Swift
282 lines
11 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2024-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import Combine
|
|
import Compound
|
|
import SwiftUI
|
|
|
|
struct HomeScreenInviteCell: View {
|
|
@Environment(\.dynamicTypeSize) var dynamicTypeSize
|
|
|
|
let room: HomeScreenRoom
|
|
let context: HomeScreenViewModel.Context
|
|
let hideInviteAvatars: Bool
|
|
|
|
private var avatar: RoomAvatar {
|
|
// DM invites avatars are broken, this is a workaround
|
|
// https://github.com/matrix-org/matrix-rust-sdk/issues/4825
|
|
if room.isDirect, let inviter = room.inviter {
|
|
.heroes([.init(userID: inviter.id, displayName: inviter.displayName, avatarURL: hideInviteAvatars ? nil : inviter.avatarURL)])
|
|
} else {
|
|
hideInviteAvatars ? room.avatar.removingAvatar : room.avatar
|
|
}
|
|
}
|
|
|
|
var body: some View {
|
|
HStack(alignment: .top, spacing: 16) {
|
|
if dynamicTypeSize < .accessibility3 {
|
|
RoomAvatarImage(avatar: avatar,
|
|
avatarSize: .custom(52),
|
|
mediaProvider: context.mediaProvider)
|
|
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
|
|
.accessibilityHidden(true)
|
|
}
|
|
|
|
mainContent
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
.padding(.bottom, 16)
|
|
.padding(.trailing, 16)
|
|
.multilineTextAlignment(.leading)
|
|
.overlay(alignment: .bottom) {
|
|
separator
|
|
}
|
|
}
|
|
.padding(.top, 12)
|
|
.padding(.leading, 16)
|
|
.onTapGesture {
|
|
if let roomID = room.roomID {
|
|
context.send(viewAction: .selectRoom(roomIdentifier: roomID))
|
|
}
|
|
}
|
|
.accessibilityIdentifier(A11yIdentifiers.homeScreen.roomName(room.name))
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private var mainContent: some View {
|
|
VStack(alignment: .leading, spacing: 14) {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
HStack(alignment: .firstTextBaseline, spacing: 16) {
|
|
textualContent
|
|
badge
|
|
}
|
|
|
|
inviterView
|
|
.padding(.top, 6)
|
|
.padding(.trailing, 16)
|
|
}
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
.accessibilityElement(children: .combine)
|
|
|
|
ViewThatFits {
|
|
HStack(spacing: 12) { buttons }
|
|
VStack(spacing: 16) { Group(subviews: buttons) { ForEach($0.reversed()) { $0 } } }
|
|
}
|
|
.padding(.trailing, 22)
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var inviterView: some View {
|
|
if let inviter = room.inviter,
|
|
!room.isDirect {
|
|
RoomInviterLabel(inviter: inviter,
|
|
shouldHideAvatar: hideInviteAvatars,
|
|
mediaProvider: context.mediaProvider)
|
|
.font(.compound.bodyMD)
|
|
.foregroundStyle(.compound.textSecondary)
|
|
}
|
|
}
|
|
|
|
private var textualContent: some View {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
Text(title)
|
|
.font(.compound.bodyLGSemibold)
|
|
.foregroundColor(.compound.textPrimary)
|
|
.lineLimit(2)
|
|
|
|
if let subtitle {
|
|
Text(subtitle)
|
|
.font(.compound.bodyMD)
|
|
.foregroundColor(.compound.textSecondary)
|
|
}
|
|
}
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var buttons: some View {
|
|
Button {
|
|
context.send(viewAction: .declineInvite(roomIdentifier: room.id))
|
|
} label: {
|
|
Text(L10n.actionDecline)
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
.buttonStyle(.compound(.secondary, size: .medium))
|
|
|
|
Button {
|
|
context.send(viewAction: .acceptInvite(roomIdentifier: room.id))
|
|
} label: {
|
|
Text(L10n.actionAccept)
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
.buttonStyle(.compound(.primary, size: .medium))
|
|
}
|
|
|
|
private var separator: some View {
|
|
Rectangle()
|
|
.fill(Color.compound.borderDisabled)
|
|
.frame(height: 1 / UIScreen.main.scale)
|
|
}
|
|
|
|
private var title: String {
|
|
room.name
|
|
}
|
|
|
|
private var subtitle: String? {
|
|
room.isDirect ? room.inviter?.id : nil
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var badge: some View {
|
|
if room.badges.isDotShown {
|
|
Circle()
|
|
.scaledFrame(size: 12)
|
|
.foregroundColor(.compound.iconAccentPrimary) // The badge is always green, no need to check isHighlighted here.
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
import MatrixRustSDKMocks
|
|
|
|
struct HomeScreenInviteCell_Previews: PreviewProvider, TestablePreview {
|
|
static var previews: some View {
|
|
VStack(spacing: 0) {
|
|
HomeScreenInviteCell(room: .dmInvite,
|
|
context: makeViewModel().context,
|
|
hideInviteAvatars: false)
|
|
|
|
HomeScreenInviteCell(room: .invite(),
|
|
context: makeViewModel().context,
|
|
hideInviteAvatars: false)
|
|
|
|
HomeScreenInviteCell(room: .invite(alias: "#footest:somewhere.org",
|
|
avatarURL: .mockMXCAvatar),
|
|
context: makeViewModel().context,
|
|
hideInviteAvatars: false)
|
|
|
|
// Not the final design, may get its own cell type entirely.
|
|
HomeScreenInviteCell(room: .invite(name: "Awesome Space",
|
|
isSpace: true,
|
|
alias: "#footest:somewhere.org",
|
|
avatarURL: .mockMXCAvatar),
|
|
context: makeViewModel().context,
|
|
hideInviteAvatars: false)
|
|
|
|
HomeScreenInviteCell(room: .invite(name: "Hidden Avatars",
|
|
avatarURL: .mockMXCAvatar),
|
|
context: makeViewModel().context,
|
|
hideInviteAvatars: true)
|
|
|
|
HomeScreenInviteCell(room: .invite(alias: "#footest:somewhere.org"),
|
|
context: makeViewModel().context,
|
|
hideInviteAvatars: false)
|
|
.dynamicTypeSize(.accessibility1)
|
|
.previewDisplayName("Aliased room (AX1)")
|
|
}
|
|
.previewLayout(.sizeThatFits)
|
|
}
|
|
|
|
static func makeViewModel() -> HomeScreenViewModel {
|
|
let clientProxy = ClientProxyMock(.init())
|
|
|
|
let userSession = UserSessionMock(.init(clientProxy: clientProxy))
|
|
|
|
return HomeScreenViewModel(userSession: userSession,
|
|
availableSessionsPublisher: .init([.init(userSession: userSession)]),
|
|
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
|
|
analyticsService: AnalyticsServiceMock(.init()),
|
|
bugReportService: BugReportServiceMock(.init()),
|
|
userIndicatorController: UserIndicatorControllerMock())
|
|
}
|
|
}
|
|
|
|
private extension HomeScreenRoom {
|
|
static var dmInvite: HomeScreenRoom {
|
|
let inviter = RoomMemberProxyMock()
|
|
inviter.displayName = "Some Guy"
|
|
inviter.userID = "@someone:somewhere.com"
|
|
|
|
let summary = RoomSummary(room: RoomSDKMock(),
|
|
id: "@someone:somewhere.com",
|
|
joinRequestType: .invite(inviter: inviter),
|
|
isJoined: false,
|
|
name: "Some Guy",
|
|
isDirect: true,
|
|
isSpace: false,
|
|
avatarURL: nil,
|
|
heroes: [.init(userID: "@someone:somewhere.com")],
|
|
activeMembersCount: 0,
|
|
lastMessage: nil,
|
|
lastMessageDate: nil,
|
|
lastMessageState: nil,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: nil,
|
|
canonicalAlias: "#footest:somewhere.org",
|
|
alternativeAliases: [],
|
|
hasOngoingCall: false,
|
|
activeCallIntent: nil,
|
|
isMarkedUnread: false,
|
|
isFavourite: false,
|
|
isTombstoned: false)
|
|
|
|
return .init(summary: summary)
|
|
}
|
|
|
|
static func invite(name: String = "Awesome Room",
|
|
isSpace: Bool = false,
|
|
alias: String? = nil,
|
|
avatarURL: URL? = nil) -> HomeScreenRoom {
|
|
let inviter = RoomMemberProxyMock()
|
|
inviter.displayName = "Luca"
|
|
inviter.userID = "@jack:somewhi.nl"
|
|
inviter.avatarURL = avatarURL.map { _ in .mockMXCUserAvatar }
|
|
|
|
let summary = RoomSummary(room: RoomSDKMock(),
|
|
id: "@someone:somewhere.com",
|
|
joinRequestType: .invite(inviter: inviter),
|
|
isJoined: false,
|
|
name: name,
|
|
isDirect: false,
|
|
isSpace: isSpace,
|
|
avatarURL: avatarURL,
|
|
heroes: [.init(userID: "@someone:somewhere.com")],
|
|
activeMembersCount: 0,
|
|
lastMessage: nil,
|
|
lastMessageDate: nil,
|
|
lastMessageState: nil,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: nil,
|
|
canonicalAlias: alias,
|
|
alternativeAliases: [],
|
|
hasOngoingCall: false,
|
|
activeCallIntent: nil,
|
|
isMarkedUnread: false,
|
|
isFavourite: false,
|
|
isTombstoned: false)
|
|
|
|
return .init(summary: summary)
|
|
}
|
|
}
|