diff --git a/Flipcash/Core/Screens/Profile/E2eeLearnMoreSheet.swift b/Flipcash/Core/Screens/Profile/E2eeLearnMoreSheet.swift index 37702b315..f2c62889c 100644 --- a/Flipcash/Core/Screens/Profile/E2eeLearnMoreSheet.swift +++ b/Flipcash/Core/Screens/Profile/E2eeLearnMoreSheet.swift @@ -95,7 +95,7 @@ struct E2eeLearnMoreSheet: View { Group { if isEncrypted { Image(systemName: "checkmark.circle.fill") - .foregroundStyle(Color.backgroundMain, Color(r: 47, g: 194, b: 107)) + .foregroundStyle(Color.backgroundMain, Color.success) } else { Image(systemName: "minus.circle.fill") .foregroundStyle(Color.white.opacity(0.7), Color.white.opacity(0.12)) diff --git a/Flipcash/Core/Screens/Settings/BetaFlagToggleRow.swift b/Flipcash/Core/Screens/Settings/BetaFlagToggleRow.swift index 56f51a76a..6dd7a4e9c 100644 --- a/Flipcash/Core/Screens/Settings/BetaFlagToggleRow.swift +++ b/Flipcash/Core/Screens/Settings/BetaFlagToggleRow.swift @@ -27,7 +27,7 @@ struct BetaFlagToggleRow: View { } .padding(.trailing, 20) } - .tint(.textSuccess) + .tint(.success) } .padding(20) .vSeparator(color: .rowSeparator, position: .bottom) diff --git a/Flipcash/Core/Screens/Settings/SettingsAppSettingsScreen.swift b/Flipcash/Core/Screens/Settings/SettingsAppSettingsScreen.swift index b6b091c29..c1d4e9484 100644 --- a/Flipcash/Core/Screens/Settings/SettingsAppSettingsScreen.swift +++ b/Flipcash/Core/Screens/Settings/SettingsAppSettingsScreen.swift @@ -25,7 +25,7 @@ struct SettingsAppSettingsScreen: View { .multilineTextAlignment(.leading) .truncationMode(.tail) .padding(.trailing, 2) - .tint(.textSuccess) + .tint(.success) } } .font(.appDisplayXS) diff --git a/Flipcash/Supporting Files/Assets.xcassets/Colors/success.colorset/Contents.json b/Flipcash/Supporting Files/Assets.xcassets/Colors/success.colorset/Contents.json index d7582b8ee..332a6d858 100644 --- a/Flipcash/Supporting Files/Assets.xcassets/Colors/success.colorset/Contents.json +++ b/Flipcash/Supporting Files/Assets.xcassets/Colors/success.colorset/Contents.json @@ -2,12 +2,12 @@ "colors" : [ { "color" : { - "color-space" : "display-p3", + "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x59", - "green" : "0xC7", - "red" : "0x34" + "blue" : "0x6A", + "green" : "0xC8", + "red" : "0x1A" } }, "idiom" : "universal" diff --git a/FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift b/FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift index c84c40f24..7c9020330 100644 --- a/FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift +++ b/FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift @@ -19,7 +19,7 @@ extension ShapeStyle where Self == Color { public static var textAction: Color { Color.black } public static var textActionDisabled: Color { Color(r: 78, g: 78, b: 78) } public static var textError: Color { Color(r: 255, g: 131, b: 131) } - public static var textSuccess: Color { Color(r: 73 , g: 213, b: 23) } + public static var textSuccess: Color { Color(r: 115, g: 234, b: 164) } public static var textWarning: Color { Color(r: 255, g: 243, b: 131) } public static var warning: Color { Color(r: 255, g: 169, b: 57) } /// The ground `warning` sits on when it labels a state rather than raising an alarm — amber at @@ -46,8 +46,8 @@ extension ShapeStyle where Self == Color { public static var checkmarkBackground: Color { Color.white } - /// `#34C759` — Apple's system green. Backed by the `success` asset (already - /// in the catalog, unused as a named token until the username progress card). + /// `#1AC86A` — the shared success fill (switch tracks, bubbles, filled icons), the same + /// green Android uses. Success text uses `textSuccess` (`#73EAA4`). Backed by the `success` asset. public static var success: Color { Color("success") } } diff --git a/FlipcashUI/Sources/FlipcashUI/Views/Badge.swift b/FlipcashUI/Sources/FlipcashUI/Views/Badge.swift index 2586429da..c36ef1679 100644 --- a/FlipcashUI/Sources/FlipcashUI/Views/Badge.swift +++ b/FlipcashUI/Sources/FlipcashUI/Views/Badge.swift @@ -125,7 +125,7 @@ struct Badge_Previews: PreviewProvider { static var previews: some View { Background(color: .backgroundMain) { VStack { - Badge(decoration: .bubble(.textSuccess), text: "Invited") + Badge(decoration: .bubble(.success), text: "Invited") Badge(decoration: .checkmark, text: "On Code") } } diff --git a/FlipcashUI/Sources/FlipcashUI/Views/Bubble.swift b/FlipcashUI/Sources/FlipcashUI/Views/Bubble.swift index a20c59fce..ed6ab997e 100644 --- a/FlipcashUI/Sources/FlipcashUI/Views/Bubble.swift +++ b/FlipcashUI/Sources/FlipcashUI/Views/Bubble.swift @@ -16,7 +16,7 @@ public struct Bubble: View { public let count: Int public let color: Color - public init(size: Size, count: Int, color: Color = .textSuccess) { + public init(size: Size, count: Int, color: Color = .success) { self.size = size self.count = count self.color = color