From 65eb17e3b9d8dbb721ad83b4f4302fe7dcf7e547 Mon Sep 17 00:00:00 2001 From: MooN <56061215+MgKyawLay@users.noreply.github.com> Date: Tue, 18 Nov 2025 22:05:34 +0630 Subject: [PATCH] new dashboard design --- app/release/baselineProfiles/0/app-release.dm | Bin 1915 -> 1922 bytes app/release/baselineProfiles/1/app-release.dm | Bin 1842 -> 1847 bytes app/release/output-metadata.json | 4 +- app/src/main/AndroidManifest.xml | 3 +- app/src/main/res/drawable/btn_bottom_left.xml | 22 ++ .../main/res/drawable/btn_bottom_right.xml | 23 ++ app/src/main/res/drawable/btn_top_left.xml | 23 ++ app/src/main/res/drawable/btn_top_right.xml | 22 ++ app/src/main/res/drawable/ic_down_arrow.xml | 11 + .../res/layout/fragment_dashboard_screen.xml | 272 ++++++++---------- .../main/res/layout/fragment_qr_refund.xml | 112 ++++---- .../res/layout/fragment_trans_info_screen.xml | 15 +- app/src/main/res/values/strings.xml | 2 +- 13 files changed, 296 insertions(+), 213 deletions(-) create mode 100644 app/src/main/res/drawable/btn_bottom_left.xml create mode 100644 app/src/main/res/drawable/btn_bottom_right.xml create mode 100644 app/src/main/res/drawable/btn_top_left.xml create mode 100644 app/src/main/res/drawable/btn_top_right.xml create mode 100644 app/src/main/res/drawable/ic_down_arrow.xml diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index c8d8fc325cc2c98c53c2636fd7a3fbfd09bef24f..5c0aa00224b196978474981bdbb606e5499ecbe5 100644 GIT binary patch delta 1463 zcmZWpdo$1pe6jsI%M#W}`t8?$^)VbgD{hagt<8waW^ZlOB`K+o@;Hoap@(LON z37@0T3?wlF9yLGe7@G!q#p5 z273U&d_C)W7+4s3!PQ^C4V)YnhF3IUA1C*6F*ICnkyf%2uCVsHqQvMgtJs$cgsfA6 z-%~^x!XwHM1n%%w_p6H~h?le?L{yLFfx|5QpPXxMn(QKIGTkaCW6*-RA%FHl@=lSo zMffo$euL44mPR`?5erzXp$DUj+vL>Uw?Ure2!A8L9TyK9sMc%FN=5|KkywohAaG0qmeh6^q>-;`)jH93UV zKK#!&=Gsf!lO-Dbg1BH+sU{chE@`7z4vb&|C(iIOy?c?{%g!?L-EAcO-I2a&VW7v! zMxL3Ux|tmvv$(ESp%1>Pq4GkG&6d`?w!TB5s(wE+QP*Avm59L|rh}Z|O0Ck5lBgf? zSaaG)c09($Bb4Zf(#KpbVfCJt!ZS|0Ek#O-n?j^`o)^=+=;*7Al<8sDo`ZcP?Cys~INq06 zoCOlIRNE+SVr%;L^Fj5A%;@a7nUc30HvAlYhPF~Zec8gwu7{|Xn#0m6({h40FXpBl zjcGF-7T9T4^VoX_jq9v^Kb+8Q-QL{boQ`b%WFh;2?F|K=pX{Q~X~SqqkI0=pP8roC zl6>zWr+0P7C-o|@(s{KO(c{kYkNl}9V?Sodll4_Td#$lMgm{8AV|GTwHrj972~{2q zjBt6yoc5~A6zAvDWwqLaBURb`oZFYiUSs3V*4?&UbTc&$uE*8p;!0p9K@d<_VI6%f z0d_S325#c(Ht~jJdJ+5W&o|Ig%*Xg@Q}1^k7}iTtwW9YF3v5n^dHjarBYH${e)cLy zWYBIo9N~lS)E3Jb%#aCXdV+?Sh;9x;zH4k5UHu|h+SDjeUF5$}3X-v}t7nc@UwX#0 z#9q9&1-nK8#I#kMiV`@mP>g)fhObgGI@fgB=Kg)S<5kmeZq2F8p?MCo*m&7m>r*is zrK}Uad~+D6=Em~azE@B&QlULr?-HRKVVfC;mB0oTIqTi#{Ciilt8~1ZxI4$#-j&FG z4Efphrv|lLx+TGT3jUyofcFk?perU7?rR3Q?;W1%lJdYt@cE9EAnr1|p4FS8J?_=X zc6Y?u`bj$J7uqZn)Ab#i7vlX?Vz>pfIvwO2tgs2v15z!!0lNG$_tV>D3oLQP5as`( zuQ+$95s8`Yz}~TI&I+y2n@vMoM2Nx%##Lwn^TqVL@PL(NjOeZ!Dc(eS%ziD1;3Kr8 zq<0+xSI7Ydl2o15R#L3F)CoToAqskao+m|ic~0d;SPsoI;`3zajwg8tLQ5o;$$(nL z1uh}d5=S!+;4M5RQW#0|-nS6l!r1c4EAHdMgpukF%q>ROoO=>_$rhd8rr4G#Tacx$ zWLA3((gc$SWdtb`^+N0%^Jmr22+I4M!qq3Z{Zx+PUeHWAk$gPDKnSLiJihy({2Nz% z?U4V^ztt-IEtZROoa`Ff7}*mkMnyZ+Z=fi7`Tj1>P?%i-5-Z$H#?eiDlboKwSEWj| zRI-EA{7MZ{3bG!5q@4f&O?_&mp9TCBDZel_sRf&Gah8K<0AIq_^NToj3)B?08ONTV U*;GfUmK>7m3N=)cDt%t^59orl?f?J) delta 1464 zcmZWpc~H^`6#glAWrj^^ju$3r8XhTWnkn0ErK`5#jIH;Qp;8HIqPr%-Pn#4=%Zw~p zEw{|InGQ@%QxUIC@;)Gx#CuCTF+ny2b*-J+-RaHu-n@D9-uvf!@4E<7Y}3K`LZEtp zrluxfNyX>sm_Y{Btn=)h?VxG^(3$}Nsz6?dGKpVgjB1ohtl6_=U@&Uu) zf_@tSc&W_0o&*+Q&*Vp$a6mD+M;LRb8&z|Lmr$r%c*$bFg=nlk8rPx<@k)BTyVSbh zcFW-rvxNsgCHm{~q5}IfFp2)#12|pl7$*m4sk&Cb$-v9Y7?}5y>H1NzY(Ac)nfYph zJpNwp(YVn&O{r;MOZw;ABPyf0UeF`snYylFM5IA9XjiOH{)=sZxL9lG0i>cnTSiE32r_oble$>dy6D<9yd-MN8Vv|7mfy@!jofqrL%EAoVeS2^-ahy z7&Keu^Fu%y33T8Sk^@4j-sWa8|UNdO;Ckoi=q&RXos@~LWB+>!x7 zs+F|BfD_jDU7aY`nLFLKjD({zUd&;DPd{7We|ZILh&PegGNi{i9`dA(coM*ISoz`z@Ne-q~Br7 z{_p%uQ-W^`?zOU8Vy-BR21C^Cl_@Nf+J^UfcKJFf#BRVNd8&`{eGl4aR z7&Es=rlKE!X#BefX2COT7zgGA@-nDi)yHi4%DO3vwyA_qZ(X0EF~;zWog@#d92kjq z!JJ$6BiLXlYBl7k(O*+9xqVp4R;Z>39iFe~W~Z8z(~^Q|5+uVkW?vb*x07Z6g4#tB zGaoieWTg!m6#IP6+6lC9WMgiMn(&?DvIyb!75`rj;p?Pa3GGR2bRDQyp3V2C=c!pA z+pk2LMXehuYGsmp9KkB6vTLHi596z$iH9&?!cAQq-1PtHCVj8^F;(3_ zdV+ck%Kn@apaPWW!1jL}Ss`zf7XtwB>!xFTRaEtWFJc?|WgT5t!w$YFzoGx_*4do+ Q*9_=k8s_Rt>K`kA19L*F@Bjb+ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm index e231205fad0271944af14dd2388aa01af411ccfc..2f4eb70b83cac77a44e1184799fb130eac2de8ce 100644 GIT binary patch delta 1603 zcmZ`)dpOg382=feVvFMm$7Q5a$z?68j?20TC81PmnQN}oQn?(=Pb9QateefyMV*)? zve7I`TGC9*rA;L*grQuwDUL2r=k#>W_xZf<`#hiL`+5I(-{<+f-Q7h|NefU_ zRR#7ZMrNxUg5-HP`H`b|zzSgnK%CP6AbB1D#3~Hsd57rl(cOOEVU&fOJ1|!*R z68&MguCBh&)@nUvaW?zT2puntZYs*@H++%L@wm1t;_{?#E|jp{Cc!r?@5q|oHWB-k z?aiw~+;~)GGmNQsrz4aVg}8!meSMWco5UMh47|Z}HXlOwO*Btl%HoJTd@`dkO;f2P zFt(LIi|z`N`E4=yu$xjebjr{G@&0Ugz`;c$(_Y>!x=2vHt0Rz3w2nAD1*w5h#{U z7po?^!dSWbVuj^JK3`oJ#-u#WB0zLENTd%2pZU{+o@R0yM2N7;O7?n;I4nwts^ce= z+DqU~_^UFbf<_btTKTeD(&ESdL^v(hlQF|tcUP-CLIty|BTn)d+HoLp9h}rF9$a19 zzo?HZLQxH7dJtto`()DCWm#v)pY*+?7gz}wMnku!Cf4yZh}E27NmXj|sDD%%-m&WWir;= z^!gr_ckW?+PW~JW%8n#9$WsOxbROgRMf}1oJl%(9PTHsKgpT6?^W(8~Do0a;+_pz8 zsBpAnZ}RC*FitB<_t(!S=34ZX@9-+A!V22XrV~o6#XTY9Re5fO+`%#tJ8*&33+E)I zz4>*qe%=K6!Gz`peK1byn25F=br_>qV9L24-dnqwpOWS z=-oPYdb3UjE}SlTb-oF!<2>YITkyG}r-e2eALq6TqaktLDjzmBwG5237Ul~0J@+n9 zoN|!U%Vs&4Z-sNrc6@1qD3XtJ;|HwiPQ?@dyBRH`$HVwi4hw)Lh3OU-$H5oXiedXzKNv3sNZ-IPItbmu zf%NC*{JIeIuhe&@-Ri_F(ER9Ty}OHwsyX`6#HBf7CeOuB7ETt;bA*(6l9wolBj4T8 zNdf?NEA-kIN#MNXZ3O@TQ0BtjMFFA({P2Cuk9OobWpnu4CBXdqxB8sopC=%zsTe8K ImA^251A@2g761SM delta 1598 zcma)-c`(~)7{`B<$hIZ4x+pfqVs~32h`3W-rCVv4nwAwr-F1|paRgbc>MByzDpItx zWtNgS;>b4IX5Au`x>Dk55?X1iu0~SJbf&vIot@ctKF{;M^UU)+e?0Td_ia+BQ;>IY z+9jh5fWcruH#sO*{u^SBEKU>|6#*E*jR5J&%K(rh3jlFaOJq#2##zhwmF?9`@~xGt*!DA+e+}_ zhzBhAC+KbiGaoy2+J++a*0e#%mQak;cS?n=21wXZYl(b1vG|QR5MO6f_>d+={@vJW zt?#C$TQZV^FgCZew4Q*QTIVC`37(wcINah&sqRn`WvQ7JmR*0})2Vvk4!aoy9n+Gd zX5kt`C*PSbButELwu;6eG_n_le~^Eigs%#RWHIAEc$<8tGqXq*O(0A3s;sHvP z>0p!42I5{Wnr6EXXMB*jcTt!souIhq9eyM7R$_NLlzWhKO+A|-Pc30oD^)L~t={#{ zfkVX>fngua-FR*n9dEOx@NMU_RsC23s^KtE?%V**8ylGD7goWlEyYV#w>#C5jvJt1H#qk%=@VxUY@(e zf?g4YSWs${bd6+8Saj+2qH0=J_i`)D8M(Dw#7Mh_0OM!H_lJvCVacmd zz$G6UMO%q`{e0$ZQ?uS{Nybeep~p$9z9@$Jrk}SUV;1fU=kaqo4PyG}*I$o1qgJfh z#xT*%0;4JR5Hsglk_^ETg)GnjnhC~tJ3H}=69!=SRayI&A~$losv0}Nu~p2$T_1UP$K0+lDk z;?rz3H;{VFq3?aWwY zv8(c#+@GMYieJ8y z#}a~35() zLmIm#Wx9BKc!NujN$m1raKyx@fZ5TMR=Hwuq2;QBwoANB+3`f_#@~JcU-=KJPx|l& zc`MzOc+6`>$t9vKCF9+%Lp3a6zGVa@;N(^?7LmJG`;hb}4%i@md++-#I4$EBe*d&^uwZiJ!>#; zXGfC$$YrQxx}@9&vCb+Kp$xekoA>K(qYbM)>)fsb$?L$I0FHEtG#~$cusC47d0e<_)DXKx zGo-+gt}|*uC2>(2p|MNhWJRaw%5HJym9s$Zb z+x8`vUxv0fa<}eV$dRh56E042;5q!Wr+M3&oU?8JQtv#jtb??oTb@2B)Wk5v7?1+W z - + + + + + diff --git a/app/src/main/res/drawable/btn_bottom_right.xml b/app/src/main/res/drawable/btn_bottom_right.xml new file mode 100644 index 0000000..1f19448 --- /dev/null +++ b/app/src/main/res/drawable/btn_bottom_right.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/app/src/main/res/drawable/btn_top_left.xml b/app/src/main/res/drawable/btn_top_left.xml new file mode 100644 index 0000000..f804a18 --- /dev/null +++ b/app/src/main/res/drawable/btn_top_left.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/app/src/main/res/drawable/btn_top_right.xml b/app/src/main/res/drawable/btn_top_right.xml new file mode 100644 index 0000000..c92bfed --- /dev/null +++ b/app/src/main/res/drawable/btn_top_right.xml @@ -0,0 +1,22 @@ + + + + diff --git a/app/src/main/res/drawable/ic_down_arrow.xml b/app/src/main/res/drawable/ic_down_arrow.xml new file mode 100644 index 0000000..149772e --- /dev/null +++ b/app/src/main/res/drawable/ic_down_arrow.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_dashboard_screen.xml b/app/src/main/res/layout/fragment_dashboard_screen.xml index e188d6a..b1021ae 100644 --- a/app/src/main/res/layout/fragment_dashboard_screen.xml +++ b/app/src/main/res/layout/fragment_dashboard_screen.xml @@ -8,109 +8,91 @@ - - - - - + + + + + + + + + + android:background="@color/colorPrimary" + android:padding="16dp"> + + - + app:layout_constraintDimensionRatio="16:6"> - - - - - - - - - + android:layout_height="match_parent" + app:iss_auto_cycle="true" + app:iss_period="5000" + app:iss_delay="5000" + app:iss_no_dots="true" + app:iss_title_background="@color/transparent" /> - + + android:paddingTop="12dp"> - + + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintDimensionRatio="1:0.4"> + app:tint="@color/colorPrimary" + android:layout_marginBottom="6dp" /> - - + + + + app:layout_constraintTop_toBottomOf="@id/cardMenuCard" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/signOnMenuCard" + app:layout_constraintDimensionRatio="1:0.8"> + android:padding="18dp"> + app:tint="@color/colorPrimary" + android:layout_marginBottom="6dp" /> - + + app:layout_constraintStart_toEndOf="@id/settlementMenuCard" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintDimensionRatio="1:0.8"> + android:padding="18dp"> + app:tint="@color/colorPrimary" + android:layout_marginBottom="6dp" /> - + + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/qrPayMenuCard" + app:layout_constraintDimensionRatio="1:0.8"> + android:padding="18dp"> + app:tint="@color/colorPrimary" + android:layout_marginBottom="6dp" /> @@ -259,58 +241,52 @@ - - - + + app:layout_constraintDimensionRatio="1:0.8"> + + android:padding="18dp"> - + - - + + + - + - + diff --git a/app/src/main/res/layout/fragment_qr_refund.xml b/app/src/main/res/layout/fragment_qr_refund.xml index d1617a6..7627443 100644 --- a/app/src/main/res/layout/fragment_qr_refund.xml +++ b/app/src/main/res/layout/fragment_qr_refund.xml @@ -23,66 +23,66 @@ android:background="@color/white"> - + + + + + + + + + + - - + + + + + + + + + - + + + + + + + + - + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - + diff --git a/app/src/main/res/layout/fragment_trans_info_screen.xml b/app/src/main/res/layout/fragment_trans_info_screen.xml index 0ea5a4d..e1cb731 100644 --- a/app/src/main/res/layout/fragment_trans_info_screen.xml +++ b/app/src/main/res/layout/fragment_trans_info_screen.xml @@ -91,7 +91,7 @@ app:layout_constraintBottom_toTopOf="@+id/actionButtonsContainer"> - - - - - + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2da33e3..b50b849 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -308,7 +308,7 @@ Processing Enter Transaction Id Transaction Id - Wave Pay + MMQR Pay(title) QR Scan Please scan here to complete your payment. Paper roll not found!