From 71761675cf8dde99a6ae1bd00812e7e5a2f0562c Mon Sep 17 00:00:00 2001
From: Somethingweirdhere <gtp@g.com>
Date: Tue, 19 Jun 2018 13:48:22 +0200
Subject: [PATCH] Fixes problems 1-3

---
 app/src/main/res/layout-v21/drawer_header.xml | 69 +++++++++++++++++++
 .../res/layout/dialog_contentsettings.xml     | 23 ++++---
 app/src/main/res/layout/drawer_header.xml     | 12 ++--
 3 files changed, 89 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/layout-v21/drawer_header.xml

diff --git a/app/src/main/res/layout-v21/drawer_header.xml b/app/src/main/res/layout-v21/drawer_header.xml
new file mode 100644
index 000000000..918bbaf43
--- /dev/null
+++ b/app/src/main/res/layout-v21/drawer_header.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="150dp"
+    android:clickable="true"
+    android:focusable="true">
+
+    <Button
+        android:id="@+id/drawer_header_action_button"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:attr/selectableItemBackground" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorPrimary"
+        android:scaleType="centerCrop"
+        android:src="@drawable/background_header" />
+
+    <ImageView
+        android:id="@+id/drawer_header_np_nude_view"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_marginLeft="30dp"
+
+        android:layout_marginStart="30dp"
+        android:layout_marginTop="30dp"
+        android:src="@drawable/np_logo_nude_shadow" />
+
+    <TextView
+        android:id="@+id/drawer_header_np_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_alignBottom="@id/drawer_header_np_nude_view"
+        android:layout_alignTop="@id/drawer_header_np_nude_view"
+        android:layout_toEndOf="@id/drawer_header_np_nude_view"
+        android:layout_toRightOf="@id/drawer_header_np_nude_view"
+        android:gravity="center"
+        android:text="@string/app_name"
+        android:textSize="30dp"
+        android:textStyle="bold|italic" />
+
+    <TextView
+        android:id="@+id/drawer_header_service_view"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_alignLeft="@id/drawer_header_np_text_view"
+        android:layout_alignStart="@id/drawer_header_np_text_view"
+        android:layout_below="@id/drawer_header_np_text_view"
+        android:text="YouTube"
+        android:textSize="18dp"
+        android:textStyle="italic" />
+
+    <ImageView
+        android:id="@+id/drawer_arrow"
+        android:layout_width="30dp"
+        android:layout_height="35dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="0dp"
+        android:paddingBottom="20dp"
+        android:paddingEnd="20dp"
+        android:paddingRight="20dp"
+        android:src="@drawable/ic_arrow_down_white" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_contentsettings.xml b/app/src/main/res/layout/dialog_contentsettings.xml
index 5669dc4c3..2bdf261f4 100644
--- a/app/src/main/res/layout/dialog_contentsettings.xml
+++ b/app/src/main/res/layout/dialog_contentsettings.xml
@@ -6,16 +6,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/floatingActionButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="16dp"
-        android:clickable="true" />
-
     <android.support.v7.widget.RecyclerView
         android:id="@+id/usedTabs"
         android:layout_width="match_parent"
@@ -26,4 +16,17 @@
 
     </android.support.v7.widget.RecyclerView>
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/floatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="16dp"
+        android:clickable="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="16dp"
+        android:focusable="true" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 5dee35eeb..9e00e01e6 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -54,14 +54,16 @@ android:focusable="true">
 
     <ImageView
         android:id="@+id/drawer_arrow"
-        android:layout_width="10dp"
-        android:layout_height="15dp"
+        android:layout_width="30dp"
+        android:layout_height="35dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_gravity="bottom"
-        android:layout_marginBottom="20dp"
-        android:layout_marginRight="20dp"
-        android:src="@drawable/ic_arrow_down_white" />
+        android:layout_marginBottom="0dp"
+        android:paddingBottom="20dp"
+        android:paddingRight="20dp"
+        android:src="@drawable/ic_arrow_down_white"
+        android:paddingEnd="20dp" />
 
 </RelativeLayout>
\ No newline at end of file