From e55c982808f367355ddc56e344d645993bba82e8 Mon Sep 17 00:00:00 2001 From: tom79 Date: Fri, 8 Sep 2017 18:20:02 +0200 Subject: [PATCH] Moves the translation button. --- .../mastodon/drawers/StatusListAdapter.java | 10 +++++-- .../main/res/drawable-hdpi/ic_fav_header.png | Bin 0 -> 1027 bytes .../main/res/drawable-hdpi/ic_fiber_new.png | Bin 0 -> 284 bytes .../res/drawable-hdpi/ic_follow_header.png | Bin 0 -> 939 bytes .../res/drawable-hdpi/ic_retweet_header.png | Bin 0 -> 514 bytes .../main/res/drawable-ldpi/ic_fav_header.png | Bin 0 -> 452 bytes .../main/res/drawable-ldpi/ic_fiber_new.png | Bin 0 -> 298 bytes .../res/drawable-ldpi/ic_follow_header.png | Bin 0 -> 556 bytes .../main/res/drawable-mdpi/ic_fav_header.png | Bin 0 -> 606 bytes .../main/res/drawable-mdpi/ic_fiber_new.png | Bin 0 -> 224 bytes .../res/drawable-mdpi/ic_follow_header.png | Bin 0 -> 602 bytes .../main/res/drawable-xhdpi/ic_fav_header.png | Bin 0 -> 1514 bytes .../main/res/drawable-xhdpi/ic_fiber_new.png | Bin 0 -> 324 bytes .../res/drawable-xhdpi/ic_follow_header.png | Bin 0 -> 1068 bytes .../res/drawable-xxhdpi/ic_fav_header.png | Bin 0 -> 2889 bytes .../main/res/drawable-xxhdpi/ic_fiber_new.png | Bin 0 -> 460 bytes .../res/drawable-xxhdpi/ic_follow_header.png | Bin 0 -> 1753 bytes .../res/drawable-xxxhdpi/ic_fav_header.png | Bin 0 -> 4211 bytes .../res/drawable-xxxhdpi/ic_fiber_new.png | Bin 0 -> 490 bytes .../res/drawable-xxxhdpi/ic_follow_header.png | Bin 0 -> 2058 bytes app/src/main/res/layout/drawer_status.xml | 26 +++++++----------- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 2 +- 24 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_fav_header.png create mode 100644 app/src/main/res/drawable-hdpi/ic_fiber_new.png create mode 100644 app/src/main/res/drawable-hdpi/ic_follow_header.png create mode 100644 app/src/main/res/drawable-hdpi/ic_retweet_header.png create mode 100644 app/src/main/res/drawable-ldpi/ic_fav_header.png create mode 100644 app/src/main/res/drawable-ldpi/ic_fiber_new.png create mode 100644 app/src/main/res/drawable-ldpi/ic_follow_header.png create mode 100644 app/src/main/res/drawable-mdpi/ic_fav_header.png create mode 100644 app/src/main/res/drawable-mdpi/ic_fiber_new.png create mode 100644 app/src/main/res/drawable-mdpi/ic_follow_header.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_fav_header.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_fiber_new.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_follow_header.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_fav_header.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_fiber_new.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_follow_header.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_fav_header.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_follow_header.png diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 05f4b8f27..973e08d61 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -14,6 +14,7 @@ package fr.gouv.etalab.mastodon.drawers; * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ +import android.graphics.Paint; import android.support.v7.app.AlertDialog; import android.content.ClipData; import android.content.ClipboardManager; @@ -198,7 +199,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_prev4_container = (RelativeLayout) convertView.findViewById(R.id.status_prev4_container); holder.status_reply = (ImageView) convertView.findViewById(R.id.status_reply); holder.status_privacy = (ImageView) convertView.findViewById(R.id.status_privacy); - holder.status_translate = (Button) convertView.findViewById(R.id.status_translate); + holder.status_translate = (TextView) convertView.findViewById(R.id.status_translate); holder.status_content_translated_container = (LinearLayout) convertView.findViewById(R.id.status_content_translated_container); holder.main_container = (LinearLayout) convertView.findViewById(R.id.main_container); holder.status_spoiler_container = (LinearLayout) convertView.findViewById(R.id.status_spoiler_container); @@ -303,6 +304,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf statusListAdapter.notifyDataSetChanged(); } }); + holder.status_translate.setPaintFlags(holder.status_translate.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); if( currentLocale != null && status.getLanguage() != null && !status.getLanguage().trim().equals(currentLocale) && !status.getLanguage().trim().equals("null")){ if (translator != Helper.TRANS_NONE) holder.status_translate.setVisibility(View.VISIBLE); @@ -995,6 +997,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf statuses.get(position).setContent_translated(aJsonString); statusListAdapter.notifyDataSetChanged(); } catch (JSONException | UnsupportedEncodingException | IllegalArgumentException e) { + e.printStackTrace(); Toast.makeText(context, R.string.toast_error_translate, Toast.LENGTH_LONG).show(); } } @@ -1038,7 +1041,8 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf But, pre-planning might save some time later... */ aJsonString = aJsonString.replaceAll("__ (u|t)(\\d+)__", "__$1$2__").replaceAll("__(u|t)(\\d+) __", "__$1$2__"); - + aJsonString = aJsonString.replaceAll("%(?![0-9a-fA-F]{2})", "%25"); + aJsonString = aJsonString.replaceAll("\\+", "%2B"); aJsonString = URLDecoder.decode(aJsonString, "UTF-8"); return aJsonString; } @@ -1077,7 +1081,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf RelativeLayout status_prev4_container; ImageView status_reply; ImageView status_privacy; - Button status_translate; + TextView status_translate; LinearLayout status_container2; LinearLayout status_container3; LinearLayout main_container; diff --git a/app/src/main/res/drawable-hdpi/ic_fav_header.png b/app/src/main/res/drawable-hdpi/ic_fav_header.png new file mode 100644 index 0000000000000000000000000000000000000000..0e8c7e9a173af0a01fa97dfeebf59280e853a58b GIT binary patch literal 1027 zcmV+e1pNDnP)&CZU?&e)8(%)Q(TOR8b}#iLMwGGAlvs6kkQ9$Q15SIlK$q7l>T(K^zmw zp<;mD^kVT=q>CNml^7T*8L6eXBd&`MVyq|<>qW!*e)w21Ta=15qLFANE{JC$wZ0pW zC{Bu(VknY{LsFKJmhyAGT+w2bC?sf``UG`f@kCq|ZR%^`vbG^xyccOA#^?85v0JMBEiOe~~h6pV1g#^`R%8Xo>8+?CIehZj6lK zSyv!(=pjak31WtrC$hv^v6&k^DlUmzNW_A7J}aYk814*w<&iz%WXHeMRrB4X<~oof>(d!7||!UBAxpL&fW-&@+u;}Sd(4zC0bQBL9Ur%AKQdrlOSAYvox zV8xPFs}A9>2dZk!kh&UltQhSR4@DA3;r6_lr@{B#}Ztl}5&??jb9NXBqyJoHoF2b~Og1``ogN;2uMRSAk4&XrX;G zjotbN(s6&MzutM7x?V7Cxd_ZYw8d{IOj~J}i|ASxine&LYJRpXw%o~4Gm_5n5#N1M zh=ELUy5;tZc)`oiGD|$5JwAv0ynJeTO{W|0r2eZumF%TsJcJZX&&xP;RJD|AMsMSL zQ6a<27+U6hI#EYHKgQ7leCFi^7-QLF@NY6oQ>LubJd=kp#Q{|FztaD9@dG1r89EaG zupn8$w-$57WAR;lAwJwr=)VnZ^(&gXc7cq0c+#f31IQ}Ji8ydkb+gfLd=U0C&rK66 xsRy+l2X5xrm>}*M%bp?o@2Kz!ukiX`*H6(M!2=vyl4}3}002ovPDHLkV1f>r@IU|n literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_fiber_new.png b/app/src/main/res/drawable-hdpi/ic_fiber_new.png new file mode 100644 index 0000000000000000000000000000000000000000..ec7fdc454012c810ac7d52e96444991e0bc543f0 GIT binary patch literal 284 zcmV+%0ptFOP))o&Pue-v#7B z;I;p0|Kp(=HUs&eP_=yk(`$f|8vhIaZve8r|5pIvv;P7AJ^ugsZv)h{0x0?cn>L~U zkKx+t|DOTEZxC%j{u~_I{-^$D`tSH(6`~C)bAhn775}TiJcw| zfFHn`@vp2&`xM7(YvZ zZS1o}LeVz*s@yh8M?r7`<5K!xNwJN6Dz?%KP9`!&n+{u~@syHcN=k`{)IrKi2_c|c zDc4M(pyqFf18pqIU~ja_Vs4ar)TfI71K(lm1xba&;Z9ul0at->;0v%QzvI&0$8i#b z=VIq4z;!;2_F>G^t(*XN3K$=eWm3FtW`P83UIBU$SwF`207nYY!*=wa;K>Z*XMm5m zjtgc4?_#moHTc%1i~uG-1n2KD+S?^1U=p^+fa^dQxG2B8A7ej|1RlZWDcI(DxvKzv z(|KhCFwtq~%vG4Mm=jiIS)|3;wA`=C)A}UN?-Hj=3SWv+1cGudEhSq7Fm^;i&9k)& z!QQMHd5a|VpOgq(PA@Ot^7;Iv2Y)&-_>GNhYegV#M&2q(sS@~}CxN4~1Pq4==uQ(j zC+oLq2|SRO&uG>q^u!{oHp@%=o&@3wUtseLP|-HZUDEb83IfRr3bbnFSD8fi2Wa=n zVa8q}1A&Y~OOzz$ipmHRA3*LgN!ZTBAh2vWCpme##mK_H>2f<&H3VK_e8zBBw%uy0 zA%eA5zODe>0jr?4SQs9RMvdKNmbrCiQB?0iNJNm2OcQ*x-sZosb($Dz~@JOh%t zGx8O93S7c`$9P6o_E|*^@_WpvI4C}u$LsiqEw}!K<;bVSmb7Gt$ZyREdFU>^U_Jl< N002ovPDHLkV1jbaxbgr1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_retweet_header.png b/app/src/main/res/drawable-hdpi/ic_retweet_header.png new file mode 100644 index 0000000000000000000000000000000000000000..8aa0ff8dd27334e434a664a46689575bf7e650e7 GIT binary patch literal 514 zcmV+d0{#7oP)07h}lV@oA0PQ2>Wzvg2SPCJR7NtIbbQV5A7Qurvn=b6Y zk0l;-K6iHhm?#PsELgCKrhvE3r^Ex1_$WXV&qPT)60vUrX2gy-L&Vy*a54gNq9z*R zh;UMpF{|-l4(8Z_ifD;nq98UBBFqi%i9H^gGhps>z}s&@0}<>yq2c@qTh2jcIp6kn z!i3XG;=t7d50v0Sd=PgM2d=-}mB0>|YoFX@TR;T|=8RdW>1Cl< zGH16~b6n@F1DRAsmJ;Bs5=#g$srd&qJ?9q)$rrG2c_tKNV)$lE45OBy(Ml(ZkVws= z7Nh7C7|8WMD~_XKvxf6$3^+4i1So{f5fc-4GbbuQp~WrWyi_|aBA|Qo#lYafJ>f%+W-wu?cYJ&h{i9k4kevuR(>fPEhJ_;{v#$wD?-`nzaX2O1Yu zQ?e45OqKX5*7ZUqLoakSOE8G1k>~$!g^@B?uwc{d59A6Vf$#EB&;S4c07*qoM6N<$ Eg4Xch-T(jq literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_fav_header.png b/app/src/main/res/drawable-ldpi/ic_fav_header.png new file mode 100644 index 0000000000000000000000000000000000000000..b697646241962b7853160922e71d926d2dbfa6be GIT binary patch literal 452 zcmV;#0XzPQP)v^MY#-_jqF@@Vj)5{ZjmU-!fmIJ!~zk;Ub9k?g;EM->wofn z>!+saoVlE4vT*9tEY3Oab2-oZj?eesE`O;PZ$VY50#xG?s|Xc)aSQGE#5)>_9iRfs z*v1`35iDkaD9(_?5Kh!GPp$B$vDNQxT%it4xIvrl*%|Lx*%ptX3km)9V;ZMeQL7?q zl`)Avbf$^A1u@wy;u{Y*z#ew6py0n1n(UXbt7nezf-j7r%&m$Vtl>kM)gr9mR>qzP z>0Z4mdBeCW%z9N~0#6vp@q$TcR?qfk%iO75rvJBEpxkA2P5Z9(z5HHge;$Xb$|?JM zjjiovWKDlJF{RQiokNkd`=)|9mkRSbdydhe#gdwsEwrk_LF~I!m~+E5;zF}+vV6u2 z*7Z?`74%#iu;8OPq5Y83Z;x7GS~P%1ol7Yl<5nR7f*R3RZK#;TK8RyOr>hy!Kp_DF us-QW?*&o*Th`aZJcY2OrHzHvTG$GD1Di!lL2I$~2Cj`CSopasBHBjq1R6_GT#Lm2 z$V7sL0Run6o6L~+W?mrh?qizfhhkf6Pg5M3{+3eQrcl^4`97H)5jS2-Ii_@% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_follow_header.png b/app/src/main/res/drawable-ldpi/ic_follow_header.png new file mode 100644 index 0000000000000000000000000000000000000000..805a8d518886ff9a7ddd72f3b7cfe702c8eb1df4 GIT binary patch literal 556 zcmV+{0@MA8P)Mlo?MBpX?bu&}VwC|S#jh4LpTqR99hER?mSVn1bP;cH_hQ&zJb$&5^- zkn(lM^UEtY-I=*2DNa4zJNG^J{LVe+yzlsY|I#eWDuN2@(*jWXBf*2gU`ae4Z%(Jv zE0BN`?D4FhwZKmV581XIgM0hao*~8BB0g1xmc>VaS^{mtgY9lfeEJG1m+DR_f&@9U zv)dy+QGBZk5h&*6HiBH`5O~Gs1mEgk`vUI$j%o8}t-qrO8(w>$fc&0B^i*&^o0bZ5f|Nf>fHM{5+d8zW3bEy9)494eG- z`w!FJ*fLEXSEHc|7V|avT1S9K5hZhL(D;s;hG!pBeTJEq@0zA;Ow*KeqajdkYNqY( u)h@Itp%d~S6<-c4ucp7zVo!(NpSCw+Lq$il#eG)*0000pv}&>%qq z1;dOMX^2`RWu-_f{|>(o{Dgxz&h0o;-~*qH!#VH!p6BxF^X) z#Z??g#|Db9h!Gq~_2PEo>-dFroJ(~*1asP@)j)MM5;EBjXn$` zSGDjNZF|`fmS0D?FT)b*;KxCA!&|kbUtcNVnmCL+97PEEsKiAy;Tb+^v8}M*zv8Ca zvIgaPHl%k2wb`hPKf*MAs>)Yf<}rZ|1h%EcHa4kxa6hxE_e`NPmQ9qX!q?D+Q#+g_ z5MeOcZ^v9;?mX_}x9TPoYZ{8tuM;;W*kVDYWEMTzd|Y9>y{!uG)(c~e<2tcD+pH8N z6girBvl==DF+6h;uP}p4UbLp=`!eQqs@+aw-7}7NIIDK_By8Xe;c=7=*rhaz-Ux-7 za9Cx3Qa;^Rud{97Sc~1m3#HGqsK9r%sQa`wa8A3r#IHfLq&D;d stvYdTyik)f=|XgpcsA3wAOCu60%f#TFDeMPY5)KL07*qoM6N<$f(@7&$p8QV literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_fiber_new.png b/app/src/main/res/drawable-mdpi/ic_fiber_new.png new file mode 100644 index 0000000000000000000000000000000000000000..589f71501282869d9d2bbde3fed2e67830471cdd GIT binary patch literal 224 zcmV<603ZK}P)yzvKT!prRH3Gtd=f|2GFJB%r9^ z|K0z5aO*DoXZtVupBE^y0@>krfX=)DcleM0=fU*h|9=pQhzJ6r0#p6}1Ds0k|5v4Z aIspLwU`-uLg?`Hb0000Y5RKXdg&^@j0-_cXP6P`ZtKdISQVIS8K|8AyDx#%7z*U2=sYGmSOrf0w zBPWE2QS*U!z9(aH#0$B*Y*f$(k1V@0JMU&@_b!3JKYlwjO$&m9S_2#hzawx!*Y!v? zn_V^xBMsgO)12cPZMqg5L81tDVwz?VteFjPT;v*Ux*~#4C&4RbYgA}MTje!pisi}M zp-5Y$J;5epotx6$3N_l&N2LIb&1Sj;Z8epRphAF?9@iQ>Edc|iQYkia{o>%5bFM_F zXhH_WeAWe@YL@ylrkE&G8wM=1U3U;m}=oOB_dj0M6{7qhw0mq0BkghOzpz< z3cLoF;_>)2epj2XV$R9hB6ta2z;_FK4EYiO$1!Yh2HO(&CVmg_OMwfqSZoqD6C}r+ z1Cz481FnN>nM`J0US8e=Aow2ao}KCp7T});&xLu}^9X{*nK>Irr0ex&0lNKI2tI;a zmemiNoSP$O>xB~b+?KM{yWI|l`{D}_yG#KqSbs9TfdV!tz$utpAhtyTNsM2AQoseq zRUZPBmEhji`EF5#|FJ_8k`b>>Sn-*`7m8peSPo$V37M0d)ZH*RQP|ul5>fDzfgY^Sf(KyE@Q+(?A3ZRG>w4JJ>losC!I0KD oLI~8?(FcjD{}sMJ$^IPP0lz=(bs9?$1ONa407*qoM6N<$g1Ni`V*mgE literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_fav_header.png b/app/src/main/res/drawable-xhdpi/ic_fav_header.png new file mode 100644 index 0000000000000000000000000000000000000000..71d0bfab062f3df45185a98b7db145f4a49c97ea GIT binary patch literal 1514 zcmVCJ);MPhhwsxUdL`^aAcQW6LlS;SDoAxpDPV)WJ()aE?_nzNb9*z@O zV1We|SYUw#);~5NlQ*9&&J{y4)d5AKLfj~FGi~!(Vxss_yeSUKGza91`C_-I5f|W; zjIfY6N_;2w;)HoPB_k|P+$CDYAEI4+E5_iQw6{aWJ7O2{zfH7=+i_0X=lv^09kD-I zJj-oZB@Rh<2Na4IIQ?a8coMf@ySOBsi=(hOk<`~LZX*9%J+OjXP%Z|is{;m#huG*w zaTq^0C)|otz8A;ith7sgM~IIQyg4|;{oUbWlh`R{CHyX}>i%m)1E+jWhr%Z&9>)P| zxE*Pg5)TlsB7RHu(Ew%97@0oQizzrQEi59=62FMw#MPZ_Zm4(-Csp9I{Yv2@q_7-> zElMn#%0JD2_z!e_G=B%8ynfyV&V}Ax`J?Ix}1JgNWs>guid$xlM#oJ@2eV zR6iFVh&L#-o)Y(nQ<5#L%#+i^mn_Im<}W%pcQLluU#aA3Xl&Mr)nci5PRu3tV?79^ z(KJg>h((C!`w0%;*1_RTIO%WJwud!UQd2~{=-n?DRlJ~`oPD3TQcMu1iX$m)ix9LS zgiAg*DW?~D;)dLyE<(EpcZif%sZ zTFuFCr`jw|#d=Ioj^SFnG5I2=(I3+syCIh%nr(#M&8beGVXjsgF=)E5T%6I1EACZS zY0cC(+{g{I*|ENOd5CzNN#(X1(JSqP8a{;1%t8!*XSi~<(+`tn6Q`-1f{nJmMvw|p zSW%85t2CheOKGwDZH5qKpt08ZZ^Ao69PF_O*#=K0&$r@$GMc7{)6bSeN_q=T*ummT zJStbCG)ij_JL@SPaN^$*eA6*zQJOxVPzhSsHzr9ZxNY=CZrEnTufXx4g(*^=pTn#pT#OF9?D+V*fyL_-+EN=*jO@ZuF=~ee^!_DXh^1wbTetyViQ#^Afb{|M zi2r4sbYE3Z8TQTkU2WWc@bH~o_(hub-+&KB(7*Z1&e#7^QhzJqYrlK)m(o&*~=)Sn<=2G z7{d)uIBC;?a&(}=k2>If_HJN)cmlC&CpX=RkHcHpq)nA3CtUYzy1W@wdu=#z32m+` zl+)3dwSi7s<-nCBryFe>W{ZKrN6PpN;9KUQnL|^`c6Q9bq zf@On`X^4jPQn_t&qjBUG9BGdDlg6kVUGPo(Thn9X=zmzGHA9a&@gZt%5{|V^o-bbK z`R%X)eeq5F&*9V?S?mOq+6$q|V!~v_&^q*_jtt_9#;6d*UQexFoFajWl1|IemuY^e z2SS{V&Et>rp!w;^(4~N|xXLdDQG|{6<#o(*GT{Fd1{PRgfdv*=V5zl#0n>O^VVK}i QN&o-=07*qoM6N<$g5!JOp#T5? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xhdpi/ic_fiber_new.png new file mode 100644 index 0000000000000000000000000000000000000000..08208c303f7f6c4e57c019c170ad68198523648b GIT binary patch literal 324 zcmV-K0lWT*P)FlrF}4PyU4<^TKtq=Jt?UF@g^P5DnQn2c)Bd$JAsfNBsWU?dr|;D5vao6rDk z0P-LrF!%rn8~$%V3S@{HECx9MX@mbifvg8WmIG7-1`hxs!~X=J=->Z;kksHXh~a+` znn3|TdqMC8+@Js;eSxq+jQ@9`7}Nmw3`qu=0I}r%(?|w!{1*VjBcvI0=D#$MG)6Lr z?LQ9~9wyD82mkl~X99~*=(Ptxx(3A{)WDViiiv=Oz=E(rzyDidjs81Ow<2I7?gaS( z%zA(|LH_^07m45SzYka*jkHWl6@xyKZOnUW75)>@tE0)#s3*-e6M$K0wC*3W1_1!} W*Fqy0+%ql!00006@}{n literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_header.png b/app/src/main/res/drawable-xhdpi/ic_follow_header.png new file mode 100644 index 0000000000000000000000000000000000000000..77c482e5b81186abcf2f0b13fc53bad65d53a455 GIT binary patch literal 1068 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png new file mode 100644 index 0000000000000000000000000000000000000000..160387cddbf6ebdf153727553c5c85890e46a6f5 GIT binary patch literal 460 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png new file mode 100644 index 0000000000000000000000000000000000000000..30dacde3c2768ae14f6e9525f9afb5ab49e129ed GIT binary patch literal 490 zcmVYE90%}HlorHAgu1lo;w-v4h)*Ccu7Y$ep?!f2A_yXV0VRWuPQE}uM6jiUA>b@N zKnE!qj9*U)F^6}THvcZl?|ai-E|*V}Yq%tp3WY+UP$>T_sKdY`-jH`ZjL<_pj?;vL zBIBZ^;?(ejqT?#g5<1Y4t{n8B1vHd{##%rVIp|#r2y&25AOaDHKqUd0LA}lGX9ulj zw9l_GxUH}S$LGgUfKXbGIFUt&M<2G^wxGEkbngN|~ zYeRC$R=9GOH^{?=>Kx=dsl~%RW1(Ci;36^T2*<4K2em!6uZhF-AmBg&+Tn_&n(~4l zmJl??nhYd7%=r|cei{(iWA@w(pcj7L3HmMmtRs?vfRhas`YN&ZtA0~pG) gL!nS86w05>Cw7uP3AM1otN;K207*qoM6N<$f{%FARR910 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_header.png b/app/src/main/res/drawable-xxxhdpi/ic_follow_header.png new file mode 100644 index 0000000000000000000000000000000000000000..ffa6139018803d68ef6089d8dd10432184240fe6 GIT binary patch literal 2058 zcmeH{{WlYO9LK*iHY2Ak!_;C?MAtTKTGBO4Z8vx1S<1&o_g@GQHWcj zrZS``dLFwNdCX%bbgN6T@>Cty)73fmPq@F_b9$fid4JCPx6gT<^ZuOmV(!w@S*rs8 z&|}bP-YZ-5ZM2~)K06|r0{{xVJbc|(;_`R>*92Cme%Jqk0FABUtQ^YYdoz6iL<6d+ z1%qoNboJJt4UI6yYu91do0xC3u-t5AZG$HeZS6_qt&ZD&bar*4xiftIg7@tY{Uz++ zA=Xh2H(C%AmvlZgJwuY2lbe@+`HHOUcE#PQ>W7czwTk*iWphj0z~IoxUt{mb)l)N{ zzs}7sesJ0p1b`-;L38mH45;&hJ@sACq8qb!(TC$h1U(PK1z$LgO?7LT@6 zZ?_+{3kI4f8q#IO#Lw|&{?9Ux@U0^+VX=wAk1?^0?l3XNrEx0F&Y_F5#8bB{9G{L*#ABt>2Y8&b)dahE<)>4 zw~jxMI`RO$Wx{5bP6Sm{%tZ_lD6bV>4oTW&? zjwrRl>Y8LsX}ePdajJi(ss!U-@MzjI>9Eu{7vxCAoqf{!%>EgzujaP6!V+t8fc?0I!;;GGS`)xjsyy z<-!jLCO8PAdNDyBy#PgC14G_J!ZzoiU>(pp5I~2LP%xyQK1{rlbY6hLQ@>i_iumF`nT6emnF!iLBz#{{4&zF&&zOU(#l;Aoc;%q CRf}@~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index 78200f4f6..537ebdb07 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -71,22 +71,6 @@ style="?attr/shapeBorder" android:visibility="gone" tools:ignore="ContentDescription" /> -