mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-21 17:12:45 +02:00
b298dedc22
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19 * commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1': finish version++ version++ comments update submodule remove obsolete tests removed unused code update submodule fix Libolm removal update license macro update license Prepare for new sprint # Conflicts: # Config/AppVersion.xcconfig # IDETemplateMacros.plist # LICENSE # README.md # Riot/Categories/MXSession+Riot.m # Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift # Riot/Managers/KeyValueStorage/Extensions/Keychain.swift # Riot/Managers/KeyValueStorage/KeyValueStore.swift # Riot/Managers/KeyValueStorage/KeychainStore.swift # Riot/Managers/KeyValueStorage/MemoryStore.swift # Riot/Managers/PushNotification/PushNotificationService.m # Riot/Managers/Settings/RiotSettings.swift # Riot/Managers/Settings/Shared/RiotSharedSettings.swift # Riot/Modules/Analytics/AnalyticsUIElement.swift # Riot/Modules/Application/AppCoordinator.swift # Riot/Modules/Application/LegacyAppDelegate.h # Riot/Modules/Application/LegacyAppDelegate.m # Riot/Modules/Authentication/Legacy/AuthenticationViewController.h # Riot/Modules/Authentication/Legacy/AuthenticationViewController.m # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Common/WebViewController/WebViewViewController.m # Riot/Modules/Contacts/Details/ContactDetailsViewController.m # Riot/Modules/Contacts/Views/ContactTableViewCell.m # Riot/Modules/Favorites/FavouritesViewController.h # Riot/Modules/Favorites/FavouritesViewController.m # Riot/Modules/GlobalSearch/UnifiedSearchViewController.m # Riot/Modules/People/PeopleViewController.h # Riot/Modules/People/PeopleViewController.m # Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift # Riot/Modules/Room/DataSources/RoomDataSource.m # Riot/Modules/Room/Files/RoomFilesViewController.m # Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.m # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift # Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h # Riot/Modules/Rooms/RoomsViewController.h # Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift # Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift # Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift # Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift # Riot/Modules/SetPinCode/PinCodePreferences.swift # Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift # Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m # Riot/Modules/Settings/Security/SecurityViewController.m # Riot/Modules/Settings/SettingsViewController.m # Riot/Modules/SplitView/SplitViewCoordinator.swift # Riot/Modules/SplitView/SplitViewCoordinatorType.swift # Riot/Modules/StartChat/StartChatViewController.m # Riot/Modules/TabBar/MasterTabBarController.h # Riot/Modules/TabBar/MasterTabBarController.m # Riot/Utils/EventFormatter.m # Riot/Utils/HTMLFormatter.swift # Riot/Utils/Tools.m # RiotNSE/NotificationService.swift
184 lines
7.6 KiB
Swift
184 lines
7.6 KiB
Swift
//
|
|
// Copyright 2022-2024 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
// Please see LICENSE in the repository root for full details.
|
|
//
|
|
|
|
import DesignKit
|
|
import SwiftUI
|
|
|
|
struct UserSessionCardView: View {
|
|
@Environment(\.theme) var theme: ThemeSwiftUI
|
|
|
|
var viewData: UserSessionCardViewData
|
|
|
|
var onVerifyAction: ((String) -> Void)?
|
|
var onViewDetailsAction: ((String) -> Void)?
|
|
var onLearnMoreAction: (() -> Void)?
|
|
|
|
private var backgroundShape: RoundedRectangle {
|
|
RoundedRectangle(cornerRadius: 8)
|
|
}
|
|
|
|
enum DisplayMode {
|
|
case compact
|
|
case extended
|
|
}
|
|
|
|
let showLocationInformations: Bool
|
|
let displayMode: DisplayMode
|
|
|
|
private var showExtraInformations: Bool {
|
|
displayMode == .extended && (viewData.lastActivityDateString.isEmptyOrNil == false || ipText.isEmptyOrNil == false)
|
|
}
|
|
|
|
var body: some View {
|
|
VStack(alignment: .center, spacing: 12) {
|
|
DeviceAvatarView(viewData: viewData.deviceAvatarViewData, isSelected: false, showVerificationBadge: false)
|
|
.accessibilityHidden(true)
|
|
|
|
Text(viewData.sessionName)
|
|
.font(theme.fonts.headline)
|
|
.foregroundColor(theme.colors.primaryContent)
|
|
.multilineTextAlignment(.center)
|
|
|
|
Label {
|
|
Text(viewData.verificationStatusText)
|
|
.font(theme.fonts.subheadline)
|
|
.foregroundColor(theme.colors[keyPath: viewData.verificationStatusColor])
|
|
.multilineTextAlignment(.center)
|
|
} icon: {
|
|
Image(viewData.verificationStatusImageName)
|
|
.resizable()
|
|
.frame(width: 16, height: 16)
|
|
}
|
|
|
|
InlineTextButton(viewData.verificationStatusAdditionalInfoText, tappableText: VectorL10n.userSessionLearnMore, alwaysCallAction: false) {
|
|
onLearnMoreAction?()
|
|
}
|
|
.font(theme.fonts.footnote)
|
|
.foregroundColor(theme.colors.secondaryContent)
|
|
.multilineTextAlignment(.center)
|
|
|
|
if showExtraInformations {
|
|
VStack(spacing: 2) {
|
|
HStack {
|
|
if let lastActivityIcon = viewData.lastActivityIcon {
|
|
Image(lastActivityIcon)
|
|
.padding(.leading, 2)
|
|
}
|
|
if let lastActivityDateString = viewData.lastActivityDateString, lastActivityDateString.isEmpty == false {
|
|
Text(lastActivityDateString)
|
|
.font(theme.fonts.footnote)
|
|
.foregroundColor(theme.colors.secondaryContent)
|
|
.multilineTextAlignment(.center)
|
|
}
|
|
}
|
|
if showLocationInformations, let ipText = ipText {
|
|
Text(ipText)
|
|
.font(theme.fonts.footnote)
|
|
.foregroundColor(theme.colors.secondaryContent)
|
|
.multilineTextAlignment(.center)
|
|
}
|
|
}
|
|
}
|
|
|
|
if viewData.verificationState == .unverified {
|
|
Button {
|
|
onVerifyAction?(viewData.sessionId)
|
|
} label: {
|
|
Text(VectorL10n.userSessionVerifyAction)
|
|
.font(theme.fonts.body)
|
|
.foregroundColor(.white)
|
|
}
|
|
.buttonStyle(PrimaryActionButtonStyle())
|
|
.padding(.top, 4)
|
|
.padding(.bottom, 3)
|
|
.accessibilityIdentifier("userSessionCardVerifyButton")
|
|
}
|
|
|
|
if viewData.isCurrentSessionDisplayMode, displayMode == .compact {
|
|
Text(VectorL10n.userSessionViewDetails)
|
|
.font(theme.fonts.body)
|
|
.foregroundColor(Color(ThemeService.shared().theme.tintColor))
|
|
.accessibilityIdentifier("userSessionCardViewDetails")
|
|
.padding(.top, 8)
|
|
}
|
|
}
|
|
.padding(24)
|
|
.frame(maxWidth: .infinity)
|
|
.background(theme.colors.background)
|
|
.clipShape(backgroundShape)
|
|
.shapedBorder(color: theme.colors.quinaryContent, borderWidth: 0.5, shape: backgroundShape)
|
|
.onTapGesture {
|
|
if viewData.isCurrentSessionDisplayMode {
|
|
onViewDetailsAction?(viewData.sessionId)
|
|
}
|
|
}
|
|
}
|
|
|
|
private var ipText: String? {
|
|
guard let lastSeenIp = viewData.lastSeenIP, !lastSeenIp.isEmpty else {
|
|
return nil
|
|
}
|
|
return viewData.lastSeenIPLocation.map { "\(lastSeenIp) (\($0))" } ?? lastSeenIp
|
|
}
|
|
}
|
|
|
|
struct UserSessionCardViewPreview: View {
|
|
@Environment(\.theme) var theme: ThemeSwiftUI
|
|
|
|
let viewData: UserSessionCardViewData
|
|
let displayMode: UserSessionCardView.DisplayMode
|
|
|
|
init(isCurrent: Bool = false, verificationState: UserSessionInfo.VerificationState = .unverified, displayMode: UserSessionCardView.DisplayMode = .extended) {
|
|
let sessionInfo = UserSessionInfo(id: "alice",
|
|
name: "iOS",
|
|
deviceType: .mobile,
|
|
verificationState: verificationState,
|
|
lastSeenIP: "10.0.0.10", //NOSONAR mocking ip for testing
|
|
lastSeenTimestamp: nil,
|
|
applicationName: "Element iOS",
|
|
applicationVersion: "1.0.0",
|
|
applicationURL: nil,
|
|
deviceModel: nil,
|
|
deviceOS: "iOS 15.5",
|
|
lastSeenIPLocation: nil,
|
|
clientName: "Element",
|
|
clientVersion: "1.0.0",
|
|
isActive: true,
|
|
isCurrent: isCurrent)
|
|
viewData = UserSessionCardViewData(sessionInfo: sessionInfo)
|
|
self.displayMode = displayMode
|
|
}
|
|
|
|
var body: some View {
|
|
VStack {
|
|
UserSessionCardView(viewData: viewData, showLocationInformations: true, displayMode: displayMode)
|
|
}
|
|
.frame(maxWidth: .infinity)
|
|
.background(theme.colors.system)
|
|
.padding()
|
|
}
|
|
}
|
|
|
|
struct UserSessionCardView_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
Group {
|
|
UserSessionCardViewPreview(isCurrent: true, displayMode: .compact).theme(.light).preferredColorScheme(.light)
|
|
UserSessionCardViewPreview(isCurrent: true, displayMode: .extended).theme(.light).preferredColorScheme(.light)
|
|
UserSessionCardViewPreview(isCurrent: true).theme(.dark).preferredColorScheme(.dark)
|
|
UserSessionCardViewPreview().theme(.light).preferredColorScheme(.light)
|
|
UserSessionCardViewPreview().theme(.dark).preferredColorScheme(.dark)
|
|
|
|
UserSessionCardViewPreview(isCurrent: true, verificationState: .verified)
|
|
.theme(.light).preferredColorScheme(.light)
|
|
UserSessionCardViewPreview(verificationState: .verified)
|
|
.theme(.light).preferredColorScheme(.light)
|
|
UserSessionCardViewPreview(verificationState: .unknown)
|
|
.theme(.light).preferredColorScheme(.light)
|
|
}
|
|
}
|
|
}
|