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">
-
+ app:layout_scrollFlags="scroll|enterAlways"
+ app:titleEnabled="false">
-
+
+
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
+ app:layout_collapseMode="pin">
\ 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" />
@@ -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" />
@@ -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" />
@@ -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" />
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:layout_height="wrap_content">
+
+
+
-
+ android:layout_gravity="end|bottom"
+ app:cardBackgroundColor="@color/md_white_1000"
+ app:cardCornerRadius="6dp"
+ app:cardElevation="0dp"
+ app:cardUseCompatPadding="true">
-
+
+
+
+ android:layout_gravity="end|bottom"
+ app:cardBackgroundColor="@color/md_red_A400"
+ app:cardCornerRadius="6dp"
+ app:cardUseCompatPadding="true">
+
+
+
\ 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 @@
@@ -43,23 +44,50 @@
+ android:gravity="end"
+ android:orientation="horizontal">
-
+ android:layout_gravity="end|bottom"
+ app:cardBackgroundColor="@color/md_green_A700"
+ app:cardCornerRadius="6dp"
+ app:cardUseCompatPadding="true">
-
+
+
+
+ android:layout_gravity="end|bottom"
+ app:cardBackgroundColor="@color/md_red_A400"
+ app:cardCornerRadius="6dp"
+ app:cardUseCompatPadding="true">
+
+
+
\ 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 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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:layout_height="wrap_content"
+ android:elevation="0dp"
+ app:elevation="0dp">
@@ -77,6 +79,11 @@
+
+
+ app:itemMargin="28dp" />
+ app:itemMargin="28dp" />