From 06a87d57049e29490c767abdf4ff7189b5bcab79 Mon Sep 17 00:00:00 2001
From: Paolo Valerdi <paolovalerdi@gmail.com>
Date: Fri, 24 Aug 2018 09:51:24 -0500
Subject: [PATCH] Notch support

---
 .../gramophone/views/StatusBarView.java       | 41 +++++++++++++++++++
 .../main/res/layout/fragment_card_player.xml  | 24 +++++++----
 .../main/res/layout/fragment_flat_player.xml  |  4 +-
 .../res/layout/shadow_statusbar_toolbar.xml   |  2 +-
 app/src/main/res/layout/status_bar.xml        |  2 +-
 5 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/com/kabouzeid/gramophone/views/StatusBarView.java

diff --git a/app/src/main/java/com/kabouzeid/gramophone/views/StatusBarView.java b/app/src/main/java/com/kabouzeid/gramophone/views/StatusBarView.java
new file mode 100644
index 00000000..07a2587a
--- /dev/null
+++ b/app/src/main/java/com/kabouzeid/gramophone/views/StatusBarView.java
@@ -0,0 +1,41 @@
+package com.kabouzeid.gramophone.views;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.view.View;
+
+/*
+    This is a temporally fix
+*/
+
+public class StatusBarView extends View {
+
+
+    public StatusBarView(Context context) {
+        super(context);
+    }
+
+    public StatusBarView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public StatusBarView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(
+                MeasureSpec.getSize(widthMeasureSpec), getStatusBarHeight(getResources()));
+    }
+
+    public static int getStatusBarHeight(Resources r) {
+        int result = 0;
+        int resourceId = r.getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = r.getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+}
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 37ffc856..9045c173 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -6,8 +6,7 @@
 
     <!--The unused FrameLayout layout is necessary to prevent a crash on rotate-->
 
-    <com.sothree.slidinguppanel.SlidingUpPanelLayout
-        xmlns:sothree="http://schemas.android.com/apk/res-auto"
+    <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
         android:id="@+id/player_sliding_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -65,11 +64,22 @@
 
                 <include layout="@layout/shadow_statusbar_toolbar" />
 
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/player_toolbar"
-                    style="@style/Toolbar"
-                    android:layout_marginTop="@dimen/status_bar_padding"
-                    android:background="@android:color/transparent" />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <com.kabouzeid.gramophone.views.StatusBarView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <android.support.v7.widget.Toolbar
+                        android:id="@+id/player_toolbar"
+                        style="@style/Toolbar"
+                        android:background="@android:color/transparent" />
+
+                </LinearLayout>
+
 
             </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 0d84e5ea..99885e41 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -8,12 +8,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
-        <View
+        <com.kabouzeid.gramophone.views.StatusBarView
             android:id="@+id/player_status_bar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding" />
 
-        <View
+        <com.kabouzeid.gramophone.views.StatusBarView
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding"
             android:background="@color/twenty_percent_black_overlay" />
diff --git a/app/src/main/res/layout/shadow_statusbar_toolbar.xml b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
index 7ded9a25..9a3cea88 100644
--- a/app/src/main/res/layout/shadow_statusbar_toolbar.xml
+++ b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <View
+        <com.kabouzeid.gramophone.views.StatusBarView
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding" />
 
diff --git a/app/src/main/res/layout/status_bar.xml b/app/src/main/res/layout/status_bar.xml
index 87c5e1d5..83c3d4fd 100644
--- a/app/src/main/res/layout/status_bar.xml
+++ b/app/src/main/res/layout/status_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<View xmlns:android="http://schemas.android.com/apk/res/android"
+<com.kabouzeid.gramophone.views.StatusBarView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/status_bar"
     android:layout_width="match_parent"