From 9cd1b4f3ba66499f5d45f2940c1ae1ce6a61b945 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Thu, 9 Apr 2015 15:44:28 +0200 Subject: [PATCH] New notification icon and setting for toolbar opaque --- app/build.gradle | 4 +-- .../helper/PlayingNotificationHelper.java | 2 +- .../ui/activities/MainActivity.java | 26 ++++++++++++++---- .../ui/activities/SettingsActivity.java | 8 ++++++ .../ic_audiotrack_white_24dp.png | Bin 333 -> 0 bytes .../ic_audiotrack_white_24dp.png | Bin 236 -> 0 bytes .../ic_audiotrack_white_24dp.png | Bin 328 -> 0 bytes .../ic_audiotrack_white_24dp.png | Bin 509 -> 0 bytes .../ic_audiotrack_white_24dp.png | Bin 625 -> 0 bytes .../res/drawable-xxxhdpi/ic_notification.png | Bin 0 -> 2911 bytes .../res/values/strings_activity_settings.xml | 1 + app/src/main/res/xml/pref_ui.xml | 5 ++++ 12 files changed, 37 insertions(+), 9 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_notification.png diff --git a/app/build.gradle b/app/build.gradle index 19261db0..f3e46209 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "com.kabouzeid.gramophone" minSdkVersion 16 targetSdkVersion 22 - versionCode 12 - versionName "0.9.6.2b" + versionCode 13 + versionName "0.9.6.3b" } compileOptions { diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java index 2eb771c2..ab2dc5d1 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java @@ -46,7 +46,7 @@ public class PlayingNotificationHelper { R.layout.notification_playing_expanded); notification = new NotificationCompat.Builder(service) - .setSmallIcon(R.drawable.ic_audiotrack_white_24dp) + .setSmallIcon(R.drawable.ic_notification) .setContentIntent(getOpenMusicControllerPendingIntent()) .setCategory(NotificationCompat.CATEGORY_PROGRESS) .setPriority(NotificationCompat.PRIORITY_MAX) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 2c16aadb..4dd6c33b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -9,10 +9,8 @@ import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.MotionEvent; import android.view.View; import com.astuetz.PagerSlidingTabStrip; @@ -24,6 +22,7 @@ import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; import com.kabouzeid.gramophone.model.MusicRemoteEvent; import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent; import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; import com.kabouzeid.gramophone.ui.fragments.NavigationDrawerFragment; import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.AbsMainActivityFragment; @@ -116,14 +115,19 @@ public class MainActivity extends AbsFabActivity setTitle(getResources().getString(R.string.app_name)); toolbar = (Toolbar) findViewById(R.id.toolbar); statusBar = findViewById(R.id.statusBar); + setToolBarTransparent(PreferenceUtils.getInstance(this).transparentToolbar()); setSupportActionBar(toolbar); - float alpha = 0.97f; - ViewUtil.setBackgroundAlpha(toolbar, alpha, Util.resolveColor(this, R.attr.colorPrimary)); - ViewUtil.setBackgroundAlpha(statusBar, alpha, Util.resolveColor(this, R.attr.colorPrimary)); - ViewUtil.setBackgroundAlpha(slidingTabLayout, alpha, Util.resolveColor(this, R.attr.colorPrimary)); setUpDrawerToggle(); } + private void setToolBarTransparent(boolean transparent){ + float alpha = transparent ? 0.97f : 1f; + final int colorPrimary = Util.resolveColor(this, R.attr.colorPrimary); + ViewUtil.setBackgroundAlpha(toolbar, alpha, colorPrimary); + ViewUtil.setBackgroundAlpha(statusBar, alpha, colorPrimary); + ViewUtil.setBackgroundAlpha(slidingTabLayout, alpha, colorPrimary); + } + private void setUpDrawerToggle() { drawerToggle = new ActionBarDrawerToggle( this, @@ -269,6 +273,16 @@ public class MainActivity extends AbsFabActivity super.onConfigurationChanged(newConfig); } + @Override + public void onUIPreferenceChangedEvent(UIPreferenceChangedEvent event) { + super.onUIPreferenceChangedEvent(event); + switch (event.getAction()) { + case UIPreferenceChangedEvent.TOOLBAR_TRANSPARENT_CHANGED: + setToolBarTransparent((boolean) event.getValue()); + break; + } + } + @Override public void onBackPressed() { if (navigationDrawerFragment.isDrawerOpen()) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java index 2adf7635..1a2fd512 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java @@ -54,6 +54,14 @@ public class SettingsActivity extends AbsBaseActivity { } }); + findPreference("transparent_toolbar").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object o) { + App.bus.post(new UIPreferenceChangedEvent(UIPreferenceChangedEvent.TOOLBAR_TRANSPARENT_CHANGED, o)); + return true; + } + }); + findPreference("colored_album_footers").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object o) { diff --git a/app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png deleted file mode 100644 index 07db49ef86f80695941b9a049fdbbbf334fc810b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^){JIEfexWt=vK&gy@!_$mo_9C~C$L_p`)>U3v5ZL@8 zeS)5|T{Cwx&tdbn%{+Whq(j(S&a`Y|O>BPE5GBF!T;GZ9rQw{zkED!vW*wf;<80c= zW}7f!d7oo_K}AnWvz_sW2LZ7s3>rn6`HXKo2*^EI&?M4qB(W?xw7T7~_o2Ne+eXI4 z@zUK<^=-aO!X{|({BE4dY&+3xa`5FY=4R8LM$S{!Cj!oFnD$32y6s@6qu7kh^UTfv g-)C%YD`H?!yPL$wK0}X#fq{X+)78&qol`;+0B=TdZvX%Q diff --git a/app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png deleted file mode 100644 index 3882039222519be9da4b98f3f933d1a8b63619d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*O)8DV{ElAr_~fUN+=wP~d4zG~=CfKwzZD^xQ#Gd3|WFfe$!`njxgN@xNAF5OHG diff --git a/app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png deleted file mode 100644 index 30119cdbe535afb76afb79e2edaba34611828563..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsB3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*J~228IKkE{-7)hu>be=Q?B{a{S{L6+XYE;sv_0Q{>J^3S{a(e5Uf~0pp*` z(jCow+xX(ew_jSKSm~#q|G!p2g};tX+1ibf^;fbrm&ODB4*OtMkpPFr`zlken3U95 zZ0_Psk@>rAxqQHfPqF9i9G-RXvk1L@>cZePfi)|0!9+Hz%mq`~^3MGTmI$zHOqJMB zz_j_o{F)8N@(=%ZJXLJ)@0^Mo<4N|8<2znUZeADsZSN1+%R5A~&b4XhN9nE6+>)yG dA^!pQT-^ox6@9!8F)%PNc)I$ztaD0e0su;6b9Vp$ diff --git a/app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png deleted file mode 100644 index 4590b76e87254063907be1c6ea018f0e951e3df2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 509 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?$Q&&$Oy(qI?gzwvevvN~*1mFHVcV@az&HTqEwN<9JpU-^1Jj4Ie z)}AJjB?_#6B`4HQ2%OL)vSh)3E~8BAm7+@&ST#Kyxq>D%iA<5uIBb%fBDtWMEi`ZE zqEFEZ{YsWmi_e`aY^?DrIcj+3IHS>&h)F5C+1_?poO850eko_VLjQrP_bNo@pX|p+o@s^wcD~Q4*BeIU_AVi>FP@#@fXcvwNAd*ZIvHAk#@V==r>bT{r%<_ zd?x;pb8JqwS_kO+ADX7AUKZ8-9-*O)V0|SGn LtDnm{r-UW|gz48( diff --git a/app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png deleted file mode 100644 index 93ad3387ef8e776ffdc07190845b99c1dc68b013..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 625 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?OAX zE(s_3po&AXdKVmYvmBfr^7}J-X(azTe%*>=m+EoWfFo+3)J_&kI7xmdK II;Vst04at382|tP diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notification.png b/app/src/main/res/drawable-xxxhdpi/ic_notification.png new file mode 100644 index 0000000000000000000000000000000000000000..a401d50f33cf635410a2871597e3623765335245 GIT binary patch literal 2911 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 eQZ(8d|10 1 + Semi-Transparent toolbar Playback controller card Colored navigation bar artist view Colored navigation bar album view diff --git a/app/src/main/res/xml/pref_ui.xml b/app/src/main/res/xml/pref_ui.xml index e1c515b7..d624c0f1 100644 --- a/app/src/main/res/xml/pref_ui.xml +++ b/app/src/main/res/xml/pref_ui.xml @@ -10,6 +10,11 @@ android:positiveButtonText="@null" android:title="@string/pref_title_general_theme"/> + +