tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Design fixes

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-01 21:17:04 +01:00
commit 13843095a8
48 changed files with 137 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

142
app/manifest-merger-release-report.txt
View file

@ -9,33 +9,33 @@ ADDED from AndroidManifest.xml:2:1
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
xmlns:android xmlns:android
ADDED from AndroidManifest.xml:4:5 ADDED from AndroidManifest.xml:2:11
android:versionCode android:versionCode
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
uses-permission#android.permission.WAKE_LOCK 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 ADDED from AndroidManifest.xml:6:5
android:name android:name
ADDED from AndroidManifest.xml:6:22 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 ADDED from AndroidManifest.xml:7:5
android:name android:name
ADDED from AndroidManifest.xml:7:22 ADDED from AndroidManifest.xml:7:22
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE uses-permission#android.permission.VIBRATE
ADDED from AndroidManifest.xml:8:5 ADDED from AndroidManifest.xml:8:5
android:name android:name
ADDED from AndroidManifest.xml:8:22 ADDED from AndroidManifest.xml:8:22
uses-permission#android.permission.VIBRATE uses-permission#android.permission.INTERNET
ADDED from AndroidManifest.xml:9:5 ADDED from AndroidManifest.xml:9:5
MERGED from com.crashlytics.sdk.android:crashlytics:2.2.1:9:5
android:name android:name
ADDED from AndroidManifest.xml:9:22 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 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:appcompat-v7:21.0.3:16:5
MERGED from com.android.support:support-v4: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 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-core:3.1.0:26:5
MERGED from com.nhaarman.listviewanimations:lib-manipulation: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.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:recyclerview-v7:21.0.3:17:5
MERGED from com.android.support:support-v4:21.0.3:16: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:recyclerview-v7:21.0.3:17:5
MERGED from com.android.support:support-v4:21.0.3:16: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:appcompat-v7:21.0.3:16:5
MERGED from com.android.support:support-v4: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:crashlytics:2.2.1:11:5
MERGED from com.crashlytics.sdk.android:beta:1.0.2:11:5 MERGED from com.crashlytics.sdk.android:answers:1.1.1:9:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:11:5 MERGED from io.fabric.sdk.android:fabric:1.1.1:9:5
MERGED from com.crashlytics.sdk.android:answers:1.0.2:11:5 MERGED from io.fabric.sdk.android:fabric:1.1.1:9:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:11:5 MERGED from com.crashlytics.sdk.android:beta:1.1.1:9:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:11: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 MERGED from com.android.support:support-v4:21.0.3:16:5
android:label android:label
ADDED from AndroidManifest.xml:16:9
android:allowBackup
ADDED from AndroidManifest.xml:14:9
android:icon
ADDED from AndroidManifest.xml:15:9 ADDED from AndroidManifest.xml:15:9
android:theme android:allowBackup
ADDED from AndroidManifest.xml:17:9
android:name
ADDED from AndroidManifest.xml:13:9 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 activity#com.kabouzeid.materialmusic.ui.activities.MainActivity
ADDED from AndroidManifest.xml:18:9 ADDED from AndroidManifest.xml:17:9
android:label android:label
ADDED from AndroidManifest.xml:20:13
android:name
ADDED from AndroidManifest.xml:19:13 ADDED from AndroidManifest.xml:19:13
android:name
ADDED from AndroidManifest.xml:18:13
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER 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 action#android.intent.action.MAIN
ADDED from AndroidManifest.xml:22:17 ADDED from AndroidManifest.xml:21:17
android:name android:name
ADDED from AndroidManifest.xml:22:25 ADDED from AndroidManifest.xml:21:25
category#android.intent.category.LAUNCHER category#android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:24:17 ADDED from AndroidManifest.xml:23:17
android:name android:name
ADDED from AndroidManifest.xml:24:27 ADDED from AndroidManifest.xml:23:27
activity#com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity activity#com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity
ADDED from AndroidManifest.xml:27:9 ADDED from AndroidManifest.xml:26:9
android:name android:name
ADDED from AndroidManifest.xml:27:19 ADDED from AndroidManifest.xml:26:19
activity#com.kabouzeid.materialmusic.ui.activities.ArtistDetailActivity activity#com.kabouzeid.materialmusic.ui.activities.ArtistDetailActivity
ADDED from AndroidManifest.xml:29:9 ADDED from AndroidManifest.xml:28:9
android:name android:name
ADDED from AndroidManifest.xml:29:19 ADDED from AndroidManifest.xml:28:19
activity#com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity activity#com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity
ADDED from AndroidManifest.xml:31:9 ADDED from AndroidManifest.xml:30:9
android:parentActivityName android:parentActivityName
ADDED from AndroidManifest.xml:33:13
android:name
ADDED from AndroidManifest.xml:32:13 ADDED from AndroidManifest.xml:32:13
android:name
ADDED from AndroidManifest.xml:31:13
service#com.kabouzeid.materialmusic.service.MusicService service#com.kabouzeid.materialmusic.service.MusicService
ADDED from AndroidManifest.xml:36:9 ADDED from AndroidManifest.xml:35:9
android:enabled android:enabled
ADDED from AndroidManifest.xml:38:13
android:name
ADDED from AndroidManifest.xml:37:13 ADDED from AndroidManifest.xml:37:13
android:name
ADDED from AndroidManifest.xml:36:13
receiver#com.kabouzeid.materialmusic.service.MediaButtonIntentReceiver receiver#com.kabouzeid.materialmusic.service.MediaButtonIntentReceiver
ADDED from AndroidManifest.xml:41:9 ADDED from AndroidManifest.xml:40:9
android:name android:name
ADDED from AndroidManifest.xml:41:19 ADDED from AndroidManifest.xml:40:19
intent-filter#android.intent.action.MEDIA_BUTTON 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 action#android.intent.action.MEDIA_BUTTON
ADDED from AndroidManifest.xml:43:17 ADDED from AndroidManifest.xml:42:17
android:name android:name
ADDED from AndroidManifest.xml:43:25 ADDED from AndroidManifest.xml:42:25
meta-data#com.crashlytics.ApiKey meta-data#com.crashlytics.ApiKey
ADDED from AndroidManifest.xml:47:9 ADDED from AndroidManifest.xml:46:9
android:value android:value
ADDED from AndroidManifest.xml:49:13
android:name
ADDED from AndroidManifest.xml:48:13 ADDED from AndroidManifest.xml:48:13
android:name
ADDED from AndroidManifest.xml:47:13
activity#com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity activity#com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity
ADDED from AndroidManifest.xml:51:9 ADDED from AndroidManifest.xml:50:9
android:label android:label
ADDED from AndroidManifest.xml:53:13
android:windowSoftInputMode
ADDED from AndroidManifest.xml:54:13
android:name
ADDED from AndroidManifest.xml:52:13 ADDED from AndroidManifest.xml:52:13
activity#com.kabouzeid.materialmusic.ui.activities.tageditor.AlbumTagEditorActivity android:windowSoftInputMode
ADDED from AndroidManifest.xml:56:9 ADDED from AndroidManifest.xml:53:13
android:label
ADDED from AndroidManifest.xml:58:13
android:name 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 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 uses-sdk
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
MERGED from com.android.support:appcompat-v7:21.0.3:15:5 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-core:3.1.0:22:5
MERGED from com.nhaarman.listviewanimations:lib-manipulation: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.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:recyclerview-v7:21.0.3:15:5
MERGED from com.android.support:support-v4: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.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:recyclerview-v7:21.0.3:15:5
MERGED from com.android.support:support-v4: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:appcompat-v7:21.0.3:15:5
MERGED from com.android.support:support-v4: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:crashlytics:2.2.1:7:5
MERGED from com.crashlytics.sdk.android:beta:1.0.2:7:5 MERGED from com.crashlytics.sdk.android:answers:1.1.1:7:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:7:5 MERGED from io.fabric.sdk.android:fabric:1.1.1:7:5
MERGED from com.crashlytics.sdk.android:answers:1.0.2:7:5 MERGED from io.fabric.sdk.android:fabric:1.1.1:7:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:7:5 MERGED from com.crashlytics.sdk.android:beta:1.1.1:7:5
MERGED from io.fabric.sdk.android:fabric:1.0.2: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 asia.ivity.android:drag-sort-listview:1.0:6:5
MERGED from com.android.support:support-v4:21.0.3:15:5 MERGED from com.android.support:support-v4:21.0.3:15:5
android:targetSdkVersion android:targetSdkVersion

6
app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java
View file

@ -87,7 +87,7 @@ public class AlbumViewGridAdapter extends ArrayAdapter<Album> {
if (vibrantSwatch != null) { if (vibrantSwatch != null) {
title.setTextColor(vibrantSwatch.getTitleTextColor()); title.setTextColor(vibrantSwatch.getTitleTextColor());
artist.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()); vibrantSwatch.getRgb());
} else { } else {
paletteBugFixBlackAndWhite(title, artist, footer); paletteBugFixBlackAndWhite(title, artist, footer);
@ -99,7 +99,7 @@ public class AlbumViewGridAdapter extends ArrayAdapter<Album> {
private void paletteBugFixBlackAndWhite(TextView title, TextView artist, View footer) { private void paletteBugFixBlackAndWhite(TextView title, TextView artist, View footer) {
title.setTextColor(Util.resolveColor(context, R.attr.title_text_color)); title.setTextColor(Util.resolveColor(context, R.attr.title_text_color));
artist.setTextColor(Util.resolveColor(context, R.attr.caption_text_color)); artist.setTextColor(Util.resolveColor(context, R.attr.caption_text_color));
ViewUtil.animateViewColor(footer, Util.resolveColor(context, R.attr.colorPrimary), int defaultBarColor = getContext().getResources().getColor(R.color.materialmusic_default_bar_color);
Util.resolveColor(context, R.attr.colorPrimary)); ViewUtil.animateViewColor(footer, defaultBarColor, defaultBarColor);
} }
} }

2
app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java
View file

@ -42,7 +42,7 @@ public class SearchAdapter extends ArrayAdapter<SearchEntry> {
title.setTypeface(null, Typeface.BOLD); title.setTypeface(null, Typeface.BOLD);
subTitle.setVisibility(View.GONE); subTitle.setVisibility(View.GONE);
imageView.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 { } else {
title.setTypeface(null, Typeface.NORMAL); title.setTypeface(null, Typeface.NORMAL);
subTitle.setVisibility(View.VISIBLE); subTitle.setVisibility(View.VISIBLE);

13
app/src/main/java/com/kabouzeid/materialmusic/ui/activities/ArtistDetailActivity.java
View file

@ -340,11 +340,24 @@ public class ArtistDetailActivity extends AbsFabActivity implements OnMusicRemot
artistTitleText.setBackgroundColor(swatch.getRgb()); artistTitleText.setBackgroundColor(swatch.getRgb());
slidingTabs.setBackgroundColor(swatch.getRgb()); slidingTabs.setBackgroundColor(swatch.getRgb());
artistTitleText.setTextColor(swatch.getTitleTextColor()); 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() { private void setUpViewPatch() {
final View contentView = getWindow().getDecorView().findViewById(android.R.id.content); final View contentView = getWindow().getDecorView().findViewById(android.R.id.content);
contentView.post(new Runnable() { contentView.post(new Runnable() {

1
app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MainActivity.java
View file

@ -110,6 +110,7 @@ public class MainActivity extends AbsFabActivity
} }
private void setUpToolBar() { private void setUpToolBar() {
setTitle(getResources().getString(R.string.app_name));
toolbar = (Toolbar) findViewById(R.id.toolbar); toolbar = (Toolbar) findViewById(R.id.toolbar);
statusBar = findViewById(R.id.statusBar); statusBar = findViewById(R.id.statusBar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);

4
app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java
View file

@ -273,9 +273,9 @@ public class MusicControllerActivity extends AbsFabActivity implements OnMusicRe
private void setStandardColors() { private void setStandardColors() {
int songTitleTextColor = Util.resolveColor(this, R.attr.title_text_color); int songTitleTextColor = Util.resolveColor(this, R.attr.title_text_color);
int artistNameTextColor = Util.resolveColor(this, R.attr.caption_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); songTitle.setTextColor(songTitleTextColor);
songArtist.setTextColor(artistNameTextColor); songArtist.setTextColor(artistNameTextColor);

2
app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java
View file

@ -291,7 +291,7 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity {
Palette.generateAsync(bitmap, new Palette.PaletteAsyncListener() { Palette.generateAsync(bitmap, new Palette.PaletteAsyncListener() {
@Override @Override
public void onGenerated(Palette palette) { 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; paletteColorPrimary = vibrantColor;
observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false); observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

10
app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/NavigationDrawerFragment.java
View file

@ -134,11 +134,11 @@ public class NavigationDrawerFragment extends Fragment {
private void setUpListView() { private void setUpListView() {
final ArrayList<NavigationDrawerItem> navigationDrawerItems = new ArrayList<>(); final ArrayList<NavigationDrawerItem> navigationDrawerItems = new ArrayList<>();
navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.songs), R.drawable.songs)); 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.album)); navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.albums), R.drawable.ic_album_white_24dp));
navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.artists), R.drawable.interpret)); navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.artists), R.drawable.ic_person_white_24dp));
navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.genres), R.drawable.songs)); 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.playlist)); navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.playlists), R.drawable.ic_queue_music_white_24dp));
drawerAdapter = new NavigationDrawerItemAdapter(getActivity(), R.id.navigation_drawer, navigationDrawerItems); drawerAdapter = new NavigationDrawerItemAdapter(getActivity(), R.id.navigation_drawer, navigationDrawerItems);

BIN
app/src/main/res/drawable-hdpi/ic_album_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 534 B

BIN
app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 330 B

BIN
app/src/main/res/drawable-hdpi/ic_person_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 360 B

BIN
app/src/main/res/drawable-hdpi/ic_queue_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 271 B

BIN
app/src/main/res/drawable-mdpi/ic_album_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 385 B

BIN
app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 262 B

BIN
app/src/main/res/drawable-mdpi/ic_person_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 278 B

BIN
app/src/main/res/drawable-mdpi/ic_queue_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 221 B

BIN
app/src/main/res/drawable-xhdpi/ic_album_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 681 B

BIN
app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 421 B

BIN
app/src/main/res/drawable-xhdpi/ic_person_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 409 B

BIN
app/src/main/res/drawable-xhdpi/ic_queue_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 333 B

BIN
app/src/main/res/drawable-xxhdpi/album.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 962 B

BIN
app/src/main/res/drawable-xxhdpi/ic_album_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 968 B

BIN
app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 577 B

BIN
app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 548 B

BIN
app/src/main/res/drawable-xxhdpi/ic_queue_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 409 B

BIN
app/src/main/res/drawable-xxhdpi/interpret.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 845 B

BIN
app/src/main/res/drawable-xxhdpi/playlist.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 464 B

BIN
app/src/main/res/drawable-xxhdpi/songs.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 740 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_album_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_launcher.png Normal file → Executable file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Before After
Before After

BIN
app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 739 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 721 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_queue_music_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 538 B

BIN
app/src/main/res/drawable-xxxhdpi/logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.8 KiB

BIN
app/src/main/res/drawable-xxxhdpi/notification_icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

2
app/src/main/res/layout-land/activity_music_controller.xml
View file

@ -74,7 +74,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="?attr/colorPrimary" android:background="@color/materialmusic_default_bar_color"
android:orientation="vertical" android:orientation="vertical"
> >

4
app/src/main/res/layout/activity_album_detail.xml
View file

@ -20,7 +20,7 @@
android:id="@+id/overlay" android:id="@+id/overlay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/header_image_height" android:layout_height="@dimen/header_image_height"
android:background="?attr/colorPrimary"/> android:background="@color/materialmusic_default_bar_color"/>
<View <View
android:id="@+id/list_background" android:id="@+id/list_background"
@ -47,7 +47,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/title_view_height" android:layout_height="@dimen/title_view_height"
android: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:elevation="@dimen/toolbar_elevation"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:gravity="center_vertical" android:gravity="center_vertical"

6
app/src/main/res/layout/activity_artist_detail.xml
View file

@ -35,7 +35,7 @@
android:id="@+id/overlay" android:id="@+id/overlay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/header_image_height" android:layout_height="@dimen/header_image_height"
android:background="?attr/colorPrimary"/> android:background="@color/materialmusic_default_bar_color"/>
</FrameLayout> </FrameLayout>
@ -50,7 +50,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/title_view_height" android:layout_height="@dimen/title_view_height"
android: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:elevation="@dimen/toolbar_elevation"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:gravity="center_vertical" android:gravity="center_vertical"
@ -64,7 +64,7 @@
android:id="@+id/sliding_tabs" android:id="@+id/sliding_tabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tab_height" android:layout_height="@dimen/tab_height"
android:background="?attr/colorPrimary" android:background="@color/materialmusic_default_bar_color"
android:elevation="@dimen/toolbar_elevation" android:elevation="@dimen/toolbar_elevation"
android:paddingRight="88dp"/> android:paddingRight="88dp"/>

2
app/src/main/res/layout/activity_music_controller.xml
View file

@ -61,7 +61,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/media_controller_container" android:layout_above="@+id/media_controller_container"
android:background="?attr/colorPrimary" android:background="@color/materialmusic_default_bar_color"
android:elevation="1dp" android:elevation="1dp"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="16dp" android:paddingBottom="16dp"

2
app/src/main/res/layout/album_tile.xml
View file

@ -20,7 +20,7 @@
android:id="@+id/footer" android:id="@+id/footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/colorPrimary" android:background="@color/materialmusic_default_bar_color"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp" android:padding="16dp"
android:transitionName="@string/transition_album_text"> android:transitionName="@string/transition_album_text">

2
app/src/main/res/layout/fragment_navigation_drawer.xml
View file

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?colorPrimary" android:background="?attr/navigation_drawer_background_color"
android:clickable="true" android:clickable="true"
android:orientation="vertical"> android:orientation="vertical">

9
app/src/main/res/layout/item_navigation_drawer.xml
View file

@ -14,22 +14,15 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"/>
android:padding="4dp"
android:src="@drawable/ic_skip_next_white_48dp"/>
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" android:textAppearance="@style/TextAppearance.AppCompat.Body2"
/> />
</LinearLayout> </LinearLayout>

2
app/src/main/res/menu/drawer.xml
View file

@ -17,7 +17,7 @@
<item <item
android:id="@+id/action_playing_queue" android:id="@+id/action_playing_queue"
android:icon="@drawable/playlist" android:icon="@drawable/ic_queue_music_white_24dp"
android:title="@string/action_playing_queue" android:title="@string/action_playing_queue"
app:showAsAction="never"/> app:showAsAction="never"/>

2
app/src/main/res/menu/menu_title_playing.xml
View file

@ -4,7 +4,7 @@
tools:context="com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity"> tools:context="com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity">
<item <item
android:id="@+id/action_playing_queue" android:id="@+id/action_playing_queue"
android:icon="@drawable/playlist" android:icon="@drawable/ic_queue_music_white_24dp"
android:title="@string/action_playing_queue" android:title="@string/action_playing_queue"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

3
app/src/main/res/values/attrs.xml
View file

@ -3,8 +3,7 @@
<attr name="title_text_color" format="color"/> <attr name="title_text_color" format="color"/>
<attr name="caption_text_color" format="color"/> <attr name="caption_text_color" format="color"/>
<attr name="music_controller_container_color" format="color"/> <attr name="music_controller_container_color" format="color"/>
<attr name="fab_color" format="color"/> <attr name="navigation_drawer_background_color" format="color"/>
<attr name="fab_color_pressed" format="color"/>
<attr name="list_selector" format="reference"/> <attr name="list_selector" format="reference"/>
<attr name="round_selector" format="reference"/> <attr name="round_selector" format="reference"/>
<attr name="rect_selector" format="reference"/> <attr name="rect_selector" format="reference"/>

28
app/src/main/res/values/colors.xml
View file

@ -1,36 +1,40 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--general-->
<color name="materialmusic_default_bar_color">@color/grey_900</color>
<!--light theme-->
<color name="materialmusic_color">@color/blue_500</color> <color name="materialmusic_color">@color/blue_500</color>
<color name="materialmusic_color_darker">@color/blue_600</color> <color name="materialmusic_color_darker">@color/blue_600</color>
<color name="materialmusic_accent_color">@color/pink_500</color> <color name="materialmusic_accent_color">@color/pink_500</color>
<color name="materialmusic_accent_color_darker">@color/pink_600</color> <color name="materialmusic_accent_color_darker">@color/pink_600</color>
<color name="materialmusic_accent_color_lighter">@color/pink_300</color> <color name="materialmusic_accent_color_lighter">@color/pink_300</color>
<color name="materialmusic_title_text_color">?android:attr/textColorPrimaryInverse</color> <color name="materialmusic_title_text_color">?android:attr/textColorPrimaryInverse</color>
<color name="materialmusic_caption_text_color">?android:attr/textColorSecondaryInverse</color> <color name="materialmusic_caption_text_color">?android:attr/textColorSecondaryInverse</color>
<color name="materialmusic_music_controller_container_color">@color/grey_400</color> <color name="materialmusic_music_controller_container_color">@color/grey_400</color>
<color name="materialmusic_navigation_drawer_background_color">@color/grey_300</color>
<color name="materialmusic_dark_color">@color/grey_900</color> <!--dark theme-->
<color name="materialmusic_dark_color_darker">#161616</color> <color name="materialmusic_dark_color">@color/indigo_500</color>
<color name="materialmusic_dark_color_darker">@color/indigo_600</color>
<color name="materialmusic_dark_accent_color">@color/pink_500</color> <color name="materialmusic_dark_accent_color">@color/pink_500</color>
<color name="materialmusic_dark_accent_color_darker">@color/pink_600</color> <color name="materialmusic_dark_accent_color_darker">@color/pink_600</color>
<color name="materialmusic_dark_accent_color_lighter">@color/pink_300</color> <color name="materialmusic_dark_accent_color_lighter">@color/pink_300</color>
<color name="materialmusic_dark_title_text_color">?android:attr/textColorPrimary</color> <color name="materialmusic_dark_title_text_color">?android:attr/textColorPrimary</color>
<color name="materialmusic_dark_caption_text_color">?android:attr/textColorSecondary</color> <color name="materialmusic_dark_caption_text_color">?android:attr/textColorSecondary</color>
<color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color> <color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
<color name="materialmusic_dark_navigation_drawer_background_color">@color/grey_900</color>
<drawable name="notification_template_divider_media">#29ffffff</drawable> <!--nav drawer list items-->
<color name="list_item_activated">#55000000</color>
<color name="list_item_activated">#26000000</color> <color name="list_item_activated_dark">#55000000</color>
<color name="list_item_activated_dark">#26FFFFFF</color>
<color name="list_item_selected">#D0D0D0</color> <color name="list_item_selected">#D0D0D0</color>
<color name="list_item_selected_dark">#77404040</color> <color name="list_item_selected_dark">#77404040</color>
<!--round and rect selector-->
<color name="button_selected">#D0D0D0</color> <color name="button_selected">#D0D0D0</color>
<color name="button_selected_dark">#30FFFFFF</color> <color name="button_selected_dark">#30FFFFFF</color>
<!--notification-->
<drawable name="notification_template_divider_media">#29ffffff</drawable>
</resources> </resources>

4
app/src/main/res/values/strings.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Material Music</string> <string name="app_name">Gramophone</string>
<string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string>
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
@ -65,7 +65,7 @@
<string name="label_current_playing_queue">Playing queue</string> <string name="label_current_playing_queue">Playing queue</string>
<string name="close">Close</string> <string name="close">Close</string>
<string name="save_as_playlist">Save as playlist</string> <string name="save_as_playlist">Save as playlist</string>
<string name="credits">Material Music is a completely free material designed music player by <b>Karim Abou Zeid</b>.\n\n<a href="https://plus.google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a></string> <string name="credits">Gramophone is a completely free material designed music player by <b>Karim Abou Zeid</b>.\n\n<a href="https://plus.google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a></string>
<string name="title_activity_search">SearchActivity</string> <string name="title_activity_search">SearchActivity</string>
<string name="more">more</string> <string name="more">more</string>
<string name="no_results">No results</string> <string name="no_results">No results</string>

23
app/src/main/res/values/styles_parents.xml
View file

@ -7,17 +7,16 @@
<item name="colorPrimary">@color/materialmusic_dark_color</item> <item name="colorPrimary">@color/materialmusic_dark_color</item>
<item name="colorPrimaryDark">@color/materialmusic_dark_color_darker</item> <item name="colorPrimaryDark">@color/materialmusic_dark_color_darker</item>
<item name="colorAccent">@color/materialmusic_dark_accent_color</item> <item name="colorAccent">@color/materialmusic_accent_color</item>
<item name="fab_color">@color/materialmusic_dark_accent_color</item> <item name="fab_colorNormal">@color/materialmusic_accent_color</item>
<item name="fab_color_pressed">@color/materialmusic_dark_accent_color_lighter</item> <item name="fab_colorPressed">@color/materialmusic_accent_color</item>
<item name="title_text_color">?android:attr/textColorPrimary</item> <item name="title_text_color">?android:attr/textColorPrimary</item>
<item name="caption_text_color">?android:attr/textColorSecondary</item> <item name="caption_text_color">?android:attr/textColorSecondary</item>
<item name="music_controller_container_color"> <item name="music_controller_container_color">@color/materialmusic_dark_music_controller_container_color</item>
@color/materialmusic_dark_music_controller_container_color <item name="navigation_drawer_background_color">@color/materialmusic_dark_navigation_drawer_background_color</item>
</item>
<item name="list_selector">@drawable/list_selector_dark</item> <item name="list_selector">@drawable/list_selector_dark</item>
<item name="round_selector">@drawable/round_selector_dark</item> <item name="round_selector">@drawable/round_selector_dark</item>
@ -35,15 +34,14 @@
<item name="colorPrimaryDark">@color/materialmusic_color_darker</item> <item name="colorPrimaryDark">@color/materialmusic_color_darker</item>
<item name="colorAccent">@color/materialmusic_accent_color</item> <item name="colorAccent">@color/materialmusic_accent_color</item>
<item name="fab_color">@color/materialmusic_accent_color</item> <item name="fab_colorNormal">@color/materialmusic_accent_color</item>
<item name="fab_color_pressed">@color/materialmusic_accent_color_lighter</item> <item name="fab_colorPressed">@color/materialmusic_accent_color</item>
<item name="title_text_color">?android:attr/textColorPrimaryInverse</item> <item name="title_text_color">?android:attr/textColorPrimaryInverse</item>
<item name="caption_text_color">?android:attr/textColorSecondaryInverse</item> <item name="caption_text_color">?android:attr/textColorSecondaryInverse</item>
<item name="music_controller_container_color"> <item name="music_controller_container_color">@color/materialmusic_music_controller_container_color</item>
@color/materialmusic_music_controller_container_color <item name="navigation_drawer_background_color">@color/materialmusic_navigation_drawer_background_color</item>
</item>
<item name="list_selector">@drawable/list_selector</item> <item name="list_selector">@drawable/list_selector</item>
<item name="round_selector">@drawable/round_selector</item> <item name="round_selector">@drawable/round_selector</item>
@ -56,9 +54,6 @@
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="fab_shadow">true</item> <item name="fab_shadow">true</item>
<item name="fab_color">@color/materialmusic_accent_color</item>
<item name="fab_colorNormal">@color/materialmusic_accent_color</item>
<item name="fab_colorPressed">@color/materialmusic_accent_color_darker</item>
</style> </style>
<style name="NotificationButtonParent"> <style name="NotificationButtonParent">