From 751f0b796aaa47368b15e372f893cbb9ec9f5511 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Fri, 17 Apr 2015 16:28:42 +0200 Subject: [PATCH] Fix in ThemeBaseActivity for the darktheme boolean and new "now playing" toolbar icon --- .../ui/activities/base/ThemeBaseActivity.java | 2 +- .../ic_play_circle_fill_white_24dp.png | Bin 0 -> 416 bytes .../ic_play_circle_outline_white_24dp.png | Bin 609 -> 0 bytes .../ic_play_circle_fill_white_24dp.png | Bin 0 -> 288 bytes .../ic_play_circle_outline_white_24dp.png | Bin 414 -> 0 bytes .../ic_play_circle_fill_white_24dp.png | Bin 0 -> 545 bytes .../ic_play_circle_outline_white_24dp.png | Bin 835 -> 0 bytes .../ic_play_circle_fill_white_24dp.png | Bin 0 -> 834 bytes .../ic_play_circle_outline_white_24dp.png | Bin 1243 -> 0 bytes .../ic_play_circle_fill_white_24dp.png | Bin 0 -> 1156 bytes .../ic_play_circle_outline_white_24dp.png | Bin 1732 -> 0 bytes app/src/main/res/menu/menu_album_detail.xml | 2 +- app/src/main/res/menu/menu_albums.xml | 2 +- app/src/main/res/menu/menu_artist_detail.xml | 2 +- app/src/main/res/menu/menu_main.xml | 2 +- app/src/main/res/menu/menu_playlist_detail.xml | 2 +- app/src/main/res/menu/menu_playlists.xml | 2 +- 17 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java index 2b92ecd8..3fb52435 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java @@ -51,7 +51,7 @@ public abstract class ThemeBaseActivity extends ActionBarActivity implements Kab ThemeSingleton.get().neutralColor = ThemeSingleton.get().positiveColor; ThemeSingleton.get().widgetColor = ThemeSingleton.get().positiveColor; // Dark theme - ThemeSingleton.get().darkTheme = PreferenceUtils.getInstance(this).getGeneralTheme() == 1; + ThemeSingleton.get().darkTheme = PreferenceUtils.getInstance(this).getGeneralTheme() == R.style.Theme_MaterialMusic; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { // Sets color of entry in the system recents page diff --git a/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1fb6dbaa7b9270f91ae2ebad59fd26182bb43ab2 GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?rhB?LhE&{oJL6#1AqRoB z=CyKMsz0QDsfpQs5%_S8T~KiTf`c4#)jCe{&NWT@nyxGf=dX(Vf8dMIt+VIeAPrO{tZNTz&f>W#k`}||JTn5Y=w_TV~ zx7WnZVUc19bC{dH(XC*W5WO1XUmLf1-fRg|i_zKXlq_r~6uxj>I%6@HZJFRKW3$?i zQ)XS`ES>S(XXi6cnHDG4uOHTM_0Ev4Tl>1PeBqU5UkzcdsdqSoXWVMpCg(KKpjCQy zz&eE^z7OxIl>`YrTJqt?@|G<@*RFfrJSzJ2k+|IN^w}2zG_HKNkYF!eyEtP*=@irI z=<6}*yk^%sy|?#gnsCTk7reJxpvuc(TjYL2XMvBF?5FFDDRGXcpG$2C`IjCgC4ThC z<_qQaS9{KfS}l{@kucAA^80yeXQ%V#N?8ZLa;|=L!~NHug=GdSJ4mJh`hKCF@W-u@?X?VIghE&{o8*$c)DNw}h ztl%%{J6--4syPC$EIQiJa--SBqq~JCE2E`s>qM`YhDXFVltwD9%#FU1X2q;-A+yZ- z`MEnvhnVG06udLPf99ub@V@uU{|N;dJK8IpV9H^%agaA)tWi*_c+0ba^TfX;3v3=R ze0X&_mum%c&gCYpA72XJvObt0FokhW`<(}J1socTToP{F_3YQB8rmlm%M~3H5|P=H z+H%nMRKu1BnU{a0$xFJst9rSfxbGvqL1Hn-G=}h=)l0Qk9OCHXo$`hAamkXVPdbga z+p5mUJZMwhr7Ku+pvX;hS*&m1=?3*f`{h+nB-JjHDQrHV$H*F1alND7U$rAFTydF# zCr9^@@-;$V9A(zBG%a$PpZvI^HFiM?Wu5iAgX-qi7`IdTr zqqn&+y!+mqdhqL_>K^4e{}!>HP2{X@YVka>qo+8!y!ETZLEjs~oQJQZ#^l{m-G8`a zUcvm69IIEJDpK2!9s1SFBU`ALCQjs9fh%ql20u-g_bbeMLkJSzM&Alp}*}7j|Kcy9UPj!&uax3#WIZx|gf}()W$zP!?W~#T0RkK2x zvJQIhTg`H_>AcBR)2Q7Ji#=l(bI$78Cs=rR-3N<5NmlD(RnjjP+6rENV6?LG$*)v4 slO0}J|L0}A&|LPJ`|oN0`?L8k{J0)9jZfzg0|Nttr>mdKI;Vst0Q7NnMgRZ+ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index 1d1ab66d99823083be7eb69e4c1840358c373130..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoQ$1ZALn>~aoqFGkDNx|p zcD=HN-vic^bG#H~a`rTNku?2FqLA3GGp}9bU8k*xPChBO(7vj8R_pr%3F&3urYvN) z6G%Jv=ZUrP=0-!cAO5Vn*<6;$WxAd6%wF-sR<(5EXKjbsU(&v8R*C(=z~@=M=D-}0 z$yrMTR!tTPI`%2(PAKEHAM7uqHhy6E;LoPXx+U^saR2cfBM)yTmovrJ?d<~H(B`jii=Pg&+F^64zL3cviwBoIq@tK$1 zue|VR-lmfontOq5$87Iru>@_Yp4!XFp>rngEBGE0U8dQ5q$&2!G)8T^RlC*&e_J7` zwuMnzx#aYO%D6eVSG~Tqs`cp7xiy!?=KH6095p@oWBmfwsExr!Gk$-(_~)o$2V!_jofYcW%qI)315=BnWoh zoN2yU`E4`*k<`0?%jO&B-%DXo*nBo6s4?UKZ=+0*^Q{vSGZh&(sWJWXlgU;LwNfu^ zG`i#(r&y;mA$!S`mII7NOO~&eRy1ibET5+3+i5*4`Njx#)*1xv1kxG5OuESMbRE!nu0mGSBnuK%qKy&_hoGo7OUtKa*T zxFyxW!8Fxuv8HlB>5eHDlXaho@rf1dZ#p{Xfm?8ccIu*wotxz}EVnKA>BRR~Pm`Tb zSF>6x`;pS&CC3EwPwdNzK3eXuVBPH-UPe=Y$;`Fvzg4sCvEa>zIq&>*?*Gv<*nZvC z`{kACm7f-DJoqqp_xU3k!R+4AKCD^aTYV;nykEaih$rupZ1C}%brH8q>SiY@Hs)UA z`kL#u?I?0= zv9HKh^GO01!{iqz=(c*)OmHez6f=Cn8YT3Z;qT+zr7Ss_>qWFHf?M{v240$dEkvYx zu`l=4u*jq=#1(x~_HQUei(TtU^E*CQzCy3U3{c@YLf@@i|q5}7|%+kf%#8x!=Y-iDFct7v& zv)z#gmo|u0h#ED{Phi$*mhos-RB}Gwl^{H){l>@pZkM(-1b(nfIN+ba*^{AjOoQ{U zOhWPWf5*ETLJmBsZ*I3*Et;^KM~~S>C6}W@Q{sDg-nAr~{k&3)??gNgG$njtc2&IX znaT8q^YLAC(FgvY+BbZPY@b=`R3Us{Lm`7ZLcFGK8~4+LvIR$v)h*OcaPtW27g7J< zX4=#eAUNqRuPozgrxhW+W_7ChgSPH~XSqKD_ zzjRt>|LFQU`y@HHZn48JlFSdi;Cj6!)6wCs!Nk3(Wv8^5eq>u;*I`|>!$p61o-m#_J zWY#i2W->X%lVj@K$>F!!U#|%>IxyGD_?wuoj{npr1{0U2tFB7db9%F8<(ir)+4 z-*4tE|Nko?H_mYB%N^@e6CZ_(JU?Dtc(Q!5-72 t*ZTLD^HW!8u|Mj57vZ3zU{%k!XsgJD?V>M^GB7YOc)I$ztaD0e0sw-ZbMycJ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2e4df6eb00f9bf68d68ba6f4adbcfda1490c55cb GIT binary patch literal 834 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D5|IXzt*Ln>~)opathBv9n| z-6>C}tlr4^pXD!qklV&fsS~)j|7B*|rTIsh%V_!pT45fyMZlm{lU03i`Hc^ zOSy#}%zLvaFN0Cav6lIFV0p4AtBDNf96t~9r3}1M+pnf>d~U4%lc9?B<1y|$2X29S znrSt)acljepzV)!EWNjTq`c~;{eS4$OzzTW2(jTZb3XjnFr&Ew?yE~6zU1sb-^ zWGnypvp>Lo3PWxhYeA$am zOH%mFzJ?{b--S!>vR{z-e4r|J@1$wF-!o^pN={hvblxw9D03!{Lq*wk4Owjrh0*W2 z`4D`hO(r!LiW?9iabtYT-!h#BRrm6ERS4rPm`do`;%~^lPeUHqun3%Tj z&w0WTz$)>pc}4SI9rgl^USlR7-HOka3||;#%(jSk<9Tk$QL-~g`)yuJL0Le!!-|P> zW^H;ccwzTbJ+A)^ut4lq*g_5sVn6QQltWckD>)y2odscZay&ufJ{$-r}?*D;-{jb8x q1FtVRK3gtf5`!uvVIEy=pS*Zt=*Q|AKN%Pp7(8A5T-G@yGywnvS8jO# literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index 00de7883710d78232f43c3603da90b4966b26310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1243 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 diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml index 93f072cd..15589f65 100644 --- a/app/src/main/res/menu/menu_album_detail.xml +++ b/app/src/main/res/menu/menu_album_detail.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/menu_albums.xml b/app/src/main/res/menu/menu_albums.xml index e80af180..6dc19722 100644 --- a/app/src/main/res/menu/menu_albums.xml +++ b/app/src/main/res/menu/menu_albums.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/menu_artist_detail.xml b/app/src/main/res/menu/menu_artist_detail.xml index 7e622505..c5b84e93 100644 --- a/app/src/main/res/menu/menu_artist_detail.xml +++ b/app/src/main/res/menu/menu_artist_detail.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index d36d0752..a2bec3be 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml index a3e93c2e..21929e7c 100644 --- a/app/src/main/res/menu/menu_playlist_detail.xml +++ b/app/src/main/res/menu/menu_playlist_detail.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/menu_playlists.xml b/app/src/main/res/menu/menu_playlists.xml index 8edb8b0d..9c0be2d2 100644 --- a/app/src/main/res/menu/menu_playlists.xml +++ b/app/src/main/res/menu/menu_playlists.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto">