mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-10-31 08:15:24 +00:00
joel.poyet
22a098ecff
Xcode 27 ships Swift 6.4, which rejects two things 26.09.1 still contains. The upstream fix for the app itself is cherry-picked as the commit before this one; these two are what it does not cover. Compound's colour overrides now take a KeyPath & Sendable, so the HealthChat brand arrays have to carry the same constraint. NotificationContentBuilder is main-actor isolated, so its test suite has to build the type from an async init. The lines match upstream's own fix, which only exists inside the larger AccountProvider change (#6103) and so cannot be cherry-picked on its own.
85 lines
3.2 KiB
Swift
85 lines
3.2 KiB
Swift
//
|
|
// Copyright 2026 Novaloop AG
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import Compound
|
|
import SwiftUI
|
|
import UIKit
|
|
|
|
/// Recolours Compound's accent token family to the HealthChat brand.
|
|
/// Applied once at startup from `AppCoordinator` via `AppHooks.compoundHook`. Because the override
|
|
/// runs at app startup (not in previews), preview snapshots keep the default Compound colours.
|
|
struct HealthChatCompoundHook: CompoundHookProtocol {
|
|
func override(colors: CompoundColors, uiColors: CompoundUIColors) {
|
|
let brand = HealthChatBrandColors.brand
|
|
let tint = HealthChatBrandColors.tint
|
|
|
|
// Solid accent → brand blue (primary + send buttons, links, accent icons, badges, borders).
|
|
// NB: bgAccentRest is a SOLID fill (behind a white icon on the send button), not a subtle tint.
|
|
let solidColorTokens: [KeyPath<CompoundColorTokens, Color>] = [
|
|
\.bgActionPrimaryRest,
|
|
\.bgAccentRest,
|
|
\.iconAccentPrimary,
|
|
\.iconAccentTertiary,
|
|
\.textActionPrimary,
|
|
\.textActionAccent,
|
|
\.textLinkExternal,
|
|
\.borderInteractivePrimary,
|
|
\.textBadgeAccent
|
|
]
|
|
let solidUIColorTokens: [KeyPath<CompoundUIColorTokens, UIColor> & Sendable] = [
|
|
\.bgActionPrimaryRest,
|
|
\.bgAccentRest,
|
|
\.iconAccentPrimary,
|
|
\.iconAccentTertiary,
|
|
\.textActionPrimary,
|
|
\.textActionAccent,
|
|
\.textLinkExternal,
|
|
\.borderInteractivePrimary,
|
|
\.textBadgeAccent
|
|
]
|
|
for keyPath in solidColorTokens {
|
|
colors.override(keyPath, with: Color(brand))
|
|
}
|
|
for keyPath in solidUIColorTokens {
|
|
uiColors.override(keyPath, with: brand)
|
|
}
|
|
|
|
// Primary button pressed state. The disabled state stays Compound's neutral grey.
|
|
colors.override(\.bgActionPrimaryPressed, with: Color(HealthChatBrandColors.brandPressed))
|
|
uiColors.override(\.bgActionPrimaryPressed, with: HealthChatBrandColors.brandPressed)
|
|
|
|
// Gradient "super"/action buttons → brand blue (SwiftUI-only concept).
|
|
let gradientTokens: [KeyPath<CompoundColorTokens, Color>] = [
|
|
\.gradientActionStop1,
|
|
\.gradientActionStop2,
|
|
\.gradientActionStop3,
|
|
\.gradientActionStop4
|
|
]
|
|
for keyPath in gradientTokens {
|
|
colors.override(keyPath, with: Color(brand))
|
|
}
|
|
|
|
// Subtle accent backgrounds (paired with accent-coloured foregrounds) → brand tint.
|
|
let tintColorTokens: [KeyPath<CompoundColorTokens, Color>] = [
|
|
\.bgAccentSelected,
|
|
\.bgBadgeAccent,
|
|
\.borderAccentSubtle
|
|
]
|
|
let tintUIColorTokens: [KeyPath<CompoundUIColorTokens, UIColor> & Sendable] = [
|
|
\.bgAccentSelected,
|
|
\.bgBadgeAccent,
|
|
\.borderAccentSubtle
|
|
]
|
|
for keyPath in tintColorTokens {
|
|
colors.override(keyPath, with: Color(tint))
|
|
}
|
|
for keyPath in tintUIColorTokens {
|
|
uiColors.override(keyPath, with: tint)
|
|
}
|
|
}
|
|
}
|