From 936af447b16b7028c4ea1317112315849ac75260 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Fri, 10 Aug 2018 22:40:43 +0530
Subject: [PATCH] push commit

---
 .../res/layout-land/fragment_banner_home.xml  |  20 +-
 .../layout-land/fragment_holiday_player.xml   |  80 --------
 app/src/main/res/layout/activity_about.xml    |   4 +-
 .../res/layout/activity_error_handler.xml     |   1 +
 .../layout/activity_pro_version_content.xml   |   8 +-
 app/src/main/res/layout/activity_search.xml   |   1 +
 .../res/layout/dialog_create_playlist.xml     |  70 +++++--
 .../main/res/layout/dialog_sleep_timer.xml    |  54 ++++--
 app/src/main/res/layout/fragment_folder.xml   |   5 +
 .../fragment_holiday_controls_fragment.xml    | 173 ------------------
 .../res/layout/fragment_holiday_player.xml    |  75 --------
 app/src/main/res/layout/fragment_library.xml  |  13 +-
 .../main/res/layout/home_section_content.xml  |   4 +-
 13 files changed, 129 insertions(+), 379 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/fragment_holiday_player.xml
 create mode 100644 app/src/main/res/layout/activity_error_handler.xml
 delete mode 100644 app/src/main/res/layout/fragment_holiday_controls_fragment.xml
 delete mode 100644 app/src/main/res/layout/fragment_holiday_player.xml

diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index 272f6df4..773a6607 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -23,19 +23,17 @@
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:elevation="0dp"
             android:focusable="true"
+            app:elevation="0dp"
             tools:ignore="UnusedAttribute">
 
-            <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+            <android.support.design.widget.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-                app:expandedTitleGravity="top"
-                app:expandedTitleMarginStart="16dp"
-                app:expandedTitleMarginTop="48dp"
-                app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleEnabled="false">
 
                 <View
                     android:layout_width="match_parent"
@@ -83,7 +81,12 @@
                             app:civ_border="false" />
                     </LinearLayout>
                 </android.support.v7.widget.Toolbar>
-            </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
+            </android.support.design.widget.CollapsingToolbarLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?dividerColor" />
         </android.support.design.widget.AppBarLayout>
 
         <android.support.v4.widget.NestedScrollView
@@ -92,6 +95,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="60dp"
             android:layout_marginEnd="60dp"
+            android:background="@drawable/bg_card_line"
             app:behavior_overlapTop="24dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
diff --git a/app/src/main/res/layout-land/fragment_holiday_player.xml b/app/src/main/res/layout-land/fragment_holiday_player.xml
deleted file mode 100644
index 6993f8f1..00000000
--- a/app/src/main/res/layout-land/fragment_holiday_player.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/holiday_background" />
-
-    <com.jetradarmobile.snowfall.SnowfallView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:snowflakesNum="80" />
-
-    <View
-        android:id="@+id/gradient_background"
-        android:layout_width="match_parent"
-        android:layout_height="16dp"
-        android:layout_gravity="bottom"
-        android:background="@drawable/shadow_up_home"
-        android:backgroundTint="?colorPrimary" />
-
-    <LinearLayout
-        android:id="@+id/now_playing_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-        <code.name.monkey.retromusic.views.HeightFitSquareLayout
-            android:id="@+id/album_cover_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <fragment
-                android:id="@+id/player_album_cover_fragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                tools:layout="@layout/fragment_player_album_cover" />
-        </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <fragment
-                    android:id="@+id/playback_controls_fragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.holiday.HolidayPlaybackControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    tools:layout="@layout/fragment_holiday_controls_fragment" />
-
-                <FrameLayout
-                    android:id="@+id/toolbar_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0">
-
-                    <android.support.v7.widget.Toolbar
-                        android:id="@+id/player_toolbar"
-                        style="@style/Toolbar48"
-                        android:layout_height="48dp"
-                        android:navigationIcon="@drawable/ic_close_white_24dp"
-                        app:navigationIcon="@drawable/ic_close_white_24dp" />
-                </FrameLayout>
-            </LinearLayout>
-        </FrameLayout>
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 3ffce59a..5845f40e 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -22,9 +22,7 @@
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
-                app:layout_collapseMode="pin"
-                app:title=""
-                tools:ignore="UnusedAttribute">
+                app:layout_collapseMode="pin">
 
 
                 <TextView
diff --git a/app/src/main/res/layout/activity_error_handler.xml b/app/src/main/res/layout/activity_error_handler.xml
new file mode 100644
index 00000000..ba755c19
--- /dev/null
+++ b/app/src/main/res/layout/activity_error_handler.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

    <android.support.design.widget.AppBarLayout
        android:id="@+id/app_bar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:elevation="0dp"
        app:elevation="0dp">

        <android.support.v7.widget.Toolbar
            android:id="@+id/toolbar"
            style="@style/Toolbar48"
            app:layout_collapseMode="pin">


            <TextView
                android:id="@+id/title"
                fontPath="@string/circular_std_black"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:gravity="center"
                android:text="@string/error"
                android:textAppearance="@style/TextAppearance.AppCompat.Large"
                tools:ignore="MissingPrefix" />

        </android.support.v7.widget.Toolbar>

        <View
            android:layout_width="match_parent"
            android:layout_height="1dp"
            android:background="?dividerColor" />
    </android.support.design.widget.AppBarLayout>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:padding="16dp">

        <code.name.monkey.retromusic.views.IconImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:paddingBottom="16dp"
            app:srcCompat="@drawable/ic_bug_report_white_24dp" />

        <TextView
            fontPath="@string/circular_std_black"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="OOPS!"
            android:textAppearance="@style/TextAppearance.AppCompat.Display1"
            tools:ignore="MissingPrefix" />

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/bug_report_summary" />
    </LinearLayout>

    <android.support.v7.widget.CardView
        android:id="@+id/clear_app_data"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
        android:layout_margin="8dp"
        app:cardBackgroundColor="@color/md_blue_A200"
        app:cardCornerRadius="6dp"
        app:cardUseCompatPadding="true">

        <TextView
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:gravity="center"
            android:paddingStart="20dp"
            android:paddingTop="12dp"
            android:paddingEnd="20dp"
            android:paddingBottom="12dp"
            android:text="@string/clear_app_data"
            android:textColor="@color/md_white_1000" />
    </android.support.v7.widget.CardView>

</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pro_version_content.xml b/app/src/main/res/layout/activity_pro_version_content.xml
index b51d0f79..e83e2bfa 100644
--- a/app/src/main/res/layout/activity_pro_version_content.xml
+++ b/app/src/main/res/layout/activity_pro_version_content.xml
@@ -36,7 +36,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
-                    android:text="Base color theme"
+                    android:text="@string/base_color_theme"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                     android:textColor="@color/md_white_1000" />
             </LinearLayout>
@@ -59,7 +59,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
-                    android:text="9+ Now playing themes"
+                    android:text="@string/now_playing_themes"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                     android:textColor="@color/md_white_1000" />
             </LinearLayout>
@@ -82,7 +82,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
-                    android:text="Carousal effect on now playing screen"
+                    android:text="@string/carousal_effect_on_now_playing_screen"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                     android:textColor="@color/md_white_1000" />
             </LinearLayout>
@@ -104,7 +104,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
-                    android:text="Window corner edges"
+                    android:text="@string/window_corner_edges"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                     android:textColor="@color/md_white_1000" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 2e93a18d..be45b556 100755
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -29,6 +29,7 @@
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:layout_scrollFlags="scroll|enterAlways"
                 app:titleEnabled="false">
 
                 <android.support.v7.widget.Toolbar
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index 5774ce6d..6daaae40 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -17,15 +18,20 @@
         android:textColor="?android:attr/textColorPrimary"
         tools:ignore="MissingPrefix" />
 
-    <EditText
-        android:id="@+id/option_1"
+    <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/playlist_name_empty"
-        android:inputType="textPersonName|textCapWords|text"
-        android:paddingBottom="16dp"
-        android:paddingTop="16dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+        android:layout_height="wrap_content">
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/option_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/playlist_name_empty"
+            android:inputType="textPersonName|textCapWords|text"
+            android:paddingTop="14dp"
+            android:paddingBottom="14dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+    </android.support.design.widget.TextInputLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,20 +39,48 @@
         android:gravity="end"
         android:padding="12dp">
 
-        <Button
-            android:id="@+id/action_cancel"
-            style="@style/Widget.AppCompat.Button.Borderless"
+        <android.support.v7.widget.CardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="@android:string/cancel" />
+            android:layout_gravity="end|bottom"
+            app:cardBackgroundColor="@color/md_white_1000"
+            app:cardCornerRadius="6dp"
+            app:cardElevation="0dp"
+            app:cardUseCompatPadding="true">
 
-        <Button
-            android:id="@+id/action_create"
-            style="@style/Widget.AppCompat.Button.Colored"
+            <TextView
+                android:id="@+id/action_cancel"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:paddingStart="28dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="28dp"
+                android:paddingBottom="12dp"
+                android:text="@string/cancel_current_timer"
+                android:textColor="@color/black_p50" />
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/action_create_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="@string/create_action" />
+            android:layout_gravity="end|bottom"
+            app:cardBackgroundColor="@color/md_red_A400"
+            app:cardCornerRadius="6dp"
+            app:cardUseCompatPadding="true">
+
+            <TextView
+                android:id="@+id/action_create"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:paddingStart="28dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="28dp"
+                android:paddingBottom="12dp"
+                android:text="@string/create_action"
+                android:textColor="@color/md_white_1000" />
+        </android.support.v7.widget.CardView>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml
index f5d64ce2..639644ea 100644
--- a/app/src/main/res/layout/dialog_sleep_timer.xml
+++ b/app/src/main/res/layout/dialog_sleep_timer.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -23,8 +24,8 @@
             android:id="@+id/timer_display"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
             android:textAppearance="?android:textAppearanceLarge" />
 
 
@@ -43,23 +44,50 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:gravity="end"
+            android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/action_set"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            <android.support.v7.widget.CardView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="start|center_vertical"
-                android:text="@string/action_set" />
+                android:layout_gravity="end|bottom"
+                app:cardBackgroundColor="@color/md_green_A700"
+                app:cardCornerRadius="6dp"
+                app:cardUseCompatPadding="true">
 
-            <Button
-                android:id="@+id/action_cancel"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                <TextView
+                    android:id="@+id/action_set"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingStart="28dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="28dp"
+                    android:paddingBottom="12dp"
+                    android:text="@string/action_set"
+                    android:textColor="@color/md_white_1000" />
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="start|center_vertical"
-                android:text="@string/cancel_current_timer" />
+                android:layout_gravity="end|bottom"
+                app:cardBackgroundColor="@color/md_red_A400"
+                app:cardCornerRadius="6dp"
+                app:cardUseCompatPadding="true">
+
+                <TextView
+                    android:id="@+id/action_cancel"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingStart="28dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="28dp"
+                    android:paddingBottom="12dp"
+                    android:text="@string/cancel_current_timer"
+                    android:textColor="@color/md_white_1000" />
+            </android.support.v7.widget.CardView>
         </LinearLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 7be297fd..7964f5c9 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -76,6 +76,11 @@
                     </android.support.v7.widget.Toolbar>
                 </FrameLayout>
             </android.support.design.widget.CollapsingToolbarLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?dividerColor" />
         </android.support.design.widget.AppBarLayout>
 
         <FrameLayout
diff --git a/app/src/main/res/layout/fragment_holiday_controls_fragment.xml b/app/src/main/res/layout/fragment_holiday_controls_fragment.xml
deleted file mode 100644
index 38abca47..00000000
--- a/app/src/main/res/layout/fragment_holiday_controls_fragment.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/playback_controls"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:ignore="MissingPrefix">
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingEnd="24dp"
-        android:paddingStart="24dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textColor="@color/md_white_1000"
-        tools:text="Title" />
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="4dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingBottom="8dp"
-        android:paddingEnd="24dp"
-        android:paddingStart="24dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textColor="@color/md_grey_300" />
-
-    <SeekBar
-        android:id="@+id/player_progress_slider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingEnd="24dp"
-        android:paddingStart="24dp"
-        android:splitTrack="false"
-        tools:progress="20" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
-
-        <TextView
-            android:id="@+id/player_song_current_progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:textColor="@color/md_grey_300"
-            android:textSize="12sp"
-            android:textStyle="bold"
-            tools:text="22.00" />
-
-
-        <TextView
-            android:id="@+id/player_song_total_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:textColor="@color/md_grey_300"
-            android:textSize="12sp"
-            android:textStyle="bold"
-            tools:text="22.00" />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/player_media_controller_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        tools:ignore="ContentDescription,UnusedAttribute">
-
-        <ImageButton
-            android:id="@+id/player_prev_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <ImageButton
-            android:id="@+id/player_next_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="8dp"
-            android:layout_toEndOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <ImageButton
-            android:id="@+id/player_repeat_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_repeat_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <ImageButton
-            android:id="@+id/player_shuffle_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_shuffle_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <Space
-            android:id="@+id/dummy_fab"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_centerInParent="true" />
-
-        <ImageButton
-            android:id="@+id/player_play_pause_button"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_above="@id/title_container"
-            android:layout_centerInParent="true"
-            android:background="@drawable/color_circle_gradient"
-            android:elevation="4dp"
-            android:padding="16dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
-
-    </RelativeLayout>
-
-    <FrameLayout
-        android:id="@+id/volume_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0">
-
-        <fragment
-            android:id="@+id/volume_fragment"
-            android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@layout/fragment_volume" />
-    </FrameLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_holiday_player.xml b/app/src/main/res/layout/fragment_holiday_player.xml
deleted file mode 100644
index 643f40ca..00000000
--- a/app/src/main/res/layout/fragment_holiday_player.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/holiday_background" />
-
-    <com.jetradarmobile.snowfall.SnowfallView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:snowflakesNum="80" />
-
-    <View
-        android:id="@+id/gradient_background"
-        android:layout_width="match_parent"
-        android:layout_height="16dp"
-        android:layout_gravity="bottom"
-        android:background="@drawable/shadow_up_home"
-        android:backgroundTint="?colorPrimary" />
-
-    <LinearLayout
-        android:id="@+id/now_playing_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:id="@+id/album_cover_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <fragment
-                android:id="@+id/player_album_cover_fragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                tools:layout="@layout/fragment_player_album_cover" />
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <fragment
-                android:id="@+id/playback_controls_fragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.holiday.HolidayPlaybackControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_holiday_controls_fragment" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/toolbar_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0">
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/player_toolbar"
-                style="@style/Toolbar48"
-                android:layout_height="48dp"
-                android:navigationIcon="@drawable/ic_close_white_24dp"
-                app:navigationIcon="@drawable/ic_close_white_24dp" />
-        </FrameLayout>
-    </LinearLayout>
-
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 6e1a7b53..26c9475d 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -22,13 +22,15 @@
         <android.support.design.widget.AppBarLayout
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:elevation="0dp"
+            app:elevation="0dp">
 
             <android.support.design.widget.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
+                app:layout_scrollFlags="scroll|enterAlways"
                 app:titleEnabled="false">
 
                 <FrameLayout
@@ -55,10 +57,10 @@
 
                             <code.name.monkey.retromusic.views.IconImageView
                                 android:id="@+id/search"
-                                android:background="?roundSelector"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="0"
+                                android:background="?roundSelector"
                                 android:padding="12dp"
                                 android:src="@drawable/ic_search_white_24dp" />
 
@@ -77,6 +79,11 @@
                     </android.support.v7.widget.Toolbar>
                 </FrameLayout>
             </android.support.design.widget.CollapsingToolbarLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?dividerColor" />
         </android.support.design.widget.AppBarLayout>
 
         <FrameLayout
diff --git a/app/src/main/res/layout/home_section_content.xml b/app/src/main/res/layout/home_section_content.xml
index fbb2cd10..3270786e 100644
--- a/app/src/main/res/layout/home_section_content.xml
+++ b/app/src/main/res/layout/home_section_content.xml
@@ -58,7 +58,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false"
-            app:itemMargin="32dp" />
+            app:itemMargin="28dp" />
 
         <View
             android:layout_width="match_parent"
@@ -119,7 +119,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false"
-            app:itemMargin="32dp" />
+            app:itemMargin="28dp" />
 
         <View
             android:layout_width="match_parent"