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 07db49ef..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png and /dev/null differ 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 38820392..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png and /dev/null differ 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 30119cdb..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png and /dev/null differ 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 4590b76e..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png and /dev/null differ 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 93ad3387..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png and /dev/null differ 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 00000000..a401d50f Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_notification.png differ diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml index c69b50a7..ea6d2d67 100644 --- a/app/src/main/res/values/strings_activity_settings.xml +++ b/app/src/main/res/values/strings_activity_settings.xml @@ -32,6 +32,7 @@ 0 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"/> + +