From b8595ddaf5b0b176ea774ac6278c5cf03eebe596 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 28 Feb 2016 23:25:34 +0100 Subject: [PATCH] Replaced the big pink heart with a vector drawable. --- .../ui/activities/base/AbsThemeActivity.java | 4 +- .../gramophone/util/PreferenceUtil.java | 79 +----------------- .../ic_favorite_red_a400_96dp.png | Bin 7942 -> 0 bytes .../layout/fragment_player_album_cover.xml | 9 +- app/src/main/res/values/colors.xml | 11 --- app/src/main/res/values/styles_parents.xml | 14 ++-- 6 files changed, 16 insertions(+), 101 deletions(-) delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_favorite_red_a400_96dp.png diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java index 5c2e2e00..8b6ff85a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java @@ -27,8 +27,8 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity { if (!ThemeStore.isConfigured(this, 1)) { ThemeStore.editTheme(this) .activityTheme(R.style.Theme_Phonograph_Light) - .primaryColorRes(R.color.indigo_500) - .accentColorRes(R.color.pink_A400) + .primaryColorRes(R.color.md_indigo_500) + .accentColorRes(R.color.md_pink_A400) .commit(); } getSharedPreferences("[[kabouzeid_app-theme-helper]]", 0).edit().putInt("activity_theme", PreferenceUtil.getInstance(this).getGeneralTheme()).commit(); // TEMPORARY FIX diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java index 1deac769..bae173a8 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java @@ -6,7 +6,6 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.StyleRes; -import android.support.v4.content.ContextCompat; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.helper.SortOrder; @@ -23,9 +22,6 @@ public final class PreferenceUtil { public static final String ALBUM_SONG_SORT_ORDER = "album_song_sort_order"; public static final String SONG_SORT_ORDER = "song_sort_order"; - // don't use "colored_navigation_bar" key here as this causes a class cast exception for users upgrading from older versions - public static final String COLORED_NAVIGATION_BAR = "should_color_navigation_bar"; - public static final String ALBUM_GRID_SIZE = "album_grid_size"; public static final String ALBUM_GRID_SIZE_LAND = "album_grid_size_land"; @@ -39,13 +35,7 @@ public final class PreferenceUtil { public static final String SONG_COLORED_FOOTERS = "song_colored_footers"; public static final String ARTIST_COLORED_FOOTERS = "artist_colored_footers"; - public static final String OPAQUE_TOOLBAR_NOW_PLAYING = "opaque_toolbar_now_playing"; - public static final String OPAQUE_STATUSBAR_NOW_PLAYING = "opaque_statusbar_now_playing"; public static final String FORCE_SQUARE_ALBUM_COVER = "force_square_album_art"; - public static final String LARGER_TITLE_BOX_NOW_PLAYING = "larger_title_box_now_playing"; - public static final String ALTERNATIVE_PROGRESS_SLIDER_NOW_PLAYING = "alternative_progress_slider_now_playing"; - public static final String PLAYBACK_CONTROLLER_CARD_NOW_PLAYING = "playback_controller_card_now_playing"; - public static final String COLOR_PLAYBACK_CONTROLS_NOW_PLAYING = "color_playback_controls_now_playing"; public static final String COLORED_NOTIFICATION = "colored_notification"; @@ -89,17 +79,6 @@ public final class PreferenceUtil { mPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); } - @SuppressLint("CommitPrefEdits") - public void setGeneralTheme(Context context, String value) { - String[] allowedValues = context.getResources().getStringArray(R.array.pref_general_theme_list_values); - for (String allowedValue : allowedValues) { - if (value.equals(allowedValue)) { - mPreferences.edit().putString(GENERAL_THEME, value).commit(); - return; - } - } - } - public int getGeneralTheme() { return getThemeResFromPrefValue(mPreferences.getString(GENERAL_THEME, "")); } @@ -117,35 +96,6 @@ public final class PreferenceUtil { } } - public int getThemeColorPrimary(Context context) { - return mPreferences.getInt("primary_color", ContextCompat.getColor(context, R.color.indigo_500)); - } - - @SuppressLint("CommitPrefEdits") - public void setThemeColorPrimary(int color) { - mPreferences.edit().putInt("primary_color", color).commit(); - } - - public int getThemeColorAccent(Context context) { - return mPreferences.getInt("accent_color", ContextCompat.getColor(context, R.color.pink_A400)); - } - - @SuppressLint("CommitPrefEdits") - public void setThemeColorAccent(int color) { - mPreferences.edit().putInt("accent_color", color).commit(); - } - - public final boolean shouldUseColoredNavigationBar() { - return mPreferences.getBoolean(COLORED_NAVIGATION_BAR, false); - } - - @SuppressLint("CommitPrefEdits") - public void setColoredNavigationBar(boolean coloredNavigationBar) { - final SharedPreferences.Editor editor = mPreferences.edit(); - editor.putBoolean(COLORED_NAVIGATION_BAR, coloredNavigationBar); - editor.commit(); - } - public final int getDefaultStartPage() { return Integer.parseInt(mPreferences.getString(DEFAULT_START_PAGE, "-1")); } @@ -166,34 +116,6 @@ public final class PreferenceUtil { return mPreferences.getBoolean(COLORED_NOTIFICATION, true); } - public final boolean opaqueStatusbarNowPlaying() { - return mPreferences.getBoolean(OPAQUE_STATUSBAR_NOW_PLAYING, false); - } - - public final boolean opaqueToolbarNowPlaying() { - return mPreferences.getBoolean(OPAQUE_TOOLBAR_NOW_PLAYING, false); - } - - public final boolean forceSquareAlbumCover() { - return mPreferences.getBoolean(FORCE_SQUARE_ALBUM_COVER, false); - } - - public final boolean playbackControllerCardNowPlaying() { - return mPreferences.getBoolean(PLAYBACK_CONTROLLER_CARD_NOW_PLAYING, false); - } - - public final boolean colorPlaybackControlsNowPlaying() { - return mPreferences.getBoolean(COLOR_PLAYBACK_CONTROLS_NOW_PLAYING, true); - } - - public final boolean largerTitleBoxNowPlaying() { - return mPreferences.getBoolean(LARGER_TITLE_BOX_NOW_PLAYING, false); - } - - public final boolean alternativeProgressSliderNowPlaying() { - return mPreferences.getBoolean(ALTERNATIVE_PROGRESS_SLIDER_NOW_PLAYING, false); - } - public final boolean gaplessPlayback() { return mPreferences.getBoolean(GAPLESS_PLAYBACK, false); } @@ -366,6 +288,7 @@ public final class PreferenceUtil { return mPreferences.getInt(LAST_CHANGELOG_VERSION, -1); } + @SuppressLint("CommitPrefEdits") public void setIntroShown() { // don't use apply here mPreferences.edit().putBoolean(INTRO_SHOWN, true).commit(); diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_red_a400_96dp.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite_red_a400_96dp.png deleted file mode 100644 index ea3771d507ef8c34379bbc1f370fc68b6d5a8505..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7942 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 diff --git a/app/src/main/res/layout/fragment_player_album_cover.xml b/app/src/main/res/layout/fragment_player_album_cover.xml index 9a6a7afe..23f50ae2 100644 --- a/app/src/main/res/layout/fragment_player_album_cover.xml +++ b/app/src/main/res/layout/fragment_player_album_cover.xml @@ -1,5 +1,6 @@ @@ -9,13 +10,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + app:srcCompat="@drawable/ic_favorite_white_24dp" + tools:ignore="ContentDescription,UnusedAttribute" /> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 6178831a..0d2c4cc4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,15 +1,4 @@ - #F50057 - #3F51B5 - - #212121 - #424242 - #E0E0E0 - - #455A64 - - #FFFFFF - \ No newline at end of file diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index c4292da2..563ced58 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -12,9 +12,9 @@ @drawable/rect_selector_dark @drawable/rect_selector_strong_dark - @color/grey_800 + @color/md_grey_800 - @color/grey_900 + @color/md_grey_900 @color/md_divider_white @color/ate_secondary_text_dark @@ -41,9 +41,9 @@ @drawable/rect_selector @drawable/rect_selector_strong - @color/white + @color/md_white_1000 - @color/grey_300 + @color/md_grey_300 @color/md_divider_black @color/ate_secondary_text_light @@ -62,9 +62,9 @@