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
81 lines
2.4 KiB
Swift
81 lines
2.4 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 SegmentedPicker<Segment: Hashable & CustomStringConvertible>: View {
|
|
private let segments: [Segment]
|
|
private let selection: Binding<Segment>
|
|
private let interSegmentSpacing: CGFloat
|
|
|
|
@Environment(\.theme) private var theme
|
|
|
|
init(segments: [Segment], selection: Binding<Segment>, interSegmentSpacing: CGFloat) {
|
|
self.segments = segments
|
|
self.selection = selection
|
|
self.interSegmentSpacing = interSegmentSpacing
|
|
}
|
|
|
|
var body: some View {
|
|
HStack(spacing: interSegmentSpacing) {
|
|
ForEach(segments, id: \.hashValue) { segment in
|
|
let isSelectedSegment = segment == selection.wrappedValue
|
|
|
|
Button {
|
|
selection.wrappedValue = segment
|
|
} label: {
|
|
Text(segment.description)
|
|
.font(isSelectedSegment ? theme.fonts.headline : theme.fonts.body)
|
|
.underlineBar(isSelectedSegment)
|
|
}
|
|
.accentColor(isSelectedSegment ? Color(ThemeService.shared().theme.tintColor) : theme.colors.primaryContent)
|
|
.accessibilityLabel(segment.description)
|
|
.accessibilityValue(isSelectedSegment ? VectorL10n.accessibilitySelected : "")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private extension Text {
|
|
@ViewBuilder
|
|
func underlineBar(_ isActive: Bool) -> some View {
|
|
if #available(iOS 15.0, *) {
|
|
overlay(alignment: .bottom) {
|
|
if isActive {
|
|
Rectangle()
|
|
.frame(height: 1)
|
|
.offset(y: 2)
|
|
}
|
|
}
|
|
} else {
|
|
underline(isActive)
|
|
}
|
|
}
|
|
}
|
|
|
|
struct SegmentedPicker_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
SegmentedPicker(
|
|
segments: [
|
|
"Segment 1",
|
|
"Segment 2"
|
|
],
|
|
selection: .constant("Segment 1"),
|
|
interSegmentSpacing: 14
|
|
)
|
|
|
|
SegmentedPicker(
|
|
segments: [
|
|
"Segment 1",
|
|
"Segment 2"
|
|
],
|
|
selection: .constant("Segment 2"),
|
|
interSegmentSpacing: 14
|
|
)
|
|
}
|
|
}
|