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 00000000..7f6fb801 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_album_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png new file mode 100644 index 00000000..69091e54 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png differ 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 00000000..05d4ef67 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_person_white_24dp.png differ 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 00000000..50db8e83 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_queue_music_white_24dp.png differ 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 00000000..64b4c9c4 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_album_white_24dp.png differ 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 00000000..e40b417c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_person_white_24dp.png new file mode 100644 index 00000000..fb642b9a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_person_white_24dp.png differ 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 00000000..5b78371d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_queue_music_white_24dp.png differ 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 00000000..c6f3f30b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_album_white_24dp.png differ 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 00000000..e8a980e6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png differ 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 00000000..d02d0ba5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.png differ 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 00000000..44a35a7b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_queue_music_white_24dp.png differ 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 bed003af..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/album.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_album_white_24dp.png new file mode 100644 index 00000000..3e455dfb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_album_white_24dp.png differ 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 00000000..d11ac14e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png differ 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 00000000..7239d88d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png differ 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 00000000..15d7528e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_queue_music_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/interpret.png b/app/src/main/res/drawable-xxhdpi/interpret.png deleted file mode 100644 index a89151b9..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/interpret.png and /dev/null differ 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 6fea8f72..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/playlist.png and /dev/null differ 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 63257b92..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/songs.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_album_white_24dp.png new file mode 100644 index 00000000..6a3408a5 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_album_white_24dp.png differ 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 4ffc0cee..26b88c4f Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png differ 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 00000000..7e68677d Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png differ 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 00000000..f6b0ddcd Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_queue_music_white_24dp.png new file mode 100644 index 00000000..ae058bb4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_queue_music_white_24dp.png differ 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 cac9baa1..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/logo.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/notification_icon.png b/app/src/main/res/drawable-xxxhdpi/notification_icon.png index 3e73e9f7..e1bce0cc 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/notification_icon.png and b/app/src/main/res/drawable-xxxhdpi/notification_icon.png differ diff --git a/app/src/main/res/layout-land/activity_music_controller.xml b/app/src/main/res/layout-land/activity_music_controller.xml index 6acbd5ef..53c51e4f 100644 --- a/app/src/main/res/layout-land/activity_music_controller.xml +++ b/app/src/main/res/layout-land/activity_music_controller.xml @@ -74,7 +74,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:background="?attr/colorPrimary" + android:background="@color/materialmusic_default_bar_color" android:orientation="vertical" > 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