From 973e5f0c8c3546640585e9bb58e92eee35ca3e40 Mon Sep 17 00:00:00 2001 From: Pete Walters Date: Tue, 23 Sep 2025 14:11:59 -0500 Subject: [PATCH] Address registration design feedback --- .../Images.xcassets/registration/Contents.json | 6 ++++++ .../continue-48.imageset/Contents.json | 12 ++++++++++++ .../continue-48.imageset/Continue 48.pdf | Bin 0 -> 7174 bytes .../no-phone-48.imageset/Contents.json | 12 ++++++++++++ .../no-phone-48.imageset/No Phone 48.pdf | Bin 0 -> 8344 bytes .../qr-code-48.imageset/Contents.json | 12 ++++++++++++ .../qr-code-48.imageset/QR Code 48.pdf | Bin 0 -> 7418 bytes .../signal-backups-48.imageset/Contents.json | 12 ++++++++++++ .../Signal Backups 48.pdf | Bin 0 -> 5109 bytes .../transfer-48.imageset/Contents.json | 12 ++++++++++++ .../transfer-48.imageset/Transfer 48.pdf | Bin 0 -> 11913 bytes .../RegistrationChoiceButton.swift | 5 ++++- ...ationChooseRestoreMethodViewController.swift | 8 ++++---- ...nEnterAccountEntropyPoolViewController.swift | 4 ++-- .../RegistrationSplashViewController.swift | 4 ++-- .../translations/en.lproj/Localizable.strings | 2 +- 16 files changed, 79 insertions(+), 10 deletions(-) create mode 100644 Signal/Images.xcassets/registration/Contents.json create mode 100644 Signal/Images.xcassets/registration/continue-48.imageset/Contents.json create mode 100644 Signal/Images.xcassets/registration/continue-48.imageset/Continue 48.pdf create mode 100644 Signal/Images.xcassets/registration/no-phone-48.imageset/Contents.json create mode 100644 Signal/Images.xcassets/registration/no-phone-48.imageset/No Phone 48.pdf create mode 100644 Signal/Images.xcassets/registration/qr-code-48.imageset/Contents.json create mode 100644 Signal/Images.xcassets/registration/qr-code-48.imageset/QR Code 48.pdf create mode 100644 Signal/Images.xcassets/registration/signal-backups-48.imageset/Contents.json create mode 100644 Signal/Images.xcassets/registration/signal-backups-48.imageset/Signal Backups 48.pdf create mode 100644 Signal/Images.xcassets/registration/transfer-48.imageset/Contents.json create mode 100644 Signal/Images.xcassets/registration/transfer-48.imageset/Transfer 48.pdf diff --git a/Signal/Images.xcassets/registration/Contents.json b/Signal/Images.xcassets/registration/Contents.json new file mode 100644 index 0000000000..73c00596a7 --- /dev/null +++ b/Signal/Images.xcassets/registration/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Signal/Images.xcassets/registration/continue-48.imageset/Contents.json b/Signal/Images.xcassets/registration/continue-48.imageset/Contents.json new file mode 100644 index 0000000000..c1f057b779 --- /dev/null +++ b/Signal/Images.xcassets/registration/continue-48.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Continue 48.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Signal/Images.xcassets/registration/continue-48.imageset/Continue 48.pdf b/Signal/Images.xcassets/registration/continue-48.imageset/Continue 48.pdf new file mode 100644 index 0000000000000000000000000000000000000000..7748d79258eea2bce1efe269b3d34ede5f1fa7c1 GIT binary patch literal 7174 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 BLp}fi literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/registration/no-phone-48.imageset/Contents.json b/Signal/Images.xcassets/registration/no-phone-48.imageset/Contents.json new file mode 100644 index 0000000000..676311366c --- /dev/null +++ b/Signal/Images.xcassets/registration/no-phone-48.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "No Phone 48.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Signal/Images.xcassets/registration/no-phone-48.imageset/No Phone 48.pdf b/Signal/Images.xcassets/registration/no-phone-48.imageset/No Phone 48.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8bd9ca1f990a94921ea402a5c5f4caf8057cabc1 GIT binary patch literal 8344 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 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/registration/qr-code-48.imageset/Contents.json b/Signal/Images.xcassets/registration/qr-code-48.imageset/Contents.json new file mode 100644 index 0000000000..2d85c2376a --- /dev/null +++ b/Signal/Images.xcassets/registration/qr-code-48.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "QR Code 48.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Signal/Images.xcassets/registration/qr-code-48.imageset/QR Code 48.pdf b/Signal/Images.xcassets/registration/qr-code-48.imageset/QR Code 48.pdf new file mode 100644 index 0000000000000000000000000000000000000000..4191f09b700ac34bf773536fc129fcfba43a069a GIT binary patch literal 7418 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 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/registration/signal-backups-48.imageset/Contents.json b/Signal/Images.xcassets/registration/signal-backups-48.imageset/Contents.json new file mode 100644 index 0000000000..326b15057d --- /dev/null +++ b/Signal/Images.xcassets/registration/signal-backups-48.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Signal Backups 48.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Signal/Images.xcassets/registration/signal-backups-48.imageset/Signal Backups 48.pdf b/Signal/Images.xcassets/registration/signal-backups-48.imageset/Signal Backups 48.pdf new file mode 100644 index 0000000000000000000000000000000000000000..aa458334bd0a2df82095e1877527b8e840e0a249 GIT binary patch literal 5109 zcmai2c{r4N`?rl{h!#r-V~xTX%ot0IEjvS!H3oyRjb(;OWNb;6WZ$x8=ZKJN@`3unpNgYdyia>9i7aHXTBxKYiVUXv>Si7*kThU_VC%=6=o*S*$yynuJ$AZAY$+wSk|SJu}xf6ipHISriXU~`d4!sN6!jY->i}gZk=&I?=|R2H#<>%MI1S`` z?%W2T0|D+KSVzffgB6fuTf`sP7cP)Pvl*p{QrUp&kjNQe9l3i5xdg*w8-^yTYcpIa zK_FThL(rwi)EHIjSay3#2=9$O&+0GZP&zT{ZbQH4CBxDQgTEQC3o2$c`L< z7BMw2MI+7)SPxu04~R!`l+kgvCrO;!B2vyE2`m?w3Q5Z|mIN6~>KmlO8HXJ{e@bp* z{x=;02LLIM0Mw@GKtK#djX{@yEa7K!U^(lC`9;pglqIJ|LK;Hia)k_e22G_|^faUf zUOOpm0;Sm=#Y~5at0m_dWTy{KEy^#R*<{|kd^dQoEd`Y!;i^j|#2p{jLrSo9hUlgA zrjYlY|HQ=_dHp#DitEXpQB7AqpDVSeZ_`fP`}$%FrBOKyzo380@virCzy~-SBF^M{ z+85|c{_X)MDWEO>+c<%~OU7LsXUhjtXe(!CL zyV%XyeY?9N$@-%8r9hLzq=Uy4%FmHO`E7=ykC8bZ`Y275`NI;Y^7BP0xu!(~qqVdT zb!YW^kUbU=g$boN-KDr8VHWj~ys9G0&oJjx-zD);ck|f?N2}G$$-iDS2fJyTX^ol4 z>dIQwtL!#a83Xcdi`q@JOhk-i^CXMbF+raw9smvijjYn5i`L(6;&VzGFIhvaYYg#- z@9`W~uPns0+$zi?$NBNq4aIw2-$lQZJ|~Y{WE*0Y1J8^1SrZ&)DNmV_jQLINnmZxU z=^Vpp=4mZym^2zF7^Cl8>{Ra}=$z<;chYmZR%2BI7#AF8tF|6UT;kre_hWBPSIp1L znJeTUEFM}KNgad^S>>eXO%&~GJ}ByX6FGc&aCsyK=?WN+Z7e%?ljd-)_ckY8NwO~g zQWjV4Tz0oSvFt~=ciBYQQ5B?ScHDS$(n`&2{;AVO?pyT=w^y#awc&27V}@Uo#=kyU zuG+UT1p`E*?)Dz9+Pq06W1f&P}hZK0HYpqx}je1?JC z12D|I&)V`S;f?ycusNfTeE9sv&N^;CcMITO)&l6*b>%>AG-Q;^o)nZ}Ed*G>Oo3oN3=ytSN5Ga?yU9P0_mE@8 z;;P<;?9psrIIzq_Dk5ji22G0%>r2;v@J{C(l2*bwW1P4};Ok38GmFia-j{rGCVd{V z8?{UA${YzD**xezsQkmExi)*N*K^i$DPrc_6rK@}zX;W59U*;>+l#n1Sm=H<|NWW^ zWnNB+VSeR|G+a#f$A^WKESi3*j3v2Vg^6#G&%ud$Zwd|^if*}W80)A+Rzs_5Rx^(3 z|9~yj7FdhjxibC7@J-K~yZ(kWmHf}_w%Qx$haX`c#k0+UV|>b&I9ixJm)y74SEhT( zlPhkn)q53pe@>5dxMsvJ>^d!sk35C5T*?t5rstO?!D`NRmf`)u2G){4(#9gv0=I*_44V^!g&93r(5U5MSmgpR?}VE zFX-{!)Sf0K=A$Bi^ugz3rKzJPSr!O%%Y4&stD;@T85`4D6EFeglK!z{^|CQ_dza^p zV#ZGQ!RUs_!SF_ES$|zW+FG}zI^fjKo(Bx=vn9`D`+Un`@M}5O*RSj_2A2jlr5JuK z)?xJPn8dVbjCF{eGA#Y1kt$9OCJcNHV%1Q+9ditNSzUKQAJ>M(B|W&0QWcA0&zTOd?qHz?YYbH~O~OUA~)-J(bm8BY5U5KTMC4@A4$ z|HTN8r4!Z(l>ALUf6~Wau+(qZ0tD7lRaHTGqwPT_T-69tb;WvJ z^FZ05e^Oah27@VWPi$p#Sjse@QLuB*Z_tEO~yCUJR!OL)dn}{T8BJ$NLiV zeJbS`5UAU>6EU+-xoaBN(3KL#WsyFpfUoT7>gw8?i~M4JIDRmD`EcW#BB3&)Q^C3N(w4&mf77o7~X() zBvW0;4d^)tao=u_ffM_kGj-wnsJLb&thFk{sM1_2Lp;DpSjX68TkqaWdQ~4KNn=gqm-A1bxymajJXI=H$k{KT&?~+o zjtohDEqlNs=9{mZPTE;pGcldQ#oaG}+Xy;((^RoeFO*Ug=h>}WCbj^rG-whSd+F+S zKv%?_YESK>-^hVB&QQd!{IDRnDS~_~J0ej>ch_!yEbo4Aq8%Rax zx2Y=Df#NgKs`*@i?3AC;OfISVT*G{OKrgYeEfpI5+4!;S<8HX$DtAamc?z3=z%3{G zAk8Z?5eCqDWgQcX%mD@Mr{)(8q7sC@Nbl7zs&UbXX_zIz1*lhB=vvjke`|T}hx^(L zkI2;OohECH`R1JWoGR||k3|8Rd-nDQr?-VN@gBftdoP^~{cx8H8CBKJw=PSIBn`;S z!&t&R{GDWQzNO0Ng(KF|%7;UOai0aYxM1nY;>$%j=Lmiwg=TxH09e>W+61@%EQ?RJ zJc+&=VIKv6j=)N8DhZ7ZJxb?JNMR79TX%RU9A-YAec3UcPKDmFI4*EEcDH9QVlZQI zNF6od1f~LM!;PhkA`_}jf^BxP@8=~9P+p=BjbM~*y1ylyN0vA3^(N!a*-@-;y3mj$ z?O|nA`E;S)dGSrx7-DSgnd*IE-eJB%m#UCx860 z7pp<6BO9dp8P38RgBf?LGztT)?2=41+P@e$MRh!>1)MQc-T7co z@&2->^at1C;8bhZT*-x=aU~hFfdiYp8reY=Y$W>Y;8mT;pqHr%TN2l&2`cT0Xssew zI3pLoNr+D7bymkN#!iZB*LsL#K1DIqQvjwd)0zvfsz{ad6uaghDfqay{oO?; zDgukJRw(fi3@kd+%bW7ufX=lUv!W=4AY1*@6^+`@)B!akJ2ddlDQHyV}%%B z-6v`hW+V$j+fbzhDo*?G*(c*;l%u-G-@<4Si%|&lE-|CBX85#Z^Z*bs+1ZZf^C&DU zkhn*jERFjZqNRjoD!*uc8>T1R;Y9Tk9NUXwxR7*c2K(e6 z#3h^POE&Bcu3?Efx{`VQ``CTTHb*NSI9!=RKoH44c~c^E_>_=;(4b{q_#j7A9jX=J zC72?hN@h7m4VR!#y38^{Cf9olALPO>{LHDXUv39amm3h8%`(?@R`mT0rpp$P)h&pC z1)rCRrKbuuMQuP#aqJjoV_z=H58*cHhSD%n%!06vO%)@%&K^TbUG6#an2jrTipYZ}yyOJ?quk;&a}$oao!*ctG_lY#A&`AX+WBOM_{IM_OU-$PuM*bs`>^~x% z6zKgs;mO7REL;_ZL%Cud|LIEbLOTE@KoAMwpY@+SK`RU2KUZ9ZNn8LNj` zPq}YkG1ebMnCuH-`}6emN|6LEBH>YM96=G;2zJzTlR=A8et|f8gH-2%^A|besQx`Urpu6~tNs zYxL)p2fOus$@%mNoGk~5)t4m)sy-lm3$7X5Islvrp+Fy@9a3qFAjJ;=3!?y_DS$Q; zhK|8C`T!(W8^YIwfD(?CN5DY-Nc^!Ld<7a)uwR}_8EXEsfbd~X_!L_Saw~GAAo`Tv z6eSK+JP5D+BYsa36Z)<1hb?(m%umS0y{B8+t{mFXYQ4oQk9dwyZ!jKdgZ-y}q<}J*ETthS2;+l>dlL-IfifwhDd1x`2LxE* zD&2S>f@<$2aZ3_szD5)e*wxUpzFW|jnpw_IvWQ=U9lD`*I5~j~$Sx=@a4z7B(fGYy zKjJS|T=CnH`QaG*4!5K(DK81`y`LSP5kC9r3)+%EqPYe(1d<3L=0@6vGl``T)1XC$ zGW5wCkl4}IL@WumOM8lY3X{Y-N<#&GmTA+-0mSESdB4IR3QGm@xwf((agb(gsc8jHNlKo2iL2se+DR#n@!V9>r69C zgJEMdlQsWt+G0U&o@nZ1Dr2hDpwj@gLcW4suQ!!=On77Dj@yyWUzne}TTD9redc&R zb((EPCpSHRwd6@Wx@2%Je3o|lbS8afaY3)N>vNaxn;&?$uUU+~?T?(nt&ZGSQ1doY zFIKM|sS0W1Gg(qepueM0>PVWLr@;r+ByUZYf_9Z7sidKEv*<0{O{gDVot zUn(5RSIggOfeqU$%1diHA{u*jrq_83qE%MomJf{~R=<`N&XQKns!wa541Vb|*4k8O z+fKQJ+Lbus7|f)69uqoH`4W*|ylXP(JQyu|D{D~9BJ0D=k`bRF#~sbct~sWsUFSL{ zx)`*pxKH9#*f!8i=#Sv7YUb;!5V8apk&iwoiR!dF452Z(wEQ zTn3-jUd@=9=swa6A1w?C$$r>Q%$F&ac(ukW2WB)l-hX1tW)Lr=Qe5FmI8s z>)?C7F}_#6#ZuDAp-J`hLCKGd>rFS?%mKzd#`J!G7=mWT3xya3dH1QR(VEeKBsDr8 zEK7oR;%3S~yjqGqqoFqW$*H`lZOj2$GTPRjz23aulb($bk09(2DN;I8cCocksXA~pA_wJv+Q6$WlbciY72(w{1es%2HOx?bLq&v+AQb-$;1FSC)1b zm5pi0brdPjG!GPyhYS6RlkMW7r|#=-h%)~f|H+`Wo>Kw!H~HJ%pXbf%9iq3QA$R(B zuy+XOPOBby>NT!9mq(q2Piay|nY#nvbY?dCF_nyocE*Yi{X3YoA-#iaJ z*Ho%@H0Ion+HKn%hi##+J0UqaQL@Qm&G-I}dkj;WF1CK#`>ka0AwRcNp|EC)m6M+9 zW#=#@8)gzRUvrdeh@_AXzCC_E2uR(gM+PEa6H)Whc$Hr^KZXs*i+%67c@AA1 z8ZRc63;EKL&*(FG|8lK<&N5OrbGR~jI$$-hO6f^q-KG9u@Y8r@GEf7U2fi-J95tW#hL4!IiJj1EY zpZPgCHSsN7E{qRWaMT%0naDGo7%t6c%%hg;^Hw&LkD3cki;=FyV3WEz8`zi`n7juw z~8D}ycr^Xyv%MxI zn?CE5h0Ur$93>l2R2O8>DLxeI)F+X}Ll9d&7@-`i4v+vAlgiE@`9?I0vO7q9HtHia z%o>~M1VVzTLHtP0TV75rU0!A!qLc3hbCi6AiiDjeg)_D``llj%Z~al7aLoUbpMS~6 zzhRbt!CC-D31ML&kb|)i;Ez^S1nB&s`74<9U!(qLS794V8+#>NkfHHkQdSrU_`{<3 zE<^t)(Z6HZ{v+o9D{9&QQ2eKs1utCFilS?Af|`2c`NjjD%(8*HiRZUX%&LEsUj-(7 z4b#pZFl=NZ($HFgku$O(nuU!#89x7#?St?Ade-IhTujvUay|I=iqlEBe|>%Vd_{Do z^|b!n@B}0h7`(LLj@kvjKA$Z{H=aN4XLr5q4n9AJygckLMqi$$M1j)umM)wkdf9&p zG*ua|CR_R6A9`wZ-P&ajo*mk#kMG7*oh}*%ATg?rE*g6MJiQVsVkCJ?@B+)uPP{Zy zDOAQi3@6%F>taGEOVB%?+#ikqu{Oq1`;Ca7;AU0oblZZsx908nW$=crVpjSnI8tww znXd@&#C$GwBo}>|Qhb;^RobNu(%>gdsxr;@j$7M6N$?u!{5Gz4TF)?NnvhgwryI?N z76|YjU39lZ?s^`{J>cu*`C?WDZ|bkuI$#p}AYS}R7v?`$+&8pP~r`_lA#TeX?O zqG!|)mx#rs;?C1w=Bw`m!N7R&J~)1o-xO2n6E{M&S86oKk$^DTILrB_j5$*q)2$5& z3a+AS_hOjs^@Uoe-ITM@N~UC$@Tod6RLQKZEI&rYT0SVP%Bi~&lzZD!*^9N*UjDJ@ zw4L{sU@{f=HZW1nV{P?}Q9Bx&s+6-CINfln^}Ao#M*s+wvef|yOOCE&k(1a-OE2hmY~+vM+fN=7<=bNoSE!+ z*WBCa+nqMaR{lVans3_&^5d{r)2e9GinKUaZII|Ck?3dopn|Y9YdCv-vJSGj0psUe zkeGG;g6E4|E}Aca#jgy*7!i4Qi4)I&%}x|YN-)H3vbjAP6W{PGZJ%^F8oF@L7I7-? zX+54?sDH|dXqll$7~qh}S&)u3drmn>p(fnQVtMtYjCK)&KYJ$Vlr+yKMMl8{;ds_Q zj_cI}sfuKr!=aYGLyb=N=-$g32;;xsnA0fM0mUq`jk7(Acc(h)b-(ure@m^?tSSv^ zh43CSpCwIDwc8LfajYp3Fw0VP4FT&N`)VW!p@h1aFVF*M@aDSrIG!G8V0H3Pas8%;Z^QM7sxb( zTjsia^6@%&!|jk89=i+2M18<&RsYElPpbK7fnX`Ywy7FiV)kjhqUrHVmARn(>sT>zCx<+D@QFlabrD>Y2)$o}fDrqKc*l%nMY!bKTQrLj=s+NUb#+ zr0Wpv15w1HT>poWR;9z*^GMz1`nD?A%x`xuCpA`#>O0^xBfpTx_Iq#-q%I$=Z3+g2r);9$tM6~@JQ8eTl z)qDh`Cxiyf0xy7PT?ET($2H5`nuS0tb`9=HMd(LU>x?~+tl_+mclcsQiUSksotQ^! zXfa&{1*Ud^7Q_AVO+McKyB}YFll;<-0{q82_4TJX`}D3jO91-mDxT{itIRa@`L2GVJde!feHlgFq=W*dH5on}8|RzBG1 zaW*AA0<;Hw@*>la6b3bKap34|uj?#%j^2Y<8g2j1U^3Vk=)Bkb)_Hpd5zRjdwQ*Ix zngmpxHyoz(*N7$P{v$=s>{eLUQ^KG0TR@O!4ZLe5U8l7kws$y1_qV`eohnb#@k9e5 z``*@zbSeEiKGnNUkdD9U&3Sbr$4vb?W+bb@YzTp53>N!F&x1}3|J-QLJj80Y?4Z6O z5XmkJx{W!CQ|%jDy!LfKiGbN~f27FE(i1}ukzV}kaME&tcZxKmKW?fKyb8jvhMaDG z-0U6od$G$g4(o0$>us4y*iGi(*)9=R-K#M=dUO#Xb%dfe9|P~F0gjpHLLqPE#3T5r zi}q@wxTkEYJ(y=zr-w_2yvz>*%$t(;Q&-%j&_&ZMh9jS9eMk9mXNpU+$J+&ab24QU zQeBb>MR=@E^D+T%c6;l@IdhH2*~3FENE64>!NzI%5}C?=goGN78@MA@A(Er2K=Hvh zDme~gXS7hjHK_}CaE9$~XCQYWuc7=6ic2|*>Kx%|O87F?Y;AVD+q&Ucx;S7YjtoNn z)=2Af9@7uPXlk6zogZ03DLtxPJU6lk-2eB6eb3 zverRTbnj5*^~B8Q! z8J~o?m-*BhGoDQnO?`_j%w!8}qBfb57{J-B>V!WwUR@8L4WG`Z_$fZyI?nBr%U|x9 z;=<7Ea^9Nqan{W)|0arfjqhMzMQi{u>>f3rnTW=--%iN5(UC069XQ|JVfJfN9SRY4 zMQ+GNh%9>rQ1GJs;uTr&tsP}-O0W$N>CoRDQ%eEF8P7A+hL#44&R*zi>zR5=nzrtF z588>!J#5-TvQNt@E)j-=Bj;-RP}f!&MD01r3kuU}#S%pH${j!&VlkWoQ8CUba#T}2 zL)9?CuB{_T1vyb-Tt+Vhcro<1BM2)su7u`!Q52{|6OvQ$B$LqmaREmpwnw4_Atk7T zK{D~~!9+#X%O?AxeKkL+PQG^&Q80aDv>)uy)~sR;za;rqk4K2qsJ|`KWfD@`mIq0J z5{?RMT8-m}+MCo-m)}n}`Kw-;OjN}81 zuJ$OoX+KrG3XWr|R|>GNN%?m%=kc4xCYu>-xgisv4+tSv zM_T!m^yPGz)zlI!^rOOIimmrIHeP*|{f(*Z zUK?K!DH40@B+{h6`i68>FuO-E{cB1r$E6rL`<%>z`JNh_Qd*{R0fSN2mPI}{ua8|3 zwID6YToBIGW-w@@z(9hFEOTB+hoDDZ$SAAH2pdsfu%Xcz`e@&cuig;+aNGi0h&ku6 zytk-Oi{hX_UhB3^gw(KCOyd`2~mZZCd3*D zZVNmkU8^Gf2aj6{_|&e{H9;W9x+|U^mLE~aEfKh zQ2hJWyr5`kOzM(+A6bWa0B%>VWJ;C?yi|B>z#torfro*J;Y92WV{RAJ>razzkn-Jv zZoTEGzWep-vvVqsI!-D~>k&3#)D#-e6p{;lco(>)f3horyua#r{HAT4*==qT`e^xgo!JyY-q+*k7?QoOqouCRNmP#J;04Ka-3v7Z& z@f_g;i}R>a3Qj78LQA`R-Z+Q-ukjt}Pt?C1?li)WoRKQi_&HJz^k*>aWh#`9D;u6Z z&aH{V_xP$gh*Zcy26W_Ii`e-tZYXNX&CS)n8K?CrOykmw}QscqNvsa?N;uJ6S10C~{uy0$MB=;eX z+avG>=$#}X%~sYp>8-0{eK_pTjf~G>CYBWx$et!mnFES-=xHTvXfO5#nfW1h|zvkw51~1j=%K9({%kU zxO1;vbaPl0f?#R%cit4F!)icl|JPhRM=s7dUT%wLL___$=ku)LR6J%jA*Nv;Cxq%C zA6P5|;Zibu*7XS%*D%H1>NOY%fr7^ap4LD;lBK*kg)S`r(P_#ZOSX`n& z`<=kIVp&nOG68a`R^0-6v`^_HA^_qpACpSty65hzHWo0=#pQ z*5^=Z&&J(N<@50wyUFEjx7>>(Q@Z*>iMv%~#Ix*hdHvvwNi-P@+$uVZXj8w%G|?F_HxyF9;12+_e_Lz!t?wt&w$G%zeN2!ax>uFeX-OEdSlJlLw8- zNoFd6_!#40`hm1*H$qxl@*~zy1L_QGN1E0Ralu7=GYJ4c+>NgJ3=VGiV7RF%x1};t z9g~j}csTMtbVf>vgg^TDx(G`X6>DhLxP-Zz_99Ol7%%Hg7Z5i2#X^?`$A! zscpx6CCB}UuimyWJp%IzOe`you7!tk-zRak=g`QZ%pJ7!qMXtv?)QbHVoxYI)G!X^ zD9TAR(F_RS4%ySC3Q!bfj;(mbaHZgU3#C8b#xjEqcuN^DjEoJ8ny#;`qHRbMaa zmxPwJ(z~=TwNb@b-WEN;X8ppJKqNCIEFatjN4kVibnI7qL=L{x3GUU=TuF3)hqqx3 z^XF&}C-suV^-Jh99%KCBo<+l77{+LbSX@;?EZUw(n~5UWbE>V5@eMh76{%hJ=Hgnp znTg((OF0FYigG>=%X&#i(OEOjq58AZr!l*I^2x`)IH4b>Cpt%2Xr6Bc)-y-+(bgmO z1={k-O;s*;M;pEsXVx}fDfoI{xOtqOO97k{C>%2%zXIhjbb#C)fh1C@pY;{tGY&Kj z;W+n;g3S*y8km}&sXL7}Hq~##pnQy#PAr&)(Z9hhsFkMozdSbUR zZiI{TP9q^5J7OEf0fVwVyde`nxGzR*?o(7S4s@S7_2DWnz6pCIMHGLY$IlKzsE?4I zMtH>QPZJwX$fW_H&?$FRj0lMqVUz?t^(%6&A1S|6`BtiEwzAiY%TF^LfzkT8RGVHP z-hZw?|23^!Ew)3QjH3HvU8}4?&^htJH{h!+S8U?|8KL{Sn*^r{DV3V8yi^Vcw|FhY z!Xk&A*UgOTzGGt%DueZkF~5o+<_~*ofqF{&j?&USimBKrzvOJ15wpFzc!m^hHflIs zH>C?2@{RKeKrDGP&f^R%QpYzNYdSsskJmOaZAa(OJ3DaT?S9*tPM5a)VY)xkw_A#8 z+wE#ITSRJhY7>1}gb;Hwu_%tO%CERcw!R1;#dI>3Cq%XB0@E=`5FD2 z^qZa-`2&zBaJ^e813m_L9IkeG!_d2p4r+Kn6Rmr43)J*ttIt`azpJDs={taSmetq& zxRKs9P7Xe|eR=+6bF_=4d3hAJuMDQa%5b{7gm47hCTcVtf>>A6J6&@_lULu*i8Y_9aKmSbb3mbPlu$tR97lbIolgzPE% zrHcuqQ1Ha$Gf@f#uQ-e_!;fheZk=(`Q%Z65pyFj5gxL*BZlK}|f|vS?`b5XEFK6e! z#kmjb^qaM;Xh(_plK;lvDY-;r^hZe}#0k-Bk;VSGX-B(TCmwo{?LwO#4D&FelSfhx z)8Y-o{EF^r)djVB8}SvyPp}pSV+mdj+npug&4z{|9{$#m)u z?&)5RAzz%{4EFhYkePs@*2;W+HggO;E9K;8A052vyIyq|2tHt>#%Eta44;+c|4I}G;XqV`1uni_`c+=(rc`JMlu_UZD+FsHI}8~#1#_<) z0at90t&Oh8UkI;OkpoR+!fu2XFj#8OfEg14|FJ(gWLVO~LG#Np@q=WgC&f5|uJRn0 z3+}8TvmtEtmIUh%-TOsnnh8&CNu z#zcp2N+i@ea4h@2cv#yHxfu}@G|;#` zN+_N975ZO?glGxTw4k35ostW^8(=XL%3r# zgUF_#(=U9iF!+V(w%(Nuh8os-DLO>>0sa& z)rT^%vk@u%TT)t7nACcBYQm!3(oZc84Gc^;O{6EXYIgs8!fqGKe&UFw;fx<3D~Sh6 z5mIF@Zrm0sFCSbpXT~tK-ufp<=@O9S4`Jg(tD7EsLezE;k|kmKm+Z*GjR^(a1Ncss z1sAR{PRxdI=19@yzmTBDtmf1kL0^fxnw&xuT_^DK>ZN}6&}za2(PzKnnc~zK6lKOJ zsn6_w{5bBCfE`{UneYf+Qgvb}kB zlb2jDf(VwVz*a}Js;!adNj&w7^^bOaN@jRf;PF|Rf*6>5MAUu=3sP+vKjF`RLT9~< z4&$r4O2Jld^@o;>r~Jp^Y(m{WgCmtzS9POSdBIeZ`Z|93nU(tBexcD4ES}tylt`pD zfoWzUIOD2t13_qd^#>sBp_~6F7iCK70e(pp9~L?>&t^SM)*pHc;u?N#@-j*H>Ae$MPKM&yrR&% z=U1er*S_U0iHq|tLOerKx%R?>K8d2|nFV?KvTUXN1V+yM6&o^YpD40wRdI(#LUh%g zb_21b;q-*P=aj(Pp_Il=zeftN{Sj+Q1bPKVBo8-K4-&-b0&0%b7+~=(V?$KEB@&RI ztlDN6EAYfCYr)6e`MEYjEsx@t3zmB1NN^WU@Bkzs+wp_QM?$|jkzxJK&AU7~y z3eWum26Fb-`TF>=EZqgSCK5^p zOR+*SKBGyJ+Um0Dh#=3tYmM%Lx&-N#;`}@eA2QT0oxa*s&lMQNTw35-+`sdBY#`j< zBn?xp>3rg&q~N3%4+r=`_R|N-S3PZ1xWI=2czQ`yR-_NozNY`R`QFt)G@RGBJ3;I0 z`g0Dwi!$jHxk0dS7MZ`ej)?hLu zHX-#M`e|UTldO8t2M!|HEjlyG@4%!Xmn7j9S8SQQEyQ1a6X6M{Lq^@o z9JEeJ)0&-AML3H7Sa+ihvY`w3Nh(q!DHlktSLdZTTMco{jYC8QVHeh^W0(ij%hdNHcT#Yj%g2Ny z$n+R9N!?HGxMKmwrBe|um!;YarH{}aZY|*HBEtS^sUIUDxga)2Bgr`uoUNzABxh?1 zL5CotpyHQ0Ai~Q!lPVvV4qeb}-!XCkV^uRk8kI! zm*UYB$1+|d$twKW=*gjmcZez+5tWp3eX&P0JDky}nR15ZbH~Y|Jgcs0G0}}g?w8En z@fGYx**l3`;Y}k8)~s4YniT(5s33d!+4PL{*r6$jzTxdowdk|R?MDuw8Bl~=xvp6&abZz~;=QvMk z{x=D@j!gl%pGL-=LM*tutDK@+uL)-4vCheFM`VM*<}LaWGNi_cqhtrK@hRmWLb%9+ zN|0kWRU)cw6ah{put)tg7AnaQ=|j-y^<;kfEQ1;MGm(Y1t<(Q_o$u7$rH>huHYV~8 z8}zSaFlJzhTTJ|o1HYu&)%JL6X6xYaCjCcL59v#(7z6Fof-Bu{3wy(AxzE!C^_gA* zlGFA7xf|#E8vX_&O(Qe)f4DLJxE=ms2IgepV)>V6g5zKCUmjs=Ya2%gfR@fb&A!TR zw(oXfdC=Ft{lGHDMrI%(8&`l9fQfWN4<@evVEU7w!@nN*XJY?ITo~jCvb6d7pP{by#wKt~03Z|GKl1-`2e7lT zv9JM55dVb%-!uBF$NF!KnS<%w5%b>|^Zzl9{oUO1U*kCc7atJF%=O=VKp@NiF^-k< zy>9=(2L!UQ|BqNldytu>u|3?MqDqLomz2uE#>$u)KxJk`{g1*jD%#jM0{#^3ub0HA eWae)CrviW3z(Mwof7JvCWM>A#k&}zciTyt@2wyh< literal 0 HcmV?d00001 diff --git a/Signal/Registration/UserInterface/RegistrationChoiceButton.swift b/Signal/Registration/UserInterface/RegistrationChoiceButton.swift index 18ef488ad6..4dea624c8f 100644 --- a/Signal/Registration/UserInterface/RegistrationChoiceButton.swift +++ b/Signal/Registration/UserInterface/RegistrationChoiceButton.swift @@ -8,6 +8,7 @@ import SignalUI class RegistrationChoiceButton: OWSFlatButton { + var iconView: UIImageView? let titleLabel = UILabel() let bodyLabel = UILabel() let disclosureView = UILabel() @@ -25,7 +26,7 @@ class RegistrationChoiceButton: OWSFlatButton // Icon let iconContainer = UIView() - let iconView = UIImageView(image: UIImage(named: iconName)) + let iconView = UIImageView(image: UIImage(named: iconName)?.withRenderingMode(.alwaysTemplate)) iconView.contentMode = .scaleAspectFit iconContainer.addSubview(iconView) iconContainer.autoSetDimensions(to: CGSize(square: 48)) @@ -35,6 +36,7 @@ class RegistrationChoiceButton: OWSFlatButton } else { iconView.autoPinEdgesToSuperviewEdges() } + self.iconView = iconView // Labels @@ -91,5 +93,6 @@ class RegistrationChoiceButton: OWSFlatButton // Unfortunately, these don't update automatically because they're // being converted to images for UIButton's background API. setBackgroundColors(upColor: UIColor.Signal.quaternaryFill, downColor: UIColor.Signal.tertiaryFill) + iconView?.tintColor = UIColor.Signal.ultramarine } } diff --git a/Signal/Registration/UserInterface/RegistrationChooseRestoreMethodViewController.swift b/Signal/Registration/UserInterface/RegistrationChooseRestoreMethodViewController.swift index c853f5f50f..acbb2532e5 100644 --- a/Signal/Registration/UserInterface/RegistrationChooseRestoreMethodViewController.swift +++ b/Signal/Registration/UserInterface/RegistrationChooseRestoreMethodViewController.swift @@ -76,8 +76,8 @@ class RegistrationChooseRestoreMethodViewController: OWSViewController { "ONBOARDING_CHOOSE_RESTORE_METHOD_BACKUPS_BODY", comment: "The body for the device transfer 'choice' view 'transfer' option" ), - iconName: "backup-light", - iconSize: 32, + iconName: "signal-backups-48", + iconSize: 48, selector: #selector(didSelectRestoreFromBackup) ) @@ -90,7 +90,7 @@ class RegistrationChooseRestoreMethodViewController: OWSViewController { "ONBOARDING_CHOOSE_RESTORE_METHOD_TRANSFER_BODY", comment: "The body for the device transfer 'choice' view 'transfer' option" ), - iconName: Theme.iconName(.transfer), + iconName: "transfer-48", selector: #selector(didSelectDeviceTransfer) ) @@ -103,7 +103,7 @@ class RegistrationChooseRestoreMethodViewController: OWSViewController { "ONBOARDING_CHOOSE_RESTORE_METHOD_SKIP_RESTORE_BODY", comment: "The body for the skip restore 'choice' option" ), - iconName: Theme.iconName(.register), + iconName: "continue-48", selector: #selector(didSkipRestore) ) diff --git a/Signal/Registration/UserInterface/RegistrationEnterAccountEntropyPoolViewController.swift b/Signal/Registration/UserInterface/RegistrationEnterAccountEntropyPoolViewController.swift index 979479f2c5..1891a40a7e 100644 --- a/Signal/Registration/UserInterface/RegistrationEnterAccountEntropyPoolViewController.swift +++ b/Signal/Registration/UserInterface/RegistrationEnterAccountEntropyPoolViewController.swift @@ -120,13 +120,13 @@ class RegistrationEnterAccountEntropyPoolViewController: EnterAccountEntropyPool self?.presenter?.forgotKeyAction() } }, - secondaryButton: .init(title: CommonStrings.learnMore) { [weak self] sheet in + secondaryButton: .init(title: CommonStrings.learnMore, style: .secondary, action: .custom({ [weak self] sheet in guard let self else { return } let vc = SFSafariViewController(url: URL.Support.backups) self.dismiss(animated: true) { self.present(vc, animated: true, completion: nil) } - } + })) ) self.present(sheet, animated: true) } diff --git a/Signal/Registration/UserInterface/RegistrationSplashViewController.swift b/Signal/Registration/UserInterface/RegistrationSplashViewController.swift index b22514bba4..f53a35501b 100644 --- a/Signal/Registration/UserInterface/RegistrationSplashViewController.swift +++ b/Signal/Registration/UserInterface/RegistrationSplashViewController.swift @@ -238,7 +238,7 @@ private class RestoreOrTransferPickerController: StackSheetViewController { "ONBOARDING_SPLASH_HAVE_OLD_DEVICE_BODY", comment: "Explanation of 'have old device' flow for the 'Restore or Transfer' prompt" ), - iconName: Theme.iconName(.qrCodeLight) + iconName: "qr-code-48" ) hasDeviceButton.addTarget(target: self, selector: #selector(hasDevice)) stackView.addArrangedSubview(hasDeviceButton) @@ -252,7 +252,7 @@ private class RestoreOrTransferPickerController: StackSheetViewController { "ONBOARDING_SPLASH_DO_NOT_HAVE_OLD_DEVICE_BODY", comment: "Explanation of 'do not have old device' flow for the 'Restore or Transfer' prompt" ), - iconName: Theme.iconName(.noDevice) + iconName: "no-phone-48" ) noDeviceButton.addTarget(target: self, selector: #selector(noDevice)) stackView.addArrangedSubview(noDeviceButton) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index ea0636d95d..ff13a8aac8 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -5537,7 +5537,7 @@ "ONBOARDING_2FA_SKIP_PIN_ENTRY_TITLE" = "Skip PIN Entry?"; /* The body for the device transfer 'choice' view 'transfer' option */ -"ONBOARDING_CHOOSE_RESTORE_METHOD_BACKUPS_BODY" = "Restore your text messages and media from your paid Signal backup plan"; +"ONBOARDING_CHOOSE_RESTORE_METHOD_BACKUPS_BODY" = "Restore your account and messages from your Signal Backup"; /* The title for the device transfer 'choice' view 'transfer' option */ "ONBOARDING_CHOOSE_RESTORE_METHOD_BACKUPS_TITLE" = "Restore Signal Backup";