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
126 lines
5.6 KiB
Swift
126 lines
5.6 KiB
Swift
//
|
|
// Copyright 2023, 2024 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
// Please see LICENSE in the repository root for full details.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct PollListItem: View {
|
|
@Environment(\.theme) private var theme
|
|
|
|
private let pollData: TimelinePollDetails
|
|
@ScaledMetric private var imageSize = 16
|
|
|
|
init(pollData: TimelinePollDetails) {
|
|
self.pollData = pollData
|
|
}
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 12) {
|
|
Text(DateFormatter.pollShortDateFormatter.string(from: pollData.startDate))
|
|
.foregroundColor(theme.colors.tertiaryContent)
|
|
.font(theme.fonts.caption1)
|
|
|
|
HStack(alignment: .firstTextBaseline, spacing: 8) {
|
|
Image(uiImage: Asset.Images.pollHistory.image)
|
|
.resizable()
|
|
.frame(width: imageSize, height: imageSize)
|
|
|
|
Text(pollData.question)
|
|
.foregroundColor(theme.colors.primaryContent)
|
|
.font(theme.fonts.body)
|
|
.lineLimit(2)
|
|
.accessibilityLabel("PollListItem.title")
|
|
}
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
|
|
if pollData.closed {
|
|
VStack(alignment: .leading, spacing: 12) {
|
|
let winningOptions = pollData.answerOptions.filter(\.winner)
|
|
|
|
ForEach(winningOptions) {
|
|
TimelinePollAnswerOptionButton(poll: pollData, answerOption: $0, action: nil)
|
|
}
|
|
|
|
resultView
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private var resultView: some View {
|
|
let text = pollData.totalAnswerCount == 1 ? VectorL10n.pollTimelineTotalFinalResultsOneVote : VectorL10n.pollTimelineTotalFinalResults(Int(pollData.totalAnswerCount))
|
|
|
|
return Text(text)
|
|
.font(theme.fonts.footnote)
|
|
.foregroundColor(theme.colors.tertiaryContent)
|
|
}
|
|
}
|
|
|
|
extension DateFormatter {
|
|
static let pollShortDateFormatter: DateFormatter = {
|
|
let formatter = DateFormatter()
|
|
formatter.timeStyle = .none
|
|
formatter.dateStyle = .short
|
|
formatter.timeZone = .init(identifier: "UTC")
|
|
return formatter
|
|
}()
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
struct PollListItem_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
Group {
|
|
let pollData1 = TimelinePollDetails(id: UUID().uuidString,
|
|
question: "Do you like polls?",
|
|
answerOptions: [.init(id: "id", text: "Yes, of course!", count: 18, winner: true, selected: true, voters:[])],
|
|
closed: true,
|
|
startDate: .init(),
|
|
totalAnswerCount: 30,
|
|
type: .disclosed,
|
|
showParticipants: false,
|
|
eventType: .started,
|
|
maxAllowedSelections: 1,
|
|
hasBeenEdited: false,
|
|
hasDecryptionError: false)
|
|
|
|
let pollData2 = TimelinePollDetails(id: UUID().uuidString,
|
|
question: "Do you like polls?",
|
|
answerOptions: [.init(id: "id", text: "Yes, of course!", count: 18, winner: true, selected: true, voters:[])],
|
|
closed: false,
|
|
startDate: .init(),
|
|
totalAnswerCount: 30,
|
|
type: .disclosed,
|
|
showParticipants: false,
|
|
eventType: .started,
|
|
maxAllowedSelections: 1,
|
|
hasBeenEdited: false,
|
|
hasDecryptionError: false)
|
|
|
|
let pollData3 = TimelinePollDetails(id: UUID().uuidString,
|
|
question: "Do you like polls?",
|
|
answerOptions: [
|
|
.init(id: "id1", text: "Yes, of course!", count: 15, winner: true, selected: true, voters:[]),
|
|
.init(id: "id2", text: "No, I don't :-(", count: 15, winner: true, selected: true, voters:[])
|
|
],
|
|
closed: true,
|
|
startDate: .init(),
|
|
totalAnswerCount: 30,
|
|
type: .disclosed,
|
|
showParticipants: false,
|
|
eventType: .started,
|
|
maxAllowedSelections: 1,
|
|
hasBeenEdited: false,
|
|
hasDecryptionError: false)
|
|
|
|
ForEach([pollData1, pollData2, pollData3]) { poll in
|
|
PollListItem(pollData: poll)
|
|
}
|
|
}
|
|
.padding()
|
|
}
|
|
}
|