From d8d51418a7ae476b73922f1193f8821c04d63569 Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 <50428976+WaseemAbbasi22@users.noreply.github.com> Date: Tue, 7 Jul 2026 12:38:59 +0300 Subject: [PATCH] added RSG Logo --- android/app/src/main/AndroidManifest.xml | 2 +- assets/images/RSG_logo.png | Bin 0 -> 21107 bytes assets/images/RSG_logo.svg | 21 +++++++ ios/Runner/Info.plist | 4 +- lib/new_views/pages/login_page.dart | 2 +- lib/new_views/pages/splash_page.dart | 62 ++++++++------------ lib/new_views/pages/unsafe_device_view.dart | 2 +- lib/views/update_available_screen.dart | 2 +- 8 files changed, 52 insertions(+), 43 deletions(-) create mode 100644 assets/images/RSG_logo.png create mode 100644 assets/images/RSG_logo.svg diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 70fa7d5b..4aa82609 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -43,7 +43,7 @@ safHV~WsR0oX5hA@O zs8s1SQX{<+S_q`x_xPFL_qW#l`>u8GAH!M(lbrLG{qFtjXFvOBgpq*`&jG;$5Crku zx_Rv`1nmWX-3#sG0>3aK=bnLI`@L>jJb|Etzr%kxddJWV2s#Pfx_0?qKVl@Q9j>>l9Y#p2mkEs2s&)tzB2tZO*z6Kx6#7TFWY*# z@4IEe3dc3>LvP>ZXP)^; z7nSd@6`C*nh%oUTpi+V!RL`qvQJuq*uQ5&wq9zZmf^SpJ(e z{!O1C9sJ89{x@zEWT^o`8GbW8eU~0jT)B2FRR-;~FeT7*BTLqAn;(IBu;mklIE`4h z9IFfN85{8rjqQp}j}*i9#YNsHebp5s^b$FtlD^ak@MFrm2dXU2+t2EsMt=$r7uQrB z@+>P%zrVF5UHiv@oGV{PzrHr*<$)@rz)6&7JGje#&uXkRQWXKS-#MWsG}F6a%A5bl z_)F=Zvm8E|H4tN33x#Z=IR+jmCgF@nr|HrD(>{o394<9{nX_r19QMh_P zKWr}~VhGYb*SXmAn9WB1$M~JgZ*&_!L`9be-7M+sKgU@o@GPY6H|Qi1@J0JivWkLp z20YEXliZK-0peA;bc>c5fhMrPw^rtYo5y%cgOs6eK0r4=^aW%K&qYd2j<#ljOTY57 zxZYL-oSc=meBcW~{g=UjN~LE1;b0Bgljp6~Z6z*4Z=VB05N&%&nzPcP;k#|DBn?jJ=UH&m&fE3dDoqB5 zbzA~k-V=CyDbo*G#RIRz%%_fW{MUX0X=)0>a|WW(CC$8LL8tBQfibqEtwc5x3m#F7 zpo|$X%4^dTLh$#E^Xpgr$Yfji3@hAyw+hVdaNyfN0aJe8N~N)T4zuFf+K*U>}q* zwI5LTPv3tyqXO0_$_Pfrz|~Bi>5YR~UQCZG5G0}td`%+$dDy$1aiIcHE)VA~AANfW zuGaZs98eNJ1kEdpi3*pFVyoK`<*J1>F2=vUSahX;1?ft%?I)JkuRdOV!!Hiap9jY% zG6mj)k7u{Od^wJLW2JEjY5~5btpnamPssrnnO`_}&CnA8EE=7TI#qo^bI3D0Z~jQpG(R@~{xQz)S-DyF&)#rw zFWr6S{t|ferHZvyEhVT_hyw~KS29)aSv=MM9!%-Idj%c?L}GcGy+PyCwq`AxGtHrQ zFLerNg%?dml-r!?F4Pi$c9h`=vUhzw3cMSv`hw;ivYz!=6>#?7!P|H2$>vVPAr24` zI#th1Js|BGP+MhOt`5qP{Gw|&{_bf^`dU{*_Q}t#W7AF1Qek$Vb}mPy38t4JmBIWT zlq1kdIdC2xGKn(n$$!oQKfC0)UY~tS%WQBUEpoTbw3*?MFY(aZx4z0)X9|RhMHxn$ z)VR)}Ed?fWMs^JEXS?P|GGXW4H6I@6Ukv$5skk1v}Z-=4?z}5a+fY$>RG%D zY1h3V6Zo>TuJY9B{2Gtv8mSoL=(Hm#gnI*f(j8UR{x@cOy>~;4e5U4v&|;9YB$zJd zBCzTDmqfv0d(=NcRu{>w&X@jMr+{I@{5mEIgqXrK&03?%yn21J)pK~C_8cE@=Hmd@ z9&dDz?0@H|4w6*LYvcWNi7z$#tX)=I{+{PyvIn)`TTn|*wSyemI-oM2KTWw2av%L* zntSm6a9aAd*Y-}P@{<6JHI5qukzG$N2C>GGVFw3UD!>Qe%y$NUUkBzzRuDK-Wzxgt z!l-7x=k3AnXl4bG0BE>k4ndXx7c=Zk0Hn*S{{fKf-F;PNL{}H^o4`o!hvV-!41?9$ z`!zX;s<*v1oCsfCd7;-JSRj!C0Fv=VC5bGIfnlsagX89F@F}2@^Kd)@+-m|6`~PwQ zKJNn78Im;OZ+m(?Xl_i|d+WzhEdtW3>!=pme#alXlTL9XHvGk6Na6ivUd$AE|1>tM z?WC0{HA#cdzdxNZi4lgJ%YKOx1)_T)FJGPKv5kFQ3}V2lK+QYlyRH;3@rSaa?sZPO z?#zvZb2s)vw%g$3TSk*!-L3VtJ-sawp!7l_`}Ee_R6?1O4JAU(jM^W|KATQk@3Pd0 z%0COfh|m#>k@g?!SD7hWJDX^p5`xveySTmZKj&)M$te)=Z~2 z7UrWn24y@WxL0e4dz}QGZrpy%z8c$L#r@n; zmi+x_o86Lze>3OE>d}t>!lY#S4vTjxw@Y1X3Wu>BsVkZqA-VnxA2zGeXXS=NeQL6( z^X23KRFl@o6^v$j&}7e#S{J)#I$YWZs>P7YMa`BP`=H^Gm^8yC1iK^BB)Cg!c}xtp z(O5zZ=4%CO#crJ!Nd+r08S(!)7XH?*IOr(65duw%Wi5OHzrht_ChLb6?yCEI&a`mn z-lqyzt`JoV4oKVDZyB|btjo%s%3IgbV76}-ZPK;eDHj)um*%v*Z`U`co;cH(fJ0>! z>I<`HW!U}sa!@}E&5kwP)CMN6#$Bp!I_rypVYEcbt;u+nsFc!!+Kq> z9JL}3z5en6x_QSepBvIf4*T2Azc7q-D?)l1F1wZRkOdzQafKSUP?J4jR@J9Q|6-wF zr($#<(3oLrPYG>oes5Qu5&fL37}e*fkjI|-W&i^H_SBz3CA6TG`2zn!(aVaS!^&>y zj0=^Oa?G-Qs_g%?kya{zwUbnB_&82_0DM+Zk!93a1lRfb6gW_L-D@f$B$CE~pBGWu z%y@tI6bYz^$VwV3*6b`AiwWCnyA81U!>vJnb^a!|5!r*Wy0wFRF*X1ZhX6sykPKxp zKH+U@T$&xm4(9A8l}%yyL#j!};GR|xKla5XyE8=HAs@r`T!Z^Rz=o5he!EAX4*n<7 z6oS#!M8$E{i_-zkZ=HgD>e~ zDnZN1NZtn972-I4YW>GXmDm3l!;E(b7L^~~lBmt4@uyULTe5YaH_*<1_aROwB>DV&S2J^jbvn+?!8gsXh+J>vzWZHCHE4tVSf*~n5`ObqUDOM#<005w z(tS7jGepOh=z^hTdY z)ly9L6(X(7?V%1AA4f=ON7CE3Z=ES8A!pAr^??fjV;01g^<1x((8Yq@FIv-bOI_QJt+Ljo^VYU{-zC>kc9c>wbs5^*+>i8g^Nz4l(rVTGa$EipLS+;>Ms zZsD72?dIZ$sYh^#8c7h+oiQ)OVZ88DXHA=Ev7HRnlSdbL6GtfDe??QR@6R#dY^Q-` zVX*pizepX##c>dSy^E*zbUy&@<@}d4HFzr75arKg=!l%SQCK$31a=R?i9pFMk|9v{ zUScxC6X1DFDnqA1K?#pss;|)(-VdDw)H2dzytHWGs`K05n7jF`UDvTAe9(tzkOp}a z$Ev7l!jSm8Svzr#5O+#x5FnfjIclQo8#8P(H9t?%Q-54g+9&LL99Wd;VbmhO7=p0f zbnekzW$XG%hn3`jg?M7&PE|1X^Wp6VPRLmagsl7zyvw*RVWxy#d`luJ^ULg*Yqjzo z$iDd;7+o7+tuygf2bx%T|tlLEdRe03gi@ME5{G z!hnOyeqM?vPPX*e0mp6r0bFQ1Fn$jt3mie4>pZh-To=a(&JP3J17LZ`p=DY;^iqKi zzAOjl_Ms2YdG(I)nX;hcB6Cp$W2of~u)DA9uIHiVGkbnr@{h{nJFKyDBR{OWDCUqF z$R@?&;JT8*S6Ku%z*IBrw&0`ji2)3%Q&bBuBC&>@(1VGZ>Hk!eR`T6ndlWifJ&3#a z(H}6d<8?da8SnpcT5UkhuK9Z+B5!bOOTiI30!jyoFsjbNe7ur}8iH~1wocePz|0RQ zjSfCO^|R$pTfdM4fa#*Zz9v&%31hgD{PyhGofATJlXK_nvH<7&15naeh$2atvVl@I zPG|prht>u3H&t^d=#6e}E^`Q%NqFfhZil)$Lx<_1Kr^iKG4dfvYX;RmR^GnB$4Mxl_|A z1ef}7=q7Mt?GA$#wg;&9iCc9}v0^WJy`1z?BPFsEMk~6pu>ek+0LUc!5gdO-1i?un z%Iy2&>X>EjnfJ;q`y5c z|B8U-^_B`k{7`UVwy}Y^@)GGFR1yLN0(^iAR7XiRUHrZ7M`Z(eY$a3n`+Yymj5fXC zK&6janZF(?gKoxxk@UTHm&HS(A*a>$Lk1$S^_GS+VT z3z=U8*zMtFPBh>eR*t2+Byjd7(P}0Z>Ch2SY#50FT9G_WJJwVc_btg9ryiubX?9R` zpwP@FWqW_{wT3}tIs8Z7{*a;8ChBV8h)b~z$3-GQ!TvAs%X_JBW{`L>=I(GSdU&#x z3g6gsdv9@YU1J{xS_A-N6n7tSs&6SekjJ(OPDj?b+QHXIEZ~uyWcKGgYO21}@AuBN z5v{y;-Ps)+FGb-M*)!!gzB(fdp&zvi`sfV(OYNDRBSfYWVWKXUdzIzxz5r>kbQf{7czjg04deL_ zNwAQ))k%wR$xV3yMUTG(sUj2R1(P7_y3Plyc9=I2x-eAn1MTr4Xq9{8BX3l_nhX zl~NFxi#M%kf4zSZoCM56;Z(VbUyAwRO%y3YuOxpYVM!p7`tjoVU{0+oJ?y;ZJ$%4t1FQJnIwt%QPDuJ=zr|w3&^lJ9K7`tDT_l%mohY;b19w}$CS>7SF$InICIzYesLiWW42@c2X+b54 zARxwy5x>1$+553)_;HeI^d%qwzO_eT++3;DtF!(jY(5TOx3!b0hnri_f-K;LSef}> zn3eAI%PRgv%6fhS7}62_q7mpNa$u=0AX&FGj7BM)RrB{&2FgK_P05`D%w1F7Oo;-| zlBuIzj*KnRI_AGsBLAkK*S(=C3;qBlrBXNWfr7VmRYd=U+m zR8Z2T3q-$0rD?EYlWcJLQpA@g3efvsWoq=>&u^adI-)ynRANTN%7XTZH~>oQvFUmp z)(ag_uAwt*Nd7NiVMidBy&gN{1*0{nJz+i&F!?GBob`!wJWlM7x6#*;4ZP5BB)B$* zCg|lplms#i!BN5;vzEWTr==b)fk8?t4>~RqN~vD7@HlpN_6_iyB2?d4k_|s} z0hCwW7YTH-jJ*A`QlQj11a%Cpw%|DP7ixkO(H$*@k^M$bAeaG zxbaQF^=LiNoMHXD9d|HM4WZuiGMX)}&g9Oh0tr9)-5vh4%|_mL^6LFB-M#_xm^(f` z_R^FLcAn0G`qz*lkQecaqa#aje$nxR6E+8EW4mo(UnejgCd zeJJ*r!Cf$6>h@Xagc_1zl&YpO`qFI<&{Q-3ZT2zfrzJdXPQIGJ?$f4Edrl`BD7h#4 z^%{$MjFOGPWLpZ(3WuQkaF`iWaF)c+)O1~)Fd(KjsTchzG8Nx?^v`H>n%Jc(vFBiu za63l3&)UB)=ead~>&s<2hfyN1!L_RXx1>zamElq0JqJ(kc=+sMgNwcU?~ zrsA8_>#|FL^e^Z)jktDg;yDjbjUuE6pZ%W)h@`=nJRA~|R8Hk!ug|B5IZxo`Mk7_Q zBDUc#lO=It#pee^?vMrG-lZ`6-h$V;gjG`!7JC7;8wHjY^|Ul$pmr``7U?)KbAF&{ z3;8i&S=L8IDJ>J|m{KH${x?NtzE z?p6%CF&T*Cy`Psj>-E67l-|oi{1*N;3IhCHFo<`!3!L1qA^jM!&Yff>s2$WI+HDFn zlaTOmV^6Z5`pHCjyA81i0Od=7ZRZBS;Q*4RvIV@dWw(}KvrNG?GjeSZjrXYK>?{dMg4=o@4(h)KZ1^{WIr z%tSRr;LYD_x*>$d0Z^-@^45P+bb9#k;k$unP{=tI;D;cFKcAt(U8VcPpZfb;3LRN2 zAYx0I6)JD=hFHKn-m&1H&OnMc4(?KMBUu*!7ta}uZ8{4=y-$*DoWe?Ca9$h%MO^(S z|HYND$E)^F6qlC(>$tvz*76RH9t(fj1ZdV&Ka11^ntA$F2q1nRBhgL}WT4XD;2qIN8D;?mr&jQ>ME^~~>saS8&Ibfti-HISahOd-JXg5rs+XsTIq_l?T&41fe z`gOUjTF?rd&^`24<~7lof#iibpvF(=S6EGI=thGQi1yRA&xSAQH7MfXS^ANCwCmsz zZ=Vx~I~V_G@i}903!rfn&dYmP(YF=zH@^hX8Ntze`qs!_su#GB~?W zz;j!klhD2fN6$OVKy|{X+R*~kfA5+5)p03^fdHVxof9zeE!|a89v~NYQ0(X&@)|~^ zhRNA|3yh+A1*C0*I_3y~jSBZeHV0ceVO$avb+zb^2(Mht(Z7TlT1*%dgNh|VO1K10 zPkDFN(^8N_y!Mz;?9dT!aXl8tydK!4hy!S)0jPk}lcnlmaZcTzFg}m6> zIBBKD56Ts3Ax=pCHY}4u7K@9WjlN1AFBmTdMf>1V{4`I6V>8XqcX5SO?z4eylab%$ z&d37s>GK|hKpA5{11wK^qzXRf#l?e zznUp-oEvO-4d%8UE7;ZG2yuivH_l)oMecoLui7eRTOZ|9#htl9FGt$qOwWMaZgsdF z3%UuyL%VqiEU-5k>)DEj0AsM>eB1N`G@nRM7K1TrOwO0D)8U60le0nh^HRlUc>^(F z_eIAiprryIaw*-q;}`W_i;hLPZ|01^)seK|9XGi53FHGuaOkaIF*m>0Ugvx@va`Fh z_HzkNS@~goUO>Kq74ax*LXb3&y3YL);i#VUESO6H{fsotr)UUA!g%SKS!qFMxNrOC ztRDC&4LSmK9{`d?GvHG~XzZUAtjmCgyX*vOJ|dpOHO4e!YZn{XQ!pjKlyCM_I(R%m z#5*^2J^05#OCJ8o1(m)4j}6>3Wq#tt=gT^-c-Wu4H>!#lp^O**AV=%Wm$rqlgB^e zD1(KtmrqV=^?tpYrv=?l0uqpbegW6%Q71$1WeH(ijT&R0=*ANJ%bAs2ZeGf?2x9|bVn_|DKX1~&Kr|94P4nUB7k zne%kmSw+j4LD%#O>)~GD#}^RX6$G|8PxA5CRkYe0;@8`^2msJs5j+-=;90E(VE7V{ zR^aC{HkamPtTc8HT=w5i8P=Ct+K)Vj163@s;$nhFwc3rtAB6;I7`TAK0(gkX%-u`k z;-K9Om*}Hkf5#9Zqd$S3=lB5-3%F}bYeMH$Z&5{9c#e|?f&3J5xCrf0u0|4|Z6?|9 zLe3!hK&qhEhJwq?k|m&`UMg|pfC>PU)aD)nq&CUgt!-|#W!VzaUIGE#eOdH}pQofQ z)eQLIukJ}W=sR422QCKkFswI^5d)`3NZ)Pcfoa6SFkw{~;QN%eGOaoiXv5gGStqbL zwR8Wc{|gNvCqc+yH8)Ydq|Nzn2`o8n})}FqUWap4I2$$kD_LH^ME) zsM#34e69pDibfZHXTwBlIJ%ZRXs4HGEZ=7WCxw*Ns>Bp;zEEL1Ykr)*|Zy|r=Nn*iwpHDMWVN;B?ZWHX5Sw6U9 z_VDQODu?`s2L2b~+#F|$a#^zItxZC~B65}9D=>*7$70H`JUP8_8%T zmYYyC!op%3spt(o#s;w_OZo0cXp^MjJlgDgK~I4?sY_y1P^_msv4yI);j5-n z*hIGVrUtn-_^SHmH0C3X4wAr5PZ!&Y(b&aSjKem*0Y*DQ+W9W#DC!KoojwYlQkqF9 zeB=xr7ZZwJpUS$Ui9TH&M1SW$lPgi-ZemST*J3=15<%B2<}&3TPxO1;S5^?V24aC# z`B|_v^UeRjr!+TCN*QXveBS|LG!o;PDuz~?wZ^!8GrMrlj#6LzkuaA?7#|CH)vgHy z9~4=t>z>HXoXzD(ndTB1eCn-zuu~OH%nHHoG_b|=AIE3r?Dwo|n(>zBMTi7x+(x2JHs9|ocWX6N zQK^dd8~<8m(FuW4!S8fn1c1AETN9IpJu{LPgKyicyu}8u&-~b4!??Fhv%MQ%^)_m6 zvK6;9p*)bGUFAWPY3K)-vAyGa9!BAJUEjot6)w^{4>PaM>at1{@0`(b>B2dVHPl*+ ze_C&SEX5rn#$icun%vktLqd%U04>ea~IDm>C@Kw(%^qtWzASq=hYy2l2 zOkK@FL(UpN06hF8h@On@iU7Tf!*!zZC-7(^O?0KSBsYZVxK^v!6^&z=dS*w2MKuRsW4WOr(AUuxsScW}SRT*vWK-u! zTUx-g=_0eC)H1S(g>AqX#WfE?#4tMG}8*gnNkc`HS`0Qa;5xTqWF5c>rM#H zlo3fEc9EFfrLo7PMEuJMXUioWE%r!q;uKEM9POeNnkTXFQNfq&s%YN+6&!6oEsYgq zDEc-JKH_A%Z~fT3ZY;qk+AKx>5u|w=@Y>gIbr+1z9L+~7VZ6QBj_rs|q!}~$pcKZe zZyjBCPAhmIYoFBFnGb&$HtbG?$*CMzAEkSmYV2Z%|0r@=&n*c}KZq*VGWR~J1DyXSBoez3A0Z0<7V9s3_b%KKNATodi82xz|N0Sx*@QqDdq3rf%=V|PGY(B zCYcO77VPyyd50lA@Cc6cYdpo@W^)rDWb==Siu~k5iJ-+2NF)Uf-14gWzCY;E(4rex zXm})2?7U!j`gKlUu`>Z65C=$VWE#&Ue_L8~TQx8`ri0wrK&fZ~V>nU9_fYW7S_)5- zTfJ9JINRVj5r$C^4m2VooxKs~G>O#O#W>18Ux;}j7G8#!7$U=mC!Q{0=npvl1( zXE>0X!oX}GXPX%c1OaA+XI{|N2H4$18DS?d%+%HU(@N+^H{#f_7*g$$(lzwd+`IhW zkc#cs>T0@l+TCAo|JcSg=VO?2>)#tTEf$@LI31W9dbzt=IHDHDDuz4fH9Nc!c{58HVtX&uWOde1|e%Q1C}Ay9og zphzV~#b@s{hclu?r#kwjFQZH{-FslE`$h1BHTCX}%d%VFm3-j(OBSaW7hA;1F4hi zD7@_4uX25lb^-B^;GprS8L4yDl>sVgDAvsLsjqAJF^>}W-+pcaUh8ZuVx3Q3#%87K zlV_!HxeM!JIlH{L-0a<|=i~eBl#G9+*>ip zZMyQ?jY5+pQMZEZu0WiwS)nOY*zLDCWV84&A!UL6GL*fE;KQ76QtZ=d=mnInI448_ zsY|nYF>MwvuSJhMvi3}Vb6aSkFOOOrBlXGgarylK8ipvtqd226Vp5h{8OAGmlhcac z*Zs5eQ^|yo#$7K7hBHGd6p_Mz&9zl!f2Jw)p)7&5^XjSv=YlKNuApmYy2$enH1>^a z*PfPLI?^aGND|(>h{|r5%T@}>z^RLn5d02;I(`}3(fvEIZY5C&-!$p261>5>mK;cr zme*i?+iIor^E8H}&K$6gEpJw3njROzexSXfetEh&7komyN2-Bx_*%;2j*Tt7fv)_) z_QoEU|!9ebQ__~fN-cuiIb^se==;|&NtXyc}{Asq&= z^&?Nz(EYb@_y@Mc@-Nj19G@Iq(2BvTl<}*VPWmU+_vV&_B1T$z{$43;Ir*rJZQbT* z#r0B7gAozj7@Kt7Re36TK#`WeU3S~Pg(+-CAL|#C=OvG%X*jTlqZg&T54o>+F7`&= zZcyH3v{CIsk~pBHt6<)%kuz$c*kb=T)y6t5E6hDXRCKmQ1?A=KLvKadmy?myg0H7e zN*yn4Ghh}Nd7SiTv}A_mXQDC8KZy@$J{$O3GwFJ)Y<*-uyU zoIaGPjmwO(PU^?9GrIThY1?dcf>1UC!wnu~Us$lQ`BeIbBfp>MFH|rpRM-&{3EW_@ zJK-)4ypM^*V{UW=sa*0`U4Q{(xfVX(sxTc zlF83AfnAB)xzf)%u$pzfjA;t&fuTyfkspWoX=Ul#W{SU^e^{_Ewen$bYqKL`c#9qH zy{CSe{hv9(e6xCyVQPRLr5=Cr$=s_LB9_E?8G3-yrO+=x-_=`kVv=V~@$z zW@DGx6{X&qC*{D|e^5Mgj&f#n#BJh&inX4M# z`{WiHp2&m)Z62s$pW<9OyEh0ZtqvQE9MYdDjTntn$RH0ZzAZ;nlKSOJ3E8J?AD5@j z77~Vvm&{5WygaL|@NpDezgG9g#k+UhXzUV`PESvJT0o7U;Al}#Mfc~{s1wkcnb6el zB;8jXB4#!f^ITz7eJf$q6$1eT^O36m?7i*h&s5Ix)q6uBvmm|)ZUf30ci&Q4da`r53I&iY7BZtgsj+n6x8 z*842xuK$GFJ;#$MQTP5rM#_YINY5*&gM{)VEyK>TLBUef6c+X_C3?r(z}K8k8;CvH zZt<`v*^xUj^Gn(S#mvV2d)HxYO%BL5ZR^kqW**V09ke=DQOv!CHK-$Qec7z*;Kr1} zeBd;GiNy#b3ZV&ppYL$4M<)lqoKlia|6A$FjjLd$15lYG1U4fxcQ350U+|^?mg6&x ze>*}*sc#{%(}`pzU7&g8NXP)-b4%~%bm?L=YD=Qd0rDh4UMppmwNkK5WlS?8s)?(( z>=U|2yki!ulCfi3d>O@Rv>Pr|=whv>|HPM{4Zzcr4r?lE-q}%&r!42^l||SVMDGY% za~Yk3mR-M|q}&C`F}Wwdht)3> zaOBBE#M1oNfhZG|{Xds?iM?Pq3!_QKDi!;*Qvir5b|-w%uxMWCV2)V1ESXgZq^o$b z>Ej}XktJHX8dvEh1pn;#6xu-XU`E}XfEMyj36Z21Oed6|k*hbpc!oA?ROqq_ZoFxCI-eomA z3quk)n0!CEPBEb@S6e5qX7P2Xjwn(bdE+abkOBXaXHQT}$PPs)sgA)Dw=6RU>uX-+ zZZyX-g8EjoMAVVX&Vxe~7^!hdmuT_(TT zX+G$iIP260??r2fRl@O+$LFw^dUyA|ML5y{_Dh$uw+Gbtd(`&HbAPE3`hic_DP23=zY!=E&hkF1E1v42Vh_|E(wH>aH<36y_YqyU zAz!`E93(m;_}xTERgq&mCPlvNRzb&&#sWnV{1QQ_{=3BJtvoTo?2{3t zW`KExsz(@r1RMx`Ev7J`{Pl&DEY_=HGGYe=-E!_`fghlz;Nb{oaiDE+v~2>CT_aB~ zNyeSwahKWZuYHL2rueQ275I}|l2h0P*~n(2MGUHR!uWuki2Lw*iV(_f&AKRe?T2zf0ibQ*LY4TOSDNnM{jkbATS^Ul5uP@xFPuZAInFOH z=rRp8(yILr4N#acac1Y`8k`Fx-JH<_C^6BrMaaMPr?`o zyIlK|R!X-y3Zme7T&1GE;uIf-==BX5TS z1DK`%!1~Hu=OK^88GwxE$Fr&jKtq1$Cl~4)-7i;bw~n2}A}z4fZpbP2>n_;*+}+&6 z@pD^;ZL=fSxhve(SF)f+U|NOR(0dU~>*|CP9B9-^5Us=Mu;x}p(UO3aL8`i+{0iL@ zaT~6&r~6l~VCKp|(P&86ZT|v-nVd^zYBSzXRkxD-6AS23Nc_uY;!$AZTB` zBp|xb5%>jyI6ztV@0)*Z@UI{I8w+q0{Obq*+TdS52!T!TZ!G+4ga4y`P>+E`g^O$! T#5Sklac^BWxK?<@_OJg1a8 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 8792c07d..75800a41 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -7,7 +7,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Atoms + RSG Atoms CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Atoms + RSG Atoms CFBundlePackageType APPL NFCReaderUsageDescription diff --git a/lib/new_views/pages/login_page.dart b/lib/new_views/pages/login_page.dart index 1c6a83bd..1bddb16f 100644 --- a/lib/new_views/pages/login_page.dart +++ b/lib/new_views/pages/login_page.dart @@ -91,7 +91,7 @@ class _LoginPageState extends State { SizedBox( height: 100.toScreenHeight, ), - "logo_white".toPngAsset(width: 110), + "RSG_logo".toSvgAsset(width: 110), 25.height, context.translation.signInToYour.customHeadingText(context).custom(color: Colors.white, fontSize: 27, fontWeight: FontWeight.w500), context.translation.account.customHeadingText(context).custom(color: Colors.white, fontSize: 27, fontWeight: FontWeight.w500), diff --git a/lib/new_views/pages/splash_page.dart b/lib/new_views/pages/splash_page.dart index 2b619ac4..d06dc9c3 100644 --- a/lib/new_views/pages/splash_page.dart +++ b/lib/new_views/pages/splash_page.dart @@ -3,7 +3,6 @@ import 'dart:io'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:flare_flutter/flare_actor.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:local_auth/local_auth.dart'; @@ -14,6 +13,7 @@ import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/controllers/notification/firebase_notification_manger.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; +import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart'; @@ -184,10 +184,34 @@ class _SplashPageState extends State { SizeConfig.init(context); _settingProvider = Provider.of(context, listen: false); _userProvider = Provider.of(context, listen: false); + + // Start splash logic after a delay + Future.delayed(const Duration(seconds: 2), () async { + if (!mounted) return; + + bool isSafe = await checkDeviceSafety(); + + if (!isSafe) { + Navigator.pushNamedAndRemoveUntil(context, UnsafeDeviceScreen.routeName, (_) => false); + } else { + if (_settingProvider.isLoaded && (_settingProvider.user != null)) { + checkTokenValidity(_settingProvider.user!.token!); + } else { + Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true); + } + } + }); + return Scaffold( body: Stack( alignment: Alignment.center, children: [ + // RSG Logo + Hero( + tag: "logo", + child: "RSG_logo".toSvgAsset(height: 100), + ).center, + // Loading indicator if (loading) Positioned( bottom: 100, @@ -196,42 +220,6 @@ class _SplashPageState extends State { height: 36, child: CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 3), )), - SizedBox( - width: MediaQuery.of(context).size.width / 1.1, - child: Hero( - tag: "logo", - child: FlareActor( - "assets/rives/atoms_splash.flr", - fit: BoxFit.contain, - animation: "splash", - callback: (animation) async { - bool isSafe = await checkDeviceSafety(); - - if (!isSafe) { - Navigator.pushNamedAndRemoveUntil(context, UnsafeDeviceScreen.routeName, (_) => false); - } else { - if (_settingProvider.isLoaded && (_settingProvider.user != null)) { - checkTokenValidity(_settingProvider.user!.token!); - } else { - Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true); - } - } - - // if (_settingProvider.isLoaded && (_settingProvider.user?.isLiveToken ?? false)) { - // _userProvider.user = _settingProvider.user; - // Navigator.of(context).pushNamedAndRemoveUntil(LandPage.routeName, (routes) => true); - // // if(isnotificationCame) - // // Navigator.of(context).push(MaterialPageRoute( - // // builder: (_) => ServiceRequestDetailsPage( - // // serviceRequest: ServiceRequest(id: "72348"), - // // ))); - // /// The below line for the new design - // // Navigator.of(context).pushNamedAndRemoveUntil(LandPage.routeName, (routes) => true); - // } - }, - ), - ), - ).center, ], ), ); diff --git a/lib/new_views/pages/unsafe_device_view.dart b/lib/new_views/pages/unsafe_device_view.dart index 2f6d2f10..5c7fd7a7 100644 --- a/lib/new_views/pages/unsafe_device_view.dart +++ b/lib/new_views/pages/unsafe_device_view.dart @@ -30,7 +30,7 @@ class _UnsafeDeviceScreenState extends State { children: [ 21.height, // Center(child: Image.asset("assets/images/logos/main_mohemm_logo.png", width: 200, height: 50)), - "logo".toSvgAsset(height: 64), + "RSG_logo".toSvgAsset(height: 64), 50.height, "Sorry".heading5(context).custom(color: AppColor.textStyleColor(context)), 21.height, diff --git a/lib/views/update_available_screen.dart b/lib/views/update_available_screen.dart index 558a0233..c48fd48b 100644 --- a/lib/views/update_available_screen.dart +++ b/lib/views/update_available_screen.dart @@ -21,7 +21,7 @@ class UpdateAvailableScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, children: [ - Hero(tag: "logo", child: "logo".toSvgAsset(height: 64)), + Hero(tag: "logo", child: "RSG_logo".toSvgAsset(height: 64)), 48.height, Text( "Update Available",