diff --git a/RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift b/RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift index afd2e47a5..1fd256b5a 100644 --- a/RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift +++ b/RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift @@ -87,7 +87,7 @@ struct LiveLocationSharingViewer: View { HStack(spacing: 10) { Image(uiImage: Asset.Images.locationLiveCellIcon.image) .renderingMode(.template) - .foregroundColor(theme.colors.quaternaryContent) + .foregroundColor(theme.colors.quarterlyContent) .frame(width: 40, height: 40) Text(VectorL10n.liveLocationSharingEnded) .font(theme.fonts.body) diff --git a/RiotSwiftUI/Modules/Onboarding/Congratulations/OnboardingCongratulationsModels.swift b/RiotSwiftUI/Modules/Onboarding/Congratulations/OnboardingCongratulationsModels.swift index a94adf6f1..bfc53c682 100644 --- a/RiotSwiftUI/Modules/Onboarding/Congratulations/OnboardingCongratulationsModels.swift +++ b/RiotSwiftUI/Modules/Onboarding/Congratulations/OnboardingCongratulationsModels.swift @@ -37,7 +37,7 @@ struct OnboardingCongratulationsViewState: BindableState { let attributedMessage = NSMutableAttributedString(string: message) let range = (message as NSString).range(of: userId) if range.location != NSNotFound { - attributedMessage.addAttributes([.font: UIFont.element.body.bold], range: range) + attributedMessage.addAttributes([.font: UIFont.preferredFont(forTextStyle: .body).vc_bold], range: range) } return attributedMessage diff --git a/changelog.d/pr-6586.api b/changelog.d/pr-6586.api new file mode 100644 index 000000000..3be1cd7b0 --- /dev/null +++ b/changelog.d/pr-6586.api @@ -0,0 +1 @@ +Reverts #6275, bringing the local DesignKit package back. diff --git a/docs/Customisation.md b/docs/Customisation.md index 7bf816815..b3de09469 100644 --- a/docs/Customisation.md +++ b/docs/Customisation.md @@ -12,6 +12,6 @@ Various features of Element iOS can be enabled/disabled/configured via flags in ## Theme -Element iOS has a [dependency](https://github.com/vector-im/element-ios/blob/92fc7046ede2720d4b46bffd07d97ce59b50d95f/project.yml#L42-L44) on our DesignKit package which supplies the fonts, colours and some common components we use across multiple apps. The fonts are defined [directly](https://github.com/vector-im/element-x-ios/tree/develop/DesignKit/Sources/Fonts) in this package. The colours come from a [dependency](https://github.com/vector-im/element-x-ios/blob/2f69c9978231b6e7cf0b0c3126846f2369e999bb/Package.swift#L13) on our [Design Tokens](https://github.com/vector-im/element-design-tokens) repo which is a style dictionary that allows to us share definitions across multiple platforms. +The themes used in Element iOS can be found in `Riot/Managers/Theme/Themes`. A newer theming system is available as nested `colors` and `fonts` properties on these themes and can be found in `DesignKit/Variants/Colors` and `DesignKit/Variants/Fonts` respectively. The newer system is used for screens built in UIKit with Swift and all of the SwiftUI screens. For logos, they're currently regular assets that can be found either in [Images.xcassets](https://github.com/vector-im/element-ios/tree/develop/Riot/Assets/Images.xcassets) or [SharedImages.xcassets](https://github.com/vector-im/element-ios/tree/develop/Riot/Assets/SharedImages.xcassets).