ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compound Fonts (#834)

Browse Source 
* Use CompoundFonts in DesignKit (deprecate ElementFonts).

* Use compound fonts everywhere.

* Update Authentication snapshots.

* Update RoomMembersListScreen snapshots.

Delete unused snapshots.

* Fix tests.
This commit is contained in:
Doug
2023-04-25 16:42:06 +01:00
committed by GitHub
parent 8b36e0faa5
commit 5bb2ceedf4
100 changed files with 185 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
+3 -3
View File
@@ -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)
}
}
}
ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift
+1 -1
View File
@@ -55,7 +55,7 @@ struct FormRowLabelStyle: LabelStyle {
.background(iconBackgroundColor)
.clipShape(RoundedRectangle(cornerRadius: 8))
configuration.title
.font(.element.body)
.font(.compound.bodyLG)
.foregroundColor(titleColor)
}
}
ElementX/Sources/Other/SwiftUI/Form Styles/FormSection.swift
+1 -1
View File
@@ -21,7 +21,7 @@ struct FormSectionHeaderStyle: ViewModifier {
func body(content: Content) -> some View {
content
.foregroundColor(.element.secondaryContent)
.font(.element.caption1)
.font(.compound.bodyXS)
}
}
ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift
+2 -2
View File
@@ -35,13 +35,13 @@ struct AvatarHeaderView<Footer: View>: 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)
}
ElementX/Sources/Other/SwiftUI/Views/UserProfileCell.swift
+2 -2
View File
@@ -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)
}