From 13843095a8c5e2a695ebed5d1ac879e0737c7b5b Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 1 Mar 2015 21:17:04 +0100 Subject: [PATCH] Design fixes --- app/manifest-merger-release-report.txt | 142 +++++++++--------- .../adapter/AlbumViewGridAdapter.java | 6 +- .../materialmusic/adapter/SearchAdapter.java | 2 +- .../ui/activities/ArtistDetailActivity.java | 13 ++ .../ui/activities/MainActivity.java | 1 + .../activities/MusicControllerActivity.java | 4 +- .../tageditor/AbsTagEditorActivity.java | 2 +- .../fragments/NavigationDrawerFragment.java | 10 +- .../res/drawable-hdpi/ic_album_white_24dp.png | Bin 0 -> 534 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 330 bytes .../drawable-hdpi/ic_person_white_24dp.png | Bin 0 -> 360 bytes .../ic_queue_music_white_24dp.png | Bin 0 -> 271 bytes .../res/drawable-mdpi/ic_album_white_24dp.png | Bin 0 -> 385 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 262 bytes .../drawable-mdpi/ic_person_white_24dp.png | Bin 0 -> 278 bytes .../ic_queue_music_white_24dp.png | Bin 0 -> 221 bytes .../drawable-xhdpi/ic_album_white_24dp.png | Bin 0 -> 681 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 421 bytes .../drawable-xhdpi/ic_person_white_24dp.png | Bin 0 -> 409 bytes .../ic_queue_music_white_24dp.png | Bin 0 -> 333 bytes app/src/main/res/drawable-xxhdpi/album.png | Bin 962 -> 0 bytes .../drawable-xxhdpi/ic_album_white_24dp.png | Bin 0 -> 968 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 577 bytes .../drawable-xxhdpi/ic_person_white_24dp.png | Bin 0 -> 548 bytes .../ic_queue_music_white_24dp.png | Bin 0 -> 409 bytes .../main/res/drawable-xxhdpi/interpret.png | Bin 845 -> 0 bytes app/src/main/res/drawable-xxhdpi/playlist.png | Bin 464 -> 0 bytes app/src/main/res/drawable-xxhdpi/songs.png | Bin 740 -> 0 bytes .../drawable-xxxhdpi/ic_album_white_24dp.png | Bin 0 -> 1304 bytes .../main/res/drawable-xxxhdpi/ic_launcher.png | Bin 9693 -> 7560 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 739 bytes .../drawable-xxxhdpi/ic_person_white_24dp.png | Bin 0 -> 721 bytes .../ic_queue_music_white_24dp.png | Bin 0 -> 538 bytes app/src/main/res/drawable-xxxhdpi/logo.png | Bin 4957 -> 0 bytes .../drawable-xxxhdpi/notification_icon.png | Bin 1588 -> 1549 bytes .../layout-land/activity_music_controller.xml | 2 +- .../main/res/layout/activity_album_detail.xml | 4 +- .../res/layout/activity_artist_detail.xml | 6 +- .../res/layout/activity_music_controller.xml | 2 +- app/src/main/res/layout/album_tile.xml | 2 +- .../res/layout/fragment_navigation_drawer.xml | 2 +- .../res/layout/item_navigation_drawer.xml | 9 +- app/src/main/res/menu/drawer.xml | 2 +- app/src/main/res/menu/menu_title_playing.xml | 2 +- app/src/main/res/values/attrs.xml | 3 +- app/src/main/res/values/colors.xml | 30 ++-- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/values/styles_parents.xml | 23 ++- 48 files changed, 141 insertions(+), 130 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_album_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_person_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_queue_music_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_album_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_person_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_queue_music_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_album_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_person_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_queue_music_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/album.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_album_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_queue_music_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/interpret.png delete mode 100644 app/src/main/res/drawable-xxhdpi/playlist.png delete mode 100644 app/src/main/res/drawable-xxhdpi/songs.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_album_white_24dp.png mode change 100644 => 100755 app/src/main/res/drawable-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_queue_music_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/logo.png diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt index 38ffd746..9940dd67 100644 --- a/app/manifest-merger-release-report.txt +++ b/app/manifest-merger-release-report.txt @@ -9,33 +9,33 @@ ADDED from AndroidManifest.xml:2:1 INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0 xmlns:android - ADDED from AndroidManifest.xml:4:5 + ADDED from AndroidManifest.xml:2:11 android:versionCode INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0 uses-permission#android.permission.WAKE_LOCK +ADDED from AndroidManifest.xml:5:5 + android:name + ADDED from AndroidManifest.xml:5:22 +uses-permission#android.permission.READ_EXTERNAL_STORAGE ADDED from AndroidManifest.xml:6:5 android:name ADDED from AndroidManifest.xml:6:22 -uses-permission#android.permission.READ_EXTERNAL_STORAGE +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE ADDED from AndroidManifest.xml:7:5 android:name ADDED from AndroidManifest.xml:7:22 -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +uses-permission#android.permission.VIBRATE ADDED from AndroidManifest.xml:8:5 android:name ADDED from AndroidManifest.xml:8:22 -uses-permission#android.permission.VIBRATE +uses-permission#android.permission.INTERNET ADDED from AndroidManifest.xml:9:5 +MERGED from com.crashlytics.sdk.android:crashlytics:2.2.1:9:5 android:name ADDED from AndroidManifest.xml:9:22 -uses-permission#android.permission.INTERNET -ADDED from AndroidManifest.xml:10:5 -MERGED from com.crashlytics.sdk.android:crashlytics:2.1.0:11:5 - android:name - ADDED from AndroidManifest.xml:10:22 application -ADDED from AndroidManifest.xml:12:5 +ADDED from AndroidManifest.xml:11:5 MERGED from com.android.support:appcompat-v7:21.0.3:16:5 MERGED from com.android.support:support-v4:21.0.3:16:5 MERGED from com.android.support:gridlayout-v7:21.0.3:16:5 @@ -49,97 +49,103 @@ MERGED from com.android.support:support-v4:21.0.3:16:5 MERGED from com.nhaarman.listviewanimations:lib-core:3.1.0:26:5 MERGED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:26:5 MERGED from com.nhaarman.listviewanimations:lib-core-slh:3.1.0:26:5 -MERGED from com.melnykov:floatingactionbutton:1.1.0:12:5 +MERGED from com.melnykov:floatingactionbutton:1.2.0:12:5 MERGED from com.android.support:recyclerview-v7:21.0.3:17:5 MERGED from com.android.support:support-v4:21.0.3:16:5 MERGED from com.android.support:recyclerview-v7:21.0.3:17:5 MERGED from com.android.support:support-v4:21.0.3:16:5 -MERGED from com.afollestad:material-dialogs:0.6.1.5:12:5 +MERGED from com.afollestad:material-dialogs:0.6.3.0:12:5 MERGED from com.android.support:appcompat-v7:21.0.3:16:5 MERGED from com.android.support:support-v4:21.0.3:16:5 -MERGED from com.crashlytics.sdk.android:crashlytics:2.1.0:13:5 -MERGED from com.crashlytics.sdk.android:beta:1.0.2:11:5 -MERGED from io.fabric.sdk.android:fabric:1.0.2:11:5 -MERGED from com.crashlytics.sdk.android:answers:1.0.2:11:5 -MERGED from io.fabric.sdk.android:fabric:1.0.2:11:5 -MERGED from io.fabric.sdk.android:fabric:1.0.2:11:5 +MERGED from com.crashlytics.sdk.android:crashlytics:2.2.1:11:5 +MERGED from com.crashlytics.sdk.android:answers:1.1.1:9:5 +MERGED from io.fabric.sdk.android:fabric:1.1.1:9:5 +MERGED from io.fabric.sdk.android:fabric:1.1.1:9:5 +MERGED from com.crashlytics.sdk.android:beta:1.1.1:9:5 +MERGED from io.fabric.sdk.android:fabric:1.1.1:9:5 MERGED from com.android.support:support-v4:21.0.3:16:5 android:label - ADDED from AndroidManifest.xml:16:9 - android:allowBackup - ADDED from AndroidManifest.xml:14:9 - android:icon ADDED from AndroidManifest.xml:15:9 - android:theme - ADDED from AndroidManifest.xml:17:9 - android:name + android:allowBackup ADDED from AndroidManifest.xml:13:9 + android:icon + ADDED from AndroidManifest.xml:14:9 + android:theme + ADDED from AndroidManifest.xml:16:9 + android:name + ADDED from AndroidManifest.xml:12:9 activity#com.kabouzeid.materialmusic.ui.activities.MainActivity -ADDED from AndroidManifest.xml:18:9 +ADDED from AndroidManifest.xml:17:9 android:label - ADDED from AndroidManifest.xml:20:13 - android:name ADDED from AndroidManifest.xml:19:13 + android:name + ADDED from AndroidManifest.xml:18:13 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:21:13 +ADDED from AndroidManifest.xml:20:13 action#android.intent.action.MAIN -ADDED from AndroidManifest.xml:22:17 +ADDED from AndroidManifest.xml:21:17 android:name - ADDED from AndroidManifest.xml:22:25 + ADDED from AndroidManifest.xml:21:25 category#android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:24:17 +ADDED from AndroidManifest.xml:23:17 android:name - ADDED from AndroidManifest.xml:24:27 + ADDED from AndroidManifest.xml:23:27 activity#com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity -ADDED from AndroidManifest.xml:27:9 +ADDED from AndroidManifest.xml:26:9 android:name - ADDED from AndroidManifest.xml:27:19 + ADDED from AndroidManifest.xml:26:19 activity#com.kabouzeid.materialmusic.ui.activities.ArtistDetailActivity -ADDED from AndroidManifest.xml:29:9 +ADDED from AndroidManifest.xml:28:9 android:name - ADDED from AndroidManifest.xml:29:19 + ADDED from AndroidManifest.xml:28:19 activity#com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity -ADDED from AndroidManifest.xml:31:9 +ADDED from AndroidManifest.xml:30:9 android:parentActivityName - ADDED from AndroidManifest.xml:33:13 - android:name ADDED from AndroidManifest.xml:32:13 + android:name + ADDED from AndroidManifest.xml:31:13 service#com.kabouzeid.materialmusic.service.MusicService -ADDED from AndroidManifest.xml:36:9 +ADDED from AndroidManifest.xml:35:9 android:enabled - ADDED from AndroidManifest.xml:38:13 - android:name ADDED from AndroidManifest.xml:37:13 + android:name + ADDED from AndroidManifest.xml:36:13 receiver#com.kabouzeid.materialmusic.service.MediaButtonIntentReceiver -ADDED from AndroidManifest.xml:41:9 +ADDED from AndroidManifest.xml:40:9 android:name - ADDED from AndroidManifest.xml:41:19 + ADDED from AndroidManifest.xml:40:19 intent-filter#android.intent.action.MEDIA_BUTTON -ADDED from AndroidManifest.xml:42:13 +ADDED from AndroidManifest.xml:41:13 action#android.intent.action.MEDIA_BUTTON -ADDED from AndroidManifest.xml:43:17 +ADDED from AndroidManifest.xml:42:17 android:name - ADDED from AndroidManifest.xml:43:25 + ADDED from AndroidManifest.xml:42:25 meta-data#com.crashlytics.ApiKey -ADDED from AndroidManifest.xml:47:9 +ADDED from AndroidManifest.xml:46:9 android:value - ADDED from AndroidManifest.xml:49:13 - android:name ADDED from AndroidManifest.xml:48:13 + android:name + ADDED from AndroidManifest.xml:47:13 activity#com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity -ADDED from AndroidManifest.xml:51:9 +ADDED from AndroidManifest.xml:50:9 android:label - ADDED from AndroidManifest.xml:53:13 - android:windowSoftInputMode - ADDED from AndroidManifest.xml:54:13 - android:name ADDED from AndroidManifest.xml:52:13 -activity#com.kabouzeid.materialmusic.ui.activities.tageditor.AlbumTagEditorActivity -ADDED from AndroidManifest.xml:56:9 - android:label - ADDED from AndroidManifest.xml:58:13 + android:windowSoftInputMode + ADDED from AndroidManifest.xml:53:13 android:name + ADDED from AndroidManifest.xml:51:13 +activity#com.kabouzeid.materialmusic.ui.activities.tageditor.AlbumTagEditorActivity +ADDED from AndroidManifest.xml:55:9 + android:label ADDED from AndroidManifest.xml:57:13 + android:name + ADDED from AndroidManifest.xml:56:13 +activity#com.kabouzeid.materialmusic.ui.activities.SearchActivity +ADDED from AndroidManifest.xml:59:9 + android:label + ADDED from AndroidManifest.xml:61:13 + android:name + ADDED from AndroidManifest.xml:60:13 uses-sdk INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested MERGED from com.android.support:appcompat-v7:21.0.3:15:5 @@ -155,21 +161,21 @@ MERGED from com.android.support:support-v4:21.0.3:15:5 MERGED from com.nhaarman.listviewanimations:lib-core:3.1.0:22:5 MERGED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:22:5 MERGED from com.nhaarman.listviewanimations:lib-core-slh:3.1.0:22:5 -MERGED from com.melnykov:floatingactionbutton:1.1.0:8:5 +MERGED from com.melnykov:floatingactionbutton:1.2.0:8:5 MERGED from com.android.support:recyclerview-v7:21.0.3:15:5 MERGED from com.android.support:support-v4:21.0.3:15:5 MERGED from com.github.ksoichiro:android-observablescrollview:1.3.0:21:5 MERGED from com.android.support:recyclerview-v7:21.0.3:15:5 MERGED from com.android.support:support-v4:21.0.3:15:5 -MERGED from com.afollestad:material-dialogs:0.6.1.5:8:5 +MERGED from com.afollestad:material-dialogs:0.6.3.0:8:5 MERGED from com.android.support:appcompat-v7:21.0.3:15:5 MERGED from com.android.support:support-v4:21.0.3:15:5 -MERGED from com.crashlytics.sdk.android:crashlytics:2.1.0:7:5 -MERGED from com.crashlytics.sdk.android:beta:1.0.2:7:5 -MERGED from io.fabric.sdk.android:fabric:1.0.2:7:5 -MERGED from com.crashlytics.sdk.android:answers:1.0.2:7:5 -MERGED from io.fabric.sdk.android:fabric:1.0.2:7:5 -MERGED from io.fabric.sdk.android:fabric:1.0.2:7:5 +MERGED from com.crashlytics.sdk.android:crashlytics:2.2.1:7:5 +MERGED from com.crashlytics.sdk.android:answers:1.1.1:7:5 +MERGED from io.fabric.sdk.android:fabric:1.1.1:7:5 +MERGED from io.fabric.sdk.android:fabric:1.1.1:7:5 +MERGED from com.crashlytics.sdk.android:beta:1.1.1:7:5 +MERGED from io.fabric.sdk.android:fabric:1.1.1:7:5 MERGED from asia.ivity.android:drag-sort-listview:1.0:6:5 MERGED from com.android.support:support-v4:21.0.3:15:5 android:targetSdkVersion diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java b/app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java index c5828f90..fe1270c9 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java @@ -87,7 +87,7 @@ public class AlbumViewGridAdapter extends ArrayAdapter { if (vibrantSwatch != null) { title.setTextColor(vibrantSwatch.getTitleTextColor()); artist.setTextColor(vibrantSwatch.getTitleTextColor()); - ViewUtil.animateViewColor(footer, Util.resolveColor(context, R.attr.colorPrimary), + ViewUtil.animateViewColor(footer, getContext().getResources().getColor(R.color.materialmusic_default_bar_color), vibrantSwatch.getRgb()); } else { paletteBugFixBlackAndWhite(title, artist, footer); @@ -99,7 +99,7 @@ public class AlbumViewGridAdapter extends ArrayAdapter { private void paletteBugFixBlackAndWhite(TextView title, TextView artist, View footer) { title.setTextColor(Util.resolveColor(context, R.attr.title_text_color)); artist.setTextColor(Util.resolveColor(context, R.attr.caption_text_color)); - ViewUtil.animateViewColor(footer, Util.resolveColor(context, R.attr.colorPrimary), - Util.resolveColor(context, R.attr.colorPrimary)); + int defaultBarColor = getContext().getResources().getColor(R.color.materialmusic_default_bar_color); + ViewUtil.animateViewColor(footer, defaultBarColor, defaultBarColor); } } diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java index cf224aac..13995bed 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java @@ -42,7 +42,7 @@ public class SearchAdapter extends ArrayAdapter { title.setTypeface(null, Typeface.BOLD); subTitle.setVisibility(View.GONE); imageView.setVisibility(View.GONE); - convertView.setBackgroundColor(Util.resolveColor(getContext(), R.attr.colorPrimary)); + convertView.setBackgroundColor(getContext().getResources().getColor(R.color.materialmusic_default_bar_color)); } else { title.setTypeface(null, Typeface.NORMAL); subTitle.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/ArtistDetailActivity.java index 19e48f40..833afe17 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/ArtistDetailActivity.java @@ -340,11 +340,24 @@ public class ArtistDetailActivity extends AbsFabActivity implements OnMusicRemot artistTitleText.setBackgroundColor(swatch.getRgb()); slidingTabs.setBackgroundColor(swatch.getRgb()); artistTitleText.setTextColor(swatch.getTitleTextColor()); + } else { + setStandardColors(); } } }); } + private void setStandardColors() { + int titleTextColor = Util.resolveColor(this, R.attr.title_text_color); + int defaultBarColor = getResources().getColor(R.color.materialmusic_default_bar_color); + + toolbarColor = defaultBarColor; + artistArtOverlayView.setBackgroundColor(defaultBarColor); + artistTitleText.setBackgroundColor(defaultBarColor); + slidingTabs.setBackgroundColor(defaultBarColor); + artistTitleText.setTextColor(titleTextColor); + } + private void setUpViewPatch() { final View contentView = getWindow().getDecorView().findViewById(android.R.id.content); contentView.post(new Runnable() { diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MainActivity.java index 7ca2a604..3796fbfb 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MainActivity.java @@ -110,6 +110,7 @@ public class MainActivity extends AbsFabActivity } private void setUpToolBar() { + setTitle(getResources().getString(R.string.app_name)); toolbar = (Toolbar) findViewById(R.id.toolbar); statusBar = findViewById(R.id.statusBar); setSupportActionBar(toolbar); diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java index 74dd9571..d20fbd4f 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java @@ -273,9 +273,9 @@ public class MusicControllerActivity extends AbsFabActivity implements OnMusicRe private void setStandardColors() { int songTitleTextColor = Util.resolveColor(this, R.attr.title_text_color); int artistNameTextColor = Util.resolveColor(this, R.attr.caption_text_color); - int colorPrimary = Util.resolveColor(MusicControllerActivity.this, R.attr.colorPrimary); + int defaultBarColor = getResources().getColor(R.color.materialmusic_default_bar_color); - animateColorChange(colorPrimary); + animateColorChange(defaultBarColor); songTitle.setTextColor(songTitleTextColor); songArtist.setTextColor(artistNameTextColor); diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java index e5250b5d..55e005c3 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java @@ -291,7 +291,7 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity { Palette.generateAsync(bitmap, new Palette.PaletteAsyncListener() { @Override public void onGenerated(Palette palette) { - final int vibrantColor = palette.getVibrantColor(Util.resolveColor(AbsTagEditorActivity.this, R.attr.colorPrimary)); + final int vibrantColor = palette.getVibrantColor(getResources().getColor(R.color.materialmusic_default_bar_color)); paletteColorPrimary = vibrantColor; observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/NavigationDrawerFragment.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/NavigationDrawerFragment.java index 524602c8..3e110ab1 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/NavigationDrawerFragment.java @@ -134,11 +134,11 @@ public class NavigationDrawerFragment extends Fragment { private void setUpListView() { final ArrayList navigationDrawerItems = new ArrayList<>(); - navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.songs), R.drawable.songs)); - navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.albums), R.drawable.album)); - navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.artists), R.drawable.interpret)); - navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.genres), R.drawable.songs)); - navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.playlists), R.drawable.playlist)); + navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.songs), R.drawable.ic_my_library_music_white_24dp)); + navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.albums), R.drawable.ic_album_white_24dp)); + navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.artists), R.drawable.ic_person_white_24dp)); + navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.genres), R.drawable.ic_my_library_music_white_24dp)); + navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.playlists), R.drawable.ic_queue_music_white_24dp)); drawerAdapter = new NavigationDrawerItemAdapter(getActivity(), R.id.navigation_drawer, navigationDrawerItems); diff --git a/app/src/main/res/drawable-hdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_album_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7f6fb80171dd9b64d6cec505a67b179fb0a567cf GIT binary patch literal 534 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^fpd+&!F-t*bu^SSS5eVUH^-*SYxabD(wO@|+! z6782YewFg5aZ}GvH}Q10h(JeQ8=t}>eC$gj1yo}$sRhj9UvwvmVUiq6mXLXl ztcG;b#(QPnti4+=@$#8^eTm3C-fr|FaQL)t0At`!%oXQV16m z*=iXdP!cS-C3p|#s)JjX-04#Ic|@i@sY_3GQr&)iO@E~qTD;f)bjC8=s@t!lsh<{b za{dj*1)`!V`D>s1`&?R9y502n9@Cp|LKobW-h9*eX~gF!pTLX0E&;KEZ%jFVo?59Y;9lvq?M5FlKqiM(4_Oixq&C@w^ zrR1l+a`HXTne!J{9=W>Yki3WWk#C3hnm<#&owVZQ>gans|NOLWsVg~8)r|Iw*-?;m ly5&^J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^Ixga-HiTG=fLM<>NG@_K#^afsDk;lJP}-&={z$8Pe)ZrE#h ze3IFxRegRI31WW9S{|k%*-^UfC1>j=DaPCMF)jOD_~iz3FY~9*3o<-^8h1oFKAm~W f!T!g^T}-oY)SZ5H&&id6fq}u()z4*}Q$iB}tB81G literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_person_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..05d4ef6781a10025e77f2984059def7dc63930c2 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^ z|CiUmx_h#U&Xw%$nZeJzBR`zWGV}NSd^RFte&n_FPJFt{=InTM`Pf9K$Z0m)RCF8X zh_fa1 z?wj*5qmBQuf4#DN!y}QGk2a}2IM&-Bswc~Jzp~BW9w_yua=EOj zQeuFd{A8OVD~*$4m(5f{R`f5K$0h3$u)yikzX=S#{<|l>=8LhPlh5gKcn$*t1B0il KpUXO@geCyC=YwDX literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_queue_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..50db8e83f56b8fbc18278de18256d0ae0809e95e GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^G^A*_Hu~x} zd+;t+Ou4|(W7@*D`+xPndgepoQzS)x{@3T@_Av5z@n3z8o~mY#(8r3ID$QAjJgbz? zFJR$mPC9AKVcTQ(M_j>Nw)OviX7gv~{|9(+)xZ94{lA{^knI1pZrUdvCJHcwe&S#J U)abu40|Nttr>mdKI;Vst0CDMA)&Kwi literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_album_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..64b4c9c4ab754f1c98ab1b4658414e693937d1bf GIT binary patch literal 385 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)8KRsO>Lo80Oonp&%$U&f0oV(aCFo)GOaF4&oVucEJSN(_i4<)ClZVbJ> zuJg~R++ue=TvZ_5Ah@#eBB#ZvB`)`G=}NoG5_Q!^U3W|#-PU#mK0DeD%F$9`$~ zTe?|=E`PbdP5Ait;DjwZcq}$)Gv_SHRl9UBBb|HAk*l*btD`lzxqDoG`+47xcal7D z&~>HaTTTua2?kyEo1BJ7#J8lUHx3vIVCg!0H^7b-v9sr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e40b417c04752aa1d3c86ae99c98944f89346f96 GIT binary patch literal 262 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)8b)GJcAr`0iUWw;wP~bU``11T*rI#FvbN9d4x#!6G>0Dmd)Ld`Re#b29 z*M8djJ0H&)4?#}N38xvaiDWEn`u&Tu?<{{q!IJ+6J)AqYH@m%<&9Q3lo()Z9>~lqZ zDzdDe-O*dv_#5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*O)8eV#6kAr_~vUN+=wau9I1Xxn@9LPq|M_K$i+s!TWC^c%h($Z%KS7M+ma z+Q_p(fa~!6vbfEY16P##zh$nF(DF+9BJ?2e!c=di#)a`u*sd}}m}^{bs$g(3zwl)L z$DYHJ@~^r?=q!}^e|(ugi%msf@Z_TB#|ou>*hp$Wv|(Gf#pi0l#0Q6C@;PI2*?;eS bsek>~fwli`|NhOuz`)??>gTe~DWM4f=H_FR literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_queue_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5b78371dd83c877b1a35b28ce6204608e7b8c29d GIT binary patch literal 221 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)8p`I>|Ar_~Tf1G!aN|87zRlpcx>1Fbu*`Sw4Bvavu$|=(e_xTkJ`~F}4 zSI^|M$kfOAv2e*H^&r!l7VUcfIc=H+yuuxq5B#hD^q=41vihHN={QS1hV_{nCsp5S SKgPhoz~JfX=d#Wzp$PyO$3wUP literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_album_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c6f3f30b17097847e9eca00e2ba133a345a8977d GIT binary patch literal 681 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~21|~&M7srr@!*6Gt_DXgXa4?>E#6U`XQOZN^nmkqDM-}Rw)OLW z*cz&`pw3Z2np05nNIr++gr$oX>~!0%#(iEV=1k14*Jbzj3C2X+Gz~4ax*B@*s=3>n z;`)vG4(1GnMQ;KYxpni&MqSa^cvj})i-tnJN{30+-z1CKQ!JJ?d)^X}C}Ldmv1#p= z6Yb0@mg;LnJZ>;m?L6Xo>dP&LNqz6^1vrf#^k@VbFkb7>I_=oNvwkAud7e`Z!MhaI zg%WHQthuMT`4Ed|)r^#>UI{OIUof^W^6XtRiD&Z_*T1&13VPq>*ni19ZFqKTLg8_K z(Fwxk_tm#e-tt2~E#yF-!0()d?NhdGUCQL;lsijm*S>e%S__ti#uzeP+gcVXdf}3m z-;X)Ek1nPh+-|mX>*tV$eQcBL(&ZTZ_iddLz&))&ZvJL9hWbCf?t- zHS@N>Oa98M6(^*(wXgBN+$C6$I(yk|r;}&ccFh-GV-|W~&Vnd)-CggOD@LT2o_!Y= zuun|j?;Q@Y?Yq*%A3NmiFD;t&z{KTm?B7}gF^l7|o6d=72Kj7OlzH2}$51DBX6w3` zneLzF+Ney4mdG>`FxmD*nR%K|bNChm+1cv5SyI!#i~rdoU3a?gUH#3z_nhqxva5IV z*EKw;?eO(Jw=K?*76j{$~pM4+MVOAw2i~rr-5fciAVW-&o`!+HaO?vr6Qq l%J20{YwNv!oNCxF^YNuu%IlS{7#J8BJYD@<);T3K0RShu9@+o^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e8a980e61ebee99ca81d38380ed8512710b98655 GIT binary patch literal 421 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~221Z#=7srr@!*6f+dL4EUIq>nn&fi1XPncSBLSF2PI69jpDSv^Ih<=dN zX1%2s^kOO+9;v!`F5JDNtL;R|C#%U41!>bK%)I~M+1cmdKI;Vst07Gu6&j0`b literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d02d0ba58836b350ea10e8498ea5ac6cb2af9777 GIT binary patch literal 409 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~221Y?o7srr@!*8!{^gHArap0p-q?}Xup@gja2an9%@IskWdP3O)ULToM zgk-~U_p^6R_R?caCzKWAY7qpF~i=IZC?2z z6SJj2fJWcTt-al0bph>Vd7I9^dGaY(FNfE9{*U8sqCCFS)*G#3cGEd=VutaB_j`Y* z&J!;<%3Q0a<9TzVa_UKL+jl#sFe%!e-Qid9WEtOu1*g@Q)m~T_$eQul@9MpbnM~z5 zD=)W23okfpUi#art~>dGq^EzCf+%CQt-@Kxq659z?0@VN`0w0fn!xouB9wuFfx*+& K&t;ucLK6Uyp`4Ha literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_queue_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..44a35a7b167a37fb3fc2bb680e4db1ae3d633696 GIT binary patch literal 333 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~228N@aE{-7)hm-%DcZfbteB6)f;A=5LGMR@ zn&Q>qiyWI8E_ujpZ7AY)oBZ;@dG-@*1qLaGF2)(mNA(P61l(teYb2$J2 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/album.png b/app/src/main/res/drawable-xxhdpi/album.png deleted file mode 100644 index bed003af17bc93501a05743d48df678b4dd1aa9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 962 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FV6O3W zaSX{|y*le)_7w+_W98!9-2q-714L}XxPmk~#JLxBKU(_bQubT9y_Grsf0@7JXX?vw zwJz<5&{y*44*0U{!lO+7)k<8k_4o6HHfO5co|#f^%)igq$oT!)@2Zo}oK9Iim1)iG zx7Rp7bC?`pn!&y~LF$Cn0^WTM!UYUbSF^sF-##g^B>jNZ4MzKhwI|*8br~9)iI#-1 z&tAaWWpp&iC-&q;iG$e-IQKOL&P+0QTpJ+DGKV?;;0~YKv!Y5(4&Dh<((jf8U3ng) zC&&`PZ0~E^voNN1y=CVFWea)clZmk%&4DhazOsC~O4=V}Mg3(tRd?~Z(dT2wQ|^ni zIK-KsuP!jYS#jw2{TKiBl=dC3NsufZ3- z+O8QKHhoNy?@oyC=(_Q;)SY4JalM~5dEe6QRt6f1oH%%7XWYZ|qX#4P)~ZNePd-}o zWW%D$1rKk0oVGZA*6i#xZ7eTjuU+e_E*}lY;K_i;sw!{i|sB;2n9PF z4xVu;=gxW=DPz@Rd(@29%H5cyrn#84CI0e*xC<{PY-*qLa=+X1e@CVV&W$o%tu3He zyJVYzNSpDRg}XkrbWPZEOQSt7a@yR~P^nkTR1aiNZs==fdTJKA&Hw4{2l!uhP3KmwpeD7k}_{lh+jPg&y};Z&O|W zWSeZk+lxKx8u}`vJTFKGT)S%dG~~Nr!MSbe%uFFo9QESmstl!3f3I@QnzrS1(xXjM z1=0^h?lON2lFE{;V=j68RQQ&7dvC*JS=P46`{&PaTG{d8yK=lw%l`S1$x2x~vYQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?SAT^vI)?!BGm>n-glaoqVzgzwiBsgK$nmx{Fmb9x^w4dAb9RnmCj z`teHBjM=K89(#W{X>VDy;>E%RLZ)UO6YE$$>M1UX%1HWpy;){jp+-5#+NH!ADnDB50^D{|RuTsOtLp&1~HAFtS znLNS$9`n|X2lJN{p0g5s-*D?^*IbW_uj~St=NAfbU)jxh#hY*W#HGh&7kJ%!9Offb zz!l;xWS%^^-LJu^=J;C+l@#$6*O=#MFOjl#n5tKP?d^@AepS-|CjG~ALl?yD>6;$b zAQiL1`qwUzY0R~YBtANFUGdwfq{O_*to2_)H_PLm$qBQAy>rV|9deU)a*MrO@MrzC zr!J9?oYq`i#C}U)f9&E-DJBzzR;_v2aLDQRSE>Ckmpo4Q$$04W%)wb{X1LPjOX`=T z4A>{tyfRPvum01^I?chcw{*Xhb)Dga`L%2B>94xtFt_PU)|Ql8vv*#}DqGR$wzXGW zS3hUk)>+C~3o5hom3QshGHY|z0_NOMz3n_92WPsOu4S{jCZ(OMZSLA9Q`q|UlH^`x z(*U>2CW$`|tepM3@bK@;QdfmdC+NLA&MQA-_tV0jcgIau{rt~yB5wN8{CEC4?xyZ? z+?)I307K!Xl$izf0k1FpyApQm|CagRejSq7%5!Dy)j5Smr8<#pQ5UoLRyQtcI=S_v z(7EJ;PkzPlhUjjP*W~`TxMz#;?}y3$2`i5saWHI*x^%~ouPY~gKF9L-C0ExQ|9q}A z)6n<$)Xsf;A}cQIHeYMyo>4o?x2-5@#imv9(_N2r@A01Ya?v9{$v0`P6C$sFblEh; zFH!ZJhmmiO#ATJOp*Kq$RyRa-Z@F4qA0DgZZJ+m`Mmghu#={HDbF9?c^-Xhj-idTvems~_ zE%xxtfPUF*_6l3QD@%K{F20p5Z2S2lW6}&``zf2sIb;&Ai}`)Je>VPm-^u6*;iw(j zzqe+YH17JV?AXCrb|QOC^`yGbEakt$yS1z&5~rEC&zYcpp3{BF%)}Y#HX46>f|#@z d?}jh1|5V9cTjRGZgMop8!PC{xWt~$(69A>#yR`rS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d11ac14e765ec25f68f6e4ceeea0964a3ba7e254 GIT binary patch literal 577 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?Zd_Y%L*<4j z>r)ObmQ>E}Cc7oPPt)GctqYv+YUjaZhh2_x2VYA}$PGCAXc5~L)df+%*Y9PNoWLk~ z;Xg~LN1@L&b2bja|BZdFv{ zCLc|f)EQ!|sy6~TZl(B(JW)QpL&dOl3P0?&N>XT_#V8rj-h3r3%-cMYKWKKOnM0QGX*Q44w3|#TPwU)P_&M{cnMbj) f0`n`23+BOLKN%O-bjC6;Ffe$!`njxgN@xNA|LW{1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7239d88d7fa9ff1bfce4c03360e793e33245d4bc GIT binary patch literal 548 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?4$UOXJVI+}Cqz^%yxl9GHYA zG@NN-Qqj1yz`5PZRj1}M^Usr)9_QO$s#wn0_37w>C>NjRM?J6ZsAzP}J+#c>pJMmd z-D+~i3wX-BXELzy_`btuz|F3jZ!xB&4xk{z?GT)i2FfUJJh2vs_KjJ$a?> z)ttHsOIf;Jvi}s}JGSoE(}z!9dE91GJ$olLE^3>_{57+r?3K1TC{AX+b=2eB%$I^@ zKE)@JTF;!nqGz+@*P9)Bp4XOr=lLY0?%!*coAso_a;DJJr&7${NX^?%MaR-Llarm`ImS+A~&5uRg`(WopZv0SMAo7hFZ z=MCy=fvtZ(I%?lBJee0M$1bwu)ROA7+nO28<|SWF?GnBqBwF(I#3HK~B6H`iX!eS7 z{QhbI|JnuRr4!zgTe~DWM4fOatS_ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_queue_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..15d7528e9dfd96a2309a1610981ef2131c9c48cc GIT binary patch literal 409 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?mb6i}Gh{o`7vlp266kJTXx6C9X0Rlr0*(9&7K&$ERyTaTNx`Yf=I zP8ItxXW0bKB{5>jrkW{Cn$t7eScEhd#-!~mRqnay$lS&}EuZI@zydL~jOpIHt}<-C zcbw_#rD&G-##atqJJ`AFq`A+j^L`u`UL4)~d1{QA-&@NoKP{fk+plpi(EIh-tF^V; zcPLt0M$0^Ix^_-%^^OHUkL$kped9xDU}pDp zaSX{|eLM4Xwuqy^vGT{aUmQ#jkyjU-+}xodAuq_Uw8H$Tw*!ml7nO=mxuc8!I|%gO z+f#LUfs%%noYJHf3j`f|nm#fz`YuZOE4t&7wV!|5vR&oN4~x|J_?MSn{a%{7%XstD zQ!-mu`NwXJ%GLe&y`gl0a1C?vgUqc_wP#IboPDG%Sm!lJCTtexiDB^OTF*Dh`k=vy zr1yn(K@o)$tQpldYZ%om-88-7y1Vk{M~*A_cWgL4bMo(54YP6|EawhAGU1f$*Q2Jv zF&#E#Dy!tudX8Q4QAwI}JLy+YxuZkacJ;3l3rH>vnXk3EG;vbF;etofGRUX1z(0KO1W}$xrax zG}|p%DK5%hM$g5*P5)*pTKhXCzVNN&Vr7{t%?FnD3gsl4_+Ngnc#(CVbL z4owp3t_W`dBcN*SIn4ECvK=`dst4~{(os?X6&PSC;P&%QA;RNGtUYCG*-;FC-g&Nl% zP%e;OcsOQuddE#xwgb`+ENLZ4hP+LjyHaz}bidF0-U**7o$q-?WYaAfjtzGY+!ry^cQ90Y%Jy%W z!DY=KWtuu$gwEaUI%}@=v7u~#p?p-ahRGq-`$eoyagFvt%K0;@z4!iQU|?YIboFyt I=akR{0AK5bng9R* diff --git a/app/src/main/res/drawable-xxhdpi/playlist.png b/app/src/main/res/drawable-xxhdpi/playlist.png deleted file mode 100644 index 6fea8f72ceba1cac3adeb563efb91fdc190036bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 464 zcmeAS@N?(olHy`uVBq!ia0y~yV6bFhU@+idV_;xdEq=+Dfq{XsILO_JVcj{ImkbPy zU7jwEAsMW1Bdz_I4MkEenuSc6V#&b%fMt%tqQy(S=b9BTM5&x}aCAM)`@)h@RNX_= z@z}wrc@y`(?lqq#FXyelZO^|wGtGDZTk_M*>eCXolfi2@y^2_RU3u<0rX|Xrns+63 zp8BSI^6afWT^>RyVZO2jMsA-Po}|g{@|~&sjC+pJzmQtZ>nmqGu}Ep)nZRiDL0&Q= zsn0t~>~BEB4#^E?);RNIuFU`MCHQIX!Jpxgf*)uTHv=+po#vllkW^q!Ss=o;!*7~UXNdh1O_kC$Nx#{@FDd#gdu#V8v!hBa$>-wB z3w~`&N&o)!Y-fsw(Jkf3qt-7^h!*V-o)po!>D40T@J<)6@ZB*xB_~Y08nf=v;mxcj Y6OtLSBf4)hFfcH9y85}Sb4q9e0HPJfuK)l5 diff --git a/app/src/main/res/drawable-xxhdpi/songs.png b/app/src/main/res/drawable-xxhdpi/songs.png deleted file mode 100644 index 63257b92b5dc378f7b93eb336181cc44c432e4c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FV4COY z;uw;_`gZ1Ce-THCW91W_cv;0tj&-Q19cg;BV2hHWSOmw7$k`IvLQJBpQ&k!LwEi(} znC79A+t(yvpR{P+T9Jqa6FiFk#68eETy%Kv=IxuUr{7WGxBh%?^LM-R=Z>E(3Vaff zwKYnaa?02Ipud1uq)_U{Yn-d@AF5sP^!bt5L6Q!CWLav@ zdrtA5wN_4b_mU@1eYG=r@0^I9X%xTzTEnN$pO$}pHs9!%*SYkrJ;ep{wmcF|e2_15 z{PxZK+os#k59E8D zy>-CCzid&anlgubi@wytD_7U>c1$p0a?kBLcVzv=`rF3}JAWG}xVQ3i#4-fgYhHOO z&+*vAuIc3EjNkROHNxGiv=hY6DEtz?&aA+_?XBhc^f}u5c&i?ZVD#47uH`gBXCdt}3q9S4*=O zyqGxARfl`=eF3HX(D)P{zxqOw$ex5e8W=)1_lOCS3j3^P6YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?<#j=U;H}MXm zp1_hhrmQa%GAuKgHe5O!8y>nZU_F1qbb}KM^c<`cCobW0XnoppQ|D&iNk%_GwV&Z! z8>aBHJv(OMD}6R3(1|nDpp+2@E+G%A5pGlts(D4{pWp+Qk}?KBOG;WE!zd{klPDmWvo@UObKH?!J*vmSy<$e z@_Hke!(4-R<`Rr+1mAJj?_@sV^g{LVtFrwk?(vm3_)R?IdyFC4 za@zE)>JH;O&MR}bF-;JQ*z=grKr7(-vlkJ<<|mDh@;>T&{Eb_uZwGS<>#JF^cmIDW zzT@uR(sJO@66*t79Ac+7N1H$I+4Ig|Q`DB%yP3{#U72dJW9ockqvr;jLbkmB!Db*T z(y&&uB>CKl?0>$B(cKpR_FJFf?|ZrJscVjY&#|3;eKOZ${J7cQv|UVW+@+^29l8C$ zqY2grEE{*Fi`|JoQrvjdc-!QiXOA&NyM7DWcKM}Ua>MDgsh#&luW|94^t!!UFZ$Nn zi+z^TF&C|TNk*RT9NRE!;qM&%x9YQZ*GFWm^yW?I4|p3c6!k7&SW-$sHiyQ-&o!4qh-qOo<6kWzjxn>yo_ld?mckQaGv#7WyP{7L909q z8u9|q8OLwp{yJ0dPxySEtE%x{b>5PXQ#0<=2Wm9ziZ4-jX5Qex{c3`N$UFWQ-@Vp6 zD1Pv+K53`tZr=}og*-2}E#KU@>wfONjiJX5AGovseS}qT-mley_h#LkWVkAKYpmIa zW98rDt;@4KrQ>JUxK%8jAjTElFWpll`SQui@UPxQ94o(OTHX(z`Mc`v_tZtZ=FVGk zSGoTtb4PQ{$Aask_AVD!s$Hp`qReZd&RZtWsH&@e`>~(oa`W>WlIA>^EBbu%60vjN z_ttWRpA0-;$5t zEc1A+E&TY)B@!pu7@wJtK1s06!nteOeeNe0n_oan1rCS*-({x@t?qEkJ;ne6p00i_ I>zopr0FbCgJOBUy literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 index 4ffc0cee13610505e43404cac7f6bde740be8a8a..26b88c4f162f4537cf3efb7544b0834be07856a9 GIT binary patch literal 7560 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 D5R&kj literal 9693 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 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7e68677daa9d991294054b7d99a560795f39dfd1 GIT binary patch literal 739 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?MT$n3a&k6FddKI@@{x19e%qMN#=I?%=E7QvU-;A~t zYP;=bz`zVfq77=Y=Q<}I2tT85mht6_^7Y{3PZx`1mtUIrDtVuaW!R%azKX>Ybk)xk zJyveL7ILRuGVHQEpIoEb{i|AG8AZ>e8n<@^`yE+S&9yZo{p_@AuA?C$j7h83G2G&H zNzvZOSg|$mtxVZkLvKaq4{^*!3Fo3%cn(}^+;i)mQUU`T44s!$cqW{yw&FvRRqnPI zY!^d1wKF5{f8V6La_PId6Ye(7pZw6jDqU~2@@se3dmCNUCrIh0r0dzupDSeS&f2_0Ym=jm^X~Vfqmk-W9a`_O$ z9lOR4etD<)6_h@O#w~rf_H^Ipi_4v)X0gBCbk^MOC-apVY4f(V-{IF=-rOyJd#V9L zYQwr!`!`x2SgLiP)%w6htpf{p&&dAZ{PsuVg$K*CSi+n(n~Di12oe)*)3b;Hyf3_J%IcpB0x z)7H(-*wg*4QTaMY3|}>uEU&mjlvl>9T7AtWE5Gk`aqxd%-PO={@4HlE(${^-EK0xQ hIl(dB@L%eI+?2XCOxmejLJSNH44$rjF6*2UngIQ=JQx4~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f6b0ddcd3f0cbbbd13d08b5c0890fcf167e61ea2 GIT binary patch literal 721 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?H67R5*HUYG?mK z?cNze!a@tJ*o5U;awlhTs02*^ck=`TxA01<#SdQ}nmX~&+?~dI)6e|;%2;K0a%Xwf zxh*a$Z_J;>B(i{kRl|XiE1&_yjBMcIW+|~yQG3?F$5^U$l)-1?F>^n!{&1fYY%xnt z`ulmG3AS0;;8|vH(rlm00iNG8)Rw668q8eq$DSo#=)t7K&wuWE%#(4LY!W$zX@=F~ zXD{oOe;P4lFY#4iELeIz`Lv4rl)KDg8&2-2c1U2&*vVe9h9UQRgR{273ps&kMkUq= zX1=a_PObJw^tmQx&zQ=2r|>2yJq?vIR7+hD>BCx~lCJdm zhF{D-HE|W*uXc%xKG_><<*p4%)_44QSx7wkagLdoGSbM zPuKY$2%OLPgZ1&zi1pKFE_aT@TxGxFR{#xoyu9tvF6 zuhuCpp3smeHSPC~$)DPG^E~I5cqBLfgtq+7^FM7EH;etvtJBMS&io5PLZNB^kq z$ozR#X4k(jJ9o}fU2v+JZ7zSzX|8}oaq*Y4{v1Ee@YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?ud5QptRUo&Z1wcDS~Aad()}~Nm$Vo5 zFSytIg<fQ?f>)XFw@z-TupH=;R?`K~7G`1zOwwZSq-w*g* z<^9p-!u6f*`j=W@~%jD&-ux!Em#aSH10jru)LjN7+wodwXqP9qa#8 z^KGJbv!X9N-?7{3>O#IPnwbmMS!MlRZ_^#s%C&DU8_3TPobZytezQpZ6PL|Fr63Vc LS3j3^P6dR literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/logo.png b/app/src/main/res/drawable-xxxhdpi/logo.png deleted file mode 100644 index cac9baa1a379d786c859f9ee16049293b950d994..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4957 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 diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml index 13e29b78..95f4a6f5 100644 --- a/app/src/main/res/layout/activity_album_detail.xml +++ b/app/src/main/res/layout/activity_album_detail.xml @@ -20,7 +20,7 @@ android:id="@+id/overlay" android:layout_width="match_parent" android:layout_height="@dimen/header_image_height" - android:background="?attr/colorPrimary"/> + android:background="@color/materialmusic_default_bar_color"/> + android:background="@color/materialmusic_default_bar_color"/> @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/title_view_height" android:height="@dimen/title_view_height" - android:background="?attr/colorPrimary" + android:background="@color/materialmusic_default_bar_color" android:elevation="@dimen/toolbar_elevation" android:fontFamily="sans-serif-medium" android:gravity="center_vertical" @@ -64,7 +64,7 @@ android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="@dimen/tab_height" - android:background="?attr/colorPrimary" + android:background="@color/materialmusic_default_bar_color" android:elevation="@dimen/toolbar_elevation" android:paddingRight="88dp"/> diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml index 1f48db87..2b36c135 100644 --- a/app/src/main/res/layout/activity_music_controller.xml +++ b/app/src/main/res/layout/activity_music_controller.xml @@ -61,7 +61,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_above="@+id/media_controller_container" - android:background="?attr/colorPrimary" + android:background="@color/materialmusic_default_bar_color" android:elevation="1dp" android:orientation="vertical" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/album_tile.xml b/app/src/main/res/layout/album_tile.xml index ddafb1f1..7909c1b9 100644 --- a/app/src/main/res/layout/album_tile.xml +++ b/app/src/main/res/layout/album_tile.xml @@ -20,7 +20,7 @@ android:id="@+id/footer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorPrimary" + android:background="@color/materialmusic_default_bar_color" android:orientation="vertical" android:padding="16dp" android:transitionName="@string/transition_album_text"> diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml index 6ccc2481..bbc49f67 100644 --- a/app/src/main/res/layout/fragment_navigation_drawer.xml +++ b/app/src/main/res/layout/fragment_navigation_drawer.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?colorPrimary" + android:background="?attr/navigation_drawer_background_color" android:clickable="true" android:orientation="vertical"> diff --git a/app/src/main/res/layout/item_navigation_drawer.xml b/app/src/main/res/layout/item_navigation_drawer.xml index 0a7a984f..c32a41b8 100644 --- a/app/src/main/res/layout/item_navigation_drawer.xml +++ b/app/src/main/res/layout/item_navigation_drawer.xml @@ -14,22 +14,15 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center_vertical" - android:layout_marginRight="16dp" - android:padding="4dp" - android:src="@drawable/ic_skip_next_white_48dp"/> + android:layout_marginRight="16dp"/> \ No newline at end of file diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml index e56689bc..83347373 100644 --- a/app/src/main/res/menu/drawer.xml +++ b/app/src/main/res/menu/drawer.xml @@ -17,7 +17,7 @@ diff --git a/app/src/main/res/menu/menu_title_playing.xml b/app/src/main/res/menu/menu_title_playing.xml index 6f1f9c18..487b46ab 100644 --- a/app/src/main/res/menu/menu_title_playing.xml +++ b/app/src/main/res/menu/menu_title_playing.xml @@ -4,7 +4,7 @@ tools:context="com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity"> - - + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 330af57b..4c9fc6b5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,36 +1,40 @@ + + @color/grey_900 + + @color/blue_500 @color/blue_600 - @color/pink_500 @color/pink_600 @color/pink_300 - ?android:attr/textColorPrimaryInverse ?android:attr/textColorSecondaryInverse - @color/grey_400 - - @color/grey_900 - #161616 - + @color/grey_300 + + + @color/indigo_500 + @color/indigo_600 @color/pink_500 @color/pink_600 @color/pink_300 - ?android:attr/textColorPrimary ?android:attr/textColorSecondary - @color/grey_800 + @color/grey_900 - #29ffffff - - #26000000 - #26FFFFFF + + #55000000 + #55000000 #D0D0D0 #77404040 + #D0D0D0 #30FFFFFF + + + #29ffffff \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05a799ba..368956ac 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - Material Music + Gramophone Open navigation drawer Close navigation drawer Settings @@ -65,7 +65,7 @@ Playing queue Close Save as playlist - Material Music is a completely free material designed music player by Karim Abou Zeid.\n\nGoogle+   Twitter + Gramophone is a completely free material designed music player by Karim Abou Zeid.\n\nGoogle+   Twitter SearchActivity more No results diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index c736798a..a6c1651b 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -7,17 +7,16 @@ @color/materialmusic_dark_color @color/materialmusic_dark_color_darker - @color/materialmusic_dark_accent_color + @color/materialmusic_accent_color - @color/materialmusic_dark_accent_color - @color/materialmusic_dark_accent_color_lighter + @color/materialmusic_accent_color + @color/materialmusic_accent_color ?android:attr/textColorPrimary ?android:attr/textColorSecondary - - @color/materialmusic_dark_music_controller_container_color - + @color/materialmusic_dark_music_controller_container_color + @color/materialmusic_dark_navigation_drawer_background_color @drawable/list_selector_dark @drawable/round_selector_dark @@ -35,15 +34,14 @@ @color/materialmusic_color_darker @color/materialmusic_accent_color - @color/materialmusic_accent_color - @color/materialmusic_accent_color_lighter + @color/materialmusic_accent_color + @color/materialmusic_accent_color ?android:attr/textColorPrimaryInverse ?android:attr/textColorSecondaryInverse - - @color/materialmusic_music_controller_container_color - + @color/materialmusic_music_controller_container_color + @color/materialmusic_navigation_drawer_background_color @drawable/list_selector @drawable/round_selector @@ -56,9 +54,6 @@ wrap_content wrap_content true - @color/materialmusic_accent_color - @color/materialmusic_accent_color - @color/materialmusic_accent_color_darker