Merge nucleic/humble-willow-marten into dev
This commit is contained in:
@@ -1,4 +1,14 @@
|
|||||||
{
|
{
|
||||||
"colors" : [ { "color" : { "color-space" : "srgb", "components" : { "red" : "0.118", "green" : "0.565", "blue" : "0.553", "alpha" : "1.000" } }, "idiom" : "universal" } ],
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : { "color-space" : "srgb", "components" : { "red" : "0.450", "green" : "0.320", "blue" : "0.820", "alpha" : "1.000" } },
|
||||||
|
"idiom" : "universal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"appearances" : [ { "appearance" : "luminosity", "value" : "dark" } ],
|
||||||
|
"color" : { "color-space" : "srgb", "components" : { "red" : "0.660", "green" : "0.550", "blue" : "0.950", "alpha" : "1.000" } },
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
"info" : { "author" : "xcode", "version" : 1 }
|
"info" : { "author" : "xcode", "version" : 1 }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,21 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
import UIKit
|
||||||
import NucleicProtocol
|
import NucleicProtocol
|
||||||
|
|
||||||
/// The mobile mirror of the Mac's design language (AppTheme/AppPalette on desktop): a deep
|
/// The mobile mirror of the Mac's design language (AppTheme/AppPalette on desktop): a
|
||||||
/// teal accent, the same categorical status palette, and the same status→color mapping
|
/// lavender/purple accent, the same categorical status palette, and the same status→color
|
||||||
/// refined by turn disposition — so the two devices read identically. Pure SwiftUI Color
|
/// mapping refined by turn disposition — so the two devices read identically. Pure SwiftUI
|
||||||
/// (no AppKit), adapting to light/dark via the system.
|
/// Color, adapting to light/dark via the system.
|
||||||
enum Palette {
|
enum Palette {
|
||||||
static let accent = Color(red: 0.04, green: 0.52, blue: 0.50) // deep teal
|
/// Lavender/purple accent with a separate shade per appearance: a deep violet in light
|
||||||
|
/// (white labels read at ~5.4:1) and a brighter lavender in dark, so it lifts off the
|
||||||
|
/// near-black background instead of muddying into it. Mirrors the Mac's appearance-aware
|
||||||
|
/// accent (AppPalette, nightSoftened for dark).
|
||||||
|
static let accent = Color(uiColor: UIColor { trait in
|
||||||
|
trait.userInterfaceStyle == .dark
|
||||||
|
? UIColor(red: 0.66, green: 0.55, blue: 0.95, alpha: 1) // brighter lavender — dark mode
|
||||||
|
: UIColor(red: 0.45, green: 0.32, blue: 0.82, alpha: 1) // deep violet — light mode
|
||||||
|
})
|
||||||
static let active = Color(red: 0.20, green: 0.55, blue: 0.95) // blue
|
static let active = Color(red: 0.20, green: 0.55, blue: 0.95) // blue
|
||||||
static let attention = Color(red: 1.00, green: 0.65, blue: 0.15) // amber
|
static let attention = Color(red: 1.00, green: 0.65, blue: 0.15) // amber
|
||||||
static let success = Color(red: 0.30, green: 0.80, blue: 0.45) // green
|
static let success = Color(red: 0.30, green: 0.80, blue: 0.45) // green
|
||||||
@@ -111,6 +120,6 @@ struct CardBackground: ViewModifier {
|
|||||||
|
|
||||||
extension View {
|
extension View {
|
||||||
func card(padding: CGFloat = 14) -> some View { modifier(CardBackground(padding: padding)) }
|
func card(padding: CGFloat = 14) -> some View { modifier(CardBackground(padding: padding)) }
|
||||||
/// Apply the teal accent app-wide.
|
/// Apply the lavender accent app-wide.
|
||||||
func nucleicTint() -> some View { tint(Palette.accent) }
|
func nucleicTint() -> some View { tint(Palette.accent) }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user