From cb85440f17711a4f11cbced06e9716f2c61a956b Mon Sep 17 00:00:00 2001
From: Daniel Nordh <3393669+danielnordh@users.noreply.github.com>
Date: Fri, 18 Oct 2024 17:36:12 +0100
Subject: [PATCH] UI tweaks to onboarding screen

---
 .../BDKLogo.imageset/BDKLogo.png              | Bin 0 -> 3743 bytes
 .../BDKLogo.imageset/Contents.json            |  21 ++++
 .../Resources/Localizable.xcstrings           |  23 +++-
 .../View/OnboardingView.swift                 | 113 ++++++++----------
 4 files changed, 92 insertions(+), 65 deletions(-)
 create mode 100644 BDKSwiftExampleWallet/Assets.xcassets/BDKLogo.imageset/BDKLogo.png
 create mode 100644 BDKSwiftExampleWallet/Assets.xcassets/BDKLogo.imageset/Contents.json

diff --git a/BDKSwiftExampleWallet/Assets.xcassets/BDKLogo.imageset/BDKLogo.png b/BDKSwiftExampleWallet/Assets.xcassets/BDKLogo.imageset/BDKLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a20f6b9c599df1d1529c652222fc20a521997a89
GIT binary patch
literal 3743
zcmZ`*dsGuw9=<af(}^8zCJ`MJB^h3dP^QW%)>j}C9ulxBXu(QncIDAsi|N*PE8OTb
zCP)E`VycL=?!l^ytJPMtYUd1X)io-uTSZGLv0bFQN~!fltGGYT{<VK>&dK@C?|$ER
zpL4$%-wWAk!-kF?iVzx>kuJ_hi0B&p(|TxG|But#01U45yw?%3CJp`xN8NK0G!n1R
zPfI}uFNXaH1y!7!m5k8g>Zc#cLl7FCm?0+TtRZfHoAu7(uS3rSBi;$*X?bMet8-^3
zW)weFWz7wAG!#mWc|=jv8gbDichp@IC#XYGw|rCj$?V9FX7!%=t>Kp$xhGcMyGoX=
z%-MecCiZ`Sc<IQu&c!9nn!R|*?t=xzn`{5pu)aO~>imJbkN@@Y$o6k;T)Xi@e;zTv
z{{vy;=hyDsICuHMPuUj}GS@yXS@}jD>e+xUr7Fa_X!VFm#s!AHTO!w(Muu&mb$3&7
zt5L=cv}-)iv^`A>PXnDrwfY3xzp11+R$uZi+7zv!W>Z(+74hNKtGnw8`}d)mI<(gn
zqg7ulfA((+V`NsJo{29*KXtS#7Wx@VWJ5ps7Igyjvx=;*qjgK8)qPMbB<mZXh*Yyc
zy^LxJ<(V2Enp$XA&fh2`EF*~0i;wAq?1oRL8Oj$S+KzXwn6524|J~^sAu>*)TJm_t
z_%527r4a9%y1Jo5k?a`4>b<G>6RU={(5^)yXBkTLR?#}qqAr2u9yhp-iJX*8c6{_U
zJJ5uLSfaP{Iz78!$?g!88li6eh@G{z43_vkD|NCmo?sBBdIdFy@=pibP%<!@XM`z4
zk&e}KwdlxOw64;D*J6NVe9cYkm@Is43qS_Gwh_RAuhjx1<7prX%f!=a0PJ`g>~+{2
zJnbET6dVfNtxO#11+e2#kldPsL;V22L7y{39O|QW%Ocdu61y_$e0d1IXb>V6n}eU0
ztt|Nao!vtk|3C()E4!3W*I6~&CCcxEDQA%ZMdZ46pvlj%`Zad^F7!kTlUccOIT@%F
zxt{H4@?=*3Yotn9G+R04w?NxwWIo$OCyd)x*nb=)ir7$eJ3Q%R-1)0Kljy*Pk}Ty(
z*#N94o|QJ3<i=M?r^GWyGqE9CaZfP_2CvXIj)*p}`s=(J$!oUhlz*wnm25<{u&RE8
zkl_<*cB0yL51mj@e&WQbIOH}6=bGPGb+^B8!hzaDv<~WFM%fZhG_gGM1Ft5EihBm-
z|H3QOY($qWtp0{s8XcwCmXXd@k@IHaSL$iqa|U57n8p!JW}f+sS66^3iSl3c3Pvzl
zS$%hmx?+yvUJE+2EX^XFH$~3B3BeIfHcBnLrXHoZPGFuVnPXl-7)E&B5IJr)YR%`F
z%1kWp8O9FWySKM6uPhd&8Kw3=W+~yjp1f4hoUQRpSTYVK^9(Z=%P{~TF9t}%asq%I
z%gaGB7Y8i>X*dWQ7M6{JaKXY-aj=AEZh_CZn15+x!qe(llG&IS9{l{=FH>WJKMhrf
zL46`Tc;Mdhmm4YsS1oGo61g>g)H+_|+Ox5o$TQ2LRUwwuUolJEE?W1%AUIPL_cs(5
z9igdDkxZ>g?usWo=X`=i6>6IYpZN=B$$#OC|334LuaL}<>&9U1O_=kmK<uLJ)fAUv
zlzZMrc8+IevJ&l3-Wx?SL9cMvhOLpT=ZZm4qO`V2gr`m9@}pE^18v_-ar4_p2ETiG
zgk>z@Nu1(%_~=9QBQ5;p!&#bb7RmhR6^?>CiuK&0xUWp|StquBbb#JHa!`JE)_#c5
z!Cz<oi0C6HA3j>P^3=fB|0<kNzV>KR|D}I=E)hjX*WAB9Z*S%2)rYzlWcJ_w?Vq2I
zy0@;+wH}wzeJA%rcxB+5iyU0zY%<Ia@o<`Uh2<*5uU7SN4y*6kh|Vkkay=Qg0LYIG
zu9twk9;F`6g;c9WX9k@!$@)R($FytQAZb;PgA*R!o8Yv}CNA!)5NxGn{UXquq>_%s
zYG|6lRR+>KY}XW!o^{}F=7IDXqBIjUVN}aZAa9tvrhI*XezNBN&-W}EI!wDh`QzGq
zn`s>trN%FQb~dDppK4hNQT7gcU{eT<?JDpJw((?#nbkw)y%C`yEA6U={8>eIOl0-`
zZRmkhA&Mf@Q)U_G(E>!0j_8gDW-IyyuDLT6ABRkgwyGU58rox)u7GZyLD=aN)Dp^n
z8+sZ+2H^TgE;3LG@B$g=1rW$U8Gw-t3_x;}kO8^V@vu8mL!X$X;m0ca?%X)Ce0es{
z92!G(zql80Hc><a#1KXBI3Ie7C`t#2Ac{%=bVL!uGku6Cii7GcG&!2px7%>&PFnX@
ztLjWvh+d=A#A|3OEi8a!UQPK2UkR+#4H@=;@*jsR`5jRN!>!1~?}BTIN#c!i<8;zF
z0@@td2ba8*7QO`C5F(mq^*drz5t89D<v*LfefFCJ_bwzW?uE2)IKHlW`>44MojV|k
zFsfB=I2HF5TF3zBNFthrw6dy^5t?lb<%h^TI~Qj_R&-GQ&!EV}8IW!DlwS`CRE;jv
ztp3leG#avP9O?W62$JzDkZnI3gttwyWeU+GLjpyqiD2?m{^5{7V1hvWJu5vArZCc3
z46&7re+1JnX6gATO+88Zt9*h0k@q^!1nd}Q9ZCx?v9gp;GCu(WH)Jv7l?S!XggAn@
zfTR8*N<9QG8hA~$!(?Bhg&FCJJ7^GY!LG;vu*4uO+;Tt#kfpf4Hwa<CeNPKvz_mgJ
zTq{(-JvImoq{d@fU{V$Lw@^W!-$Dhe*klkYfxAs{sgNi|B(ujPOEU@2m(Bd6*4i`2
zMzWq>2p#$G!*%`NT^e}pPbRr%2Wrh37@r_=Ef7votiF?#{5xo!1Iy!h=37Xa&9wb0
z#lfT12HAAnC#=Z8RuVd*1<|Utg%F-}kvm~kjc?QTQ546U<dOzt&*7OYv*dLu@8yxq
zmp&m8Ogh%nO$$rGG=lIrMQ(>xtpSsn;wG8o^tsqNk@fro3bPE~B-ZJyXDh|!ABwwq
z{>kItYIoMs_GKg!|6*PB`S9{L6SSI5$Uafz=Ce|XkG78{nPyf_PsZ;#cm}ri=p4nG
zNO<aekbY|0^Q@<a;?`L-V->Q)Qd3x|2TUBvoML4fOldrG#4Pn}qg($9x@b)pLwGuU
zLLdbbtOpLbua0j03&lOODe@$e=>UO&(D#~UZWq%1+b2}c!R`wpY`Uth;+Z{0sY|}f
zo__d#XT5_P9;2$Ionp%)Fc}H`eFz<oRaH;#r(1ufxFj(|PO3t>P5XIflUeHGa+RP!
zGGPZQ1bElDtvRd*PFmO+s~wt7=sh_OZWRpD2If|Z;~)Xy&Ekg8^jv@v((*+xK}>pn
zqd0#`h}@Ee-TQ!j2Fm#%@|sL2Aw&s%_dJKc(;x`jW3{_Z?4Fj(HZ3BVKy!sK(<E6o
zKx-;?kKa#UHWPY&AMZ?{IBye>M#=JitacOz{Q$^GKpx<o2Y@_SA;g1oBaq;X1JXq3
zCxLS!#hnFbJUI8nYD;5O+rnJs9E=&*PuFfkx@);?bOfQ#f5G8jMsX#M5P1?SHAaCZ
z1-q~0u+cgoa~%F2Aag@x-Yhj1<|;ne@hjlu3H>^7mQY-e<5Wdob#eH2VGjRsT4<}y
zFL=yribb`(Tz7u1=%+zaO`9>&tvAU<(W>oJ(I09M+NQEa(IjKh0ya!^8s+F{6<rnm
z1_OMR@d1(Ix}If=NRl~JMNfw1wu?&W76jjSTBV4IalBRuwpCV*aRNkXOgbj+Lj~M@
zsDK-8)xt6WqBQvQAgZ7ONflJUc`Vv3;5>Jp)m9g?MPms)_f@QRe)FZ%r>1WfR>Ktf
zvK{_Sw4f%5{$`4kX7GVjk`Z7=@u1yJzg~@WPP=m4fr+LF?PQFKE}P_opua0}gx>F?
zS7&3QJ3<?4mhf7iYcF(B#&=i=y*F8z9-*Swysk8gvy5bW6{PzNbVdpL#g^Ad#<-oH
z3QPLEIhbk?Y;W=%7D9hESs4SSwO*GUOrzLRF#T|(qOW%E>NNHu%wc|hz0XxjGBtH{
zF>K>LpKBo$4Rmp&in5GBINrukzTSs)i4Nrm4At#*=}D$7lC6Si?ugR1z)+XPq*y{<
z(m<zyX^AliC)+rN4+GN*hXOYX_j+9vn4;K*ozV8D#Y%bkJPw|t6|XK(E+ss@#{`n*
zYT<j6gevH{b1|_dP1y^5by&0otb}@7D*9fLb4W%V9safU0mY%BzMI<Cf`g~8Pe6u~
iaf2T=|NFCT9C&8ZwYXnXrhNEhkjZdliw9Gr4gUf6sW;F7

literal 0
HcmV?d00001

diff --git a/BDKSwiftExampleWallet/Assets.xcassets/BDKLogo.imageset/Contents.json b/BDKSwiftExampleWallet/Assets.xcassets/BDKLogo.imageset/Contents.json
new file mode 100644
index 00000000..2a791272
--- /dev/null
+++ b/BDKSwiftExampleWallet/Assets.xcassets/BDKLogo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "BDKLogo.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/BDKSwiftExampleWallet/Resources/Localizable.xcstrings b/BDKSwiftExampleWallet/Resources/Localizable.xcstrings
index 5678d1a6..4cf558a0 100644
--- a/BDKSwiftExampleWallet/Resources/Localizable.xcstrings
+++ b/BDKSwiftExampleWallet/Resources/Localizable.xcstrings
@@ -223,6 +223,9 @@
           }
         }
       }
+    },
+    "An example bitcoin wallet\npowered by Bitcoin Dev Kit" : {
+
     },
     "Are you sure you want to delete the seed?" : {
       "localizations" : {
@@ -245,7 +248,6 @@
       }
     },
     "BDK Wallet" : {
-      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -297,8 +299,12 @@
           }
         }
       }
+    },
+    "Create wallet" : {
+
     },
     "Create Wallet" : {
+      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -347,8 +353,12 @@
           }
         }
       }
+    },
+    "Esplora server" : {
+
     },
     "Esplora Server" : {
+      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -524,9 +534,6 @@
     },
     "Please make sure to write it down and store it securely." : {
 
-    },
-    "powered by Bitcoin Dev Kit" : {
-
     },
     "Receive" : {
       "localizations" : {
@@ -583,7 +590,10 @@
     "Seed is not synced across devices." : {
 
     },
-    "Select Bitcoin Network" : {
+    "Select bitcoin network" : {
+
+    },
+    "Select esplora server" : {
 
     },
     "Select Fee" : {
@@ -611,6 +621,9 @@
     },
     "Send Transaction" : {
 
+    },
+    "Server" : {
+
     },
     "Settings Error" : {
       "localizations" : {
diff --git a/BDKSwiftExampleWallet/View/OnboardingView.swift b/BDKSwiftExampleWallet/View/OnboardingView.swift
index 09965740..6e1f2f86 100644
--- a/BDKSwiftExampleWallet/View/OnboardingView.swift
+++ b/BDKSwiftExampleWallet/View/OnboardingView.swift
@@ -23,7 +23,6 @@ struct OnboardingView: View {
                 .ignoresSafeArea()
 
             VStack {
-
                 HStack {
                     Spacer()
                     Button {
@@ -48,65 +47,60 @@ struct OnboardingView: View {
                     .padding()
                 }
 
-                Spacer()
-
-                VStack(spacing: 25) {
-                    Image(systemName: "bitcoinsign.circle")
+                VStack {
+                    Image("BDKLogo")
                         .resizable()
-                        .foregroundStyle(
-                            .secondary
-                        )
-                        .frame(width: 100, height: 100, alignment: .center)
-                    Text("powered by Bitcoin Dev Kit")
-                        .foregroundStyle(
-                            LinearGradient(
-                                gradient: Gradient(
-                                    colors: [
-                                        .secondary,
-                                        .primary,
-                                    ]
-                                ),
-                                startPoint: .topLeading,
-                                endPoint: .bottomTrailing
-                            )
-                        )
-                        .fontWidth(.expanded)
-                        .fontWeight(.medium)
+                        .frame(width: 150, height: 150, alignment: .center)
+                        .padding(40)
+                    Text("BDK Wallet")
+                        .textStyle(BitcoinTitle1())
+                    Text("An example bitcoin wallet\npowered by Bitcoin Dev Kit")
+                        .textStyle(BitcoinBody3())
                         .multilineTextAlignment(.center)
-                        .padding()
                 }
-                .padding()
-
-                Picker(
-                    "Network",
-                    selection: $viewModel.selectedNetwork
-                ) {
-                    Text("Signet").tag(Network.signet)
-                    Text("Testnet").tag(Network.testnet)
-                }
-                .pickerStyle(.automatic)
-                .tint(.primary)
-                .accessibilityLabel("Select Bitcoin Network")
-
-                Picker(
-                    "Esplora Server",
-                    selection: $viewModel.selectedURL
-                ) {
-                    ForEach(viewModel.availableURLs, id: \.self) { url in
-                        Text(
-                            url.replacingOccurrences(
-                                of: "https://",
-                                with: ""
-                            ).replacingOccurrences(
-                                of: "http://",
-                                with: ""
-                            )
-                        )
-                        .tag(url)
+                
+                Spacer()
+                
+                NavigationStack {
+                    HStack {
+                        Text("Network")
+                        Spacer()
+                        Picker(
+                            "Network",
+                            selection: $viewModel.selectedNetwork
+                        ) {
+                            Text("Signet").tag(Network.signet)
+                            Text("Testnet").tag(Network.testnet)
+                        }
+                        .pickerStyle(.automatic)
+                        .tint(.bitcoinOrange)
+                        .accessibilityLabel("Select bitcoin network")
                     }
-                }
-                .pickerStyle(.automatic)
-                .tint(.primary)
+                    HStack{
+                        Text("Server")
+                        Spacer()
+                        Picker(
+                            "Esplora server",
+                            selection: $viewModel.selectedURL
+                        ) {
+                            ForEach(viewModel.availableURLs, id: \.self) { url in
+                                Text(
+                                    url.replacingOccurrences(
+                                        of: "https://",
+                                        with: ""
+                                    ).replacingOccurrences(
+                                        of: "http://",
+                                        with: ""
+                                    )
+                                )
+                                .tag(url)
+                            }
+                        }
+                        .pickerStyle(.automatic)
+                        .tint(.bitcoinOrange)
+                        .accessibilityLabel("Select esplora server")
+                    }
+                }.padding(.horizontal, 50)
 
                 if viewModel.wordArray != [] {
                     SeedPhraseView(
@@ -121,13 +115,12 @@ struct OnboardingView: View {
 
                 Spacer()
 
-                Button("Create Wallet") {
+                Button("Create wallet") {
                     viewModel.createWallet()
                 }
                 .buttonStyle(
                     BitcoinFilled(
-                        tintColor: .primary,
-                        textColor: Color(uiColor: .systemBackground),
+                        tintColor: .bitcoinOrange,
                         isCapsule: true
                     )
                 )
@@ -135,7 +128,7 @@ struct OnboardingView: View {
 
             }
 
-        }
+        }.padding(.bottom, 20)
         .alert(isPresented: $showingOnboardingViewErrorAlert) {
             Alert(
                 title: Text("Onboarding Error"),