mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-22 09:32:52 +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
166 lines
7.6 KiB
Swift
166 lines
7.6 KiB
Swift
//
|
|
// Copyright 2021-2024 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
// Please see LICENSE in the repository root for full details.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct TimelinePollAnswerOptionButton: View {
|
|
// MARK: - Properties
|
|
|
|
// MARK: Private
|
|
|
|
@Environment(\.theme) private var theme: ThemeSwiftUI
|
|
|
|
let poll: TimelinePollDetails
|
|
let answerOption: TimelinePollAnswerOption
|
|
let action: (() -> Void)?
|
|
|
|
// MARK: Public
|
|
|
|
var body: some View {
|
|
Button {
|
|
action?()
|
|
} label: {
|
|
let rect = RoundedRectangle(cornerRadius: 4.0)
|
|
answerOptionLabel
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
.padding(.horizontal, 8.0)
|
|
.padding(.top, 12.0)
|
|
.padding(.bottom, 8.0)
|
|
.clipShape(rect)
|
|
.overlay(rect.stroke(borderAccentColor, lineWidth: 1.0))
|
|
.accentColor(progressViewAccentColor)
|
|
}
|
|
.accessibilityIdentifier("PollAnswerOption\(optionIndex)")
|
|
.disabled(action == nil)
|
|
}
|
|
|
|
var answerOptionLabel: some View {
|
|
VStack(alignment: .leading, spacing: 12.0) {
|
|
HStack(alignment: .top, spacing: 8.0) {
|
|
if !poll.closed {
|
|
if BWIBuildSettings.shared.bwiEnableBuMUI {
|
|
Image(uiImage: answerOption.selected ? Asset.Images.pollCheckboxSelectedBum.image : Asset.Images.pollCheckboxDefault.image)
|
|
} else {
|
|
Image(uiImage: answerOption.selected ? Asset.Images.pollCheckboxSelected.image : Asset.Images.pollCheckboxDefault.image)
|
|
}
|
|
}
|
|
|
|
Text(answerOption.text)
|
|
.font(theme.fonts.body)
|
|
.foregroundColor(theme.colors.primaryContent)
|
|
.accessibilityIdentifier("PollAnswerOption\(optionIndex)Label")
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
|
|
HStack(spacing: 6) {
|
|
if poll.closed, answerOption.winner {
|
|
Image(uiImage: Asset.Images.pollWinnerIcon.image)
|
|
.foregroundColor(Color(ThemeService.shared().theme.tintColor))
|
|
}
|
|
|
|
if poll.shouldDiscloseResults {
|
|
Text(answerOption.count == 1 ? VectorL10n.pollTimelineOneVote : VectorL10n.pollTimelineVotesCount(Int(answerOption.count)))
|
|
.font(theme.fonts.footnote)
|
|
.foregroundColor(poll.closed && answerOption.winner ? Color(ThemeService.shared().theme.tintColor) : theme.colors.secondaryContent)
|
|
.accessibilityIdentifier("PollAnswerOption\(optionIndex)Count")
|
|
}
|
|
}
|
|
}
|
|
|
|
if poll.type == .disclosed || poll.closed {
|
|
ProgressView(value: Double(poll.shouldDiscloseResults ? answerOption.count : 0), total: Double(poll.totalAnswerCount))
|
|
.progressViewStyle(LinearProgressViewStyle.linear)
|
|
.scaleEffect(x: 1.0, y: 1.2, anchor: .center)
|
|
.accessibilityIdentifier("PollAnswerOption\(optionIndex)Progress")
|
|
}
|
|
}
|
|
}
|
|
|
|
var borderAccentColor: Color {
|
|
guard !poll.closed else {
|
|
return (answerOption.winner ? Color(ThemeService.shared().theme.tintColor) : theme.colors.quinaryContent)
|
|
}
|
|
|
|
return answerOption.selected ? Color(ThemeService.shared().theme.tintColor) : theme.colors.quinaryContent
|
|
}
|
|
|
|
var progressViewAccentColor: Color {
|
|
guard !poll.closed else {
|
|
return (answerOption.winner ? Color(ThemeService.shared().theme.tintColor) : theme.colors.quarterlyContent)
|
|
}
|
|
|
|
return answerOption.selected ? Color(ThemeService.shared().theme.tintColor) : theme.colors.quarterlyContent
|
|
}
|
|
|
|
var optionIndex: Int {
|
|
poll.answerOptions.firstIndex { $0.id == answerOption.id } ?? Int.max
|
|
}
|
|
}
|
|
|
|
struct TimelinePollAnswerOptionButton_Previews: PreviewProvider {
|
|
static let stateRenderer = MockTimelinePollScreenState.stateRenderer
|
|
|
|
static var previews: some View {
|
|
Group {
|
|
let pollTypes: [TimelinePollType] = [.disclosed, .undisclosed]
|
|
|
|
ForEach(pollTypes, id: \.self) { type in
|
|
VStack {
|
|
TimelinePollAnswerOptionButton(poll: buildPoll(closed: false, type: type),
|
|
answerOption: buildAnswerOption(selected: false),
|
|
action: { })
|
|
|
|
TimelinePollAnswerOptionButton(poll: buildPoll(closed: false, type: type),
|
|
answerOption: buildAnswerOption(selected: true),
|
|
action: { })
|
|
|
|
TimelinePollAnswerOptionButton(poll: buildPoll(closed: true, type: type),
|
|
answerOption: buildAnswerOption(selected: false, winner: false),
|
|
action: { })
|
|
|
|
TimelinePollAnswerOptionButton(poll: buildPoll(closed: true, type: type),
|
|
answerOption: buildAnswerOption(selected: false, winner: true),
|
|
action: { })
|
|
|
|
TimelinePollAnswerOptionButton(poll: buildPoll(closed: true, type: type),
|
|
answerOption: buildAnswerOption(selected: true, winner: false),
|
|
action: { })
|
|
|
|
TimelinePollAnswerOptionButton(poll: buildPoll(closed: true, type: type),
|
|
answerOption: buildAnswerOption(selected: true, winner: true),
|
|
action: { })
|
|
|
|
let longText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
|
|
|
|
TimelinePollAnswerOptionButton(poll: buildPoll(closed: true, type: type),
|
|
answerOption: buildAnswerOption(text: longText, selected: true, winner: true),
|
|
action: { })
|
|
}
|
|
}
|
|
}
|
|
.padding()
|
|
}
|
|
|
|
static func buildPoll(closed: Bool, type: TimelinePollType) -> TimelinePollDetails {
|
|
TimelinePollDetails(id: UUID().uuidString,
|
|
question: "",
|
|
answerOptions: [],
|
|
closed: closed,
|
|
startDate: .init(),
|
|
totalAnswerCount: 100,
|
|
type: type,
|
|
showParticipants: false,
|
|
eventType: .started,
|
|
maxAllowedSelections: 1,
|
|
hasBeenEdited: false,
|
|
hasDecryptionError: false)
|
|
}
|
|
|
|
static func buildAnswerOption(text: String = "Test", selected: Bool, winner: Bool = false) -> TimelinePollAnswerOption {
|
|
TimelinePollAnswerOption(id: "1", text: text, count: 5, winner: winner, selected: selected, voters:[])
|
|
}
|
|
}
|