From d5b0a8fc15fadb5654936d089a4ae144e07dd9f9 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Wed, 28 Oct 2015 10:52:27 +0100
Subject: [PATCH] Fixed wrong alignment of prev/next buttons on devices below
 Lollipop. Cleaned up unused resources.

---
 app/src/main/assets/changelog.html          | 6 ++++++
 app/src/main/res/layout/fragment_player.xml | 8 ++++----
 app/src/main/res/values-v21/dimens.xml      | 1 -
 app/src/main/res/values/dimens.xml          | 4 ----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 6b78a25b..6ebabf19 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -25,6 +25,12 @@
 
 <p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>
 
+<h3>Version 0.9.47 beta 2</h3>
+
+<ol>
+    <li><b>FIX:</b> Wrong alignment of prev/next buttons on devices below Lollipop.</li>
+</ol>
+
 <h3>Version 0.9.47 beta 1</h3>
 
 <ol>
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index b81e0320..286627c2 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -124,8 +124,8 @@
                     android:layout_width="72dp"
                     android:layout_height="72dp"
                     android:layout_centerVertical="true"
-                    android:layout_marginEnd="@dimen/tmp_now_playing_skip_rewind_margin"
-                    android:layout_marginRight="@dimen/tmp_now_playing_skip_rewind_margin"
+                    android:layout_marginEnd="-8dp"
+                    android:layout_marginRight="-8dp"
                     android:layout_toLeftOf="@+id/dummy_fab"
                     android:layout_toStartOf="@+id/dummy_fab"
                     android:background="?round_selector"
@@ -139,8 +139,8 @@
                     android:layout_width="72dp"
                     android:layout_height="72dp"
                     android:layout_centerVertical="true"
-                    android:layout_marginLeft="@dimen/tmp_now_playing_skip_rewind_margin"
-                    android:layout_marginStart="@dimen/tmp_now_playing_skip_rewind_margin"
+                    android:layout_marginLeft="-8dp"
+                    android:layout_marginStart="-8dp"
                     android:layout_toEndOf="@+id/dummy_fab"
                     android:layout_toRightOf="@+id/dummy_fab"
                     android:background="?round_selector"
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
index 3f4ecc65..d76109ac 100644
--- a/app/src/main/res/values-v21/dimens.xml
+++ b/app/src/main/res/values-v21/dimens.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="fab_margin_top_left_right">16dp</dimen>
-    <dimen name="fab_margin_bottom">20dp</dimen>
     <dimen name="tmp_now_playing_skip_rewind_margin">-8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ba38643a..d29838fe 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -26,9 +26,6 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     <dimen name="pause_bar_distance">4dp</dimen>
     <dimen name="pause_bar_height">14dp</dimen>
 
-    <dimen name="fab_icon_bound_width">56dp</dimen>
-    <dimen name="fab_icon_bound_height">36dp</dimen>
-
     <dimen name="color_view_border">1dp</dimen>
 
     <dimen name="empty_text_size">20sp</dimen>
@@ -46,7 +43,6 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
 
     <!-- ONLY 0dp WHILE THERE IS THE BUG IN DESIGN SUPPORT LIBRARY 22.2.0-->
     <dimen name="fab_margin_top_left_right">0dp</dimen>
-    <dimen name="fab_margin_bottom">0dp</dimen>
     <dimen name="tmp_now_playing_skip_rewind_margin">-24dp</dimen>
 
     <dimen name="title_box_padding_small">16dp</dimen>