From 1109eaff796218b6832a58cee85fdfde1391e9ef Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Tue, 25 Apr 2023 16:42:06 +0100 Subject: [PATCH] Compound Fonts (#834) * Use CompoundFonts in DesignKit (deprecate ElementFonts). * Use compound fonts everywhere. * Update Authentication snapshots. * Update RoomMembersListScreen snapshots. Delete unused snapshots. * Fix tests. --- DesignKit/Package.swift | 2 ++ .../Sources/Buttons/ElementActionButtonStyle.swift | 3 ++- .../Sources/Buttons/ElementCapsuleButtonStyle.swift | 2 +- .../Sources/Buttons/ElementGhostButtonStyle.swift | 2 +- DesignKit/Sources/Fonts/ElementFonts.swift | 1 + DesignKit/Sources/Fonts/ElementUIFonts.swift | 1 + .../Sources/TextFields/ElementTextFieldStyle.swift | 6 +++--- .../Sources/Other/AccessibilityIdentifiers.swift | 1 + .../Other/SwiftUI/Form Styles/FormButtonStyles.swift | 6 +++--- .../SwiftUI/Form Styles/FormRowLabelStyle.swift | 2 +- .../Other/SwiftUI/Form Styles/FormSection.swift | 2 +- .../Other/SwiftUI/Views/AvatarHeaderView.swift | 4 ++-- .../Other/SwiftUI/Views/UserProfileCell.swift | 4 ++-- .../Other/UserIndicator/UserIndicatorModalView.swift | 2 +- .../Other/UserIndicator/UserIndicatorToastView.swift | 2 +- .../View/AnalyticsPromptScreen.swift | 10 +++++----- .../LoginScreen/View/LoginScreen.swift | 4 ++-- .../LoginScreen/View/LoginServerInfoSection.swift | 5 +++-- .../View/ServerSelectionScreen.swift | 4 ++-- .../SoftLogoutScreen/View/SoftLogoutScreen.swift | 12 ++++++------ .../EmojiPickerScreen/View/EmojiPickerScreen.swift | 2 +- .../View/EmojiPickerScreenHeaderView.swift | 2 +- .../Sources/Screens/HomeScreen/View/HomeScreen.swift | 4 ++-- .../Screens/HomeScreen/View/HomeScreenRoomCell.swift | 6 +++--- .../InviteUsersScreen/View/InviteUsersScreen.swift | 2 +- .../View/InviteUsersScreenSelectedItem.swift | 2 +- .../Screens/InvitesScreen/View/InvitesScreen.swift | 2 +- .../InvitesScreen/View/InvitesScreenCell.swift | 2 +- .../OnboardingScreen/View/OnboardingPageView.swift | 4 ++-- .../RoomDetailsScreen/View/RoomDetailsScreen.swift | 6 +++--- .../View/RoomMembersListScreen.swift | 2 +- .../View/RoomMembersListScreenMemberCell.swift | 2 +- .../Screens/RoomScreen/View/MessageComposer.swift | 8 ++++---- .../Screens/RoomScreen/View/RoomHeaderView.swift | 2 +- .../Sources/Screens/RoomScreen/View/RoomScreen.swift | 4 ++-- .../View/Style/TimelineItemBubbledStylerView.swift | 4 ++-- .../View/Style/TimelineItemPlainStylerView.swift | 4 ++-- .../View/Supplementary/TimelineReactionsView.swift | 4 ++-- .../View/Timeline/CollapsibleRoomTimelineView.swift | 2 +- .../RoomScreen/View/Timeline/FormattedBodyText.swift | 2 +- .../View/Timeline/ReadMarkerRoomTimelineView.swift | 2 +- .../View/Timeline/SeparatorRoomTimelineView.swift | 2 +- .../View/Timeline/StateRoomTimelineView.swift | 2 +- .../Timeline/TimelineStartRoomTimelineView.swift | 2 +- .../View/Timeline/UnsupportedRoomTimelineView.swift | 2 +- .../RoomScreen/View/TimelineItemDebugView.swift | 4 ++-- .../SessionVerificationScreenModels.swift | 4 ++++ .../View/SessionVerificationScreen.swift | 11 ++++++----- .../StartChatScreen/View/StartChatScreen.swift | 2 +- .../ElementX/View/TemplateScreen.swift | 4 ++-- UITests/Sources/SessionVerificationUITests.swift | 1 + .../en-GB-iPad-9th-generation.authenticationFlow.png | 4 ++-- .../en-GB-iPad-9th-generation.login-0.png | 4 ++-- .../en-GB-iPad-9th-generation.login-1.png | 4 ++-- .../en-GB-iPad-9th-generation.login-2.png | 4 ++-- .../Application/en-GB-iPad-9th-generation.login.png | 4 ++-- ...B-iPad-9th-generation.roomMemberDetailsScreen.png | 3 --- ...-GB-iPad-9th-generation.roomMembersListScreen.png | 3 +++ .../en-GB-iPad-9th-generation.serverSelection-0.png | 4 ++-- .../en-GB-iPad-9th-generation.serverSelection-1.png | 4 ++-- .../en-GB-iPad-9th-generation.serverSelection-2.png | 4 ++-- ...B-iPad-9th-generation.serverSelectionNonModal.png | 4 ++-- .../en-GB-iPad-9th-generation.softLogout.png | 4 ++-- .../en-GB-iPhone-14.authenticationFlow.png | 4 ++-- .../Application/en-GB-iPhone-14.login-0.png | 4 ++-- .../Application/en-GB-iPhone-14.login-1.png | 4 ++-- .../Application/en-GB-iPhone-14.login-2.png | 4 ++-- .../Application/en-GB-iPhone-14.login.png | 4 ++-- .../en-GB-iPhone-14.roomMemberDetailsScreen.png | 3 --- .../en-GB-iPhone-14.roomMembersListScreen.png | 4 ++-- .../en-GB-iPhone-14.serverSelection-0.png | 4 ++-- .../en-GB-iPhone-14.serverSelection-1.png | 4 ++-- .../en-GB-iPhone-14.serverSelection-2.png | 4 ++-- .../en-GB-iPhone-14.serverSelectionNonModal.png | 4 ++-- .../Application/en-GB-iPhone-14.softLogout.png | 4 ++-- ...pseudo-iPad-9th-generation.authenticationFlow.png | 4 ++-- .../pseudo-iPad-9th-generation.login-0.png | 4 ++-- .../pseudo-iPad-9th-generation.login-1.png | 2 +- .../pseudo-iPad-9th-generation.login-2.png | 4 ++-- .../Application/pseudo-iPad-9th-generation.login.png | 4 ++-- ...o-iPad-9th-generation.roomMemberDetailsScreen.png | 3 --- ...udo-iPad-9th-generation.roomMembersListScreen.png | 3 +++ .../pseudo-iPad-9th-generation.serverSelection-0.png | 4 ++-- .../pseudo-iPad-9th-generation.serverSelection-1.png | 4 ++-- .../pseudo-iPad-9th-generation.serverSelection-2.png | 4 ++-- ...o-iPad-9th-generation.serverSelectionNonModal.png | 4 ++-- .../pseudo-iPad-9th-generation.softLogout.png | 4 ++-- .../pseudo-iPhone-14.authenticationFlow.png | 4 ++-- .../Application/pseudo-iPhone-14.login-0.png | 4 ++-- .../Application/pseudo-iPhone-14.login-1.png | 4 ++-- .../Application/pseudo-iPhone-14.login-2.png | 4 ++-- .../Application/pseudo-iPhone-14.login.png | 4 ++-- .../pseudo-iPhone-14.roomMemberDetailsScreen.png | 3 --- .../pseudo-iPhone-14.roomMembersListScreen.png | 4 ++-- .../pseudo-iPhone-14.serverSelection-0.png | 4 ++-- .../pseudo-iPhone-14.serverSelection-1.png | 4 ++-- .../pseudo-iPhone-14.serverSelection-2.png | 4 ++-- .../pseudo-iPhone-14.serverSelectionNonModal.png | 4 ++-- .../Application/pseudo-iPhone-14.softLogout.png | 4 ++-- changelog.d/43.change | 2 +- 100 files changed, 185 insertions(+), 178 deletions(-) delete mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMemberDetailsScreen.png create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreen.png delete mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMemberDetailsScreen.png delete mode 100644 UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMemberDetailsScreen.png create mode 100644 UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreen.png delete mode 100644 UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMemberDetailsScreen.png diff --git a/DesignKit/Package.swift b/DesignKit/Package.swift index b1f6cf8c0..7360e5736 100644 --- a/DesignKit/Package.swift +++ b/DesignKit/Package.swift @@ -12,12 +12,14 @@ let package = Package( .library(name: "DesignKit", targets: ["DesignKit"]) ], dependencies: [ + .package(url: "https://github.com/vector-im/compound-ios.git", revision: "0b1c62f9a9efac3d9ac06c51531392d55057a0eb"), .package(url: "https://github.com/vector-im/element-design-tokens.git", exact: "0.0.3"), .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.4") ], targets: [ .target(name: "DesignKit", dependencies: [ + .product(name: "Compound", package: "compound-ios"), .product(name: "DesignTokens", package: "element-design-tokens"), .product(name: "Introspect", package: "SwiftUI-Introspect") ], diff --git a/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift b/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift index 7ae86d2a1..e4e0b9a17 100644 --- a/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift +++ b/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift @@ -14,6 +14,7 @@ // limitations under the License. // +import Compound import DesignTokens import SwiftUI @@ -55,7 +56,7 @@ public struct ElementActionButtonStyle: ButtonStyle { .padding(.vertical, verticalPadding) .frame(maxWidth: maxWidth) .foregroundColor(fontColor) - .font(.element.bodyBold) + .font(.compound.bodyLGSemibold) .background(Capsule() .fill(color) .opacity(backgroundOpacity(when: configuration.isPressed))) diff --git a/DesignKit/Sources/Buttons/ElementCapsuleButtonStyle.swift b/DesignKit/Sources/Buttons/ElementCapsuleButtonStyle.swift index 9711ced4f..f7bcb1d91 100644 --- a/DesignKit/Sources/Buttons/ElementCapsuleButtonStyle.swift +++ b/DesignKit/Sources/Buttons/ElementCapsuleButtonStyle.swift @@ -35,7 +35,7 @@ public struct ElementCapsuleButtonStyle: ButtonStyle { configuration.label .padding(7) .frame(maxWidth: .infinity) - .font(.element.headline) + .font(.compound.bodyLGSemibold) .foregroundColor(fontColor) .multilineTextAlignment(.center) .background(background) diff --git a/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift b/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift index a3d7f1d5a..ede9ac08f 100644 --- a/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift +++ b/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift @@ -47,7 +47,7 @@ public struct ElementGhostButtonStyle: ButtonStyle { .padding(.vertical, verticalPadding) .frame(maxWidth: maxWidth) .foregroundColor(color) - .font(.element.footnoteBold) + .font(.compound.bodySMSemibold) .background(border) .opacity(opacity(when: configuration.isPressed)) } diff --git a/DesignKit/Sources/Fonts/ElementFonts.swift b/DesignKit/Sources/Fonts/ElementFonts.swift index 447512542..ebc2da563 100644 --- a/DesignKit/Sources/Fonts/ElementFonts.swift +++ b/DesignKit/Sources/Fonts/ElementFonts.swift @@ -18,6 +18,7 @@ import SwiftUI public extension Font { /// The fonts used by Element as defined in https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1362%3A0 + @available(*, deprecated, renamed: "compound") static let element = ElementFonts(values: ElementBaseFonts()) } diff --git a/DesignKit/Sources/Fonts/ElementUIFonts.swift b/DesignKit/Sources/Fonts/ElementUIFonts.swift index 66f6a2a79..1d616c2e6 100644 --- a/DesignKit/Sources/Fonts/ElementUIFonts.swift +++ b/DesignKit/Sources/Fonts/ElementUIFonts.swift @@ -18,6 +18,7 @@ import UIKit public extension UIFont { /// The fonts used by Element as defined in https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1362%3A0 + @available(*, deprecated, message: "Not yet available in compound.") @objc static let element = ElementUIFonts(values: ElementBaseFonts()) } diff --git a/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift b/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift index f15be94f4..d9d2a09c9 100644 --- a/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift +++ b/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift @@ -119,13 +119,13 @@ public struct ElementTextFieldStyle: TextFieldStyle { return VStack(alignment: .leading, spacing: 8) { labelText - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(labelColor) .padding(.horizontal, 16) configuration .focused($isFocused) - .font(.element.callout) + .font(.compound.bodyLG) .foregroundColor(textColor) .accentColor(accentColor) .padding(.leading, 16.0) @@ -148,7 +148,7 @@ public struct ElementTextFieldStyle: TextFieldStyle { footerText .tint(.element.links) - .font(.element.caption1) + .font(.compound.bodyXS) .foregroundColor(footerColor) .padding(.horizontal, 16) } diff --git a/ElementX/Sources/Other/AccessibilityIdentifiers.swift b/ElementX/Sources/Other/AccessibilityIdentifiers.swift index cffe931f0..39f472efd 100644 --- a/ElementX/Sources/Other/AccessibilityIdentifiers.swift +++ b/ElementX/Sources/Other/AccessibilityIdentifiers.swift @@ -108,6 +108,7 @@ struct A11yIdentifiers { let acceptChallenge = "session_verification-accept_challenge" let declineChallenge = "session_verification-decline_challenge" let emojiWrapper = "session_verification-emojis" + let verificationComplete = "session_verification-verification_complete" let close = "session_verification-close" } diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift index 6a93bb514..3a0e6dc1e 100644 --- a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift +++ b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift @@ -26,13 +26,13 @@ enum FormRowAccessory: View { switch self { case .navigationLink: Image(systemName: "chevron.forward") - .font(.element.subheadlineBold) + .font(.compound.bodyMD.bold()) .foregroundColor(.element.quaternaryContent) case .progressView: ProgressView() case .selection(let isSelected): Image(systemName: isSelected ? "checkmark.circle.fill" : "circle") - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(isSelected ? .element.primaryContent : .element.tertiaryContent) } } @@ -95,7 +95,7 @@ struct FormActionButtonStyle: ButtonStyle { Text(title) .foregroundColor(.element.secondaryContent) - .font(.element.subheadline) + .font(.compound.bodyMD) } } } diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift index 06ced19e2..2029f9685 100644 --- a/ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift +++ b/ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift @@ -55,7 +55,7 @@ struct FormRowLabelStyle: LabelStyle { .background(iconBackgroundColor) .clipShape(RoundedRectangle(cornerRadius: 8)) configuration.title - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(titleColor) } } diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormSection.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormSection.swift index 2fd765e64..6ade45401 100644 --- a/ElementX/Sources/Other/SwiftUI/Form Styles/FormSection.swift +++ b/ElementX/Sources/Other/SwiftUI/Form Styles/FormSection.swift @@ -21,7 +21,7 @@ struct FormSectionHeaderStyle: ViewModifier { func body(content: Content) -> some View { content .foregroundColor(.element.secondaryContent) - .font(.element.caption1) + .font(.compound.bodyXS) } } diff --git a/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift b/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift index ed543da8b..588fc061d 100644 --- a/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift +++ b/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift @@ -35,13 +35,13 @@ struct AvatarHeaderView: View { Text(name ?? id) .foregroundColor(.element.primaryContent) - .font(.element.title1Bold) + .font(.compound.headingLGBold) .multilineTextAlignment(.center) if let subtitle { Text(subtitle) .foregroundColor(.element.secondaryContent) - .font(.element.body) + .font(.compound.bodyLG) .multilineTextAlignment(.center) } diff --git a/ElementX/Sources/Other/SwiftUI/Views/UserProfileCell.swift b/ElementX/Sources/Other/SwiftUI/Views/UserProfileCell.swift index 21789a6d7..a20f33c32 100644 --- a/ElementX/Sources/Other/SwiftUI/Views/UserProfileCell.swift +++ b/ElementX/Sources/Other/SwiftUI/Views/UserProfileCell.swift @@ -32,12 +32,12 @@ struct UserProfileCell: View { VStack(alignment: .leading, spacing: 4) { Text(user.displayName ?? user.userID) - .font(.element.title3) + .font(.compound.headingSM) .foregroundColor(.element.primaryContent) if user.displayName != nil { Text(user.userID) - .font(.element.subheadline) + .font(.compound.bodyMD) .foregroundColor(.element.tertiaryContent) } diff --git a/ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift b/ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift index c9cfbe45d..ee21fde74 100644 --- a/ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift +++ b/ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift @@ -35,7 +35,7 @@ struct UserIndicatorModalView: View { Image(systemName: iconName) } Text(indicator.title) - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(.element.primaryContent) } } diff --git a/ElementX/Sources/Other/UserIndicator/UserIndicatorToastView.swift b/ElementX/Sources/Other/UserIndicator/UserIndicatorToastView.swift index 05600e4b6..c6a41f5a0 100644 --- a/ElementX/Sources/Other/UserIndicator/UserIndicatorToastView.swift +++ b/ElementX/Sources/Other/UserIndicator/UserIndicatorToastView.swift @@ -25,7 +25,7 @@ struct UserIndicatorToastView: View { Image(systemName: iconName) } Text(indicator.title) - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(.element.primaryContent) } .id(indicator.id) diff --git a/ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift b/ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift index f939f8714..1b8f51b2d 100644 --- a/ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift +++ b/ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift @@ -60,14 +60,14 @@ struct AnalyticsPromptScreen: View { .padding(.bottom, 24) Text(L10n.screenAnalyticsPromptTitle(InfoPlistReader.main.bundleDisplayName)) - .font(.element.title2Bold) + .font(.compound.headingMDBold) .multilineTextAlignment(.center) .foregroundColor(.element.primaryContent) .padding(.bottom, 2) .accessibilityIdentifier(A11yIdentifiers.analyticsPromptScreen.title) Text(context.viewState.strings.optInContent) - .font(.element.body) + .font(.compound.bodyLG) .multilineTextAlignment(.center) .foregroundColor(.element.secondaryContent) .tint(.element.links) @@ -88,7 +88,7 @@ struct AnalyticsPromptScreen: View { AnalyticsPromptScreenCheckmarkItem(string: context.viewState.strings.point3) } .fixedSize(horizontal: false, vertical: true) - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(.element.secondaryContent) .frame(maxWidth: .infinity) } @@ -98,14 +98,14 @@ struct AnalyticsPromptScreen: View { VStack { Button { context.send(viewAction: .enable) } label: { Text(L10n.actionEnable) - .font(.element.bodyBold) + .font(.compound.bodyLGSemibold) } .buttonStyle(.elementAction(.xLarge)) .accessibilityIdentifier(A11yIdentifiers.analyticsPromptScreen.enable) Button { context.send(viewAction: .disable) } label: { Text(L10n.actionNotNow) - .font(.element.bodyBold) + .font(.compound.bodyLGSemibold) .padding(12) } .accessibilityIdentifier(A11yIdentifiers.analyticsPromptScreen.notNow) diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift index f6cc41e58..ae8926f91 100644 --- a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift +++ b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift @@ -54,7 +54,7 @@ struct LoginScreen: View { /// The header containing a Welcome Back title. var header: some View { Text(L10n.screenLoginTitle) - .font(.element.title1Bold) + .font(.compound.headingLGBold) .multilineTextAlignment(.center) .foregroundColor(.element.primaryContent) } @@ -70,7 +70,7 @@ struct LoginScreen: View { var loginForm: some View { VStack(alignment: .leading, spacing: 0) { Text(L10n.screenLoginFormHeader) - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(.element.primaryContent) .padding(.horizontal, 16) .padding(.bottom, 8) diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginServerInfoSection.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginServerInfoSection.swift index ce63c1a1a..2fec37a27 100644 --- a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginServerInfoSection.swift +++ b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginServerInfoSection.swift @@ -31,14 +31,14 @@ struct LoginServerInfoSection: View { var body: some View { VStack(alignment: .leading, spacing: 8) { Text(L10n.screenLoginServerHeader) - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(.element.primaryContent) .padding(.horizontal, 16) Button(action: editAction) { HStack { Text(address) - .font(.element.subheadlineBold) + .font(.compound.bodyMDSemibold) .foregroundColor(.element.primaryContent) .padding(.horizontal, 16) .padding(.vertical) @@ -46,6 +46,7 @@ struct LoginServerInfoSection: View { Spacer() Image(systemName: "chevron.right") + .font(.compound.bodyMD.bold()) .foregroundColor(.element.tertiaryContent) .padding(.trailing, 16) } diff --git a/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift b/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift index deaa86446..8a497679e 100644 --- a/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift +++ b/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift @@ -44,12 +44,12 @@ struct ServerSelectionScreen: View { .padding(.bottom, 8) Text(L10n.commonSelectYourServer) - .font(.element.title2Bold) + .font(.compound.headingMDBold) .multilineTextAlignment(.center) .foregroundColor(.element.primaryContent) Text(L10n.screenChangeServerSubtitle) - .font(.element.subheadline) + .font(.compound.bodyMD) .multilineTextAlignment(.center) .foregroundColor(.element.tertiaryContent) } diff --git a/ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift b/ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift index becb584d7..df6ef70cf 100644 --- a/ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift +++ b/ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift @@ -55,20 +55,20 @@ struct SoftLogoutScreen: View { var header: some View { VStack(alignment: .leading, spacing: 16) { Text(UntranslatedL10n.softLogoutSigninTitle) - .font(.element.title2Bold) + .font(.compound.headingMDBold) .multilineTextAlignment(.leading) .foregroundColor(.element.primaryContent) .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.title) Text(UntranslatedL10n.softLogoutSigninNotice(context.viewState.credentials.homeserverName, context.viewState.credentials.userDisplayName, context.viewState.credentials.userId)) - .font(.element.body) + .font(.compound.bodyLG) .multilineTextAlignment(.leading) .foregroundColor(.element.primaryContent) .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.message) if context.viewState.showRecoverEncryptionKeysMessage { Text(UntranslatedL10n.softLogoutSigninE2eWarningNotice) - .font(.element.body) + .font(.compound.bodyLG) .multilineTextAlignment(.leading) .foregroundColor(.element.primaryContent) } @@ -88,7 +88,7 @@ struct SoftLogoutScreen: View { Button { context.send(viewAction: .forgotPassword) } label: { Text(UntranslatedL10n.softLogoutForgotPassword) - .font(.element.body) + .font(.compound.bodyLG) } .frame(maxWidth: .infinity, alignment: .trailing) .padding(.bottom, 8) @@ -124,13 +124,13 @@ struct SoftLogoutScreen: View { var clearDataForm: some View { VStack(alignment: .leading, spacing: 12) { Text(UntranslatedL10n.softLogoutClearDataTitle) - .font(.element.title2Bold) + .font(.compound.headingMDBold) .multilineTextAlignment(.leading) .foregroundColor(.element.primaryContent) .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.clearDataTitle) Text(UntranslatedL10n.softLogoutClearDataNotice) - .font(.element.body) + .font(.compound.bodyLG) .multilineTextAlignment(.leading) .foregroundColor(.element.primaryContent) .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.clearDataMessage) diff --git a/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreen.swift b/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreen.swift index 815c800d3..0ddffc7fb 100644 --- a/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreen.swift +++ b/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreen.swift @@ -33,7 +33,7 @@ struct EmojiPickerScreen: View { context.send(viewAction: .emojiTapped(emoji: emoji)) } label: { Text(emoji.value) - .font(.element.title1) + .font(.compound.headingLG) } } } diff --git a/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreenHeaderView.swift b/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreenHeaderView.swift index 03208065f..a286ac49a 100644 --- a/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreenHeaderView.swift +++ b/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreenHeaderView.swift @@ -22,7 +22,7 @@ struct EmojiPickerScreenHeaderView: View { var body: some View { HStack { Text(title) - .font(.element.subheadline.bold()) + .font(.compound.bodyMD.bold()) .foregroundColor(.element.primaryContent) .frame(maxWidth: .infinity, alignment: .leading) } diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift index fbc731500..92b33d4ea 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift @@ -167,7 +167,7 @@ struct HomeScreen: View { VStack(alignment: .leading, spacing: 4) { HStack(spacing: 16) { Text(L10n.sessionVerificationBannerTitle) - .font(.element.headline) + .font(.compound.bodyLGSemibold) .foregroundColor(.element.systemPrimaryLabel) Spacer() @@ -181,7 +181,7 @@ struct HomeScreen: View { } } Text(L10n.sessionVerificationBannerMessage) - .font(.element.subheadline) + .font(.compound.bodyMD) .foregroundColor(.element.secondaryContent) } diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift index 0cf7532e6..791757b17 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift @@ -85,14 +85,14 @@ struct HomeScreenRoomCell: View { var header: some View { HStack(alignment: .top, spacing: 16) { Text(room.name) - .font(.element.headline) + .font(.compound.bodyLGSemibold) .foregroundColor(.element.primaryContent) .lineLimit(1) .frame(maxWidth: .infinity, alignment: .leading) if let timestamp = room.timestamp { Text(timestamp) - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(room.hasUnreads ? .element.brand : .element.tertiaryContent) } } @@ -156,7 +156,7 @@ struct HomeScreenRoomCellButtonStyle: ButtonStyle { private extension View { func lastMessageFormatting() -> some View { - font(.element.subheadline) + font(.compound.bodyMD) .foregroundColor(.element.tertiaryContent) .lineLimit(2) .multilineTextAlignment(.leading) diff --git a/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift b/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift index a1813f4d8..c9a103ee8 100644 --- a/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift +++ b/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift @@ -55,7 +55,7 @@ struct InviteUsersScreen: View { private var noResultsContent: some View { Text(L10n.commonNoResults) - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(.element.tertiaryContent) .frame(maxWidth: .infinity) .listRowBackground(Color.clear) diff --git a/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreenSelectedItem.swift b/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreenSelectedItem.swift index bca54fe2d..2bc2a2997 100644 --- a/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreenSelectedItem.swift +++ b/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreenSelectedItem.swift @@ -29,7 +29,7 @@ struct InviteUsersScreenSelectedItem: View { avatarSize: .user(on: .inviteUsers), imageProvider: imageProvider) Text(user.displayName ?? user.userID) - .font(.element.title3) + .font(.compound.headingSM) .foregroundColor(.element.primaryContent) .lineLimit(1) } diff --git a/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreen.swift b/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreen.swift index b4c434f7b..343e8624b 100644 --- a/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreen.swift +++ b/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreen.swift @@ -42,7 +42,7 @@ struct InvitesScreen: View { private var noInvitesContent: some View { Text(L10n.screenInvitesEmptyList) - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(.element.tertiaryContent) .frame(maxWidth: .infinity) .listRowBackground(Color.clear) diff --git a/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift b/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift index 4adc1f175..9121bc158 100644 --- a/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift +++ b/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift @@ -86,7 +86,7 @@ struct InvitesScreenCell: View { private var textualContent: some View { VStack(alignment: .leading) { Text(title) - .font(.element.headline) + .font(.compound.bodyLGSemibold) .foregroundColor(.element.primaryContent) if let subtitle { diff --git a/ElementX/Sources/Screens/OnboardingScreen/View/OnboardingPageView.swift b/ElementX/Sources/Screens/OnboardingScreen/View/OnboardingPageView.swift index 7a79fc366..f5b039a67 100644 --- a/ElementX/Sources/Screens/OnboardingScreen/View/OnboardingPageView.swift +++ b/ElementX/Sources/Screens/OnboardingScreen/View/OnboardingPageView.swift @@ -40,11 +40,11 @@ struct OnboardingPageView: View { Spacer() Text(content.title) - .font(.element.title1Bold) + .font(.compound.headingLGBold) .foregroundColor(.element.primaryContent) .multilineTextAlignment(.center) Text(content.message) - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(.element.secondaryContent) .multilineTextAlignment(.center) } diff --git a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift index ef2ddf007..7e42e2172 100644 --- a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift +++ b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift @@ -102,7 +102,7 @@ struct RoomDetailsScreen: View { Section { Text(topic) .foregroundColor(.element.secondaryContent) - .font(.element.footnote) + .font(.compound.bodySM) } header: { Text(L10n.commonTopic) .formSectionHeader() @@ -122,7 +122,7 @@ struct RoomDetailsScreen: View { } else { Text(String(context.viewState.members.count)) .foregroundColor(.element.tertiaryContent) - .font(.element.body) + .font(.compound.bodyLG) } } label: { Label(L10n.commonPeople, systemImage: "person") @@ -145,7 +145,7 @@ struct RoomDetailsScreen: View { Text(L10n.screenRoomDetailsEncryptionEnabledTitle) Text(L10n.screenRoomDetailsEncryptionEnabledSubtitle) .foregroundColor(.element.secondaryContent) - .font(.element.footnote) + .font(.compound.bodySM) } } icon: { Image(systemName: "lock.shield") diff --git a/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift b/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift index de4faaa1c..8cb7ac708 100644 --- a/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift +++ b/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift @@ -32,7 +32,7 @@ struct RoomMembersListScreen: View { } header: { Text(L10n.commonMemberCount(context.viewState.members.count)) .foregroundColor(.element.secondaryContent) - .font(.element.body) + .font(.compound.bodyLG) .padding(.vertical, 12) } .padding(.horizontal) diff --git a/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift b/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift index 60eb745d2..293383044 100644 --- a/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift +++ b/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift @@ -35,7 +35,7 @@ struct RoomMembersListScreenMemberCell: View { .accessibilityHidden(true) Text(member.name ?? "") - .font(.element.calloutBold) + .font(.compound.bodyMDSemibold) .foregroundColor(.element.primaryContent) .lineLimit(1) diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift index fd719f554..932802efd 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift @@ -48,7 +48,7 @@ struct MessageComposer: View { } label: { submitButtonImage .symbolVariant(.fill) - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(sendingDisabled ? .element.quaternaryContent : .global.white) .background { Circle() @@ -127,7 +127,7 @@ private struct MessageComposerReplyHeader: View { Spacer() Button(action: action) { Image(systemName: "xmark") - .font(.element.caption2.weight(.medium)) + .font(.caption2.weight(.medium)) .foregroundColor(.element.secondaryContent) .padding(12.0) } @@ -145,7 +145,7 @@ private struct MessageComposerEditHeader: View { Spacer() Button(action: action) { Image(systemName: "xmark") - .font(.element.caption2.weight(.medium)) + .font(.caption2.weight(.medium)) .foregroundColor(.element.secondaryContent) .padding(12.0) } @@ -159,7 +159,7 @@ private struct MessageComposerHeaderLabelStyle: LabelStyle { configuration.icon configuration.title } - .font(.element.caption1) + .font(.compound.bodyXS) .foregroundColor(.element.secondaryContent) .lineLimit(1) } diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift index 7782df301..5ab8f9827 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift @@ -28,7 +28,7 @@ struct RoomHeaderView: View { roomAvatar .accessibilityHidden(true) Text(context.viewState.roomTitle) - .font(.element.headline) + .font(.compound.bodyLGSemibold) .accessibilityIdentifier(A11yIdentifiers.roomScreen.name) } // Leading align whilst using the principal toolbar position. diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift index eb7515f84..0f34f3fd7 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift @@ -74,7 +74,7 @@ struct RoomScreen: View { private var scrollToBottomButton: some View { Button { context.viewState.scrollToBottomPublisher.send(()) } label: { Image(systemName: "chevron.down") - .font(.element.body) + .font(.compound.bodyLG) .fontWeight(.semibold) .foregroundColor(.element.secondaryContent) .padding(13) @@ -132,7 +132,7 @@ struct RoomScreen: View { } } label: { Image(systemName: "plus.circle") - .font(.element.title1) + .font(.compound.headingLG) .foregroundColor(.element.brand) } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift index ea93b24ce..3ab522529 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift @@ -62,7 +62,7 @@ struct TimelineItemBubbledStylerView: View { TimelineSenderAvatarView(timelineItem: timelineItem) .accessibilityHidden(true) Text(timelineItem.sender.displayName ?? timelineItem.sender.id) - .font(.element.footnoteBold) + .font(.compound.bodySMSemibold) .foregroundColor(.element.primaryContent) .lineLimit(1) .padding(.vertical, senderNameVerticalPadding) @@ -112,7 +112,7 @@ struct TimelineItemBubbledStylerView: View { if timelineItem.properties.isEdited { Text(L10n.commonEditedSuffix) - .font(.element.caption2) + .font(.compound.bodyXS) .foregroundColor(.element.tertiaryContent) } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift index 358daae63..856443f62 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift @@ -56,7 +56,7 @@ struct TimelineItemPlainStylerView: View { Spacer() Text(timelineItem.timestamp) .foregroundColor(Color.element.tertiaryContent) - .font(.element.caption2) + .font(.compound.bodyXS) } .padding(.top, 16) } @@ -67,7 +67,7 @@ struct TimelineItemPlainStylerView: View { VStack { if timelineItem.properties.isEdited { Text(L10n.commonEditedSuffix) - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(.element.tertiaryContent) } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift index 99735f75b..01ce5ee21 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift @@ -43,9 +43,9 @@ struct TimelineReactionButton: View { var label: some View { HStack(spacing: 4) { Text(reaction.key) - .font(.element.subheadline) + .font(.compound.bodyMD) Text(String(reaction.count)) - .font(.element.subheadline) + .font(.compound.bodyMD) .foregroundColor(.element.secondaryContent) } .padding(.vertical, 6) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift index a833677f1..d82c8dca6 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift @@ -60,7 +60,7 @@ private struct CollapsibleRoomTimelineItemDisclosureGroupStyle: DisclosureGroupS .animation(.elementDefault, value: configuration.isExpanded) } .frame(maxWidth: .infinity) - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(.element.secondaryContent) .padding(.horizontal, 36.0) .padding(.top, 20.0) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift index e4a0850b9..966861203 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift @@ -152,7 +152,7 @@ struct FormattedBodyText: View { private var blockquoteAttributes: AttributeContainer { var container = AttributeContainer() - container.font = .element.subheadline + container.font = .compound.bodyMD return container } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ReadMarkerRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ReadMarkerRoomTimelineView.swift index 19c469d05..30ffdf3d9 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ReadMarkerRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ReadMarkerRoomTimelineView.swift @@ -24,7 +24,7 @@ struct ReadMarkerRoomTimelineView: View { VStack(alignment: .trailing, spacing: 2) { Text(L10n.roomTimelineReadMarkerTitle) .textCase(.uppercase) - .font(.element.caption2Bold) + .font(.compound.bodyXSSemibold) .foregroundColor(.element.quaternaryContent) Rectangle() .frame(height: 0.5) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift index 45919273b..f2e99108c 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift @@ -21,7 +21,7 @@ struct SeparatorRoomTimelineView: View { var body: some View { Text(timelineItem.text) - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(.element.secondaryContent) .frame(maxWidth: .infinity) .padding(.horizontal, 36.0) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/StateRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/StateRoomTimelineView.swift index 492be7286..7614601e5 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/StateRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/StateRoomTimelineView.swift @@ -21,7 +21,7 @@ struct StateRoomTimelineView: View { var body: some View { Text(timelineItem.body) - .font(.element.footnote) + .font(.compound.bodySM) .multilineTextAlignment(.center) .foregroundColor(.element.secondaryContent) .frame(maxWidth: .infinity, alignment: .center) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineStartRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineStartRoomTimelineView.swift index 9247a736c..3ec1adbcb 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineStartRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineStartRoomTimelineView.swift @@ -21,7 +21,7 @@ struct TimelineStartRoomTimelineView: View { var body: some View { Text(title) - .font(.element.footnote) + .font(.compound.bodySM) .foregroundColor(.element.secondaryContent) .padding(.vertical, 24) .frame(maxWidth: .infinity) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift index ced134622..cac8c4d5f 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift @@ -28,7 +28,7 @@ struct UnsupportedRoomTimelineView: View { Text(timelineItem.error) .fixedSize(horizontal: false, vertical: true) - .font(.element.footnote) + .font(.compound.bodySM) } } icon: { Image(systemName: "exclamationmark.triangle") diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift index 64d212e8e..21bda26fe 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift @@ -74,7 +74,7 @@ struct TimelineItemDebugView: View { DisclosureGroup(title, isExpanded: $isExpanded) { disclosureGroupContent } - .font(.element.subheadline) + .font(.compound.bodyMD) .padding() Divider() @@ -89,7 +89,7 @@ struct TimelineItemDebugView: View { Divider() Text(text) - .font(.element.caption1.monospaced()) + .font(.compound.bodyXS.monospaced()) .foregroundColor(.element.primaryContent) } .frame(maxWidth: .infinity) diff --git a/ElementX/Sources/Screens/SessionVerificationScreen/SessionVerificationScreenModels.swift b/ElementX/Sources/Screens/SessionVerificationScreen/SessionVerificationScreenModels.swift index fbea0ec87..4b13756f7 100644 --- a/ElementX/Sources/Screens/SessionVerificationScreen/SessionVerificationScreenModels.swift +++ b/ElementX/Sources/Screens/SessionVerificationScreen/SessionVerificationScreenModels.swift @@ -49,6 +49,10 @@ struct SessionVerificationScreenViewState: BindableState { return L10n.commonVerificationCancelled } } + + var titleAccessibilityIdentifier: String { + verificationState == .verified ? A11yIdentifiers.sessionVerificationScreen.verificationComplete : "" + } var message: String { switch verificationState { diff --git a/ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift b/ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift index 7015f38b0..d3e3e3e15 100644 --- a/ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift +++ b/ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift @@ -79,6 +79,7 @@ struct SessionVerificationScreen: View { .multilineTextAlignment(.center) .foregroundColor(.element.primaryContent) .padding(.bottom, 8) + .accessibilityIdentifier(context.viewState.titleAccessibilityIdentifier) Text(context.viewState.message) .font(.subheadline) @@ -156,7 +157,7 @@ struct SessionVerificationScreen: View { Button(L10n.screenSessionVerificationTheyDontMatch) { context.send(viewAction: .decline) } - .font(.element.bodyBold) + .font(.compound.bodyLGSemibold) .accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.declineChallenge) } @@ -176,7 +177,7 @@ struct SessionVerificationScreen: View { Button(L10n.screenSessionVerificationTheyDontMatch) { context.send(viewAction: .decline) } - .font(.element.bodyBold) + .font(.compound.bodyLGSemibold) .accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.declineChallenge) .disabled(true) } @@ -203,9 +204,9 @@ struct SessionVerificationScreen: View { var body: some View { VStack(spacing: 16.0) { Text(emoji.symbol) - .font(.element.largeTitleBold) + .font(.compound.headingXLBold) Text(emoji.description) - .font(.element.subheadline) + .font(.compound.bodyMD) .foregroundColor(.element.secondaryContent) } .padding(8.0) @@ -218,7 +219,7 @@ struct SessionVerificationScreen: View { var body: some View { Image(systemName: systemName) .resizable() - .font(.element.body.weight(.light)) + .font(.compound.bodyLG.weight(.light)) .scaledToFit() .foregroundColor(.element.accent) .frame(width: 100, height: 100) diff --git a/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift b/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift index 9329ba1d1..b920ea8ca 100644 --- a/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift +++ b/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift @@ -103,7 +103,7 @@ struct StartChatScreen: View { private var noResultsContent: some View { Text(L10n.commonNoResults) - .font(.element.body) + .font(.compound.bodyLG) .foregroundColor(.element.tertiaryContent) .frame(maxWidth: .infinity) .listRowBackground(Color.clear) diff --git a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift index 487c9bf34..218e5e0a6 100644 --- a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift +++ b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift @@ -45,7 +45,7 @@ struct TemplateScreen: View { var mainContent: some View { VStack(spacing: 36) { Text(context.viewState.promptType.title) - .font(.element.title2Bold) + .font(.compound.headingMDBold) .multilineTextAlignment(.center) .foregroundColor(.element.primaryContent) .accessibilityIdentifier("title") @@ -57,7 +57,7 @@ struct TemplateScreen: View { HStack { Text("Counter: \(context.viewState.count)") - .font(.element.body) + .font(.compound.bodyLG) .multilineTextAlignment(.center) .foregroundColor(counterColor) diff --git a/UITests/Sources/SessionVerificationUITests.swift b/UITests/Sources/SessionVerificationUITests.swift index 9ac388d0d..3b729714b 100644 --- a/UITests/Sources/SessionVerificationUITests.swift +++ b/UITests/Sources/SessionVerificationUITests.swift @@ -49,6 +49,7 @@ class SessionVerificationUITests: XCTestCase { app.buttons[A11yIdentifiers.sessionVerificationScreen.acceptChallenge].tap() app.assertScreenshot(.sessionVerification, step: Step.acceptingEmojis) + XCTAssert(app.staticTexts[A11yIdentifiers.sessionVerificationScreen.verificationComplete].waitForExistence(timeout: 5.0)) app.assertScreenshot(.sessionVerification, step: Step.verificationComplete) app.buttons[A11yIdentifiers.sessionVerificationScreen.close].tap() diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.authenticationFlow.png index 450a67dfb..800e3cfac 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.authenticationFlow.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.authenticationFlow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec2b3b2ae7317bebbeec2c1a28abdaabc9877204454ee5616af0cac75dd25b42 -size 87928 +oid sha256:ef8332a434d1ee1e8e477baab70db5f21b8e19dabdfec3cb37d8a58a07f2dfa3 +size 87407 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-0.png index be543cc72..52107e7f8 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-0.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4683098a91caed1dc2040833dabed1db830cec0757663bf0f98eec877c9a781 -size 89630 +oid sha256:231a54d4b7ee98698ec443cf557d6b6d43b200600a24961366e54aa1b05bd12b +size 88208 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-1.png index 524edbbce..b597047bc 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-1.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36cd714098d67868223cd9532aba434ed0b26e093f49cb5e1728511da18baa1a -size 75713 +oid sha256:d1c86458e7d69a865e1e99b31d6d36eb8ec50b4d9451c8bbcc94dbcd551b7438 +size 75711 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-2.png index 1c07da329..e35f2abfb 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-2.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac1ef27c8950618f1891c0219363bbe6653667b16f922a4f84554fb85be5185f -size 88179 +oid sha256:afba2a8d37741ade05717616b721d421867d51fa40992909ad0299fd7b0c9c6f +size 88152 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login.png index 42711a175..b6a15239b 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:354a89e44e590eaead83e7067b23c25bec856d24a96e7aa0edf47aa4ed6f9ddc -size 86403 +oid sha256:511188a181af1da44b6887f85ccbb88d4e19117f2f87692cf442ce3373c19433 +size 85133 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMemberDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMemberDetailsScreen.png deleted file mode 100644 index 83a037bc7..000000000 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMemberDetailsScreen.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd7201be7a1cb41467f2f91ed40173b79cead8e99c82ad89686f01abd836b26c -size 76432 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreen.png new file mode 100644 index 000000000..80cc99933 --- /dev/null +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreen.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7d2d9e612e8f551c6c75f77e359a72e0cdf402940f4284e1983f1246dcd52f7 +size 75860 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-0.png index c8d67f389..a125dc92a 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-0.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:704a782a3fb3e9d99eafe567d305edf62f72109ce3442da7b4ab91f8cdb00b8f -size 97501 +oid sha256:cccec1e509adc2041ff349c6906aedcb5598e54ff6c534d7ec234dc4f1777d09 +size 96753 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-1.png index 0dae41ba7..f9a62c3c0 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-1.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f24087c1338f3a7cd3db0a91e67ab1fb333dbe3947addfca43f7224b0452658 -size 168863 +oid sha256:b2020251a237e98dffeeb1895aec31270cc93713f65c58d12e734943582f97e6 +size 168798 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-2.png index 582d67b70..9d8a13dd5 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-2.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c968d3625a28d40bf555e2f7f38661ff63722df08c5a0d03a04b20cd6342d09 -size 98816 +oid sha256:55bdb5c8c1829c52939e4959a1c4acf6ee2762f907a6e873aa398a149af53de0 +size 97559 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelectionNonModal.png index 9b7331700..79800835c 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelectionNonModal.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelectionNonModal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e3f25b2f80d9e58af3bc8986ac0b0d5dee8c6be99525a8fcc8221ea1b233906 -size 94136 +oid sha256:3c7d5815896118336ce2b6fa82b8625285b43de51c66a90b81a0019be506ad17 +size 93394 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.softLogout.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.softLogout.png index 744a53e86..86843338a 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.softLogout.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.softLogout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c359500fb5bb25d49e7b42b7963c18a3fad46c100669b4f2fe8f95cc0b5115df -size 120278 +oid sha256:a18ea7853cb55a1fa02499b7410d1fcffd9b9ca2f0a03cd7b9c3105cd4652517 +size 120196 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.authenticationFlow.png index 9012154bc..b3ee99603 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.authenticationFlow.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.authenticationFlow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55f2e3defd6e1dd070ac7cf377e02d6a5b22145cefd431b2103062601d21fc5b -size 96567 +oid sha256:b40ed44328119207df894a5617b29e2b7616b7642b8bc0a8cf1dcfa0551f2491 +size 96064 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-0.png index b25178310..503eeeb54 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-0.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a91f01196882f11f591c96bcdcb19ff0fcd96b30f395fdbf04c8e2fcf88e9a31 -size 98927 +oid sha256:834ac755d94df5f3dbc9ac2fc8bfa2a8944e8dacbdc8e1230dc898ad18412c46 +size 97420 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-1.png index a5af1bca0..4b2e916e3 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-1.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb9e6ef890631bafdac2d88ee2c03a498685195e872b4b4f346373acf643f831 -size 77888 +oid sha256:dde7a3add93db5eff4bb7fcec66d43e2c467c25b514806f2d5812fb95995c79d +size 77839 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-2.png index 38a2a445b..63675a1f4 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-2.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6accbd0df355c6d0666311cb9faf25a702520e862284aac3932a8f387a68802 -size 100297 +oid sha256:e14113da03d4f9ea05553836cfee5f24b002e98c7a771d11e28fe7b90016a2d8 +size 100246 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login.png index b33f828e8..577da7875 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5ca48609e56626ddcf34b4ab49051861466024ab898e8a466c2e84e87b95476 -size 95251 +oid sha256:8dcb69fb081682f8ca9601256b6d24cf1762439ae0d4a3e68ea399e8c2db5788 +size 94481 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMemberDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMemberDetailsScreen.png deleted file mode 100644 index 1a38b555f..000000000 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMemberDetailsScreen.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff634d4d98c8ba4a64a65888e39932c4997c81324e197e3cb7b841bac54abe6a -size 81635 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png index ca34bb67a..daa96d647 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39473c3ac0d998cb0eb838280827c70a688f2db69aa2ac00d460d0c4a5070e93 -size 82754 +oid sha256:6a6c9fdb03015d69f4e4ed307fe69ae26294c59a9ae595f3c9fc6096443a2d43 +size 82026 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-0.png index f15ac0c89..464554dd0 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-0.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91782800a413c273a3d3b5fd84896a5bde9a87ac25f199883d682e94006c3c85 -size 111953 +oid sha256:f6d978fb8b86bd67fbc60a8f2f4115fed38657ab00f0afd9e5b77e13ff828768 +size 111414 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-1.png index a1ed14679..fadc6e6eb 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-1.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b876c5df16b9421ac33cc2b937f752483414db06ddb6a2a25f6c0515cdf1b3f4 -size 173195 +oid sha256:86c8b92559ac35f5721b90b3f0ac51aee4ef1352a097deb1b75b1b27975d9273 +size 173377 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-2.png index 3059aff5c..e3f10a636 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-2.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c1f427c84959a513475e5c40a5f5961436f75842ccf7e80151ed8caf305f343 -size 115230 +oid sha256:2f07d107a1fb2d14e03ddca3f79ec7e11e3d5afe7a5442cd7b26bae1dc0426d8 +size 114313 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelectionNonModal.png index 93874a247..5595521c4 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelectionNonModal.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelectionNonModal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5158f5470ea255e7780eae7b78c00c0e8737d3ba6894c2a805b77c3f002adb61 -size 107373 +oid sha256:f0ec40146986070a920837aafbe514f55a79661bfa442662b5a43592b11621fb +size 108302 diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.softLogout.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.softLogout.png index 1b9cad657..85619fef4 100644 --- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.softLogout.png +++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.softLogout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2230f61ec8690371717beb99d92f012219298385ef311d89f88797613576abf2 -size 153348 +oid sha256:5dae2d958457d2c23a65788245d0dd5fda0f808e9c2dab692ae4ebaa802b3c1b +size 155060 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.authenticationFlow.png index c2f5fbf81..384c7b141 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.authenticationFlow.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.authenticationFlow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67bfd4b81e1598dabd450afe1c955399ef69b51534961f5f20f2ef9484bc69bd -size 92565 +oid sha256:8ad9a2318453d554ae2ec43c985bbae6d5496d03561bf5759c9089592a334480 +size 92066 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-0.png index 962b03ef1..a10cb1a60 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-0.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6110e8095a5ca74008ff55b1baecb24fb78d9926782b46725272c94341bcd65e -size 94048 +oid sha256:709dbc0dcb03e61c72900b03f93491da3a8c43ff095b0f628d91b39ec06a94f1 +size 92694 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-1.png index ed4c57840..828dfda1a 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-1.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a654688b27120213bae227961b0d954d76682c02e6c57c4c45715fc31ae304eb +oid sha256:b4f95f61c63e0e14193fc1f21c439709508a1c46e54a95806d42f120a2dcf793 size 79627 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-2.png index 7a584fab5..2b8d7be91 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-2.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ae368aa91f0b358da5d96747590e92a649a7799fa4b866e2475aec23af80204 -size 107353 +oid sha256:a2b9a459a16931023f81443d6518581800edbc0d9dd7b198639cfe4e55ad5f2c +size 107330 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login.png index cfb2dd83c..43ffc7082 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91b9052d02f067d265d13deb9249322cf49b4c7ded3f8fc0ef14fc3e28284207 -size 91433 +oid sha256:05a769fada47570430f9fc16381b01d77bfe3b7e1c950c553a5df3ed728b765f +size 90286 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMemberDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMemberDetailsScreen.png deleted file mode 100644 index d2afd23d4..000000000 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMemberDetailsScreen.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd7a1fcfbf788424f6a8221d306020e4349378f780fee1b2cdd058ea24d769ce -size 80084 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreen.png new file mode 100644 index 000000000..3ef52c256 --- /dev/null +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreen.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1ba0077281f0c50d3c56d01c6a745893c6c0d633dff40e04e348c41635bede9 +size 79529 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-0.png index 4f2bfc113..459b65d72 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-0.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:418e459caa144de170393411d57f76b640219959af8868570496169f947f3cc7 -size 115986 +oid sha256:81c1a58f856e230efb85434b7c2ca2b78e36eff9b4aa31029eb075c137ac10c7 +size 115390 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-1.png index fd6668bb8..10b297880 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-1.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a584193016efaf635e7630416be6dad8b3d5387aa2edfc4630a782ad93ed5b2 -size 187780 +oid sha256:61adfdee4d157b813b6f56f7bb375d8d78e4dd05857b57ffaec0670a0bcd134a +size 188124 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-2.png index b7747a453..0124c20e1 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-2.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelection-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2deb2893977d77038a5555da79de84407fd65c06bf745755556b1e63a86a6ea5 -size 119860 +oid sha256:0a4450f8960b16dfda70317c79c8374c86b7e5a34602e52058b929bd87011588 +size 118711 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelectionNonModal.png index 86d97adf3..f8445dc9d 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelectionNonModal.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.serverSelectionNonModal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:235b63b4082c7137e089f3570434a20b513014d949bda277ff73d4785987f621 -size 112921 +oid sha256:75a7c6ca93ac109cc601783b027e255f318f442ecc8045fa69bf4fb4f184452f +size 112062 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.softLogout.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.softLogout.png index 2b164af31..1eeb7b06b 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.softLogout.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.softLogout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d805065062ee7c9ae8cd44be28e2863d69330563335348d4f042ae9c2aefb95 -size 161030 +oid sha256:a193e2bae6b39361d9009f6ac6717593ac424c8579318aa98606710787674536 +size 160281 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.authenticationFlow.png index ea94d4f29..1b299484c 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.authenticationFlow.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.authenticationFlow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05b9c56451a29104b170de1ace7ed42706af3030e3f92f064534a632989a6f21 -size 114222 +oid sha256:db846fed5cd2472e611beaee52b3e02cc1d70490427e5085bb5d37813924ee32 +size 114993 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-0.png index 7e5624e03..16581606e 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-0.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa9af5670518637837d225e27d401cc36f33bd7d865a9e6ba24e72b872c558e5 -size 116142 +oid sha256:a58acc6d270e9398b0f638fbcd23a968fa88ef968cc5943d95b73cc4883e2a22 +size 116000 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-1.png index 0dd7b4fa9..cb0cae674 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-1.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc6e8489847aed3a6e687e71951b999f3907c68ba2ab5c1e4f3e3412c11753c6 -size 93903 +oid sha256:31e489f4fd821ccf142d0cd558e23d78b8bd72f5117b4d4dabc7c5b8efad2fc5 +size 93858 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-2.png index 0959b6ee9..6eecc346b 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-2.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9960c28aa3381c0618cb0ef0609ce1cf11df3c8d040da6ae416f3a680c881894 -size 131951 +oid sha256:bbedad6a1bded0780796d5e4db07a2f94770cc551ec3e071e0ab89c728c8925b +size 131905 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login.png index 8d4f634b4..5a60d28d0 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e2f12fa356efb5e115949cde388a3b884d26c4a97d8bff9688540b96cd1a56b -size 112287 +oid sha256:8b58ab8bc33ee6ea79a2fd995a38896920e4aa64d19453bdc611365f5f63663c +size 111471 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMemberDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMemberDetailsScreen.png deleted file mode 100644 index 631f82b37..000000000 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMemberDetailsScreen.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac138e7b287a9e3b1df4de680949ad361be4b35b7e5016b71d7141c3f2a99d82 -size 88752 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png index 07c5360d0..5bdef3a3c 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26150a466fb3d23e496a8d011bb9a134b1db9c1d7a1e26a06a604f86e1e747ac -size 88536 +oid sha256:b80e3cb5bc5ab0612680ab30972dfb97c0f96b1b3b2e2931aa07b1177781608e +size 86530 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-0.png index b1be0d66d..c4b5c1627 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-0.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04fd81aeafe56b6ff2e819c0476a2349216848bd7d6bfeff2dcee1ce9cabffb6 -size 135604 +oid sha256:dda0bbdefa40fd426f3205f1cbb791010e531b3c1ca4522441edb0c510347158 +size 135166 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-1.png index edfe8c812..b9167d563 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-1.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e8f90f96b6a002fc3278cfc6145989a2cffbf22d5fb8f1ad01010442e2845dd -size 194807 +oid sha256:af3955acbbee0c717649996c01aa7a9f89ef3e77e9b45f896574fb7db1388f4b +size 195270 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-2.png index a7cd4c350..f371627d7 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-2.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelection-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1144067cf306aafc7bec22f160ea4fd995cc6176f58e4810aae8a7a02e97a90f -size 143234 +oid sha256:121ffd5367e25ea4c74bbeb2394eb3fb7890a2ac28b3bb679664123346639753 +size 142332 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelectionNonModal.png index b9f6c1b3b..92c2177e4 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelectionNonModal.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.serverSelectionNonModal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbbb38b27e01f990442b4dd84676f91169c60d1c8325cbab33fcf8a1469d6a0b -size 130560 +oid sha256:0b671d41caf4576ca0910e41df7988d3956ef241259b195acfa2175c8f86018c +size 130248 diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.softLogout.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.softLogout.png index e8accbb4b..4a7c8c0a3 100644 --- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.softLogout.png +++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.softLogout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:512b06e6f3632aa63bb5e1aa9814f141d13c84c5848cf8b425ebdd3a844e0956 -size 221268 +oid sha256:a7d006f07a1970cbd5a70ab6170182782a85875d9316db86bc7a37ce03bb73d2 +size 220025 diff --git a/changelog.d/43.change b/changelog.d/43.change index 89eb24a43..ec19ca7d5 100644 --- a/changelog.d/43.change +++ b/changelog.d/43.change @@ -1 +1 @@ -Allow the search bar to be styled. \ No newline at end of file +Use Compound fonts everywhere. Allow the search bar to be styled. \ No newline at end of file