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.
154 lines
5.9 KiB
Swift
154 lines
5.9 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2023-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
|
|
|
|
/// The view shown when the user isn't part of any rooms.
|
|
struct HomeScreenEmptyStateView: View {
|
|
let context: HomeScreenViewModel.Context
|
|
|
|
var body: some View {
|
|
VStack(spacing: 2) {
|
|
Text(L10n.screenRoomlistEmptyTitle)
|
|
.font(.compound.bodyLG)
|
|
.foregroundColor(.compound.textSecondary)
|
|
.multilineTextAlignment(.center)
|
|
|
|
Text(L10n.screenRoomlistEmptyMessage)
|
|
.font(.compound.bodyLG)
|
|
.foregroundColor(.compound.textSecondary)
|
|
.multilineTextAlignment(.center)
|
|
.padding(.bottom, 16)
|
|
|
|
Button { context.send(viewAction: .startChat) } label: {
|
|
Label(L10n.actionStartChat, icon: \.chat)
|
|
.font(.compound.bodyLGSemibold)
|
|
.foregroundColor(.compound.textOnSolidPrimary)
|
|
.padding(.vertical, 6)
|
|
.padding(.horizontal, 8)
|
|
}
|
|
.buttonStyle(.borderedProminent)
|
|
.buttonBorderShape(.capsule)
|
|
}
|
|
.padding(16)
|
|
}
|
|
}
|
|
|
|
/// A custom layout for the empty state which will show it centrally with the
|
|
/// session verification banner and invites button stacked at the top.
|
|
struct HomeScreenEmptyStateLayout: Layout {
|
|
/// The vertical spacing between views in the layout.
|
|
var spacing: CGFloat = 8
|
|
/// The minimum height of the layout. This should be the height of the scroll view.
|
|
var minHeight: CGFloat = 0
|
|
|
|
func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) -> CGSize {
|
|
// We keep the proposed width and replace the height with the minimum specified,
|
|
// or the total height of the subviews if it exceeds the minimum height.
|
|
let width = proposal.width ?? .greatestFiniteMagnitude
|
|
var height: CGFloat = spacing * CGFloat(max(0, subviews.count - 1))
|
|
|
|
for subview in subviews {
|
|
let size = subview.sizeThatFits(proposal)
|
|
height += size.height
|
|
}
|
|
|
|
return CGSize(width: width, height: max(minHeight, height))
|
|
}
|
|
|
|
func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) {
|
|
let mainView = subviews.first { $0.priority > 0 }
|
|
let topViews = subviews.filter { $0 != mainView }
|
|
|
|
var y: CGFloat = bounds.minY
|
|
|
|
// Place all the top views in a vertical stack, centering horizontally.
|
|
for view in topViews {
|
|
let size = view.sizeThatFits(proposal)
|
|
let x = (bounds.width - size.width) / 2
|
|
view.place(at: CGPoint(x: x, y: y), proposal: proposal)
|
|
y += size.height + spacing
|
|
}
|
|
|
|
// Place the main view in the center if there is space, otherwise add it to the stack.
|
|
guard let mainView else { return }
|
|
|
|
let mainViewSize = mainView.sizeThatFits(proposal)
|
|
if (y + mainViewSize.height / 2) < bounds.height / 2 {
|
|
let center = CGPoint(x: bounds.midX, y: bounds.midY)
|
|
mainView.place(at: center, anchor: .center, proposal: proposal)
|
|
} else {
|
|
let x = (bounds.width - mainViewSize.width) / 2
|
|
mainView.place(at: CGPoint(x: x, y: y), proposal: proposal)
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
struct HomeScreenEmptyStateView_Previews: PreviewProvider, TestablePreview {
|
|
static var previews: some View {
|
|
HomeScreenEmptyStateView(context: viewModel.context)
|
|
.previewDisplayName("View")
|
|
|
|
GeometryReader { geometry in
|
|
ScrollView {
|
|
HomeScreenEmptyStateLayout(minHeight: geometry.size.height) {
|
|
banner
|
|
|
|
HomeScreenEmptyStateView(context: viewModel.context)
|
|
.layoutPriority(1)
|
|
}
|
|
}
|
|
}
|
|
.previewDisplayName("Normal Layout")
|
|
|
|
GeometryReader { geometry in
|
|
ScrollView {
|
|
HomeScreenEmptyStateLayout(minHeight: geometry.size.height) {
|
|
banner
|
|
banner
|
|
banner
|
|
|
|
HomeScreenEmptyStateView(context: viewModel.context)
|
|
.layoutPriority(1)
|
|
}
|
|
}
|
|
}
|
|
.previewDisplayName("Constrained layout")
|
|
}
|
|
|
|
// MARK: -
|
|
|
|
static var banner: some View {
|
|
Text("This is a title that is very long")
|
|
.font(.compound.headingXLBold)
|
|
.multilineTextAlignment(.center)
|
|
.frame(maxWidth: .infinity)
|
|
.padding()
|
|
.background {
|
|
RoundedRectangle(cornerRadius: 20)
|
|
.fill(Color.compound.bgSubtleSecondary)
|
|
}
|
|
.padding()
|
|
}
|
|
|
|
static let viewModel = {
|
|
let userSession = UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userID: "@user:example.com",
|
|
roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded([])))))))
|
|
return HomeScreenViewModel(userSession: userSession,
|
|
availableSessionsPublisher: .init([.init(userSession: userSession)]),
|
|
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
|
|
analyticsService: AnalyticsServiceMock(.init()),
|
|
bugReportService: BugReportServiceMock(.init()),
|
|
userIndicatorController: UserIndicatorControllerMock())
|
|
}()
|
|
}
|