From 012f60be566dda2463fdb8019a359cd1640c24a5 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 4 Jun 2017 00:05:02 +0200 Subject: [PATCH] use proper alpha for dark themed icons --- .../ui/ConferenceDetailsActivity.java | 8 ++++---- .../conversations/ui/ConversationActivity.java | 4 +++- .../ui/adapter/ConversationAdapter.java | 6 +++--- .../ic_notifications_black54_24dp.png | Bin 455 -> 0 bytes .../ic_notifications_none_black54_24dp.png | Bin 558 -> 0 bytes .../ic_notifications_off_black54_24dp.png | Bin 725 -> 0 bytes .../ic_notifications_paused_black54_24dp.png | Bin 582 -> 0 bytes .../ic_notifications_black54_24dp.png | Bin 359 -> 0 bytes .../ic_notifications_none_black54_24dp.png | Bin 401 -> 0 bytes .../ic_notifications_off_black54_24dp.png | Bin 510 -> 0 bytes .../ic_notifications_paused_black54_24dp.png | Bin 444 -> 0 bytes .../ic_notifications_black54_24dp.png | Bin 559 -> 0 bytes .../ic_notifications_none_black54_24dp.png | Bin 669 -> 0 bytes .../ic_notifications_off_black54_24dp.png | Bin 1015 -> 0 bytes .../ic_notifications_paused_black54_24dp.png | Bin 698 -> 0 bytes .../ic_notifications_black54_24dp.png | Bin 779 -> 0 bytes .../ic_notifications_none_black54_24dp.png | Bin 968 -> 0 bytes .../ic_notifications_off_black54_24dp.png | Bin 1429 -> 0 bytes .../ic_notifications_paused_black54_24dp.png | Bin 971 -> 0 bytes .../ic_notifications_black54_24dp.png | Bin 993 -> 0 bytes .../ic_notifications_none_black54_24dp.png | Bin 1221 -> 0 bytes .../ic_notifications_off_black54_24dp.png | Bin 1851 -> 0 bytes .../ic_notifications_paused_black54_24dp.png | Bin 1218 -> 0 bytes src/main/res/layout/activity_muc_details.xml | 1 + src/main/res/layout/conversation_list_row.xml | 1 + src/main/res/values-v21/themes.xml | 10 +++++----- src/main/res/values/themes.xml | 8 ++++---- 27 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index b58073298..94fa7525b 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -560,10 +560,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers } } - int ic_notifications = getThemeResource(R.attr.icon_notifications, R.drawable.ic_notifications_black54_24dp); - int ic_notifications_off = getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp); - int ic_notifications_paused = getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp); - int ic_notifications_none = getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp); + int ic_notifications = getThemeResource(R.attr.icon_notifications, R.drawable.ic_notifications_black_24dp); + int ic_notifications_off = getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black_24dp); + int ic_notifications_paused = getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black_24dp); + int ic_notifications_none = getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black_24dp); long mutedTill = mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0); if (mutedTill == Long.MAX_VALUE) { diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index d6dff80ef..72f2007c3 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1515,7 +1515,9 @@ public class ConversationActivity extends XmppActivity } }); } - builder.create().show(); + AlertDialog dialog = builder.create(); + dialog.setCanceledOnTouchOutside(false); + dialog.show(); } } diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index daa569de5..202c80357 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -126,17 +126,17 @@ public class ConversationAdapter extends ArrayAdapter { long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0); if (muted_till == Long.MAX_VALUE) { notificationStatus.setVisibility(View.VISIBLE); - int ic_notifications_off = activity.getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp); + int ic_notifications_off = activity.getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black_24dp); notificationStatus.setImageResource(ic_notifications_off); } else if (muted_till >= System.currentTimeMillis()) { notificationStatus.setVisibility(View.VISIBLE); - int ic_notifications_paused = activity.getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp); + int ic_notifications_paused = activity.getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black_24dp); notificationStatus.setImageResource(ic_notifications_paused); } else if (conversation.alwaysNotify()) { notificationStatus.setVisibility(View.GONE); } else { notificationStatus.setVisibility(View.VISIBLE); - int ic_notifications_none = activity.getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp); + int ic_notifications_none = activity.getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black_24dp); notificationStatus.setImageResource(ic_notifications_none); } diff --git a/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png deleted file mode 100644 index d0e987e89e9b93ec06554d6ea058612050a3fbff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 455 zcmV;&0XY7NP)ICOG&71kuq&aP!Zg!zEG*UVh1&4u|)^LCC%N-9s*1E>QDN>A1_xN`{OJ;MBEm zfon@x!zk04lfku3Gi4Rp68mJD29a~1540BU9RO|M1^9>!PFX`IzzA3i)O`Xsz+Fsu z>>H#|mGM-(EnF^u` z9i_Yca;y}oLVE_0s0>x8Z4mKDA52wf-5}!GP>NKc9GkF|VcpBJQwxQtg+f$PXpr%F z!%#u!_hUd_p)SRb-9w5{ZW&LP5~;FRwhS51*9Id?Jlk)%o002ovPDHLkV1k|exgP)k diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png deleted file mode 100644 index 6ea331d130902037ea61b54fa7a6b443ef035c3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmV+}0@3}6P)Y-}n$+V5R}g0&ZpFuXv8P*h_OA zT*O^}AMV@ugm;leqC3>V1Ds6bk9dsF*w1|X33L=f8hy! zRQS7in!Hl(d}N_0(4{PXjh#TwHa4>H;30_ z*M8PI%<4Z?d-Tbzx&qcXg1yo6Aa3MYY|a$%9axnTZ?Aw6J?E-a8qju}z*%%w8M8R! zZ<#eWC3XNSQI9Pc!Ivo3g2U)XLu}q!wBilE7YXzTZCHVM5!7RR#Uu`*BVk@6y0Ir3 z`?@HgIMjS>#;{PShe9T^JHtT?o(y?5gElUjx)q;chf6Z1hPy|C>Ot3`+zjpAv?dYgwgs;<$`& zS(XY7peGNJa8qa&j+b0O12~iurmQZ(%|~kmDiWrwZlQJ0Y5_W5FicrJf?19w1=BWK zU%?;?vA-hcE!>$7&`fAIjz)PWaY?Lw^*Iw<@aHA}BQ91Me^+SNG2D~jO<9exnp%Vd zwNgWPk}_vpxD6!UvGW3rMQgMPe+mb2J1J32A9CiM)xV?P@4;jXVE=aQ00000NkvXX Hu0mjf&_FD} diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png deleted file mode 100644 index 3366fc69367614f5c676ddcb3f5a8ec82e9e060c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmV-M0=fN(P)}&)}3$YU{gtWdeVq;?zEYt{E%q%SHKJLzJ3P}zu+_`h-?BUMLof&AO zMUmH^H98XD*Z>x^eE}TXkfkie~Yj6)tbLnSRnGA<2F0uA7y8G?$yCh@a64%C1bNw9QLr+{?>G3YUC z(tmXdNsGXs$F~pM1;md5+phKyDpS`{Kayr>N*EW0X-SYYLnA)EQJ~k=egs~%?Y9H{ zIE)2leSBq?T|-SFsJc|~i5C@2>6B$c`s%;|@U8i_P;17Eo+JeY?XCuJ2)yfd1+@X< za2N^l!w+x-Jn8lhr{9{72ZnTz7yzkM9lGH6^sI)K@~E7^V+J2ltvI2YjI3_NSHq)$ diff --git a/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png deleted file mode 100644 index 91cd0b8497f95932dc15b0692f336abb90d8210b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4k`Ik*J7<@iRJgRL_DV>&ScVx%MTInLsr#cr! zyywV2wg1?)J)+n?(eAL<@0|7>ht17m**2=~I;LdESaBef_ko>ZU4Z=+G3H|vH@>+g z@n93fg-B`UDRU;C)16(-x9ThZ3br%ad#2@{+_pL?j#J|2UElX-Q*O&&nIUiT+c|%( zSKJo$n3jt6=W~`_DZP6|%>2h8Zac0j{|Ngly&@4mvRV6p{$=oV^>bP0l+XkKBq5C$ diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png deleted file mode 100644 index 7c41a4452e97ea8fe969049e18286c2568f8ab1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4aAi(-z{yZ}?C9!KwVPV%JG8Ud~j8mLeCtkh3H$m~5nbHc4uxngR^#VCI zN1o|yVpn{VyJ@4<2UF{rwV&gRCg;p3@kuS(t+?;-2G5H=ZI0sXigIj|qkPOo<{$NX zS!Mbp>*5mE*DsRSO_F~gV!rZ`U+)jGZ=&VDd#Y_TqjqL*Dqz9^LWji4qM0Q!W;jbbFH8JxyWZI|Hxm) rRCAT}y3-ZMjrJAx^!ME2Jf`oqNo9_ZdZIQk_!vB0{an^LB{Ts5q&=SZ diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png deleted file mode 100644 index c2ee2de297d23a37e43662fe04615962dcfc34aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 510 zcmV42OA-PSnC549xk>bIy0pJkNO!*IgZj zu~TvW9v4@+sjH1QguR+Sg}FGth>%OwnepbahKa=M##nMa9=%I-BjcUoSsZ)#j#*46 zF%R$@zwo6LaEN_O#<7cS4C7uB*Nw+MITmi8yh%ih`kcvX2$Cm zO1KxBLWR*#vQ2c>jFcT*^aw)z_YAs1^ni;&}g4IrHRvQVCH{s#c=<0Zb80%i&! zE4Y@E>a%5<)?v5TOv&Hi(8s!d6Prc>yn= z_W)i%rIaXi+e;)851^8$EQ!j;My%qFWOlQ6@7$&FPbT-=Gv{m0Idg{pj-isWwLssZ zouV{S!a)stfo=yUg&0mWUd2N6zZiIhNJ-HO>KN_fzv2=%{gf*O#y7C5ceGV3;{*43 z2KuFF20H}-2r|=ooBfKs9tF?{E5=q>l^}aj)pE$G)rql91})3Qw{~8#uvriel=h_zK?^ z9s<4emkxefvNZBiG>EZ!FJ`Y%F=(`NvKrmR%w8uLC=~&lzt9~FWnQ!+Oa%G`$0^=SvRYys;)zx^Z_Q+L{l>e>MT zcm>|H5^7E2ai9&%IkvwBPJrjUi8TzY0lWD3W*0aHF7hPLJA_hT2iaVz11-$3dXN^7 z$G`&Sm(SaaGr%M8BoRwjp&?)oogr8Q_H9gWq&?6EriI!pnzoi(U!kN2nuPgNTCuUc zkQiuT9uKq`0Oox~5(An;=Q~rr0*QeMfyR|dUxCEHs6Z1ew#2}oK;w${QYtaf5NLwM z4)r))7|}r4L<40L4U|nZP&U2>(jZlQW!tB*&l_1vF$NOMi;dGZq^p6Vitmx&Xu`!n z(Z%;ja4_LA2g)eE$Hrd`D!&Rv$|l4S(;;SyB#U?8Kr>m0IdK2Wy-FN0osoTj(E(1i xlZ80s>i}1nEs_z;_W2EP1iS>u7m569J^`G5DRE;5*C_x1002ovPDHLkV1mMU;<*3- diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png deleted file mode 100644 index d5586382912b96f8eb2f4fd591d864dce080f257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HA%P)PzzBbrZa_6q9}eE zOAAZChFFV@BBT&IC2AomXuu|j2!fz)qGqGT%)(^Ym$`Rmb_mWNmgU^N_nh2Z(gaRm9Uo&8n2cSBQ<&>9zKlgI;afVk7e{dp2XgZ-NlNK;OcJprG=-b#cb5(x z;2Hi7h&O}lHXi*p?xf#A#Fo%Jj%4h0+{LQ`YnSm^as<17U@Oh#eP|*vwcEmUZtSV# z%u6$FlsqY|S1f0b7jJ<+|2tNy0&Dc96n>vUX0f%$;3;d4o^GkA*H^}!;Vgww_ z*-H^Vy5w)}^1g=>BVc#V{uJS(-`c$Ip~MK7%Gp07e02Gdvv-C%h!K##`2C6S(Qj?= zg|({N>9NrWsGCMW-82H~rV&s#p#pk6LYB>ykjWte=8Q+ctN;;3pNYqne3mDY-qApc zJQLTEJV`^iWk^G~ND0-Ee3#i_6E^)>sG)AEc*S(v#~nqJkG_tM!J~W)e-CKCCm&B$=7B_est~ zVZJbM=CJlU>v#5Lt-TKe1`POLGgOn`)!2pGi~k?v9h_b62d!FehXuRw5H2i!R|!#H zFZY9n6YVx&FSaJy-_haTor!I;ND;6BFXKwQgiQ%;)+OFsGATpod0bvxk76f2$8-nV zEw~Rmy7-#KX*BY}>`sb+Z*h|d9xlR-_zW{`cDwK#uIb_HTHG&Q$O)XujCT3+@rUaXcg5MWn7mokXm~b(p|E#cvX0LSPxgVmO`?yxmFw_+s0=SUIDSGmDd5ip8pMP_YhqYyPAM4T35 z`?kdAY{Pp++hnQ;7}Kh87P46^krSB1ANWD^L|M{YEmpFuxll#G16ql#6PMspF<0jB z8%~OeT_)l$9Lou&ihxJNnD50_vDQxt5kKQs(R*bT@R6KgQj58EQfeV$*gUNj@TYi7 z2=kUQ+|!c$rz-pAoCwhLFbQmP23!rgeX z?f+rCyBv=DC4i_xpJ@C4Ha=LY(|!to2k~feJ%@w%WGN2&Eda*xaB)3{H$_=qiIosQ zYtv7Z4hLi=uqG=d03OG^#r0Xdp~AkPN+y1+LYqzu;RgIJN{w?ObI;~DS;-zCMC{Qj z4zoA=D=mPC;TchSWRp9D#&LC(2bC}+3cZt}@Jl8~z_`{LUI)XXFf){W_nc;t773#()Uc_a+jOzNpQI(D2 zB)omscLuMD4gVtQ`oK|@X?$V+>E8unkNr`n26gnne%(*xrm-)<$0ocYzD=CMYxuL1 zVI4iNUH30J$HeJf8O?LpZFpUm;HgKz39*@9c%;}6W%E>`pN9B2IMd6h4gpi*?X4FF lzq8`aACOrl3>Yw=ob&D-mBl|oTUY=9002ovPDHLkV1l^;%g6u# diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png deleted file mode 100644 index cd0ddaa036a20c26b828ab184266807f82017e0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 698 zcmV;r0!96aP)3rV*+@vtM7$Eh z#zOoTmKK)&3u3ln;kmb&NLXPpBCHI;M$!Z=7Pnh&w|?APUAHG4_nX|ssj5?_ez#8D zM-?R{B_qvPLH&;71P(OpXLyWy>_Dqxci7-0j$(D=s!BvH#ST=7-C=`+9m-~k2vn4S zbs5VBCUy#K#w>PsssDwq_!cW*tVO&9r?EF<`aJ$&<3@+F!+3Yl0v=iV450k;zz3N4EFT!$^B#t z5s+op>bQk3sj?XyiO_coMSV`+#haA9-M{G-g(3tz!D7nZh%3U@TVG-eSi-%OJ%P(u z8#&HjV&9e9_?@yhNoHfQtzEQqiY=i1PitB0JD^E40Yxq1p)v9TVy952ugpRj`5DM7 zV7`!1v~ns><2?Vw^M)g!DtUio+J?+3U|551Qk79e76HQ^e3PmSBC@Q3l^A@JWBnS8 z{8Ol8r77Zw>ALRQF5hu2X0RgG!0R4$BXPv^Q0D`T8Xm+BR>UD+4KE~HBXDyF>&L1c4y9+b9XsUx6ACiXCLN%%-wq- z2!bF8f+3~tUBC{`09S$2zhAFA*7AoD?*f4Rz$0L~xB%P&W`RAz z^(TSjz!vZg_-R^Q2Tcz1E#Nw^034{8u>rgWmPo?PX-d#p;65;+l(z=F0zN6_b)|_W zb`5w898%0YNNS$zz!$~bU04gc4cx_MFlYgnNPW^rgM7eN&>V2jFu!DqbSHhb2)7bc z08eOc8gU+2#^3?h;s>;W2Q)i{7zG|$e5Zw=8^AGxT!{(NG(r_^L1Ux|pcf0kUd=#l zL03rYJ6?m1{I2 zAOs17Ab}7h5P}3kkU$6$2tfiNNI*-_yi$%PcQisY{>z>xPeBD~d*5=Mkh+3$l~Yns zQ&Js4xyvajs3EDUph1ySQczJ+6+we0r=*~Qq$;D>Aj&DZ+3yEp9wZQgf*|n3bHmef zdf#yQ9e8F~OIJKQ>D4~2T{Ejfz*ErMKCXRZR)v74phbE+sk1^lALfGRvG6V6J#dch zyVF*H7oI$x-7K6(HE002ov JPDHLkV1kELJi-6~ diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png deleted file mode 100644 index d11bf922bb9a81a93eec4e310b2583760c03ab2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 968 zcmV;(12_DMP)7ET|h2PzhFCs4+@-N!)1C1j@q1 znBb0uF8Cg-{1(QDwWEAlMiQV{myy^U#sV+O0POBz4eO~a-Dc1>;AgIJ_+eti#t_5uiI;J(c z7Bum6QKYBwJdWTHwib?m61#98zhb4;?A9>O%ls5x!8~>h8RI5SV?h$uI^z;Fi?^ha z5Wx+6jLSjsvW(*tJAk+GSYXT@I4I4wuLs6mN85sq;Z5ya45sj+bQb*3LVUC<=rG>c zz;X9*6^r=3_wz6K1CJ`p-6s|ARz}i8Z3LAjfX55R{DiZ(h+COsW~5Q_nzZc5aU4J6 z%3x`hX=4OU=^&CCwv$yEGE74iL9Ubn)DVqnY>a;XSF&49g|am{yL%sy)50| zY2q_6HR1|B&%8Gyjj%AH1s%$?U&ooie!h^3d=rNQ`w12FxKu=&I4gE(a9>{dK7o_c zNI`owFI{fpLSR3AF7#rrWsAU@Y|(<6_*TBCj>4b#ZopgyCQ{IzO#5PB9~+JRR8$9% zf^xSomIC|OXzYosK{J{5raBQtE_QCJF))#Wa!KXZSrPo6Y0rIG0~0AIxA1+?T5D8t zvBMVO^`?D+DyTpeRGk&aB1kIaFL308mjVfqT<@A{|qNGu_;7z)m)qIIhhWX&IyE`_M9Maa9t@3|I%QB3h z%_gVMtRW-~Q-e06oIZ1dexS~S3RFRrN~KG>d}j4s8{crbj8iS#2;L{L#NMvYG~A{QZ60>y{bf$7Y&GjsMHW~R>f zrS0kLb@u$u-fOS5*FN;<(W6I?9zA9$bK2d3GKO#$1}FbM*~Y$Hq_5o_z(PEUTPv>b z!h87VviGQrP8dPYsul-s#Lf8j@^)t`{fX^|upqI0EpbY$cWKJCg%p9-;6*%-`2}qZ zHSn3?g0{0zRG^jEjCtY8kiWfT!;C0;O9kYV9V=4R+qM^VH{KOvlFB{yIh zcHqJc?fY>DMzB$RQ3tRT6F6SSc6N#^^YieW@IkfMfp^6hs$?S`!Quk?K>hs0QwgF=}QP57q6pe%GiL^|NlARUT&tNz1 z79+7Ji*S#KwhtxPsY^aLZlKu zRa`%T145+KV0E<^Ne2_{)Fel$QBR~nF`f2QT>lG)ai{d0a4q&~L4unr7po`I@Z`_R zsc;lWgwstCsekew+hh&{awe-Kk=6^}Q^{(a6aJ^1Kk)ZtyA+YG5{tlZ2{x+8oz2g| zCettDw_sfOpK=c3te7e(4B|7KPqcH9+ydPv9Pdo56;Jy2itGEu2wIhJ|9N8CjwRTb zLT-T`$F+4n(}#6pT2-z*`^4xQPUyoze3j6C3ONN@gvT`INBV@%IVM)Ja`p<5mly2E zVv&mcTd@5UatgFTB%zJcCjz}A!cmvA%cUK~X6X|PL8Z+?EeW@a+K(zwIMwyFeRBxf2 z!&_p7Yld2JSRrx>l(KoxrG2K#W&SMQP#qS`#KOeBT%?l(B1GD(x{@(2L^{%-ohvi+ z1$hO^`c^EdxPDZOq?Xt1J6#|mh1sGyj2Oe4VwGzd-5?NLhnG~Bi}vGf5ihlb zZV`wOX%yE~T;F5*I$Sc{BoL9nZWYt6oFDMM7F1okO&}t99aS9+evJ=g7O5KrA_|kE zs#A(D@o~-@<=pPrl+jirTqE+f?WXQQ9}wFp`*Pf*n*|~q_mB{&+(~BST3UN%CkvLQB=I4`rGNG8$F0X+G(*};+#=w*YO(-ibH#+*nBg;uUgKh(#}7ZPQIQK8~Y8Hh}tR8 zA>5|^VW%;CD824=RFsFB+6HN-Koes4uQ9zyrSfvy-ktA+IA|{J7jGk$&N&_yzG9me jmX&+-=+UD`kJ-(C9}U#y7`mE&00000NkvXXu0mjfo#UT` diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png deleted file mode 100644 index 108f7b94417b0941e60681f9b59e8435ec53e2db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 971 zcmV;+12p`JP)8~PnWY{Hu<&Y42cv$!uo+%|R!!-%NF7PJM= zM~*oSN3c0&z)dlO;R&I>Gmg`%pDw(x`e|Y-_T!t5@z)Xi3R;dFuM1Dd3>H(+c45Sv zn?1NER^PJL$yvimy@Ep;8teAo( zZTGu0e}OCbqG8`5JQ+EcR$?}>w%dCf|KKC_(}fDJ^_a^Ih9c-XJ`tMNTJ9B=hNhWD zY@H#O+lVP>mgf2;&eUw*j1Np-fsEF5454U$Rw$#cWe#r(i-+0BE$CN#tiHbdl28!K zN=`w4;W)0=>^p$Ny=K!uEUm0&L(p$y_N{21W)NyYy$Z^G7aKf9Pzyy+3q?>1IXdaK!uy~oS5ON@ zPz$jH4YA3*93x1Kwd|qxDU~o~IX6p?Sp^MM&WOs4l4cP!bU7m`Gf3(xXrss(QRyhD zi=d4rXGEogq%L={jVNct;c5S&jDuPzf(nH~PI4}-d}#6qF0bNP!dx23*-8I0#j%%? zWzj-TL3Ix+G!gBo)oIBo=xdX`sdLfzrJ$tbd@cMMzQbP4uS#9S3H9suy)cCJ?*-u% tf~VYk)a7TPS*-}`_=Q5DP$(3p=0Dj(T(_rwBv=3d002ovPDHLkV1l%`yZ8VA diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png deleted file mode 100644 index c05fd3b548ce0564cd98ce83aa971f86e50c7b18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 993 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 diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png deleted file mode 100644 index 647a611a2968239eb62a50d5c2ebda99d69e6685..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1218 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf4nJ zn8$)Jqhx~{kij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6wn}hPZ!6K ziaBrRp6us!lsHhI%r;rD`j~)D9E@R+N-7bE>_kotd1I_hLN7NE@Hb~D1dieSI0mTP&(7=BYW$9acRC zf8Dv4xfD4wn9Z2H3uj-~eZceKWMa=OPS*o63DyQ)8u#2EsC;nHh;wz4=!#&@ao+aQ zg6VSPZ#EmTp5OfYSaaB}J$yd<21`les|O3)e>B81zBUZspKoR8e51dH<-6(v_8X5h zzx|)VxrgP~Qs&<;I<_)L+a5W)i1V|I(EB}}+#dfg3LMXhGThl|*S~~Shf(O^jLI2} z9|E>5X%O@2RxdGA_>nV3WCM$Yy2N^o$BnK*2cwoSF=`i0yPt0P@1RU-coN%(Im%yo zJvuU`aT%|-iB*~~r6F&jg_+>VNUsAn5QftMi-aZzncG{E#hNT#og9`s@PwWt0|=XqN_S|W7b503$I@6dERI(Ip3VoTBDAeMI!Ri zjad@}9y~HDm);Sv^o&|U-bstY-g5DxoQ&I&ZJ7NM^Bku}aID!RaQf$p3>|ObU^@o) zhWC=G%LMQBM7t&l88oc?Q!bf$jA6IHj?x=SYK-ZP>XP&MkB990ylk;=l3+pSn~y(B z)3DC@TyRetD71(rnn?19;)07HRZT3?e;eG^{F!n! z)qjC)BE%NgKoQrEE)sim-WGP@w$Smkz2`(&3^_C|U)`Us%k6$d zVL^YAy{9Qh%=S6mrAY!Gn0ACc*r8orclOB{wjR3;s%x0`9E|x|>r!wV=m;=cy74Ec Y9CyV&-`+?sV0pvf>FVdQ&MBb@0K#Vt5dZ)H diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index f4e45598f..56b7f90b8 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -134,6 +134,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="@dimen/image_button_padding" + android:alpha="?attr/icon_alpha" android:src="?attr/icon_notifications"/> diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 12605e6ca..65be4802a 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -109,6 +109,7 @@ android:layout_alignWithParentIfMissing="true" android:layout_centerVertical="true" android:layout_marginLeft="4dp" + android:alpha="?attr/icon_alpha" android:src="?attr/icon_notifications" /> @drawable/ic_share_white_24dp @drawable/ic_camera_alt_white_24dp - @drawable/ic_notifications_black54_24dp - @drawable/ic_notifications_off_black54_24dp - @drawable/ic_notifications_paused_black54_24dp - @drawable/ic_notifications_none_black54_24dp + @drawable/ic_notifications_black_24dp + @drawable/ic_notifications_off_black_24dp + @drawable/ic_notifications_paused_black_24dp + @drawable/ic_notifications_none_black_24dp