From dcac18f75656f048b03ac77ee783c2ebeb70a770 Mon Sep 17 00:00:00 2001
From: Eugene Cheung <ey.cheung@outlook.com>
Date: Wed, 28 Jun 2017 17:50:40 -0400
Subject: [PATCH 1/2] Default notification background to white

---
 .../service/notification/PlayingNotificationImpl.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java
index 843affc6..25408dc4 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java
@@ -102,7 +102,7 @@ public class PlayingNotificationImpl extends PlayingNotification {
                             @Override
                             public void onLoadFailed(Exception e, Drawable errorDrawable) {
                                 super.onLoadFailed(e, errorDrawable);
-                                update(null, Color.TRANSPARENT);
+                                update(null, Color.WHITE);
                             }
 
                             private void update(@Nullable Bitmap bitmap, int bgColor) {
@@ -115,10 +115,10 @@ public class PlayingNotificationImpl extends PlayingNotification {
                                 }
 
                                 if (!PreferenceUtil.getInstance(service).coloredNotification()) {
-                                    bgColor = Color.TRANSPARENT;
+                                    bgColor = Color.WHITE;
                                 }
                                 setBackgroundColor(bgColor);
-                                setNotificationContent(bgColor == Color.TRANSPARENT ? Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP : ColorUtil.isColorLight(bgColor));
+                                setNotificationContent(ColorUtil.isColorLight(bgColor));
 
                                 if (stopped)
                                     return; // notification has been stopped before loading was finished

From aa736badf2f0fc978bf16b8a5c2eb174e9eb1d2b Mon Sep 17 00:00:00 2001
From: Eugene Cheung <ey.cheung@outlook.com>
Date: Wed, 28 Jun 2017 17:51:07 -0400
Subject: [PATCH 2/2] Remove unnecessary wrapper layouts

---
 app/src/main/res/layout/notification.xml     | 219 ++++++++---------
 app/src/main/res/layout/notification_big.xml | 243 ++++++++++---------
 2 files changed, 229 insertions(+), 233 deletions(-)

diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index bac198e7..deaba784 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -14,130 +14,121 @@
   ~ limitations under the License
   -->
 
-<!--This FrameLayout IS necessary in order tp prevent fucking TouchWiz to interpret the "background="#00000000" as making the whole notification transparent-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="64dp">
+    android:layout_height="64dp"
+    android:baselineAligned="false"
+    android:orientation="horizontal">
+
+    <FrameLayout
+        android:id="@+id/icon_group"
+        android:layout_width="@dimen/notification_large_icon_width"
+        android:layout_height="@dimen/notification_large_icon_height"
+        android:layout_weight="0">
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:scaleType="centerInside"
+            tools:ignore="ContentDescription" />
+
+    </FrameLayout>
 
     <LinearLayout
-        android:id="@+id/root"
+        android:id="@+id/media_titles"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#00000000"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        tools:ignore="UselessParent">
+        android:layout_height="wrap_content"
+        android:layout_gravity="fill_vertical"
+        android:layout_weight="1"
+        android:minHeight="@dimen/notification_large_icon_height"
+        android:orientation="vertical">
 
-        <FrameLayout
-            android:id="@+id/icon_group"
-            android:layout_width="@dimen/notification_large_icon_width"
-            android:layout_height="@dimen/notification_large_icon_height"
-            android:layout_weight="0">
-
-            <ImageView
-                android:id="@+id/image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:scaleType="centerInside"
-                tools:ignore="ContentDescription" />
-
-        </FrameLayout>
-
-        <LinearLayout
-            android:id="@+id/media_titles"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="fill_vertical"
             android:layout_weight="1"
-            android:minHeight="@dimen/notification_large_icon_height"
-            android:orientation="vertical">
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:gravity="bottom"
+            android:singleLine="true"
+            android:textAppearance="@style/Theme.Phonograph.Notification.Title"
+            tools:ignore="NestedWeights" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:gravity="bottom"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.Phonograph.Notification.Title"
-                tools:ignore="NestedWeights" />
-
-            <TextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.Phonograph.Notification" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/media_actions"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="6dp"
-            android:layout_marginRight="6dp"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal"
-            tools:ignore="UnusedAttribute">
-
-            <!-- media buttons will be added here -->
-            <ImageButton
-                android:id="@+id/action_prev"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-            <ImageButton
-                android:id="@+id/action_play_pause"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-            <ImageButton
-                android:id="@+id/action_next"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-        </LinearLayout>
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="@style/Theme.Phonograph.Notification" />
 
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+    <LinearLayout
+        android:id="@+id/media_actions"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginEnd="6dp"
+        android:layout_marginRight="6dp"
+        android:layoutDirection="ltr"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
+
+        <!-- media buttons will be added here -->
+        <ImageButton
+            android:id="@+id/action_prev"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_weight="1"
+            android:background="@drawable/notification_selector"
+            android:gravity="center"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
+            tools:ignore="ContentDescription" />
+
+        <ImageButton
+            android:id="@+id/action_play_pause"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_weight="1"
+            android:background="@drawable/notification_selector"
+            android:gravity="center"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
+            tools:ignore="ContentDescription" />
+
+        <ImageButton
+            android:id="@+id/action_next"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_weight="1"
+            android:background="@drawable/notification_selector"
+            android:gravity="center"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
+            tools:ignore="ContentDescription" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/notification_big.xml b/app/src/main/res/layout/notification_big.xml
index 535a85bc..50428d2f 100644
--- a/app/src/main/res/layout/notification_big.xml
+++ b/app/src/main/res/layout/notification_big.xml
@@ -16,132 +16,137 @@
 
 <!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
 
-<!--This FrameLayout IS necessary in order tp prevent fucking TouchWiz to interpret the "background="#00000000" as making the whole notification transparent-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="128dp">
 
-    <RelativeLayout
-        android:id="@+id/root"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#00000000"
-        tools:ignore="UselessParent">
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="@dimen/notification_big_image_size"
+        android:layout_height="@dimen/notification_big_image_size"
+        android:scaleType="centerCrop"
+        tools:ignore="ContentDescription" />
 
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="@dimen/notification_big_image_size"
-            android:layout_height="@dimen/notification_big_image_size"
-            android:scaleType="centerCrop"
+    <ImageButton
+        android:id="@+id/action_quit"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="2dp"
+        android:background="@drawable/notification_selector"
+        android:padding="6dp"
+        android:scaleType="fitCenter"
+        tools:ignore="ContentDescription" />
+
+    <LinearLayout
+        android:id="@+id/media_titles"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="8dp"
+        android:layout_toEndOf="@id/image"
+        android:layout_toLeftOf="@id/action_quit"
+        android:layout_toRightOf="@id/image"
+        android:layout_toStartOf="@id/action_quit"
+        android:minHeight="@dimen/notification_large_icon_height"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="@style/Theme.Phonograph.Notification.Title" />
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dp"
+            android:layout_marginTop="-1dp"
+            android:layout_weight="1"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="@style/Theme.Phonograph.Notification" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="@style/Theme.Phonograph.Notification" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/media_actions"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_below="@+id/media_titles"
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_toEndOf="@id/image"
+        android:layout_toRightOf="@id/image"
+        android:layoutDirection="ltr"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
+
+        <!-- media buttons will be added here -->
+        <ImageButton
+            android:id="@+id/action_prev"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_weight="1"
+            android:background="@drawable/notification_selector"
+            android:gravity="center"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
             tools:ignore="ContentDescription" />
 
-        <LinearLayout
-            android:id="@+id/media_titles"
-            android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginLeft="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="8dp"
-            android:layout_toEndOf="@id/image"
-            android:layout_toRightOf="@id/image"
-            android:minHeight="@dimen/notification_large_icon_height"
-            android:orientation="vertical">
+        <ImageButton
+            android:id="@+id/action_play_pause"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_weight="1"
+            android:background="@drawable/notification_selector"
+            android:gravity="center"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
+            tools:ignore="ContentDescription" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.Phonograph.Notification.Title" />
+        <ImageButton
+            android:id="@+id/action_next"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_weight="1"
+            android:background="@drawable/notification_selector"
+            android:gravity="center"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
+            tools:ignore="ContentDescription" />
 
-            <TextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="-1dp"
-                android:layout_marginTop="-1dp"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.Phonograph.Notification" />
+    </LinearLayout>
 
-            <TextView
-                android:id="@+id/text2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.Phonograph.Notification" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/media_actions"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_below="@+id/media_titles"
-            android:layout_marginEnd="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_toEndOf="@id/image"
-            android:layout_toRightOf="@id/image"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal"
-            tools:ignore="UnusedAttribute">
-
-            <!-- media buttons will be added here -->
-            <ImageButton
-                android:id="@+id/action_prev"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-            <ImageButton
-                android:id="@+id/action_play_pause"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-            <ImageButton
-                android:id="@+id/action_next"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>