mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-10-31 16:24:11 +00:00
1b06ca0dcd
Add an AttributedString subtitle initialiser to Compound's TitleAndIcon, with the existing String initialiser forwarding to it so current call sites are unchanged. Add a preview state with a bold run and re-record the titleAndIcon snapshots. This lets screens with partially bold copy, such as the multi-account announcement, use TitleAndIcon instead of rebuilding its layout.
128 lines
4.2 KiB
Swift
128 lines
4.2 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
/// Our standard screen header that includes a title and icon along with
|
|
/// optional subtitle and button components.
|
|
///
|
|
/// **Note:** In Figma this component includes some pre-defined padding
|
|
/// which this implementation doesn't include as it sometimes needs to be
|
|
/// changed and is generally easier to use global padding within the screen
|
|
/// than it is to add/subtract additional padding to some arbitrary defaults.
|
|
public struct TitleAndIcon: View {
|
|
private let title: String
|
|
private let subtitle: AttributedString?
|
|
private let icon: KeyPath<CompoundIcons, Image>
|
|
private let iconStyle: BigIcon.Style
|
|
private let button: ButtonDetails?
|
|
|
|
public init(title: String,
|
|
subtitle: String? = nil,
|
|
icon: KeyPath<CompoundIcons, Image>,
|
|
iconStyle: BigIcon.Style,
|
|
button: ButtonDetails? = nil) {
|
|
self.init(title: title,
|
|
subtitle: subtitle.map { AttributedString($0) },
|
|
icon: icon,
|
|
iconStyle: iconStyle,
|
|
button: button)
|
|
}
|
|
|
|
public init(title: String,
|
|
subtitle: AttributedString?,
|
|
icon: KeyPath<CompoundIcons, Image>,
|
|
iconStyle: BigIcon.Style,
|
|
button: ButtonDetails? = nil) {
|
|
self.title = title
|
|
self.subtitle = subtitle
|
|
self.icon = icon
|
|
self.iconStyle = iconStyle
|
|
self.button = button
|
|
}
|
|
|
|
public var body: some View {
|
|
VStack(spacing: 16) {
|
|
BigIcon(icon: icon, style: iconStyle)
|
|
|
|
VStack(spacing: 8) {
|
|
Text(title)
|
|
.foregroundColor(.compound.textPrimary)
|
|
.font(.compound.headingMDBold)
|
|
.multilineTextAlignment(.center)
|
|
|
|
if let subtitle {
|
|
Text(subtitle)
|
|
.foregroundColor(.compound.textSecondary)
|
|
.font(.compound.bodyMD)
|
|
.multilineTextAlignment(.center)
|
|
}
|
|
}
|
|
|
|
if let button {
|
|
Button(button.title, action: button.action)
|
|
.buttonStyle(.compound(.tertiary, size: .small))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public extension TitleAndIcon {
|
|
/// Everything required to construct the `TitleAndIcon` view's optional button.
|
|
struct ButtonDetails {
|
|
public let title: String
|
|
public let action: () -> Void
|
|
|
|
public init(title: String, action: @escaping () -> Void) {
|
|
self.title = title
|
|
self.action = action
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
public struct TitleAndIcon_Previews: PreviewProvider, TestablePreview {
|
|
public static var previews: some View {
|
|
states
|
|
}
|
|
|
|
public static var states: some View {
|
|
VStack(spacing: 84) {
|
|
TitleAndIcon(title: "Headline",
|
|
icon: \.circle,
|
|
iconStyle: .defaultSolid)
|
|
|
|
TitleAndIcon(title: "Headline",
|
|
subtitle: "Description goes here",
|
|
icon: \.circle,
|
|
iconStyle: .defaultSolid)
|
|
|
|
TitleAndIcon(title: "Headline",
|
|
subtitle: "Description goes here",
|
|
icon: \.circle,
|
|
iconStyle: .defaultSolid,
|
|
button: .init(title: "Learn more") { })
|
|
|
|
TitleAndIcon(title: "Headline",
|
|
subtitle: attributedSubtitle,
|
|
icon: \.circle,
|
|
iconStyle: .defaultSolid)
|
|
}
|
|
.padding(24)
|
|
.padding(.bottom, 16)
|
|
}
|
|
|
|
private static var attributedSubtitle: AttributedString {
|
|
var subtitle = AttributedString("Description with ")
|
|
var boldText = AttributedString("bold text")
|
|
boldText.inlinePresentationIntent = .stronglyEmphasized
|
|
subtitle.append(boldText)
|
|
return subtitle
|
|
}
|
|
}
|