From 84534303e43ca9781b0dc55f1d0943c10a2ad826 Mon Sep 17 00:00:00 2001
From: Aidan Follestad <drummer.aidan@gmail.com>
Date: Sat, 18 Apr 2015 02:44:35 -0500
Subject: [PATCH] More updates. To fix tomorrow on KitKat: FAB is too far down,
 status bar color is wrong in artist/album detaill screens.

---
 app/src/main/res/layout/activity_main.xml | 10 ++++++----
 app/src/main/res/values-v19/dimens.xml    |  2 +-
 app/src/main/res/values-v21/dimens.xml    |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1d0cb7d9..3a561dba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,12 +15,14 @@
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:clipToPadding="false" />
+            android:clipToPadding="false"
+            android:fitsSystemWindows="true" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingTop="@dimen/main_toolbar_paddingtop">
 
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
@@ -69,8 +71,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|right|bottom"
-            android:fitsSystemWindows="true"
-            tools:ignore="RtlHardcoded">
+            tools:ignore="RtlHardcoded"
+            android:fitsSystemWindows="true">
 
             <com.melnykov.fab.FloatingActionButton
                 android:id="@+id/fab"
diff --git a/app/src/main/res/values-v19/dimens.xml b/app/src/main/res/values-v19/dimens.xml
index d6eaf99c..a7e78eb3 100644
--- a/app/src/main/res/values-v19/dimens.xml
+++ b/app/src/main/res/values-v19/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="statusMargin">25dp</dimen>
-
     <dimen name="navigation_drawer_image_height">165dp</dimen>
+    <dimen name="main_toolbar_paddingtop">@dimen/statusMargin</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
index d6eaf99c..b0d7e609 100644
--- a/app/src/main/res/values-v21/dimens.xml
+++ b/app/src/main/res/values-v21/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="statusMargin">25dp</dimen>
-
     <dimen name="navigation_drawer_image_height">165dp</dimen>
+    <dimen name="main_toolbar_paddingtop">0dp</dimen>
 </resources>
\ No newline at end of file