ui: color from orange to primary

bitcoindevkit · Oct 5, 2024 · d9dca01 · d9dca01
1 parent 611f267
commit d9dca01
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 11 deletions.
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
                             )