Design fixes

app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java

@@ -87,7 +87,7 @@ public class AlbumViewGridAdapter extends ArrayAdapter<Album> {
                 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<Album> {
     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);
     }
 }

app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java

@@ -42,7 +42,7 @@ public class SearchAdapter extends ArrayAdapter<SearchEntry> {
             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);

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() {

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);

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);

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) {

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<NavigationDrawerItem> 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);
 

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"
                 >
 

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"/>
 
         <View
             android:id="@+id/list_background"
@@ -47,7 +47,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"

app/src/main/res/layout/activity_artist_detail.xml

@@ -35,7 +35,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"/>
 
         </FrameLayout>
 
@@ -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"/>
 

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"

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">

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">
 

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"/>
 
     <TextView
         android:id="@+id/title"
-
         android:layout_width="match_parent"
-
         android:layout_height="match_parent"
         android:layout_marginLeft="16dp"
-
-
         android:fontFamily="sans-serif-medium"
         android:gravity="center_vertical"
-
         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
         />
 </LinearLayout>

app/src/main/res/menu/drawer.xml

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

app/src/main/res/menu/menu_title_playing.xml

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

app/src/main/res/values/attrs.xml

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

app/src/main/res/values/colors.xml

@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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_darker">@color/blue_600</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_lighter">@color/pink_300</color>
-
     <color name="materialmusic_title_text_color">?android:attr/textColorPrimaryInverse</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_dark_color">@color/grey_900</color>
-    <color name="materialmusic_dark_color_darker">#161616</color>
-
+    <color name="materialmusic_navigation_drawer_background_color">@color/grey_300</color>
+    
+    <!--dark theme-->
+    <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_darker">@color/pink_600</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_caption_text_color">?android:attr/textColorSecondary</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>
-
-    <color name="list_item_activated">#26000000</color>
-    <color name="list_item_activated_dark">#26FFFFFF</color>
+    <!--nav drawer list items-->
+    <color name="list_item_activated">#55000000</color>
+    <color name="list_item_activated_dark">#55000000</color>
     <color name="list_item_selected">#D0D0D0</color>
     <color name="list_item_selected_dark">#77404040</color>
 
+    <!--round and rect selector-->
     <color name="button_selected">#D0D0D0</color>
     <color name="button_selected_dark">#30FFFFFF</color>
+
+    <!--notification-->
+    <drawable name="notification_template_divider_media">#29ffffff</drawable>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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_close">Close navigation drawer</string>
     <string name="action_settings">Settings</string>
@@ -65,7 +65,7 @@
     <string name="label_current_playing_queue">Playing queue</string>
     <string name="close">Close</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="more">more</string>
     <string name="no_results">No results</string>

app/src/main/res/values/styles_parents.xml

@@ -7,17 +7,16 @@
 
         <item name="colorPrimary">@color/materialmusic_dark_color</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_color_pressed">@color/materialmusic_dark_accent_color_lighter</item>
+        <item name="fab_colorNormal">@color/materialmusic_accent_color</item>
+        <item name="fab_colorPressed">@color/materialmusic_accent_color</item>
 
         <item name="title_text_color">?android:attr/textColorPrimary</item>
         <item name="caption_text_color">?android:attr/textColorSecondary</item>
 
-        <item name="music_controller_container_color">
-            @color/materialmusic_dark_music_controller_container_color
-        </item>
+        <item name="music_controller_container_color">@color/materialmusic_dark_music_controller_container_color</item>
+        <item name="navigation_drawer_background_color">@color/materialmusic_dark_navigation_drawer_background_color</item>
 
         <item name="list_selector">@drawable/list_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="colorAccent">@color/materialmusic_accent_color</item>
 
-        <item name="fab_color">@color/materialmusic_accent_color</item>
-        <item name="fab_color_pressed">@color/materialmusic_accent_color_lighter</item>
+        <item name="fab_colorNormal">@color/materialmusic_accent_color</item>
+        <item name="fab_colorPressed">@color/materialmusic_accent_color</item>
 
         <item name="title_text_color">?android:attr/textColorPrimaryInverse</item>
         <item name="caption_text_color">?android:attr/textColorSecondaryInverse</item>
 
-        <item name="music_controller_container_color">
-            @color/materialmusic_music_controller_container_color
-        </item>
+        <item name="music_controller_container_color">@color/materialmusic_music_controller_container_color</item>
+        <item name="navigation_drawer_background_color">@color/materialmusic_navigation_drawer_background_color</item>
 
         <item name="list_selector">@drawable/list_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_height">wrap_content</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 name="NotificationButtonParent">