From f0cb230fab5883cb41b28051523b5b848fd98068 Mon Sep 17 00:00:00 2001 From: Zafar Ivaev Date: Mon, 24 Jul 2023 18:00:28 +0500 Subject: [PATCH] fix: change Crypto screen title and button icons --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- p2p_wallet/Common/Models/WalletActionType.swift | 4 ++-- .../Contents.json | 2 +- .../actionReceive.imageset/actionReceive.pdf | Bin 0 -> 3567 bytes .../Contents.json | 2 +- .../actionSwap.imageset/actionSwap.pdf | Bin 0 -> 3658 bytes .../homeReceive.imageset/receive.pdf | Bin 2854 -> 0 bytes .../Assets.xcassets/homeSwap.imageset/swap.pdf | Bin 2726 -> 0 bytes .../Resources/Base.lproj/Localizable.strings | 2 +- .../Resources/en.lproj/Localizable.strings | 2 +- .../Resources/fr.lproj/Localizable.strings | 2 +- .../Resources/ru.lproj/Localizable.strings | 2 +- .../Resources/vi.lproj/Localizable.strings | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename p2p_wallet/Resources/Assets.xcassets/{homeSwap.imageset => actionReceive.imageset}/Contents.json (75%) create mode 100644 p2p_wallet/Resources/Assets.xcassets/actionReceive.imageset/actionReceive.pdf rename p2p_wallet/Resources/Assets.xcassets/{homeReceive.imageset => actionSwap.imageset}/Contents.json (76%) create mode 100644 p2p_wallet/Resources/Assets.xcassets/actionSwap.imageset/actionSwap.pdf delete mode 100644 p2p_wallet/Resources/Assets.xcassets/homeReceive.imageset/receive.pdf delete mode 100644 p2p_wallet/Resources/Assets.xcassets/homeSwap.imageset/swap.pdf diff --git a/p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index cc1807eca6..5ce58bff3e 100644 --- a/p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -266,8 +266,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/promises.git", "state" : { - "revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e", - "version" : "2.3.1" + "revision" : "c22f76b709dc4bb6d274398259e75c191e50998a", + "version" : "2.3.0" } }, { @@ -365,8 +365,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "5f542894dd8efbd766d8adf73ef2f947b0cd5e21", - "version" : "2.56.0" + "revision" : "324bc65a28323660fad8a36a7a37f0c2c78eeb9a", + "version" : "2.55.0" } }, { diff --git a/p2p_wallet/Common/Models/WalletActionType.swift b/p2p_wallet/Common/Models/WalletActionType.swift index 4dd02a43e6..69870ad4f4 100644 --- a/p2p_wallet/Common/Models/WalletActionType.swift +++ b/p2p_wallet/Common/Models/WalletActionType.swift @@ -32,13 +32,13 @@ enum WalletActionType { var icon: UIImage { switch self { case .receive: - return .homeReceive + return .actionReceive case .buy: return .homeBuy case .send: return .homeSend case .swap: - return .homeSwap + return .actionSwap case .cashOut: return .cashOut } diff --git a/p2p_wallet/Resources/Assets.xcassets/homeSwap.imageset/Contents.json b/p2p_wallet/Resources/Assets.xcassets/actionReceive.imageset/Contents.json similarity index 75% rename from p2p_wallet/Resources/Assets.xcassets/homeSwap.imageset/Contents.json rename to p2p_wallet/Resources/Assets.xcassets/actionReceive.imageset/Contents.json index 2ce27aa7b2..e52948c6e0 100644 --- a/p2p_wallet/Resources/Assets.xcassets/homeSwap.imageset/Contents.json +++ b/p2p_wallet/Resources/Assets.xcassets/actionReceive.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "swap.pdf", + "filename" : "actionReceive.pdf", "idiom" : "universal" } ], diff --git a/p2p_wallet/Resources/Assets.xcassets/actionReceive.imageset/actionReceive.pdf b/p2p_wallet/Resources/Assets.xcassets/actionReceive.imageset/actionReceive.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8f1a467d3ef6280e6e98e3773fda1f4e071e7ba2 GIT binary patch literal 3567 zcmeHJO>f*b5WVwP@M0i2MB=ADfWScfiJ}eSdV2^E^dQTMz3HyxN^;@k*Y^!2kFRGa6!-Z{N$+Wm;#R$cSl zmQ_bC{K>Pk=7oRaA`%O;WLlBU2pSP-n;W6Hlu=@Y%~Ku{2qpn5*)ep- z0#i5}R>yV&Pszf`fbM4K6kWyxlTRX;cxWD_2X}0uA+ZiCIPGO&FA$eOvHdJf^rtIWi;jjH8C$c)g$++JReh>5cXPlf>vGAu!W25gCVKk;<&e z1eYngA=A0xCQ7BT3g>2!))v*CnW6-1CzPO$a(t=cXz&;GfskF2PYCja3u~3KX2Q^G13MxanB;_v{$!rOZXE+fmPeF@&bSm&mMd*7Ld&Dn zAWVcNA`4d4LjP)#jG@^> z$6`o((O@cELk84QKX305DyIx?`4sVa^9)l16 z=RJnZ&x^j;H4jVMm$v%M@Z?A~Tt@USPps9J10O$fKp)2}?mn4fDsrnCl;e@0&qH|3 zA;kfNVdntKFyI_O`TA6D4?SwB4?Sun0$1M_+g;T%lJ}>w7pYDt0ZA3Czl_t{sxV<>~8=7 literal 0 HcmV?d00001 diff --git a/p2p_wallet/Resources/Assets.xcassets/homeReceive.imageset/Contents.json b/p2p_wallet/Resources/Assets.xcassets/actionSwap.imageset/Contents.json similarity index 76% rename from p2p_wallet/Resources/Assets.xcassets/homeReceive.imageset/Contents.json rename to p2p_wallet/Resources/Assets.xcassets/actionSwap.imageset/Contents.json index 4fbd877cbc..44143df501 100644 --- a/p2p_wallet/Resources/Assets.xcassets/homeReceive.imageset/Contents.json +++ b/p2p_wallet/Resources/Assets.xcassets/actionSwap.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "receive.pdf", + "filename" : "actionSwap.pdf", "idiom" : "universal" } ], diff --git a/p2p_wallet/Resources/Assets.xcassets/actionSwap.imageset/actionSwap.pdf b/p2p_wallet/Resources/Assets.xcassets/actionSwap.imageset/actionSwap.pdf new file mode 100644 index 0000000000000000000000000000000000000000..b860bcb5265a2b8074e6857be79c6add3f5e1ad7 GIT binary patch literal 3658 zcmeHKO>f*b5WVwP@M0i2td`#rfxtlgiJ}eS?)DHM=s}hhd(-vGUCD*hU*9*BL`q&4 zbr0<+G+PM=w;wA4vb^~45cYb^HQ34-C#-V}7kdkMdzHJqivlelYyDyB0djWU`?Y|C7h zi(G2QZKgq{^nA!o_!xp)34^vrE;Tnz!?(?sDCgT^-iXW%#rHP`1B?S>Jck=d4Ri&E$NxyySGuhIVwm zcJQ@CANqd#a994b>9N;5utC7k9LGrh&fM{FA2y7QcY>QSH8j+C^?Qb1)ub-L*=@^~ zp!Tdm+w($}$l#Erlq576lk4dHZr5}z|4i+13hAo6tq0&keX}Y5ZKF+=QqN9hG5(`) z+U&Y|haHK55xk=R2Re>-BtR3M2{Oa2v5p}Gh|%#j@leuiD@q$^IyCt8+$HweZGzwd zi9Af+XW!j-_nqB4xw*QY$ixaEA%*7i7Xfg74i^`q+OFtdp<;acw%R`IA3-Cypi}LB zS1mVUdR2X2m(}9cCCqQ*|H@W;6EaD=4^qFF@M^fnTjfTii8NLg7A=n#ZMns5=U5ef zMK%u1bdni8vl&R0VNXdd_Mn#jx3VAzYc#c57$&BsxyL(z`K*lOvwxwM9B8rGMUkyh8XhU$du2eMQ-t8 z1#i5^K^ciV#1kPwB#XvJQ9aZ1!#9GX8D1qWE}mj4%r6FA9>E)Di;%zeo=iDLg&1;w zSzq*xu=p&@j7`BLvwl${W{t{?M$A}at%V{{+Gg6uNUl?@BfE0Me;?K77KJT1Ve3UI ze5J4_oW4vrKqa!vNi72bwBA6nw;1A*#!(&EDMv42myAriDwr9z7GAtUX{9tsnJ6kq z_jU%%Qb~|Tu*M5Yek7m-s8C-rTxs^>3VVP#0T7F=2aJem#zgt>2Ejoj?G+4x=>6}6 zj^pS=_5x#yE}a;1SqD=tPdP?~7!L1CcL`jN@+H6*df2#iu;%`bu*jHt*>%-#nu_He zX$0zU*I{g3k9h36_qfly&KOY#OE{=7MRFkaa^GVV>DcE%BtA*f`arCAEk@*s;zakD zn|%v+pKvz9Z~F1a*9xXL%ZJJV z@2b^$dD%R}UHEzBrU<|OVdXt7sI_cTtFyi+(?!$lffDWtJiT52tdM;-(JpuUE*)jG5+^4w-(UX%*_=S} diff --git a/p2p_wallet/Resources/Assets.xcassets/homeSwap.imageset/swap.pdf b/p2p_wallet/Resources/Assets.xcassets/homeSwap.imageset/swap.pdf deleted file mode 100644 index 86ddeb3a0d7e1ef5415539d18b6b0d5037312260..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2726 zcma)8O^+Kl487}D=(0d^h)hb<7Z3z!cAKJTi*B9Xf*xG&WaGkXx3*KH{q=pcXQbKP z96AR>ej+J;JW9N}y?OVFT{ea-+5PW-7;9g@wr}2;VRxs0ji2L-ABWxj>5~lrmnwBU z9fs9|S= zMg3eLPF!tqC5s4I0U;vC1SIDaDFVr%#6%rI<(%ihd4@&kWrmm4G3A=UsE))8LjoUW z7<{K#Ati}(j?k-xOY%Shg{YB(+rh_xbQy$OStwa%1TNw$ya#!~W6nzBluMCv4v8fQ z$1}(!76ypaRF8Iff+GARDIGYTP``d5^F`~TEaOylH!wQ ze5@28pT*}eFATsOLg56tvBr!$Bt>6pr$UD`l94eTY_x*4nsPwx8~XskdMbKq=V>Fk zwimJ}Nx*4nkwgKR&@TeL5L;3&5{{$dS0Uj#j6i(oT#JE1m3O=z-%0$*?^=_8=MwDZ0_Ky z)d-e$I_G--8M^$;|09r@CA`ivOB&#@9oPfEUY%Ck{rzLrFNfiyA)C#GxcY0+OCego z