From e5fbd092992a471142a5d48576d038570e85639e Mon Sep 17 00:00:00 2001 From: nostrbuddha Date: Sun, 10 Nov 2024 21:41:01 +0530 Subject: [PATCH] Resources - Cleanup --- .../composeResources/drawable/bell.svg | 4 - .../drawable/compose-multiplatform.xml | 36 ------- .../composeResources/drawable/copy.svg | 10 -- .../drawable/currency_euro.png | Bin 0 -> 2010 bytes .../drawable/currency_gpb.png | Bin 0 -> 2358 bytes .../drawable/currency_usd.png | Bin 0 -> 1975 bytes .../composeResources/drawable/euro.svg | 9 -- .../composeResources/drawable/fiat_btc.svg | 9 -- .../composeResources/drawable/filter.xml | 9 -- .../drawable/flag_of_india.xml | 96 ------------------ .../composeResources/drawable/gpb.svg | 9 -- .../composeResources/drawable/home.svg | 3 - .../drawable/ic_star_empty.xml | 10 -- .../drawable/ic_start_filled.xml | 10 -- .../composeResources/drawable/icon_bell.png | Bin 0 -> 552 bytes .../composeResources/drawable/icon_copy.png | Bin 0 -> 828 bytes .../composeResources/drawable/icon_copy.svg | 3 - .../composeResources/drawable/icon_home.png | Bin 0 -> 847 bytes .../composeResources/drawable/icon_market.png | Bin 0 -> 924 bytes .../composeResources/drawable/icon_qr.png | Bin 0 -> 440 bytes .../composeResources/drawable/icon_qr.svg | 12 --- .../drawable/icon_question_mark.png | Bin 0 -> 1254 bytes .../drawable/icon_question_mark.svg | 3 - .../drawable/icon_settings.png | Bin 0 -> 1351 bytes .../composeResources/drawable/icon_sort.png | Bin 0 -> 297 bytes .../composeResources/drawable/icon_trades.png | Bin 0 -> 480 bytes .../drawable/learn_and_discover.svg | 9 -- .../composeResources/drawable/logo.svg | 9 -- .../drawable/logo_with_slogan.svg | 9 -- .../drawable/logo_with_slogan_xml.xml | 10 -- .../composeResources/drawable/market.svg | 3 - .../composeResources/drawable/qr.svg | 12 --- .../drawable/question_mark.svg | 3 - .../composeResources/drawable/right_arrow.svg | 3 - .../drawable/rounded_browser.svg | 4 - .../drawable/rounded_chat.svg | 4 - .../drawable/rounded_star.svg | 4 - .../composeResources/drawable/settings.svg | 3 - .../composeResources/drawable/sort.svg | 3 - .../composeResources/drawable/trades.svg | 10 -- .../composeResources/drawable/usd.svg | 9 -- .../ui/components/CurrencyProfileCard.kt | 13 +-- .../ui/components/atoms/icons/Icons.kt | 11 +- .../ui/components/molecules/TopBar.kt | 14 --- .../presentation/ui/screens/ExchangeScreen.kt | 18 ++-- .../ui/screens/TabContainerScreen.kt | 11 +- .../presentation/ui/screens/URLScreen.kt | 10 -- 47 files changed, 27 insertions(+), 368 deletions(-) delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/bell.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/compose-multiplatform.xml delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/copy.svg create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_euro.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_gpb.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_usd.png delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/euro.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/fiat_btc.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/filter.xml delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/flag_of_india.xml delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/gpb.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/home.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_star_empty.xml delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_start_filled.xml create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_bell.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_copy.png delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_copy.svg create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_home.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_market.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_qr.png delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_qr.svg create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.png delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.svg create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_settings.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_sort.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_trades.png delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/learn_and_discover.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan_xml.xml delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/market.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/qr.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/question_mark.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/right_arrow.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_browser.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_chat.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_star.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/settings.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/sort.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/trades.svg delete mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/usd.svg diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/bell.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/bell.svg deleted file mode 100644 index e86007f0..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/bell.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/compose-multiplatform.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/compose-multiplatform.xml deleted file mode 100644 index c0bcfb28..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/compose-multiplatform.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/copy.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/copy.svg deleted file mode 100644 index b63853df..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/copy.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_euro.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_euro.png new file mode 100644 index 0000000000000000000000000000000000000000..31d48fe01e3df012465ff61af7e7faff6127e8d2 GIT binary patch literal 2010 zcmV<02POE4P)C$SSJaXy=-O_~}rDNPqjLpmTWE$XP+QEi>JX__=Tbxa##6G9YJ!K7-{ z;J-;l0-;S4LIorQ5?`f23oWDwrAZoE(k3x=;-q#Or-|bv{(K*t`<#-d^|Kwd;@D4q ze)rsafA`#Te&^f=+@k2Z&eLV}`E;4x;}(TmmNr@~aC;hr>J95f*>*Q)En3S<1ukB+ z7J=iSr4sX6GCH9pW-q9*c#k@Mwg&_M8={U{zBA+pXvIA?)a_Ug$BN&>YTpLlQbSik zx=}a2i=%PuKYdbhaLN$k;m?qoKZ^eUe}O=EG}lzQ0eSY;W7W_0!|L1((N+mf#j=DG z$Ud1r4S9-1&>-+SG(F#-4S!m+kmtAe zLN48H7EKN*g)%vbn!*@1tqK^=reZRVecOo2;yL5`sJ{`Bgan?`(M~!{x27-rFwFKkZ9$b| z9v$Q>^bcS7YS9}k$HmDK^aWjpTUad$We^?rtPEmj^B^{_9l`O7t04&*()*Xe6?EDW zd(AJgcIOKid~ee5A)#g8HeGf;LSb&nh=;(es|_JVzF`qn9C)t-7p|6&H3XzI-k8Sl zZ!PTs(@`7x#;UN!HH~+_aU(&Eqtgy^pW-;1C>0*pe4qFX3-OX=qsm!qCge#SbaeV^ zjO!F#g9Ij;w7^W}QX=}va!(QP-hgYt!LtMkC(0uDdlle>u_QsVug#(jr<^djhOMw~ z+=W;cFxMnbpw66p=9FDaHbYWi9NM)iOLU6}n8VLr(f=dmrwsn8KRUFl0eN zK8b|sSa}ueYbMZKc@=-W`#g;$m}+yfqn5A;%t8`xk?fh&BtgYa&n5h>wI3(`_BtN& z_>fdYLN@PlR4bfn67 ziS^?-%^1tHH&d!k^H5SvC1)uk-K3Ks6Td^m=c&DdqZb;DaF@hXnu+reNmS5zX$7_( z{tX^*5996gO*EsD5xJI#MhH(r=WTk4b|tl)Xd=w$YdE5}h_$z80;G>+IIQH2&2+I_1CW|X^-zT#Gaa3*v9W#}kG7q|bKAef9c5txrI@N05Eysa z4C!{_&l|o)TYbS#&>da1zy5d#Bexoi*d*{GwLs)hHG1%+YnB_Az?cjJR z!t+*qKC}uw3k>XWh0)RIM}ef`_5KAd`zIK>;e_IN4u$*vhV-F+ycqY5wNS69=v`N$dr zQzg(CkbH?;OO9arn@4c*?SUo3-K02n%8!-p5lAIlV9G=4umoYu?cWBCFdVt#`#x^B~`I(U?p4~kA3NkQd_M`NsXST!DdYJ0% z2J`YZPce?tb3RO--;2)YPQv7kNbco38;Y@E{~;7s{tCRc0{Sw6v6l^cB81uCt2p!g zK}=to$)+yk956neFwRYJ$1#c?l};w?HH?EM64UFszIf*re1vE08;6?mBjTm79(fXx zBX8nT|8003bK?S9_tlC;jg6v3*d$n;&3b{ePLK*56k?pJ#Afw)IH1NRy0s*CS_zyu s2k+4keoSFy=cumR0)apQyT>ic_b$onJfJQG@&Et;07*qoM6N<$g503X{Qv*} literal 0 HcmV?d00001 diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_gpb.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_gpb.png new file mode 100644 index 0000000000000000000000000000000000000000..643fb3b616b4ab6e85eb985ab37b213972d36092 GIT binary patch literal 2358 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 JPDHLkV1fwKvU~sl literal 0 HcmV?d00001 diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/euro.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/euro.svg deleted file mode 100644 index c3edfee1..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/euro.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/fiat_btc.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/fiat_btc.svg deleted file mode 100644 index 64451f40..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/fiat_btc.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/filter.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/filter.xml deleted file mode 100644 index 2972f723..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/filter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/flag_of_india.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/flag_of_india.xml deleted file mode 100644 index fd210361..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/flag_of_india.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/gpb.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/gpb.svg deleted file mode 100644 index 067ea620..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/gpb.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/home.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/home.svg deleted file mode 100644 index 085646c4..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_star_empty.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_star_empty.xml deleted file mode 100644 index be22f749..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_star_empty.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_start_filled.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_start_filled.xml deleted file mode 100644 index 7d7dc714..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_start_filled.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_bell.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_bell.png new file mode 100644 index 0000000000000000000000000000000000000000..eda31a647dca9e2d7928e4dbef7574ff2a923ad1 GIT binary patch literal 552 zcmV+@0@wYCP)(f z!Y~lVFF`^)(hV{~J3-qC+6@X40`Wwdpk;#6C&V8qbc1$-GC|p(8G&a+l71(J7er$F z5~n=)Cn2KbY=1fX?7I*-9RG_)B?!Z?eK;IOX`0^Q7vNTqJ=%Gmx5d4$BuPGp!(l{1 zL;`2CSPt%?uQ{F~l6meNI|R>-&YIMkVgv+FOI6~SHV2uG zq0)ny_kPI&&1Une+wJa(Y?K~^xJRrln-p9FTxgLbL zSE>n&m7Ba4O|i`*?v&h=D_0;g-ZB0nvJYq16LMHW{AB?(ZfatWDo!+(c%w!({B2;q zB_U#g$c8t%ws@I$5+W9eij4QJNW(Ph_xo!SA{NNyBDRNnDi#@KHeyPBemjENxr5_s qbS$uVed2W3v|6pHs_u0-E}cJ@w4GZ@IRsEN$O08!{HMtU{D4;@o)IpqKp`ZaX%Og zJ}4y>Qe?eeKSKOFX%NqxPA8>yYNWt&x%`74oXW1DCpVYN>0SP;-Ob`LR3=m~kse_2hr@xzw}nej5I?0GAk+i%`P|&^_wRyu7d_v{rgIbG8L04e>nj@!WNj#wVpiFw#? z&yye?4LmfP%|HXF%c8cvAL@$BD1^P>?Js4+Z8RFc`u)D^FAR79z0874p}55!fmlil zuU|TfG5X5gI#6MuDC7DYdc;1St5NiOh_biH% zVe=mzZV+!qwCTzwqzHC?2X!OsB=LZqB(`BfRxbyySG->63TPWboEv!J{b4cpU>D(r z8P}7lDCYxyyxc%4KFLtYLS_%Jc!ba!e;Fdwk9xh{71!)*kjVoaUQ5K=d5LF~Js`^s z@ST&H9_5H?O4*iVWez5>gRns?55zq>Q8EC-qy=yQUI&38#EA%!^LvEGy|9~fJzdd(bPjlV>?G_aT~AkZQ0@aoQyNe-KR=X6Lfq38 zRg#=$XffbgOKOtS45cB2hHqx4Rx*J9s{}^8QjUb3W_$sih-SS=Qd+kF0000 - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_home.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_home.png new file mode 100644 index 0000000000000000000000000000000000000000..8e63f66d919ee47ae0fe20b04a874f56f112b696 GIT binary patch literal 847 zcmV-V1F-ywP)CNUk96z)l5n2WAO5>zRK9N+347 z6saAXK+F#i2rfC?`S&q9yCO|49t_DF~<2{9N9uHgKV%+50hfs@JPii8jmFq_T3=ks}P z`ErEUEBpO^$u=Z_wSeh#`g6P8E=X}6L*=1ZEPlfEGaSBG?bwEG$r7tMFdmQZaOtY$ zaJq+a?gq;+KU@r-e;h`cTd&u9bRicB;7GGxukX;ZHO=E6&1SQ&vonbRkLWGuk_Z)B z07sf!F82%0s}qqcci{YEm_2&!2A4T0Lyki&hE+9ggo-5~BusjU{nbvV^J4p*xM4Q( zB=*CkvC^o{GwdMSu&weac9@MMAP^=i!E)|)jNLDnEKElc{wf`W!|YSkFne|gai~K@ zu3FAv5>C`efYE5whmc#fJW7NL?ST;Ids5CbtyZhc-_+FOo?9!7J>XBYSIr}1n6$+d zX8no%tg|up079kuAr6z(w{o8G7r&}s*9i=-uF1wI02Ap(DLNbDCEz;H;?-ao1bj8U zA2tWd>WAr_&r=Cq*hCY4Rk*aW9O?f6YJLJN~MB-)J-zB!oy0@S3q&t(Ls- zn4D)ggT-%-jP#XlNB|K5XEyRW4oMsL8d+j304-Ugc+MZ;Uh9%2)^h+WHjn$$Jtujk zQmL!%uKXdxslqAC3|pY0V%-CpotdlK8glx~!W7$UvP3+LhV2ccPvw|&AxoN6K+>cF zlIG(GkjPu25+~6!3cxb|9K7elT&WB)3~ngRfr9bW&v>kYl-I?@`utu3G^S(PLl}Di zM}~ZS;!*N=VH+T$0M1(s2e9wS@etTZq~mqY`Tew6?9aI{c>dwPg5Stq`)`o|rlkB& Z`~~dKWp0EZixdC=002ovPDHLkV1geDhCu)T literal 0 HcmV?d00001 diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_market.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_market.png new file mode 100644 index 0000000000000000000000000000000000000000..ef981d6cf7dc78e6bf890cfad36a1195927528fe GIT binary patch literal 924 zcmV;N17rM&P))DWZ-oKD@OoCU^oE9$v6U*43+~$0SDm-Y)7zi1SSM!V2%`DcTg0 zfG8b!RVp$6?s>0!MhNl56E`6zGK$G$@=_=ihPhm>ie-4aola*&`(@Gr$8oCL?e;JH ztjYDq130tX0O-# z#r4e`1GCu-ZI&O_0OCGAfJX@J{%4|qWV9?0ZfbdnEEXi3tJHR z(6mXBx&vU;5OVrId_doWsJ^iKU*)n%K8REuz#WCu_a;>hqnM!C$0Q#_st$lbLsC_R zL+XX=>&vGmRT<@jNX>!ibXsHbIUZ6CuKzXiL8RsY7{KZs4drB%H2VZd(}B9C=|V=p zR!bzzJ^_qZ37i~ge+7fqaJ?P1+wHY!j32x;T|3N&vEfSPIxrBn$CVEvl7abr?!XPu zfyrB7&|tUQ{S-04=y^rj?LbC;tkAd^iafr zSki*FP!0IQ4ba3wOT?7Vy&*I3iL|lDImZItm*lcZKKFzi#L68Vg6ryh{V4e$WCs+3 zE0v1&LdCHl!F!Z^5TOIGt8M?r=)v>dl-6`CB)QAq12_G>4&MtOH2Ar{z|+J{pOna& yP^ITR(s;y84*1uMv-I%U@Apmd#1l_E6#oHXY0)>)!>nTf0000&JHhyn#3Kg@o|v4fF=SlJKB6;|N>;bc>R(#+LuGEkUziVjSClrCHjw5M?r% z?`9`0bX|8G$MI^0r6B2xqBvJob!YlPn1}3e{)A0rjGh&vmc#qSTrbT-c3=nXMp~y7 z^wKXg_E4`{gs*FLJ)RA9V2TglCd{7sn#ycQI01dqKaP_pRv; iDQa<0jm~5;zs3`6FEf-pWSEfv0000 - - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.png new file mode 100644 index 0000000000000000000000000000000000000000..98ede35a994f909a147fcaf518eaadd256eb60b3 GIT binary patch literal 1254 zcmV6191Y#3BV@^IRW;9-^%6$m=j>H_*P*~Kym`i32;t;a)Nk8QGD~BGltP< zq?wUb$s&GLD$Ao$_jFJHrX@1Q82>jWq$Hf3ovppTzOLYQ6&HUO)kX9tCMM#yx3?Jg zKPD$9yPKPvT`2)032`fYZ~{I!vJ{;Tm^=J94nKwbcoEDM)~mlaoWq);jI{8#H+Xljsrb=0>{A9mvp1T=wEUc=q96 zOIiLfokeVFYHA;LAL(O0iytO8I{eV-m1f(n5J}n)q5>gqe zGto392RXJpgx3x#vpLkqunV7TyI}PJYTsn+TKs@m{^E%Uw6DYg71?5a47*_U1*-sN zyk~|K2b9A{u6Yc{2+LJ*qiy`J+a{$1U{z@>r0^BiyjlB z{K+*#EJ8_ZDZb_am?b8$JP;2khOv65J3l|)pv}_Wd9Tm4B*hezy?@uoSc;hQQc(!Z zm%%_Ex)Bd3hD(e>rn5afJS>8_gaXR!;=T9XQl_2A{5GnQ@xLblFc(jO%%EUNSXSV@ zp7GwYIVZIPX6#2%6-xn}pPz4_GHoGx*s9J;9~$J1_w}I^E!z$xCWTa(I7QUaLCq501tb(Dp-S0+wO!a*jIV$kV$WpWc1-my6+ zC4ePDIAgXA(Dog(k)Kp0)sbCNCm z+A?us5(uo9i;X05r!*i5dj4xGI5Q9za?A3)da*B@n7O)D;)2wIz@h zM!hP*JZO0!VnUNZmRr-*XmoBw&dEgRX^gwvoVYw`!wA`Z$x8 zYw^UicmQ?zSJWlf=24K&hUiocZHp`as^Ye8o<9gGj68j41+~{R%xQ?eIzO`%VRt#v zURQX2aAoAMcBcf2ZyU-^l<#bK)Xpi`STA!PnYZf{Ejr5UE6ND9O zBw=8JYoq1TDtc@sO8d;prjz=7vps}-N7d)TVXcF7-NLvH|Gpt%d+&C Q0ssI207*qoM6N<$g8wQ*VgLXD literal 0 HcmV?d00001 diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.svg deleted file mode 100644 index e68697a1..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_settings.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..5f87423e7ac1603549f7867da00b5425a699d687 GIT binary patch literal 1351 zcmV-N1-SZ&P)}tAbz=4ArXv5pczO8(;3L8yK@e{#@Cm(wAg+P zr>YBh{g%5g50Np(_`fkBCF1=2eC_4srG>8*&y*BTV{2>cQcA+4ln4;t6hHAqf~PGd zqBI81&d!$Poxm6>M@L6XQWB;=Gr8SvSDv4rci-OLRwgDUF7dsyv$K=(9mdv*?lUzt zwStcud(YR`*BbV`nVFes)a&(L(Y*@$01tY4db$Ro3)XNtIXQVjM(}wpmIgpj70li6 zJ0))3XXwq&&i*un?}=r0V4@2qszsS7#DIr*8$HR}ehNqZX-_ygIk{7F^qLQ%KEXuP z2MQ1`nh=_To`Ch8&>A&&foJk;i6F>;k9bN*-b11bJw&5@877M1)hE%O-mfSVK?bnF zfs1&m*O*AdKA4h+T~{;5w!tyj`=VifKsd(s=?{4HyFL?-kB@s2K+p$Zw|^xc8dDym zZ4*wKWJF2G z2-4PeTZyUkD}W|zqBM@@BD5x`0V9z^$!lR3Pt&)?WaMQ?ZY3ke*mjrB9nuzZg?$dC z--&5Ang?i?kUD)~pjtW|m`fe=NI*3TiY6GAodjQLe+3Pe&!T$8Ffd%7xxkJQDVAQRJTNQ{BR zG1h|`4_!71sr*)R`?-RJTxKF{U^u3UGgavTCfQZxJ$$DQI)(%rEvN0O(gSVx&T^Pz zka*p$N?|U`qO@lORO5F?6+47zF&80TwBv@_#rgU9t{O_@3uhChwviL!Ti&KFfM%&DO${BYLx=T+{42|)Ak1!DEYa$xn_}K&YTmBT+t{5hguVL{(7J?cu z(od|R^t*^BM(F^94Dbrk{tfB(T$vVQNs&7oYkq}mJg>F1gIAWZTZyLRRXT_u{I0JC z`3@0d)z?MQBoQjxR?Sb}*r!$lcTg92UzbrB2!zMf5bct>vlVptlf56c>$`&**$23g z8#q#aBL0L^fs}{r*7OaDXH7B+@kBI?2AHssJH&O>?r0Uggq3=^O9Yr0Tn#FMa(`kt z{`}~h8P|#`TfXIbJ%dU240XSFXM+Z%l^t|^eB6py7jNEW(>Zu<&xHor zHL?*5;?}o?G8mN9X072kDIkn(6d(UH=bWd-R zN|yV5+;VQ$>GekUKIuRI-u~Apoy|Sw-{GbF_UtVJ>prGW{;VxOWZm9{{m{k_PSm>6L3K11I>i8eMq zn_cLEs;a)buKU+t+bqkDd7hsM2<5vu1Yhf~d;R$uM4)gA7{Qyg1jeL*BY5ij{*S6H`2t^7o~$gQd*+w3#ZXNrDt`0QTjdq zrL?p$_2qhq%d$KurB3!u{cax6dLNrd8kH(BDr6ERo>~cM5|i_QB#Fsxl&ddSVf(tM zdB7ndV;;C;NHi3guU|!QCVn?dXK+Pe487TX2CrGj_dJ{cS-n|E0#0D6H}grrodIS^ z9fA~K=1RZ{FmoiJ1(=Y;Y5^l(C!6S4Vs#cW@^v!!2aHLh5VQ1ZfgxWvlo0OC;16+V z=>{z@XJZH}Fn8SvDX?T$i#iX~_I1~y8Fd~Q;oFkK&jX - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo.svg deleted file mode 100644 index ca281a8f..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan.svg deleted file mode 100644 index 239aa1bb..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan_xml.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan_xml.xml deleted file mode 100644 index ac2a8116..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan_xml.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/market.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/market.svg deleted file mode 100644 index 036bda12..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/market.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/qr.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/qr.svg deleted file mode 100644 index 68ee9ad9..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/qr.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/question_mark.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/question_mark.svg deleted file mode 100644 index aa6deb35..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/question_mark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/right_arrow.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/right_arrow.svg deleted file mode 100644 index 3d7c66ce..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/right_arrow.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_browser.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_browser.svg deleted file mode 100644 index d96a3994..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_browser.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_chat.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_chat.svg deleted file mode 100644 index 9b00c9d3..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_chat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_star.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_star.svg deleted file mode 100644 index ac06d522..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_star.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/settings.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/settings.svg deleted file mode 100644 index 3aea4047..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/settings.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/sort.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/sort.svg deleted file mode 100644 index fe6c3cc0..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/sort.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/trades.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/trades.svg deleted file mode 100644 index 915bf9e4..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/trades.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/usd.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/usd.svg deleted file mode 100644 index f59ccaec..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/usd.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/CurrencyProfileCard.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/CurrencyProfileCard.kt index 3c49480e..d892d340 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/CurrencyProfileCard.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/CurrencyProfileCard.kt @@ -1,5 +1,6 @@ package network.bisq.mobile.presentation.ui.components +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -15,15 +16,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import bisqapps.shared.presentation.generated.resources.Res -import coil3.compose.AsyncImage import network.bisq.mobile.presentation.ui.components.foundation.BisqText import network.bisq.mobile.presentation.ui.theme.BisqTheme +import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.painterResource @OptIn(ExperimentalResourceApi::class) @Composable -fun CurrencyProfileCard(currencyName: String, currencyShort: String, imagePath: String) { +fun CurrencyProfileCard(currencyName: String, currencyShort: String, image: DrawableResource) { Row( modifier = Modifier.fillMaxWidth().padding(horizontal = 14.dp, vertical = 16.dp), verticalAlignment = Alignment.CenterVertically, @@ -32,11 +33,7 @@ fun CurrencyProfileCard(currencyName: String, currencyShort: String, imagePath: Row( verticalAlignment = Alignment.CenterVertically, ) { - AsyncImage( - model = Res.getUri(imagePath), - contentDescription = null, - modifier = Modifier.size(36.dp), - ) + Image(painterResource(image), null, modifier = Modifier.size(36.dp)) Spacer(modifier = Modifier.width(8.dp)) Column { BisqText.baseRegular( diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/icons/Icons.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/icons/Icons.kt index 2f1ee88b..4b0551ef 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/icons/Icons.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/icons/Icons.kt @@ -4,16 +4,21 @@ import androidx.compose.foundation.Image import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import bisqapps.shared.presentation.generated.resources.Res -import bisqapps.shared.presentation.generated.resources.bell -import bisqapps.shared.presentation.generated.resources.img_bot_image +import bisqapps.shared.presentation.generated.resources.* import org.jetbrains.compose.resources.painterResource @Composable fun BellIcon(modifier: Modifier = Modifier) { - Image(painterResource(Res.drawable.bell), "Bell icon", modifier = modifier) + Image(painterResource(Res.drawable.icon_bell), "Bell icon", modifier = modifier) } @Composable fun UserIcon(modifier: Modifier = Modifier) { Image(painterResource(Res.drawable.img_bot_image), "User icon", modifier = modifier) +} + + +@Composable +fun SortIcon(modifier: Modifier = Modifier) { + Image(painterResource(Res.drawable.icon_sort), "Sort icon", modifier = modifier) } \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt index 6508fab7..53aa1943 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt @@ -46,23 +46,9 @@ fun TopBar(title: String = "",isHome:Boolean = false) { }, actions = { Row(verticalAlignment = Alignment.CenterVertically) { - -// AsyncImage( -// model = Res.getUri("drawable/bell.svg"), -// contentDescription = null, -// modifier = Modifier.size(30.dp), -// ) BellIcon(modifier = Modifier.size(30.dp)) - Spacer(modifier = Modifier.width(12.dp)) - -// AsyncImage( -// model = Res.getUri("drawable/bot_image.svg"), -// contentDescription = null, -// modifier = Modifier.size(40.dp), -// ) UserIcon(modifier = Modifier.size(30.dp)) - } }, diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/ExchangeScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/ExchangeScreen.kt index 8128712a..d806f420 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/ExchangeScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/ExchangeScreen.kt @@ -20,11 +20,17 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.dp import androidx.navigation.NavController +import bisqapps.shared.presentation.generated.resources.* import bisqapps.shared.presentation.generated.resources.Res +import bisqapps.shared.presentation.generated.resources.currency_euro +import bisqapps.shared.presentation.generated.resources.currency_gpb +import bisqapps.shared.presentation.generated.resources.currency_usd import coil3.compose.AsyncImage import network.bisq.mobile.presentation.ui.components.CurrencyProfileCard import network.bisq.mobile.components.MaterialTextField import network.bisq.mobile.presentation.ui.components.TopBar +import network.bisq.mobile.presentation.ui.components.atoms.icons.SortIcon +import network.bisq.mobile.presentation.ui.components.atoms.icons.UserIcon import org.jetbrains.compose.resources.ExperimentalResourceApi @OptIn(ExperimentalResourceApi::class) @@ -51,17 +57,13 @@ fun ExchangeScreen( Box(modifier = Modifier.width(250.dp)) { MaterialTextField(text = "Search", onValueChanged = {}) } - AsyncImage( - model = Res.getUri("drawable/sort.svg"), - contentDescription = null, - modifier = Modifier.size(24.dp), - ) + SortIcon(modifier = Modifier.size(24.dp)) } Spacer(modifier = Modifier.height(12.dp)) Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { - CurrencyProfileCard("US Dollars", "USD", "drawable/usd.svg") - CurrencyProfileCard("Euro", "EUR", "drawable/euro.svg") - CurrencyProfileCard("British Pounds", "GPB", "drawable/gpb.svg") + CurrencyProfileCard("US Dollars", "USD", Res.drawable.currency_usd) + CurrencyProfileCard("Euro", "EUR", Res.drawable.currency_euro) + CurrencyProfileCard("British Pounds", "GPB", Res.drawable.currency_gpb) } } } diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/TabContainerScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/TabContainerScreen.kt index 967f0b38..a624a254 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/TabContainerScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/TabContainerScreen.kt @@ -10,9 +10,6 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import bisqapps.shared.presentation.generated.resources.* import bisqapps.shared.presentation.generated.resources.Res -import bisqapps.shared.presentation.generated.resources.home -import bisqapps.shared.presentation.generated.resources.icon_question_mark -import bisqapps.shared.presentation.generated.resources.trades import network.bisq.mobile.presentation.ui.model.BottomNavigationItem import network.bisq.mobile.presentation.ui.navigation.BottomNavigation import network.bisq.mobile.presentation.ui.navigation.Graph @@ -21,10 +18,10 @@ import network.bisq.mobile.presentation.ui.navigation.graph.RootNavGraph import network.bisq.mobile.presentation.ui.theme.BisqTheme val navigationListItem = listOf( - BottomNavigationItem("Home", Routes.TabHome.name, Res.drawable.home), - BottomNavigationItem("Buy/Sell", Routes.TabExchange.name, Res.drawable.market), - BottomNavigationItem("My Trades", Routes.TabMyTrades.name, Res.drawable.trades), - BottomNavigationItem("Settings", Routes.TabSettings.name, Res.drawable.settings), + BottomNavigationItem("Home", Routes.TabHome.name, Res.drawable.icon_home), + BottomNavigationItem("Buy/Sell", Routes.TabExchange.name, Res.drawable.icon_market), + BottomNavigationItem("My Trades", Routes.TabMyTrades.name, Res.drawable.icon_trades), + BottomNavigationItem("Settings", Routes.TabSettings.name, Res.drawable.icon_settings), ) diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/URLScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/URLScreen.kt index 53484551..ed68b82e 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/URLScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/URLScreen.kt @@ -6,12 +6,8 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.slideInHorizontally import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -21,16 +17,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.navigation.NavController import bisqapps.shared.presentation.generated.resources.Res -import bisqapps.shared.presentation.generated.resources.icon_copy import bisqapps.shared.presentation.generated.resources.icon_question_mark -import coil3.compose.AsyncImage import network.bisq.mobile.components.MaterialTextField import network.bisq.mobile.presentation.ui.components.atoms.icons.BisqLogo import network.bisq.mobile.presentation.ui.components.foundation.BisqButton