From 8e72402b2fdcbdc6ff912997a7b11ce9b6feba0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Tue, 22 Mar 2022 13:47:56 +0100 Subject: [PATCH] Add fixes to UART profile --- .../android/service/NotificationService.kt | 2 +- .../main/res/drawable/ic_notification_icon.xml | 1 + .../theme/view/dialog/StringListDialog.kt | 2 ++ .../drawable-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 18933 bytes .../android/uart/view/UARTAddMacroDialog.kt | 4 ++-- .../android/uart/view/UARTContentView.kt | 13 +++++++++++-- 6 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 lib_theme/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png diff --git a/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt b/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt index 681941d5..ef0863a3 100644 --- a/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt +++ b/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt @@ -74,7 +74,7 @@ abstract class NotificationService : LifecycleService() { return NotificationCompat.Builder(this, CHANNEL_ID) .setContentTitle(getString(R.string.app_name)) .setContentText(getString(messageResId, "Device")) - .setSmallIcon(R.drawable.ic_notification_icon) + .setSmallIcon(R.drawable.ic_launcher_foreground) .setColor(ContextCompat.getColor(this, R.color.md_theme_primary)) .setContentIntent(pendingIntent) .build() diff --git a/lib_service/src/main/res/drawable/ic_notification_icon.xml b/lib_service/src/main/res/drawable/ic_notification_icon.xml index 3a3f4904..70962226 100644 --- a/lib_service/src/main/res/drawable/ic_notification_icon.xml +++ b/lib_service/src/main/res/drawable/ic_notification_icon.xml @@ -1,6 +1,7 @@ }^`dsIDzhCPVW1z1=N5f7-B9Z8{G*yl8-&e#RYD)Ya!*lpM z{zKuVtYt!tafR9;nndCuX{joi_~(8P3NSZ0H@UU;LZL&-wX&y}ry!i1TqrKO=%b}& z*5~CWkv}?}@3r;3N_EQ)taTqgY*W*z9VdLWPt{9hH`(sjYErN5%&*z~@(K=l@=ENb z=gX|4v>&dNyNF1y1!wecS})K&A>S$d@c+?YCWmnk6fxs1Yb_si86zMd;7`XjdTs^(#ScoSPoK^)7iRAL>?t!w=k-n}BqGvw z8>_2S&iDEGc@Acby?gf__5JqhkrIY5bDY|p+$fBAj3$iv@d}%MjEZ~r?p?>L7}o^d zdZPT0j1mvx?(Y8MHwMcY|Eb7_4s$-jr1BK#YM*VmVMI$By< z0V^|ud__j3cM3L{%?Ix8W@2Jm?G*a!PtTuF+9w1op|^w{=XNeI`(7W zVcixs>Yk9NMyMAKM$vIdxlXl5?p#}V*LV!0uCTDM!$h@1j5bx1|N7no`nl0~b_ek+ zU9S_{b_&lh@lc10W$B(bH#dKkE$K35)pF&JCmyu1GyEicGyA$`7m6nzs+1_KosD=rfr{5>*eNaqHj6sPZ?tyz-)piP{7eN)w=C;fOjuP3et*u+1 zdox9Q@$m$sPnnvU)?C6|FjGZu?-%}kMInTk6io04BY&!P(NOv!v-0X!=a}WHY{j!) z6zOD&NRIx_(iKSEC*%1kx(cKI$7tHj@L6^xhO2$&tNvV3n0$|cX-Vn-y8InW_t;7# z6SK}p6G`47oO-g9GPc0+B8D}Fm6a9e=unjY-Qfs~4vdO3&4D$|&CPkwe{RsMKmARS zpkDaMTsQ+?YQ~SK7+`2>YDVA1sKIa+*_YHkT^ji0<;$1)w+#-ux?$keMGhW3sHvx? z_W*;5nu0t=mDlhfBaPSO8^tGcqh)69?;3o{($mwKM$g%^MipTkwr=otva_?>A6syc zM7q{7MT>1>u7iPBeDK-&`qiAAoHsu)d0Q*PCr>c3u&|Wz@3FuMlK8tiZWH2$S9J0A z_Ljguy|KZyar}m^fY+N^w>Kl1Wd;evNthkJd(v!l?H?9WG+n!B6k~qu!RhX=%YVKE z@7ml$%!*C$pU;`ZXE13Ii&Vbt=;Y*7AArrkbm-LmOP-#d;%m*nE=bGD%HEW}{7X3f zhvq(Pc{&W2vHKQPo}ZtmAI7*Rjn!`^{x38%l;m~dTJVlt*E+Jq&pl7Wf?DmyKD%dg z6U%tc!NK9hjU)C^f+M*Xw*SLOz%Xg$_KEI1>tSqcoO)gw>xF}Dho6+o)4yvrmhOn5p`qtjuU@SuJ|TN8 zMjVUincS?bET`B^lT)WoN!hhu-I1YH^0aMw$sgZpa*SOIXX)$fbBl?IDLee5pL$@{ zy8$n|QLL9EB_I6v_mR<5LlgwuJ7m7KBBB9_jH&XhgrS%^rj_3g|og=gz59j9Q)=_+71~j5_)+JeK zDed1r_L#no!M`Ww>b*=8BO{|dtgNh#3mfz9<_+GnM#istR3Dw|&Dg{njlS)-e-hd~ zy>!;z-aZxos3bc%kT|}+7++fI{!tLc0L4#8=;jFv)U%Aoj~|bd*&Za(&Ip<{@8aO# z$l1P=S@;>ot+V@vuW<+eW=rj<)>Y`-A&}Z5hfnMw6s=5|mzVbuZ|PPrJWEFUKxNJE zMG@Dac{mqeH+x`NBZTw+hIQjU#zhp#snVS4CvB zfABv2xm)2lp2u8YJq-Ky&7D#0Q3MtJzn8XR?Jt5vH@E-7AP-YilnhubxOM9mKQHfD zkrn>e45WuICXQ?;CI~z0P|v;ibLYETvNhZLhodu0c)GBl^Q&p#~F* zwzXE_pb0<6(B}N!xsRdi(I|pC+S=Lzdf5^^!^6X=j=@|>-6-mYeeW9mT*yLqkorir z7Bq!a#8yNR8T@i@vaPM{;?GY#d#@_ro@tAqQqwNl^F7f>?`KAKnHz~D;dSaFO*Bro znwr}7tS0oIrH^r<>OLnKSZPUo2i@M1R6RUAjzneo$=^&(P2CLJMx_v&l*COXe_VBA zA^)}52kNfRp7q!oXB?KhJ3F@@mzI9zZPP%e$Uyt#t18nRYBmnyK(3pjA>-!vy27!=^R#QpM9PwD|GjMTo9g@ef~Hdl^lAAZI}is~R4-z`p$!EM9)~l9C zp`@8@>RvV~E*Lm!ciHAyg8wdcZ)_)5ipy~H@fqAj3Jet92ERm-U=Sjty zRJ);GnYg}ecMxZr4B6V8MDg6mZg^_ob6%xCOXL339tZTYQhf}f*GsTJ7(ecI;>3v` zFJ8QOi(Vtd*<&%V`c6mptuTp|hr$a7;C)Nb#;+7Ujl??za_k9FxzZjVMZ**aika{8 zrb&9&FP?s)EKVY!@wF2;p$=29W7n=-3*Z0am*Yy}U}R*xgv0HSqIt*2Y_*xg^nj}; z%fC>A-7Lc94{e{P2^yCOC84>XkBq!)%ogq4*1*Zl>|Ka*{+Xyx|LxJL(4^G68Woi& z=lSW`0W^tqlP72Dde-IJlri34{?WWv@=bEqTNV{Z?@gRhh*J50 zPv$GQy?mGd?2C)x+kSc}}vWu1}syS+t(o{n}M(;|VqvR*ttsn59GP z8`^{gYFy`H|IVSbv#j2)9fbY6Mms-X{Ak%&IBws?T}le)iN1F2TJOs2@btIu-`#Su zvn`*VeWWUqStfON^jD(!fSO!tN!(_JEtaS1d|!4=@aFoe$^2i|sJ0rHajv)ZUUx|v zo*XlQT6!k6w_BfdcXxjU;<<*E=IeXM%;f6odLKoJ4+uaYDl&3=eM5un(JWnc4UKEm zx5~DS-UvD?o^yY4;lhWhsi~zw4elU^*aWr4x^L&hFP7e6TcEVgGvyj}o9%swy1F@6 zR?(6z;WWhWRj0;r<;oSxjo-g%gFmO6oyY0(036aFssZZq7?wOSGd*2?K|hu(^ssm7 z#zfb!W`|?=63_vf_2~Hc_@Q*||CkcQDJUb_%pU`Q+`7e+8n0t#J|1vtPD#3wj-13u z;v!e9kfZWyNAdnLa9ib?z{#6(uiv`0Z98=6P&qpHIF?KXrAgPs#N^dI(=vso%WDgp z7ww{yGOw|QDqm-Nz`G7?`R#r4Qxgn$0fb<<@|!$LqXjhl+~d%4fFOib>%`JQhE+Md+DQMcLiZ zTyys`K)9eMPZ_ zMr%z*>{hm22P~_)(0^0Ska6EpY*CyoPOXzCPlkN289!4vp`gq_5wP5MY%*8MZ9+n* zca$Q^&U{UH7q5|~{DYm|hke*Cd9e@;!-1+m&Ko-_}E$C8Ces1SxnBzs|I>67*&nfFYllI^}?*kDd z<%a~iAX>hmpDf_|mxp#8QGg6?6VFh8i02&x;7akiNMvQPH{QpFIUxPchYOy3=j5&81ah;0M}Te}yfBDr5C5EzFMf*L+3mnKS5hU3UK9uURiVF8^z(<i` zu22Bb3pWwkE}NI=9~js`i_d0`9%6@i;+V-ev(BI9%pBaB>Yx%u%k~r4dXo`oOH;kT zmNiNq&2cK8?P$g^Ny(af;igLjGVJN;sWUP*{$YdC5v9tTVq$7Kx{3Wdj_Naqx9q?) z>u4;cZNuV8OG{t+^elx;P*89d8}wf19U-5To}S>L;n5wy4rXDgJ=C) zqAujg`plW&$ulSdBNuIgj;y7T27P^?GNu5QzVqeaC&j-8km{Uaqp%Kt)Am znJBaMzTYhyZaT;w=KyxzSo^^O(&OFL*{N1(E-aAcn@ons4!{JW&uCb+2Fur!mTHYY z+Edwc@IP~Wi3%v93-3Ff#U0H<-460YoSr!5!=>h!bE%ry9spE*>%u*+(2A@26*gQ^u@61V z7<~O&5H+ml3xP$qZ|>q%c``IS%#9Mz^)zNLU*Pak7!UPhbcYwYGRuF!(F%r!j7CR< zMho;J=6FA+2B8l9l@<^Xh?;4+O4N|l1L#6dLwB@@-avpLP-5!_f@w8-B+EqE8JL+- zVQD9xt*Tmk`})@I+_j7Al$F)r$Hm3PT+b5Hmu|U)JLMa*V255N$RAOOW54mwVe?FZ zm-^)@1g(cROx)e>FJG0MpTBibPEPI_8m7ZuTJNy_uWxp7$-VlH&L5)1zlW)mbwKiE zshPEemb;i25DEkmEr-k>Wlb{80n#@$`NKbcJZo@}QFcf1ze9q80ZoCcbJlEZY%=WJ zyLbBq%ahWS$2rxjB0A4L$~b(w*0mp;5+_%%I~;WG$J_elr+4#%*Nc>I8<76(r;C^+ zQ2WBi&baQ&#-L&Wkx{@895A9)IZz2)-YGO{z{4Q7#L3Q^ITr$O{Sv#O zn~{aZECc;!zD)fjD@%jb@AG*}OK-jU<^4VY-F0y?gy5M^5TvQDriQ6sA;y29MuQz< z$t5o@4o0Y8?>QzCtVGPNEVfY{Z~gnT_lHE&+ibTB;k$BPI3zH}b$&#B976XxDdn55 zY)sZ6=IG)Q(Vf)jY9=?N^RDrkt=JP#ov~FjXR2-TR(7b{&Bwr zIf5ipq0iBo)ar3S2eDsxTW@SKT&5ejva<5+*n59_Jsjh*49E1>g{99GibS%lUYv)( zAc23QhXU+u!<%Jr@G55OfIgkuRU<9IKI!!A5}Lb%j<)B{b!H#EpzjT3#0_#yB-szP zP~QRzCDDe(Ai&Z@oY>rNE0Uzp+}zxcc&q7-_V)J51s*y3h^wP2qcuQ0*HBOsIAwnymE<3RfZwn^ zwd#AqkmYhDv6HjVPxhl16UwGT=5f}YjB2+_OLsi)?e)qh zw_JDv2+8dI6(HE2>pBM+V+mPn85D`dC!Q=@HL&zR94bAgyCPY2#Otlf z34At%mcY#?CVlZBUDbG<8=-Hve#QHCf%`v^D^fXq!5bj|?{QKDDlaZT zZ0teJZ21jV6x>y{hderg?qg5kML)aQ+1b}10;brSh0s$4`!s>BA*ybK5Ff1UTr+Q$ zltP%rFSRs0e_C2vBA7oj&R`6hP+>v>U6N2CQ-|1nVmBQ=4<}mlCE&=G%WD_IYI|N}>y7W}iV*QJEaBr~ag<KL=&dV9l2H2dsJS`k2}lHamvOSIV`F0j&CJX$Lj~ag$!EBt8Cr1g zp25Mi`uh5F0Esenz*WQ8CHh3CdHJI;Y5T`p&DVs>TC_eS1^q zeqvyM53O~X<`^aa(%=v`8k+Brx{z_Q4n*0rRPRDo-_#vli{b$G5rNzZdGGG9Ak6w5ge@wL!a~2C7 zc(e7}H`i4<`1j8HPWY<{ok9g1!$=tn8g@vNBc zXh$-XhXJsm!}I_o1v-Ijyt&W+J4p$T+moQY#Q zzJmTF0PUXk`}g-xuk&PLi#zp6s^23%Hm`Ed?6Tfg_VQNkuo%o56QT4tY<{4WossSO zHTjPV3ss=uoqKn*wq~mInyHPAO=f1M*&ZlCA23A~?p;wLTIb`lH17`2LKqBgX=%9# zIxs6+{DF0@$8@fs&7+c_ohKmoq`+3WB>ufqjFwBz-(aPS!~F`R0u%jWT5C0q$5J$e zqKZm#XFqlL)oa(Nj%K~!s`~NYo*3`dxzW?a5}lxPZC9xLubjuZXJQr?uTYwh(q&q{EO0vWLX3aH!Z+R0_r%S?JPrMSSWoUDn8=tQ{ukk zF4Gl-{4K&P*ay{DXDq5T{J(gLgxJNJP3OZOG|9s{k{s;fmh>(O10NyCo zJXI6PJmmX*V)gUC&5b0N+1%CF(NXO+#q)E*(H8-LeuniJWC?Tm&Npxk%oc600TES_ZrUFR|2<_x6o_K-=x}l(f)%>A;13wIzt;I zhd$opI)&xsBL*4G+`F3fv$8a z!_Kiswf7Wv>PSUUw29FIxf}wZ%;Zb$`Gnp0y0Er2N_Nqoa!2aJiruug;vD9r*k0f4 zOJ0x0TTDGTT~~=?El<8}n>-sWrE;>1vN8}jz@MRnj0|RLm3^v3 zY$8;;HvFuLnGFX+%ctdi4$~h~&zApVBb2V)pLg8v9aM=U($fCaah(Ngl=UWx3=~Vt z%N%lnD~?;$)zwzH@744c87QV&Hh;a@`v3aRB`1-9 zaq0#J2BuKmiU7dK`+UV&X&X=#ccOyCc7EhKbO8dX8-!Tne;boq7xy>5x$0??I@~8BQ9UE*cX&#OR}Cjd(=CCW%c#mt8&LD+CO>L%kl9Q zDx&VgagC7BpAeHlqZ0RDw9Ul(-y-Tha82L6DK>1;x|0fj96B3(=Ksk6DK4qkm4)`u4NOc3nL9QWqcv5*F;>q~ngX~+$g9GZCUyfZMoU~_;~@gz%& zKu>&t?a9ub&z@>PDcgY9;qP(|2F1HpfG{NYevXFer2>1`5jad=MJ0lO;R|TJ{~S@i z`iVw@Z!|pZ?2PQ}?!GqJ=vOh&LmfY8^MA7dJuzEoQtoRjEBwuCT9%fUF9~>c2HL-% znQ_h>pVT=n@kz6!`4+L%ZK97!V(bm^f%c}1&G+~c)K$=&7T-cIG;64@m)UbsP|21R zb(!|**&`s3$`>viAb81-$=0nWP^=1BM67Py(knP+W_FC1IvmtBHP40`9H0~JJ-7@r zq%N=By)`$k+Eu!kW;Y;s&Y{`AIZ1VSrn&B)s#vJV^@OnUC2lJc{?cNfE z;$~UdA*a!u^q)Nc>^&RPd6pqY6>#^}>(@2t;Y+$T^tR}KqeDeHCx%{4WX~m~&56f9 z$fQ+@+4ED&Jj7u4=n z)Rc=!dS6KLZsMs;57E#Y0Gz(f%*@!rTGOVthJ<@Ex=5rA{GC`ihYkwf6wM~b!GgXE zFLUefA7HbP_NkA( zAG{iCCDf=R%p3u|2fAQbSy@@nv(fkOMJ9m%{t+6$c-7}RspQ$go@A0cm-t05-ZdRY z%ij44ifzBIIV6ToHkOF$i|z)q+z!9BCps=}rw80Xj;eKbHN#|0{*xxk>5Nr1HQPl+ zMUCeB7J-&~k~n34E|*(3wxskptnWI^GyUqxX-W%*M|ssnd_!TZDg#_j>qpy24Vq)* z@>=R9`<~7>hoi#EMB!JNCOt^@@s*`M29^c(7! z=*3qL?ea6W=XXu;st(QeUZ6Rf>PByIxq@o_cpJ(4jl-PS^TLuuP=`c#wC@Q7LPJBt z9^0B_eO+gGpD1%2p?I~no=DDBaAW{TKJj<4BNCcZ{{#lzf8&qGM&pwIko4>hq@d#j=T~&w$+}B9r`kr(_D|+2LbDf@K3w&q$eAAqm zFr*VEi+yQcq@HJcrfotupYZt1qdeM?h(@|?k+!6*k~kqPbyeBjzJ~!EdSK=MsBdgM zzJ2?4I!RS9fq#tkPzwA50?6{+hup^6(4M}|%sgxLnLm|rlWoJ{yI^H4Gt$-=-Mks;e*f^&$hNfJ&p*q|D$ZM4Sa^UxMj_JifPa`jQ~Pok%XZW9lKP;k;8x<403_ zYeX^bEcjbPtdxNIzJVREWpa>lUFx!7SV>yp$A}_N&CoeJ3b}y5t8^yeWZo(FnF0e@ zmL|?!?SM@S{U`Mhb6nAMcM|Jcq<$fgl@ghfRw z4&o0H<=~T-m)8q)tP{C)F!o(*Nb3wzJJw~jXS42)C)1cU9`Q*w)QL$8V|o0aZNALW z`b-|m(7y|Y)a)akk`19vaPePB@WYqe?SDbw{>iPb%^^ZHcIVSn~ zshBBjAZH<@o+-> zE9(XMs6Sg4sa?q*Vor6dGtk$>t}lI6k1wd57-LK@2=8E zhtwLQl&30;VIOBz9KXN%KNJ!t+9Itr{?x{pyhF?%2^8S=Z3*g^m4)c8?}uGod*sNG z6riU+@JUw#cin=%w!6n=kDpB9rF*hhxgIjy-zh{K1Gh@9DGBxj=m52!F{NLu1X7(c z0t~>F3@j~asKe!C_C@tL{E|Mbt|p7l)(H1<2lVhHKwz$IGU6%!30S!EvAx;p&gL*z z>A!o2VxGfQW;ai1&R^@R^IKnmSZy3cJSC4EQ&CbPBPr6S8yJU|ZvDQ}vI?jCEc#|_ z@AKzE9$ZED0^GFS`Iv-wm~N^x`6!H@+1VDTd@fanq_3q8Vuduyji0C&txixfGTJ`< z`sI62SeT;7=(UP=>77g|&(d}`S6Au&6I*|O6Ph_**qKo+CRv9=_q!nfo(s(Vw`GMX zF0;=i(ns_kfNJgl4Xmtm;$^}?{yjSwnVIjsU6Q9Rnh)s{gSbmz+JZwuLid)JmvusA zFUJV+8r)|8sHedsNcKco%-Wzd&iB?=h9`!F>U4VA+7k=Y)6?&B5{#8@8z`PR!$lq0 z&UN*Os<4|AQd9NDcl8sT9UUDTLbig#EF~SfA4kV)&2BSIWVSa|GrCjFpnEKB;Ip+! z%6%&20KX7vp#Hy`o6UWn6GK*Jb^~zBeSRXQD(*H;9ZrHK0lb%lJ-GMN=g;y(p49m? zswX^!?xf$AGB|R@Hm!OnV@z3W(|}y@_zFMU7r4VsaAy6cKYna~p(FxbuAzY)o|N~! z;A{%xH38>hGaC!S3WSR`g{N(Y_;@zA``Ir_t(EjQ9QSxj8-yv2(r*8&A})*f{{HIG z^mmw)C)=v5a|8`+Z0JAZDc&y4JsrAm%_;RvHX)Y8>^-1PBKg9UrWH$aF4D*AjAb<~{R01Ia)>US9Rn78XkgVTmI(%k zZ@5XDuIBqNOQ@pAa8{V2BaDbzqET`C;V4OJY~t_m|8z2370{Z;Azu-`;>S)0@!dh6 z(8^@E}=J z-l5dQ#Kf0=lRGE~WyCxJkH4GK6Q_l}n}03^gVgRs;7g7^Ifxwls^3 zvdN;M?--PHJpt;)c*Ogo0RzlvX zuIBha$;)5+w;p&T=eN-3eET3_;ko-kzVor>&Ys&liHrm6v^>JHL%GS53;3CYRHQpo zjB57X+qNVU;kLm2Jx)s*fpoA`Y{!(CkBoc?SNZ(=ukVim^n8PUX4F8x!Y7%o*(+&U zrCP#zh|j2Q?9$FQ3A6xKNTTnXoZ;gjUMIZp8-a?V*5#MS-*B+AORT+|SyD!74{@VP z7+2D8FYjO@X&8HE-3uYOGY0FCvsY~b1J@&9x-sw5DrNs6o|ak7ewW!jo=?psH`3Ob zh!GH>yH{|Sd~36Q)s>f)I{jU1-DP( zBg}kUOl;r>IGY9R=m&}k6eO`L?RQF>lhQs_G3e4E=b8Tx8fCB(VSp#D6T#6lKm()T zQ1sQR^WSbG{*s-ObDEH&t|uompccGynIB@HPy%3=zpIF3AiNgcWW=#)i z`CbfCB7VF1A%cF_-`~?oUq=&}jM@w;-t(dEHwgjU9DvO*g0$~sjy^jgv3H>sQhxpN zh1nEMcE-7o%s|q2?9H}e%cU24U%)^5^9IL93N8LECzlEUVWCEnKoAW0?mI@M_m96S z$+STvITLEaAVX#5$f6AnUmu^ zK8PYs<_p?>3SMN9I(EC$Hm3I{>}?j zee*|WUDo2MNmsZj7sL>2^Ms{)8P#TK1-)#cPoIcH6A3J29)-B%15E~-?bDA8wX?1% zF!`7_Mf)Ruz)HBlbx3zfa_;IDKCVQhS`G*ZTs$NyYW7;lCsk2Y1 zTM>i`{3XzXz}RilruxQ(7I@)10eB=4C|68yP<=bC zs;SJh*g_xiV>XMI6&0L_JccYGhq4GyMP>rp%>co+^^md13QdwWS-FES%Q?uhf*_Np zpm+0K_HuCtSAjvKeg!gf5Z>#Nvrn~i;XW8-9N>kQ{rvpQxViJ&&_l}!JsGo(j5-_O zQZbAKXO2Sh8~Srj?FUCka8>oa1J9uIOzp7h(qyFb5Y@Q zF8K#QmO-#4x6(o9KvW}Lr5eX~Q6fuJMQpFhujrqUP5w!G&lvnjPEIz&V|7G?hey3Z z-o{Isv(}k10Xm;H{~j&W@W=P>e_MjaPXnk+13;5AIxxV)^SHrspXv@Z{vXCpec~yj zoUGyw&yw$8;Pn{1Mk?^|5F=%(u?Tye7yL=nBPXn<0xK+pnU|4MI9-J@7qTkQLn2MQ zd2>8AF0PlT0GQUpDG3os1KxpS_yzGa{Xd9}_v2;X4kkMbCD$~U7}4b)7A-)eb+{Cu zM-6$8?80DBqW_&Jq_?gCYNgAI4tns>-f|K6M{IkT0YI-y`Z75R0+(cTC^_5E9#Bl|iK{KIaJYmuXhz4zq*_+TPUoM2;+&Cq_+`l{rUbT2og|VN zZ3I|DHuyFb$jNSy6yGlsB5kZlx}AqbO9a)rfnT_0WS)?R-dH)X+C;_KW}aY%e>aaT`!9;{kN>^E7w>DUD5HtNi(z&n@pgGeD0^2vuJtA|pB&BZd*18TW^K z#DU$*H8nkL|8si@E;ius@iWpKCt_U~MASkT6>Ih#kEH;7Y*j>@tbs}!n12)q#IuPE zUVit(gk+7K?EUu_`b-|oO9`*sz;Gn?K)W}aU>7$N`LQ{}^~x#QVP^fYzNEN2?{X$+ z74Sf{g2u&9Z=CH^f&k2e2<-;Uu47o=qr}^zg@F5|wb>3lxPRZDFn8_Gp5=v%&4+tZ z3mV>h1w_W;8!U=bPTyXhi(lcDV3p^gK9BWUo<)o%8wk~Lm#1L5_Gcn&>H{+)hX`0T zM)Z{UIcO*ymbu@e%5?b zIS|(QmZdHZZto-?GHghPqKw;~-Wj5dG-}W*>px>pGP1MFYHKLGh0MzEz@qBQ^cwtL z;t66GvJMBnDTY9Wxjc-9tlx^WxeD)}BEaAO@yGpaIK+Q8Ht7Fg5l+rpjNGfbDDUz3 zy;`dP(L4wM@C$qESdL3h4G#84Ty44X7g)xVr{b&e?0@`6PZb|aK&g8F*n_VR%Ayc- zfE((CDMMG_@NjR<<5I(9KISENVnjfBPYpt!{~*nTAdc+6osx1_hj9h!yD@qQw431D zEtMWurTX@S<**j(N&9?{nvlFvtyZRP`{kJ~PuJ1YPYK+@oi}(?8EKuV>?RKBN;pj|AK^29!{gvII{Qe}m z*zG~b6VMuzEBi1|^JF0Nr0(P7{6=@q7eHwX`Gl7{ zDZ&K~uNqEWAI~ng+2cw;IDH~eL-^-?h9QIki|a?N8-#gNt!g~AODc-ie}4bxgSZ{_ z9O&u-Jcn4o-NMCJ%>-NnMmATv#V0=UnukQfgk_<)eZ;rv0%RZo+{bt*z}XnK>eW1Z0-`m(U8GW5zVdtwm4D>)Xiko@3Y67~2^` zMnbuBAj+XE<f7+y2Jw@^@<=j4068a z*c(eY5yn1gI$cM{3yL^LN%T8L8gcTSsYz-OcREd1-Lt{Nvl6tLYasKiUDl90#i4mWzan`@MFe=g|5> z&V9?B*jcUf(#IR92nY=SvAHJg9ButdZKDlCJiy}r8WS#(&A%9p8W|bc0LPlRb?&YD zK7Z=Me<@R1*Y3K?`BJ3(TnWcb%BJRKdD2ORx!-3nscIh>2vXV8x6o~~YM^37=R zjDIw_IClH6mCGMcMJKerMT+di#9fA?3m`0Fs2FT2-yO_rF*LhS|=99-S`Ac_*_0 zN9u?+u~)CPii|9Dbatjp$1euIl`jY7Z$k9Qu|yv2htk#0{>>WWdNl=dmAe$c2zC%x z(7Z;7!nO5pt##bGIZ#rMFZMp8_^-loVGXk^2Y$wzfBmPI#u5%BDaAmqPrejr=;Sxs zv{1E27@^tUM7{yJu`4eOTM>H<`Pp;e8sYu-Ixjei?}>AKTrSvDiqB{FjwhK%xf z&@9oG-yf;a!AKoL*P`vos;`#aJ+MqRv$Naff@5mDB@qM5nz%=n_pq|^V{3hKvXWI8T6Hte1yzSuWds zOu5wc%GKf9v8G=c`{mN_q6SxiN>iNt0zBgg-br?oO+>(!lm$tVY|@v}nsY6YZmZ-(FPo}=Rl#KCkQ*A>ce3v@;^-0WTZ-n)m-aIp21 z6#IwH{+{Zgg7?!Ic)s{V8p;XBJRE0ph;=l{GjPZak< zf>HLB#veoG9Yt6-)5Z0#wz^*MJvSUE;xR>hXfqVY{Y zup>ks{zCa9;>y4jvdId>Jwk22WQ9G+0Ux45>$nPPnJ>nuO56v#{frl{yOc(cOBMEG zfU1?3zr~kG3!5oNND+d|KAdsgXV5!h@raWWz8OQOsS>5FocbC*cuqpKIsYer{b5DET43Kzf?q+|E; zy|wNv?B-La;KWt&HN=gJr+uP6fBnh=0y4#yrCa>NN{V+M!$Q+}K66|-e%6KEK{%bi zeBb^5=4XA~WbkEauOPgh&dtL5hjofCqgL?EOfCLv_Sv5x}j2Qk=AB?_QQvwhrX^aMQdJB1Z${y7Q=z z)qr%Ks0<#Uqz8_R5JH(41i^9eo)Y%JBVA5*GnOv77Jk2o+eVuNx}JN`N8AWzXGT*y z)3>i;7bN;x36rvjhL7=vdzU_qbGQSD=jG=9^>T2yWAP=)S@|HNFL8&k2a$t+Lq{#% zu#PgAovD(QA?|ykZVUt3+Y>lTS0cM(^?K?#0KfO-^3{PgCS7jG6RVoP3Et36suMSa+Rj|=|qAplj zTT^A(KhM$RpL>hKoCvi!sL0@;iH>uL@7bA}#u3r=r!CQ##Trn>9vsv#{84#!vF|<| zSeOTr^u|bPn}mF52))J`o#=h%vP|srqfufLL)V2WumB2RK!HqBcnz%#s^6aC70h#OY0Bx#q7w{O=zu*p;mh-grwCS6l z8u}R^#-j0wA3Zt@r->a8)dk_HukqUt48gaevM~5v!xn`FiBkRaD#meCd<}iMA0TKr8tW$Jxj0cemR-BgOc>*lCLip@vAhf zp~Q66L@Gj(>)86+zjdGZodIs!IC5_oj}Eh(Oy9P>?#__{xpr<&XdX-ca*23PKh(lY z5SP;sSSW+--UwH#i;+~F-jHE}5G22J_NObbflN$*w z3-j1Ew$d^(39nG;4~RCe3`rnp;B`-zP#rkjn;uO;Sz=jzkvP8HepF0oPV84iH-~<8 zf`CUn4|Ojagq+k5?9|lVUj!`3K%q@+e`W}$vH3NozA4DtZ#ZqgG$})aM^+lHHZNkofhoo?NM?}1kV&t9n z)I{BrC%4bOI9&7W%BNzUsM{+h>9-|Mh8XQ04I>YwCOr-fvDqy&$|5&gBEXy?P9;?T zOxsN5mX&Aezgc9QW*T-J@lMfw6Ldq_ls~7qE?P~^(rs#@yvFH7vB{2_HWOdY*DEKB zzW3utuR91`-~DcXoO6u&3ZIk!_nFhZuPXJ_T!Wl+O%osGalRM7e0A0DfBBQW-a6tw z2DjIzv@QrK|H_bcEZOI<%x-+Gyt0IcpGhinY(7j;EVMjlP+go?RcYkku{7qBtb-Ek z3fgWRw9R_Lg`@xNIhS>BZ$bO7;cH}e5l-;5Jwk6ZI66C>(`_o%ymRQSxhEUnU{9L+ zeM^nVPeX4K!-!0rk0H4=|8UbW>+6avD@Dg@o{FEdfKj(QS9pJkP_NZ>9rvtl3AQBp zecThfIG$`XPI+!1J9Lja%#$|A!6cGnba`I$LOj1ztSef9YPa zIotIplUL?lPuYw`vy#|ODyaPF$xy02I>4Fn#4BlA1~QVz9_Uz`bk6t2-Myl+v`(#E z^j%HjrTIn=>kh4AE^$lho4=C3dtaKIRun)4d5)K>n<^z!b4*}}#a%b6>)ut>-lwVW zUo`}(9OgeQvha6Xo-Jv8v@=Xw$Ze@O*}#AP$f@gWrxntr3KTw`VEQG@KznPxtBCZ3 z(%JfVSIKpgQu(O%(ua17#s3Y*%xJsB_c_vdrmQpHWWs`!#uNb;4?RqU2Vvxp)Pkj{jJD%Qtc!l!ON|9tbf1z@AcAQnzgmUpd`NjLl z-Oh)VXhvyR-_bVRZ&@qoy1U7vSxuz!x{{5om-f`%Md3ZPimiI;W9NCYCr8v3Uduky zW-FL-xRX(P$=F9#b$&4RLOP~?R85GJ`-{PTJvE-7sUWrgp1z?JdM=<>djT=i_5ZSj y-VeC$vL8_tUusq}YMOl(m7~%uQL3WC@$ZC5*+*BpPtS%)7+Pxjs^!YI;r|Di-7UfZ literal 0 HcmV?d00001 diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt index e64c6236..8a50932d 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt @@ -21,6 +21,7 @@ import androidx.compose.runtime.saveable.rememberSaveable 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.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -83,7 +84,7 @@ internal fun UARTAddMacroDialog(macro: UARTMacro?, onEvent: (UARTViewEvent) -> U val background = if (selectedIcon.value == icon) { MaterialTheme.colorScheme.primaryContainer } else { - MaterialTheme.colorScheme.secondaryContainer + Color.Transparent } Image( @@ -97,7 +98,6 @@ internal fun UARTAddMacroDialog(macro: UARTMacro?, onEvent: (UARTViewEvent) -> U ) } - item(span = { GridItemSpan(GRID_SIZE) }) { Row( modifier = Modifier.fillMaxWidth(), diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt index 47c55bcc..b3bd2704 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt @@ -155,9 +155,18 @@ private fun OutputSection(records: List, onEvent: (UARTViewEve horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically ) { - SectionTitle(resId = R.drawable.ic_output, title = stringResource(R.string.uart_output), modifier = Modifier) + SectionTitle( + resId = R.drawable.ic_output, + title = stringResource(R.string.uart_output), + modifier = Modifier + ) - Icon(Icons.Default.Delete, contentDescription = "Clear items.", modifier = Modifier.clickable { onEvent(ClearOutputItems) }) + IconButton(onClick = { onEvent(ClearOutputItems) }) { + Icon( + Icons.Default.Delete, + contentDescription = "Clear items.", + ) + } } Spacer(modifier = Modifier.height(16.dp))