From 8d1d4092aae1ff6bb60d5d3f015e03576fe6f638 Mon Sep 17 00:00:00 2001 From: kapodamy Date: Fri, 14 Dec 2018 14:51:55 -0300 Subject: [PATCH] add missing icons in bright theme * missing white icons * update attrs.xml and styles.xml --- .../giga/ui/fragment/MissionsFragment.java | 19 ++++++++++++++---- .../drawable-hdpi/ic_delete_black_24dp.png | Bin 0 -> 317 bytes .../drawable-hdpi/ic_delete_white_24dp.png | Bin 0 -> 319 bytes .../res/drawable-hdpi/ic_grid_black_24dp.png | Bin 0 -> 422 bytes .../res/drawable-hdpi/ic_grid_white_24dp.png | Bin 0 -> 415 bytes .../res/drawable-hdpi/ic_list_black_24dp.png | Bin 0 -> 265 bytes .../res/drawable-hdpi/ic_list_white_24dp.png | Bin 0 -> 276 bytes .../drawable-mdpi/ic_delete_black_24dp.png | Bin 0 -> 198 bytes .../drawable-mdpi/ic_delete_white_24dp.png | Bin 0 -> 198 bytes .../res/drawable-mdpi/ic_grid_black_24dp.png | Bin 0 -> 270 bytes .../res/drawable-mdpi/ic_grid_white_24dp.png | Bin 0 -> 279 bytes .../res/drawable-mdpi/ic_list_black_24dp.png | Bin 0 -> 248 bytes .../res/drawable-mdpi/ic_list_white_24dp.png | Bin 0 -> 254 bytes .../drawable-xhdpi/ic_delete_black_24dp.png | Bin 0 -> 270 bytes .../drawable-xhdpi/ic_delete_white_24dp.png | Bin 0 -> 274 bytes .../res/drawable-xhdpi/ic_grid_black_24dp.png | Bin 0 -> 276 bytes .../res/drawable-xhdpi/ic_grid_white_24dp.png | Bin 0 -> 288 bytes .../res/drawable-xhdpi/ic_list_black_24dp.png | Bin 0 -> 247 bytes .../res/drawable-xhdpi/ic_list_white_24dp.png | Bin 0 -> 249 bytes .../drawable-xxhdpi/ic_delete_black_24dp.png | Bin 0 -> 506 bytes .../drawable-xxhdpi/ic_delete_white_24dp.png | Bin 0 -> 495 bytes .../drawable-xxhdpi/ic_grid_black_24dp.png | Bin 0 -> 427 bytes .../drawable-xxhdpi/ic_grid_white_24dp.png | Bin 0 -> 419 bytes .../drawable-xxhdpi/ic_list_black_24dp.png | Bin 0 -> 292 bytes .../drawable-xxhdpi/ic_list_white_24dp.png | Bin 0 -> 295 bytes .../drawable-xxxhdpi/ic_delete_black_24dp.png | Bin 0 -> 541 bytes .../drawable-xxxhdpi/ic_delete_white_24dp.png | Bin 0 -> 547 bytes .../drawable-xxxhdpi/ic_grid_black_24dp.png | Bin 0 -> 363 bytes .../drawable-xxxhdpi/ic_grid_white_24dp.png | Bin 0 -> 382 bytes .../drawable-xxxhdpi/ic_list_black_24dp.png | Bin 0 -> 330 bytes .../drawable-xxxhdpi/ic_list_white_24dp.png | Bin 0 -> 320 bytes .../activity_main_player.xml | 2 +- .../main/res/layout/activity_main_player.xml | 2 +- app/src/main/res/menu/download_menu.xml | 18 ++++++++--------- app/src/main/res/values/attrs.xml | 3 +++ app/src/main/res/values/styles.xml | 8 ++++++-- 36 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_grid_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_grid_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_list_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_list_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_grid_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_grid_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_list_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_list_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_grid_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_grid_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_list_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_grid_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_grid_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_list_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_grid_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_grid_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_list_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java index aa9c497f1..a4be9301e 100644 --- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java +++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java @@ -7,9 +7,12 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.content.SharedPreferences; +import android.content.res.TypedArray; import android.os.Bundle; import android.os.IBinder; import android.preference.PreferenceManager; +import android.support.annotation.AttrRes; +import android.support.annotation.DrawableRes; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -89,7 +92,7 @@ public class MissionsFragment extends Fragment { mEmpty = v.findViewById(R.id.list_empty_view); mList = v.findViewById(R.id.mission_recycler); - // Init + // Init layouts managers mGridManager = new GridLayoutManager(getActivity(), SPAN_SIZE); mGridManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { @Override @@ -103,7 +106,6 @@ public class MissionsFragment extends Fragment { } } }); - mLinearManager = new LinearLayoutManager(getActivity()); setHasOptionsMenu(true); @@ -120,7 +122,7 @@ public class MissionsFragment extends Fragment { // Bug: in api< 23 this is never called // so mActivity=null - // so app crashes with nullpointer exception + // so app crashes with null-pointer exception mActivity = activity; } @@ -189,12 +191,21 @@ public class MissionsFragment extends Fragment { mList.setAdapter(mAdapter); if (mSwitch != null) { - mSwitch.setIcon(mLinear ? R.drawable.grid : R.drawable.list); + mSwitch.setIcon(getDrawableFromAttribute(mLinear ? R.attr.ic_grid : R.attr.ic_list)); mSwitch.setTitle(mLinear ? R.string.grid : R.string.list); mPrefs.edit().putBoolean("linear", mLinear).apply(); } } + @DrawableRes + private int getDrawableFromAttribute(@AttrRes int ic) { + TypedArray styledAttributes = mActivity.obtainStyledAttributes(new int[]{ic}); + int resId = styledAttributes.getResourceId(0, -1); + styledAttributes.recycle(); + + return resId; + } + @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); diff --git a/app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ba8820363ec185ea85c54720ee4b709ae6c0fc9b GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$UKzz{uk1;usRq`u2vQwrd~*`-l1I zl}pVN1U5;`nA+)R);zB_Fn@w?WKGNTn`$T9C!AFA)LgwOfX%MOrmcM0?bkcMTdY6v z^LoAQ|NCpJ+pAA_&R0B>Bwby5>yS;Brd#{P0~rgGBaT>F{djYkPj6$-N4a#dhbD3o?BL)(7O;=LW4@*f)`Jo8BYt zIftya32j?>=yc2(ws}iy%kMGiG#hCkp%?ZIvnsrJs*a}VWQg{6I_gJsv-&<@df#av zzvEDf4#%{D`5a#wrp`}z5jWE(nLSs=ZA)+LUHK!I!VUH-#c$tIcI_qWx=3KKFnGH9 KxvX|k1|%Oc%$UKzz{uw5;usRq`u2vRw{xHb+k>6a zY?~Ia1x6a4u`$RLnC+NW94K}~E#eR7;T&PX`j#0!N=h7I2Nxw=kXL+XxT9oe%zM4( zO^+%cuDxH$Hz#;sl&)HVL8I%N1pDQ+It%3Yd(Jpbc2TIv70J8nPTg7XIo&Z==JC2i^A^O4gt#+L7TuP3N4}#n zXOZ}ZSXcRCwhV6l{DGbteD- literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_grid_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_grid_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2db18582c2906e204f3007cee270ebb97d488f3d GIT binary patch literal 422 zcmV;X0a^ZuP)nP^NG9}0Xg73$+A(`%eX zYzI39{ssql7LECiivmBWLRIL&3vJ;l)4%wY2yGYmE9@sid-zk}4^yF6IL-8D`$mSD z#&Ur_#aqlqW7hGbz;C2NHTPvom>aoHkI6R)-;Bwd7v{;Re#UAd^Sr?C;Dx(qSx;Cv zIesw}nz&_Og{n{$`rks`_9mmc@9tUC2>VQqKfqEeKFkun6!?`?Xr_IlT%U}|ckn3U zJ9v5zUo%z~aGdD??<2Os%L0EaoPCd@F)PBv&hcxh&?YW3J;zDJcJQgdUt(97GsAqv z?*jiV6`HtZUxljBgA?kt7f1C7?;^GlzJYW6K-hQU<6v3%S3~y+=Pi1$(<;cOV(H#lW46F2v!N|ChQ%k7>%-!E3i_6g_mVx5dujOo5y0d zI636}IEAo;^TF4>|L`)*IX}}hHUAjg!?@7bc#^QUaX;Y47-BJ*8Dcl!N4d~gIe+jo zVOvZB9*(e*%zVOGz)!1C6}s_4uW(uD1%6~g`vHH6!%XM{eh2*LT<9@Q3jKyj!Y*JV z;7{-ZcaoXs_!{urO--NZ)O?^ zeS(KLE_8~Q2|K`}fIr3-mXevx*@s=?pXEY(I4|@R-xIdQn}9#Zdn_k2@9-<&KjuPn zckHWB6}oXkBi(&-UB6%_VFy?X_^IyRNq5_y!)Nt?}n0`#~?julWV6q_xt# z+@^!3z>|3ooJku?^YXgu{r4201ZHLp45Xb%^Rh|@W%tTr(0_x@fu(r|l+r3`US4#) z|DMABH*U;1FqC#G&CAPl&@=F3egciOM`>QZr-QP4W!Vk70bb1wFp)Ns=H;T}`3FG| a9F-kHEtdRUpr-Wz0000(&8NluWs++?wI<3<(9<}%Lxe&b)qs9!&MB^6DRV=&HVmA{$B#OOyRr2L$9JE zd(W~*+bF%M%6}EGz*pc{hI1p^_ePV23?Vbpf{s4fV`uu^=CzPUBM4RG+bL}D;p{0m uJK?^8ALjv<>XIEUFA5Img#Np1%UBdDwdP%o@-m>q7(8A5T-G@yGywoR=S(#K literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8f10392cac7644b0c4b09e20f52ce13b0bd60970 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjy`C>7wES+6Ote6n0olNO-6--h0jII{NMQ zMy}ueaxKL&dsZH6FiSF+QpS_;E_|3jq z-tICB4OJT`os5MAKy2_72&JcE@I(tr;OXR{1bc&@ftK`~41V|vz7mXpyOXOD%niO% zf~~<9G+Du${E8D(y|d0rZSER8r~U^6gJ)Xc{}lNzNM(c0Q3-N`Pk~5!CI&CGAe7U% z`NSi|BZG%DS$*K<olS)$JH_nJvHzcIY|_&nd#`n_Gtesxp00i_>zopr09-L;Gynhq literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f0d3f5f7cff9f53b0fb070d4d40d4ca6f64fccee GIT binary patch literal 254 zcmVYH5>z7jL9j@K;A&C})*(v>SY-hgf<>yNbOAPL-GFPb&jM_+fX8A!;ikPZ zW1$D$;=Ik_@^M?OOU@&Bzz~Dz1)jp?(oY9w_{C53TWrJS@|_NRsj`WFk3Yv{l@3hs ziTCJT%){mK*2sMiFDP-1GI3Yoaw*e++HX+%KpQ=D6L%9XmrkvB{TIC81Fz9Ln1;(` z+~^G!*kK+0PW9b)N3cu>`WWFcdV%L~xeOY)?1EO|r68}40 zUw*tDBk^sD*$$bkKW4n^HXg}csAsr6{XYMs|4-Ph*TwJfo+p+M^dN($tDnm{r-UW| DT4rf% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a1b828bf928a98888a4fbbf9204c1f87e7fef099 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUto1QL?AsLNtZ`pb=2THU)?7Y#z zvvFIYXjxM$m!6{Dan>E&;tCNrZ)tvecX)r1ob<#g&z_yTBXFKOzFuy}U7zbqbvbPH z!uM3ZzPtb7xmUJZ?%hq4@0Z|WV4hcK@a(|tro^qg`4<%amoDgCeyn^mUqaj5W9Hgy zIleR2f9*PL#ih`|z{G)txWV9XvV6m(wp$Hy^1@8}3L=CzbWi7GTz_LV+YiS%k8+zn zzTdIJs*bZT=g#skos$EP=_^*vNo-v0wf(?O-(PgSGY6|=t%}oS3j3^ HP6baGgzB8KxQ$Z_4x!K2xpWj9bL^zv58&q<`;ZeoWf)DEOGbhq`oShT0EV zm;77zsn#lfQDy$Z5O;9*#D98U{4eFV{>x}!WRpl}V610fahbpSPTLpjh4vHo3I1Yb zuDEyMIzt6ZzW=Z03-KQI;=e?hQ~pbs9$;YRF*wk$hB5coqZ1py|J-~b-t#`^-&u?{ z`7g9TR0_GQQ~c}m!unEw>%OFhH}Z?Yrn5;*FkRpy@6z|ze!oc7H@kSwzb%Y=^55|0 X$7` zqU(&r2M$L>yVr1SmXe8hQzoBy*8PLvw~p%z-tIqCKY8|U_B@-1Eww%No<9Bz28;o& zddmNTK5#$sXRSZSq;=%7(0|1rvLCY#=F2=_V7EBH$oFG+1CN9BPUesOP4$X(dOv0> z9GJ23^UscX6RidR>-;c(w4Sy8IMb^4;o1wPr(a>@D`;SrdC=g91B&4a&o@$P!+|GYkUKRVB1pUOD3;8<0qn=I5OiIM{{4#GPh)XE(Q`_TNq il40co{U(Ob%5nSJyb}&CK9vgeGJ~h9pUXO@geCw&^>^0* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_list_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_list_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0f7327fadeacdc39422adcbe44146bc63ad2b13f GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUteV#6kAsLNtr!MSr3KVe__dlv4 zaYU2tzcY_g(?KPR1&#vU|KEt;(D^nqVdB|5eVLb0W!j~_*yzEe?w1AVh)B=4oAjj#u-m?RtcV+|CnnTpCklVl{_vmKH kt&ktD*?@L)DAq{-Z;Fy02N)%w#4?n6R z;nIEZyFhbC!iJcD3kn@a%fE5vi2c5Ce!K6E*XJc?m?iq(TxE1jBDu#?yU=4l6FZCK};Nt#`3;4=`Yc3ke;b~mZPFrSI1ai;~RRj!eY zEAzg8y;Tm~f1WiMUg+4o;Ii7`Ov3{+%o(#5=wAb=KN>5#fg$gaBFJ!Q-XFirUoq+m r@kKEEe-tXYm9j&h4P^hZKZ^Q^pIZ|i?3U>R`h~&M)z4*}Q$iB}8Q5WF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4cb4c08e2d5bc8bbb83fc99bd95d02010b5a9e89 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U_9vQ;uumf=j|O^eU?Cm)`#Ys zwBiL7ITn60HWA|Ooaf}cIB20`^Q54~YF71aQ34-DcXwuS@9w&pq->b3zOy_n?A+uz zWySAj_x2{Soq02V1q1Vegoe-}yXum^2iQKa>|wtl=J}>Rk>v(kTqD~Bo()nPxO<*e z^lKbzu$`3ex5DD=we-D=?FUlww!b{USTHSdx=Nu_>(9O753C-~^lJ*wESCScsdBB9 zmDldyLNON_mCiRFk?}awcw`aVEybTR-#mNEzW&m({wMd_^5Wt@Xr%?N3HT#_$8Wpb zN=GerAsLSXg@cVOG+=~r{8lMmW2&KX!6@K-#SNt}_G?O}9;W`~HVNN3bdGvX$Ya~V zw9i<^?0qe>`GJ@vY%8@6XnnZwFtPiF@dnN>ZdnSwjK>cgmuJ^0GJP;bXwR;st|yik z(ocO}{f$qCar4J@bI%%VV3@LSxA*fT%8G@kN6hOgcYS? c#@hSkBi)|*CH`6b4j88lp00i_>zopr0G|KJPXGV_ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bd11b4c66ce16c9380af0941567031454e81d02e GIT binary patch literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VBF^E;uumf=j|QCY>`Bfwu=JS zw2mnpT(IcKsriY@H#BZ!Cob-tI`x)|wC~ELy<3x>&%YQI;^J$-xLV}o#v7pmDS1uC zzf%uaKiGEqPI`OfwjXJEdP;pvJsUcNZO^RuYPa`L;hkgYIbRIQH{PgPAD1Bc{R40H zuZ_Lz7FVnG|8EktnRCao_Nd{{HSa5WHn08uhq?d5ABN9aLg^auAD=Z`-(r`tfS*~< zS~r^Wif$tpXNboFCnixg-V*uO#&+4xY*7aPZX2B5Y!I=akM!7HSI3Vtw^l<#WI{6Rr|o>)z@2`(^Ls2)>wf(<0$JXLvMA)Y0rWX0iKk z>)m^l)a{^r=fLr0oV#id%F4{HTHv`v)aGc~WuE`rdefu!?_zqsA?;7D?6ml;yfz10 zmlf6>_KZ2kz2`9hpE;j$9@@q|;+hs+{*(JzZ+u;e)N|>xk~)d|O8Yx*Opm|pYH<0C Tc#eZw?LI_moH?*1-caYw{@t7% z9e;H9N!2l(Kl*Lc&i|}yy8g0$xOZp%^-7+U1q&LR*tn!LGO#cbc(&yIV6+jtZGQHz zX+iv(c&7Dd{~oqFzk{jnm2g2^&U};a^BXrO)%O=pE&I0pwT+UJ(*K#Mhog_Jt?6oh z_D{${?^}7p>u3MgoO|qf%e@zmO<<{G4y)VvuiRhTH~Y8tgDp4iv%Z`4JGxX(P;lb^ zGm9RIK33NVeq-`oyeImnNb~{M;`+_!jQOJMzxEbN%z3nH=l^pS&wUCR_n3VD{@P~V zlG-aA*gXYxg#`0iX}Q4v_p`3unIBxg{Z`7J^Dp1zU#WC?BL0&tnlG_7R(jnJU?ebj My85}Sb4q9e03TGkZU6uP literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_grid_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_grid_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe059481e836a0264e83096628fc1b1ce6023db GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V9fG#aSW-L^Y->auVzM(wugxV zZPOZ!0`D{_9O{b5aT62^V{x3Y_3qT~37@3G_HfKD|0tDaCttzSx0ip;uh!`Y>wf%X zXZHN%{^BQ7*wJr`cJgn~`Ig^UT3nyBU{)g&GbF(9e?nGzPS~X-eH)JB2cDuVN;?1mG^7U&HnBEV9^bGre|mW zHXBV)@x0xAcJq<^_iPq=+uYCojefA=hCM^t*}s29GVbmuPYBGpZ~FcEfju|oGp;}T zw~*_~Mq&R;vN(JMvN1uO$ych}?c-iigPeE%8uy|Ze;?SfbALG7q%YI=G5(IxZ9H?7 RIT;xE44$rjF6*2UngGv?vcv!Y literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_list_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..52d0c00a17994990d99d28d8cc949109e2187854 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!uRUEHLn`LHy=j=`6e!U8P+qC) zfw!PE^R7;j&Iep7LQT;e5j%sWt2cVhJfy_kaWvcb^MO~rf8^(UGFiTpSzN_)5(vEv z6Mn!jr)iJM-4(%_?hh=bUkLtS{MWQ*Qr?x7Q{odII`BOKp}#)Q9he`;-e8-l22v=0 zz(U$%(vn?l2c&-Re40|S*l%ghi;8EqB72v}o@kUg(O5P6Tw~h-@eTY&-n#;q2bFD+ z7oVhZcOmlzP{PuJJ8zzopr08o&4p8x;= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e5f698298456b7cb877e2352de76ad338dcf2a03 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!?>t=`Ln`LHy=Lge93bF&vB6Pr zlE^KM8NN#l8rL|82yR!1*cm+g%R#NBt*zWU%rfuu-1u9-@AGrk?LYQ2JtnDm0@0=Y z48{+HZ?s2?-rgelvg|;vXa-}=#X(|b2V6x@fb>j4=*i%#VYGjE4QwQHfjBeBkw6sml7DY( WbI`(vbM66s&fw|l=d#Wzp$Py9vUe{4 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ab07ea2ae96b3ffd072d9644d118d8b55bda90dc GIT binary patch literal 541 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V0_}~;uumf=k4A7tIik79RK+I zk&Jo_BXg?J9M>Q=<>sX6(gCLqEa1^Q@Jw%t_k=TQrA2D0PyJ^~q%1gGV70jQ{PW*` z{#Mw%DrKDi{qy(N<=dD&C#f9ZOklq;cZ=+UD@p4kjnf;hA2@%qnmI@R%d)K-dG{p$ z`^f)|(_;IH)7K6}CiFk;tKVSz;1JXM=*;Pj=XL7;G}kh&^Q(WVa=c-E#qsE=wak70 zpX&biVC32$q}{NG=>&qf%#_1W-cbGj=ete+6MZJRluG|!Kj~(*!J8;y5r;5_NX8V_ z38DkRxO>R{!kfGDWotR}9>`~W%j4U9jpg}Aev@kP_Sozu-Uqh-CZ@er-eCDAYH|$o zzQ^*}U+NgHv){{{<$S>SPjl}*?gt+ZSo@Z;RCLyF39M$7k*!+DI)`Q6qd)5(1m0$z z$Gp5fF3oZF0q1Y^Gp=hMk^8_{!IHzfzbk=z2a8SG|JQ%YT(@)EFs}R1FJtF9>CZ9! Ysek4lOXgEx0Y*E6r>mdKI;Vst04N09wEzGB literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a8358eb71286cb51ee10a3633a3f24ebfe0a933f GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V0`82;uumf=j~nFEYU=U)`uoi z%_q6G1Z>#kp{x`Uk)@cSpXVT;lcX4t!dUjssen`IT9}i;RD~w{gr%(!8s9hWh}j@n zKk1I8uq}TL_m6X@4KANOGHx<) zm^Pq-VtLE2OCJ3D=t@!oSBc}vUXTDV`9x)o^d{jBhLzSSOY{Vgu?8)n`6IlVyk z{vl`G!{v88-v5raXj=Yo+x zWnOhtsEt9rq5Lud<2}cn*DNi+W4`90k=#uCbNOmjWgjKN|93uIy=qm~4gRywycD%B Ss~-nOK7*&LpUXO@geCwAq2jUt literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_grid_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_grid_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..fe78d853e74f89291e5f1002f193801d8fd1138b GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U^Mb{aSW-L^Y-q>Tqj2X*Nftf zvFoK5Fx9aKG%!Er(l}IPTh?Gce`=a)cl|mO#aUP9b*L&#RPp@3O84a6NeqY}38*cjl9&RSn5V086#aSW-L^Y-q+%)<^Mu7T^{ zthi?~fol!l8>THC!Hr!4tDdJm%whg~l1K1I%#5X#PRCbs9$7wF#nZ~q^O;Ka^J48c z-|xjuUeo%wpYiv1mFcIrU)&9=V06}cqtE>8yNWQ-CVW7K;lZ?&*EM$B`U}2)n|4e5 zfmOo)iP!8;c~4UDob)B?XzYdk_gU96%i%KvDyQHH)N?6&>hu5SU=;LpaSW-L^Y+eKuhKw~)`yJ$ z?yQwK6ZL1E;}*`O&9htr>?VsVm>E{c-twFKc?oB=E&ram4IfWd~YbdU?pCapWtK=NmQ1i<=1FgO$YU^vvF&zt!)}%T z-R~yLnB|3*hrL|*F$`#!kELf(WXY^23kp~7+U%9yyZzQj-Had66Bv0m>;!8wK2X3W zagO2eThjxTlU6V4{_;;?^}98f_8*I8WMD9OYIQRCqHmS`xwSyC+{bInYPhBTiKQ?w z=jb791{zV#`(e_PR2tQ+DP=@0BoMa8a1Lb+N&0-mmZF6*2UngDQH BgQfrg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..053a1a0da97aa4ac5f9aa2d4836fe12394d87bc3 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U}X1naSW-L^Y)IlSBs-S>qSQS z-J;CNz9qbiW-6pDb5qig+R0!j%zV9&H^!m#utDn=%Yw^Z`!Z%dyq^O!1PmHfRVsZx zg}%`|dGNs6SLd{jcw lu3HAQ_#W6|um>3a-_n=QIhto+n7jfc;OXk;vd$@?2>{=GdBFex literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/activity_main_player.xml index 7d7e1230e..5f484267b 100644 --- a/app/src/main/res/layout-large-land/activity_main_player.xml +++ b/app/src/main/res/layout-large-land/activity_main_player.xml @@ -239,7 +239,7 @@ android:focusable="true" android:padding="5dp" android:scaleType="fitXY" - android:src="@drawable/list" + android:src="@drawable/ic_list_white_24dp" android:background="?attr/selectableItemBackground" tools:ignore="ContentDescription,RtlHardcoded"/> diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml index 3dccc5c4c..8cf9ba32f 100644 --- a/app/src/main/res/layout/activity_main_player.xml +++ b/app/src/main/res/layout/activity_main_player.xml @@ -237,7 +237,7 @@ android:focusable="true" android:padding="5dp" android:scaleType="fitXY" - android:src="@drawable/list" + android:src="@drawable/ic_list_white_24dp" android:background="?attr/selectableItemBackground" tools:ignore="ContentDescription,RtlHardcoded"/> diff --git a/app/src/main/res/menu/download_menu.xml b/app/src/main/res/menu/download_menu.xml index e79367135..4e2b32715 100644 --- a/app/src/main/res/menu/download_menu.xml +++ b/app/src/main/res/menu/download_menu.xml @@ -3,17 +3,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - - + android:icon="?attr/ic_delete" + android:title="@string/clear_finished_download" + app:showAsAction="ifRoom" /> + + + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7b879fb4c..c0e7fa532 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -38,6 +38,9 @@ + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 87e19cede..da1ae0e38 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -22,7 +22,6 @@ @drawable/ic_info_outline_black_24dp @drawable/ic_bug_report_black_24dp @drawable/ic_headset_black_24dp - @drawable/ic_delete_sweep_white_24dp @drawable/ic_file_download_black_24dp @drawable/ic_share_black_24dp @drawable/ic_cast_black_24dp @@ -54,6 +53,9 @@ @drawable/ic_add_black_24dp @drawable/ic_settings_backup_restore_black_24dp @drawable/ic_blank_page_black_24dp + @drawable/ic_list_black_24dp + @drawable/ic_grid_black_24dp + @drawable/ic_delete_black_24dp @color/light_separator_color @color/light_contrast_background_color @@ -82,7 +84,6 @@ @drawable/ic_headset_white_24dp @drawable/ic_info_outline_white_24dp @drawable/ic_bug_report_white_24dp - @drawable/ic_delete_sweep_black_24dp @drawable/ic_file_download_white_24dp @drawable/ic_share_white_24dp @drawable/ic_cast_white_24dp @@ -114,6 +115,9 @@ @drawable/ic_add_white_24dp @drawable/ic_settings_backup_restore_white_24dp @drawable/ic_blank_page_white_24dp + @drawable/ic_list_white_24dp + @drawable/ic_grid_white_24dp + @drawable/ic_delete_white_24dp @color/dark_separator_color @color/dark_contrast_background_color