ui: color from orange to primary

reez · reez · commit 74a867b31c92 · 2024-10-05T11:19:17.000-05:00
diff --git a/BDKSwiftExampleWallet/Assets.xcassets/AccentColor.colorset/Contents.json b/BDKSwiftExampleWallet/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -3,7 +3,7 @@
     {
       "color" : {
         "platform" : "universal",
-        "reference" : "systemOrangeColor"
+        "reference" : "labelColor"
       },
       "idiom" : "universal"
     }
diff --git a/BDKSwiftExampleWallet/View/Activity/TransactionDetailView.swift b/BDKSwiftExampleWallet/View/Activity/TransactionDetailView.swift
@@ -115,7 +115,7 @@ struct TransactionDetailView: View {
                     } label: {
                         Image(systemName: "safari")
                             .fontWeight(.semibold)
-                            .foregroundStyle(Color.bitcoinOrange)
+                            .foregroundStyle(.primary)
                     }
                     Spacer()
                 }
@@ -142,7 +142,7 @@ struct TransactionDetailView: View {
                         }
                     }
                     .fontWeight(.semibold)
-                    .foregroundStyle(Color.bitcoinOrange)
+                    .foregroundStyle(.primary)
                 }
             }
             .fontDesign(.monospaced)
diff --git a/BDKSwiftExampleWallet/View/OnboardingView.swift b/BDKSwiftExampleWallet/View/OnboardingView.swift
@@ -126,7 +126,7 @@ struct OnboardingView: View {
                 }
                 .buttonStyle(
                     BitcoinFilled(
-                        tintColor: .bitcoinOrange,
+                        tintColor: .primary,
                         textColor: Color(uiColor: .systemBackground),
                         isCapsule: true
                     )
diff --git a/BDKSwiftExampleWallet/View/Receive/ReceiveView.swift b/BDKSwiftExampleWallet/View/Receive/ReceiveView.swift
@@ -75,7 +75,7 @@ struct ReceiveView: View {
                             }
                         }
                         .fontWeight(.semibold)
-                        .foregroundStyle(Color.bitcoinOrange)
+                        .foregroundStyle(.primary)
                     }
                 }
                 .padding()
diff --git a/BDKSwiftExampleWallet/View/Send/AmountView.swift b/BDKSwiftExampleWallet/View/Send/AmountView.swift
@@ -71,7 +71,13 @@ struct AmountView: View {
                         )
                         .labelStyle(.iconOnly)
                     }
-                    .buttonStyle(BitcoinOutlined(width: 100, isCapsule: true))
+                    .buttonStyle(
+                        BitcoinOutlined(
+                            width: 100,
+                            tintColor: .primary,
+                            isCapsule: true
+                        )
+                    )
 
                 }
 
diff --git a/BDKSwiftExampleWallet/View/Send/BuildTransactionView.swift b/BDKSwiftExampleWallet/View/Send/BuildTransactionView.swift
@@ -149,12 +149,12 @@ struct BuildTransactionView: View {
                         .buttonStyle(
                             isSent
                                 ? BitcoinFilled(
-                                    tintColor: .bitcoinRed,
+                                    tintColor: .secondary,
                                     textColor: Color(uiColor: .systemBackground),
                                     isCapsule: true
                                 )
                                 : BitcoinFilled(
-                                    tintColor: .bitcoinOrange,
+                                    tintColor: .primary,
                                     textColor: Color(uiColor: .systemBackground),
                                     isCapsule: true
                                 )
@@ -188,10 +188,11 @@ struct BuildTransactionView: View {
                                                     systemName: showCheckmark
                                                         ? "checkmark" : "doc.on.doc"
                                                 )
+                                                .foregroundStyle(.primary)
                                             }
                                         }
                                         .fontWeight(.semibold)
-                                        .foregroundStyle(Color.bitcoinOrange)
+                                        .foregroundStyle(.primary)
                                     }
                                 }
                                 .fontDesign(.monospaced)
diff --git a/BDKSwiftExampleWallet/View/Send/FeeView.swift b/BDKSwiftExampleWallet/View/Send/FeeView.swift
@@ -98,7 +98,13 @@ struct FeeView: View {
                     )
                     .labelStyle(.iconOnly)
                 }
-                .buttonStyle(BitcoinOutlined(width: 100, isCapsule: true))
+                .buttonStyle(
+                    BitcoinOutlined(
+                        width: 100,
+                        tintColor: .primary,
+                        isCapsule: true
+                    )
+                )
 
             }
             .padding()
diff --git a/BDKSwiftExampleWallet/View/Settings/SeedView.swift b/BDKSwiftExampleWallet/View/Settings/SeedView.swift
@@ -63,7 +63,7 @@ struct SeedView: View {
                             BitcoinFilled(
                                 width: 120,
                                 height: 40,
-                                tintColor: .bitcoinOrange,
+                                tintColor: .primary,
                                 textColor: Color(uiColor: .systemBackground),
                                 isCapsule: true
                             )

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`"color" : {`
`5`	`5`	`"platform" : "universal",`
`6`		`- "reference" : "systemOrangeColor"`
	`6`	`+ "reference" : "labelColor"`
`7`	`7`	`},`
`8`	`8`	`"idiom" : "universal"`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ struct TransactionDetailView: View {`
`115`	`115`	`} label: {`
`116`	`116`	`Image(systemName: "safari")`
`117`	`117`	`.fontWeight(.semibold)`
`118`		`- .foregroundStyle(Color.bitcoinOrange)`
	`118`	`+ .foregroundStyle(.primary)`
`119`	`119`	`}`
`120`	`120`	`Spacer()`
`121`	`121`	`}`
`@@ -142,7 +142,7 @@ struct TransactionDetailView: View {`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`.fontWeight(.semibold)`
`145`		`- .foregroundStyle(Color.bitcoinOrange)`
	`145`	`+ .foregroundStyle(.primary)`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`.fontDesign(.monospaced)`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ struct OnboardingView: View {`
`126`	`126`	`}`
`127`	`127`	`.buttonStyle(`
`128`	`128`	`BitcoinFilled(`
`129`		`- tintColor: .bitcoinOrange,`
	`129`	`+ tintColor: .primary,`
`130`	`130`	`textColor: Color(uiColor: .systemBackground),`
`131`	`131`	`isCapsule: true`
`132`	`132`	`)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ struct ReceiveView: View {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`.fontWeight(.semibold)`
`78`		`- .foregroundStyle(Color.bitcoinOrange)`
	`78`	`+ .foregroundStyle(.primary)`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`.padding()`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,13 @@ struct AmountView: View {`
`71`	`71`	`)`
`72`	`72`	`.labelStyle(.iconOnly)`
`73`	`73`	`}`
`74`		`- .buttonStyle(BitcoinOutlined(width: 100, isCapsule: true))`
	`74`	`+ .buttonStyle(`
	`75`	`+ BitcoinOutlined(`
	`76`	`+ width: 100,`
	`77`	`+ tintColor: .primary,`
	`78`	`+ isCapsule: true`
	`79`	`+ )`
	`80`	`+ )`
`75`	`81`
`76`	`82`	`}`
`77`	`83`
Original file line number	Diff line number	Diff line change
`@@ -149,12 +149,12 @@ struct BuildTransactionView: View {`
`149`	`149`	`.buttonStyle(`
`150`	`150`	`isSent`
`151`	`151`	`? BitcoinFilled(`
`152`		`- tintColor: .bitcoinRed,`
	`152`	`+ tintColor: .secondary,`
`153`	`153`	`textColor: Color(uiColor: .systemBackground),`
`154`	`154`	`isCapsule: true`
`155`	`155`	`)`
`156`	`156`	`: BitcoinFilled(`
`157`		`- tintColor: .bitcoinOrange,`
	`157`	`+ tintColor: .primary,`
`158`	`158`	`textColor: Color(uiColor: .systemBackground),`
`159`	`159`	`isCapsule: true`
`160`	`160`	`)`
`@@ -188,10 +188,11 @@ struct BuildTransactionView: View {`
`188`	`188`	`systemName: showCheckmark`
`189`	`189`	`? "checkmark" : "doc.on.doc"`
`190`	`190`	`)`
	`191`	`+ .foregroundStyle(.primary)`
`191`	`192`	`}`
`192`	`193`	`}`
`193`	`194`	`.fontWeight(.semibold)`
`194`		`- .foregroundStyle(Color.bitcoinOrange)`
	`195`	`+ .foregroundStyle(.primary)`
`195`	`196`	`}`
`196`	`197`	`}`
`197`	`198`	`.fontDesign(.monospaced)`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,13 @@ struct FeeView: View {`
`98`	`98`	`)`
`99`	`99`	`.labelStyle(.iconOnly)`
`100`	`100`	`}`
`101`		`- .buttonStyle(BitcoinOutlined(width: 100, isCapsule: true))`
	`101`	`+ .buttonStyle(`
	`102`	`+ BitcoinOutlined(`
	`103`	`+ width: 100,`
	`104`	`+ tintColor: .primary,`
	`105`	`+ isCapsule: true`
	`106`	`+ )`
	`107`	`+ )`
`102`	`108`
`103`	`109`	`}`
`104`	`110`	`.padding()`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ struct SeedView: View {`
`63`	`63`	`BitcoinFilled(`
`64`	`64`	`width: 120,`
`65`	`65`	`height: 40,`
`66`		`- tintColor: .bitcoinOrange,`
	`66`	`+ tintColor: .primary,`
`67`	`67`	`textColor: Color(uiColor: .systemBackground),`
`68`	`68`	`isCapsule: true`
`69`	`69`	`)`