Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Flipcash/Core/Screens/Profile/E2eeLearnMoreSheet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion Flipcash/Core/Screens/Settings/BetaFlagToggleRow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct BetaFlagToggleRow: View {
}
.padding(.trailing, 20)
}
.tint(.textSuccess)
.tint(.success)
}
.padding(20)
.vSeparator(color: .rowSeparator, position: .bottom)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct SettingsAppSettingsScreen: View {
.multilineTextAlignment(.leading)
.truncationMode(.tail)
.padding(.trailing, 2)
.tint(.textSuccess)
.tint(.success)
}
}
.font(.appDisplayXS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions FlipcashUI/Sources/FlipcashUI/Theme/Colors.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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") }
}

Expand Down
2 changes: 1 addition & 1 deletion FlipcashUI/Sources/FlipcashUI/Views/Badge.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down
2 changes: 1 addition & 1 deletion FlipcashUI/Sources/FlipcashUI/Views/Bubble.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading