From 7410515d1ee223464354295a206dff82110c86a6 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Wed, 30 Oct 2019 20:39:55 +0530
Subject: [PATCH] Fix notification layout

---
 .../base/AbsSlidingMusicPanelActivity.kt      |   4 -
 .../layout_notification_collapsed.xml         | 159 ------------------
 .../layout_notification_expanded.xml          | 143 ----------------
 .../layout/layout_notification_collapsed.xml  |  14 +-
 4 files changed, 8 insertions(+), 312 deletions(-)
 delete mode 100644 app/src/main/res/layout-v24/layout_notification_collapsed.xml
 delete mode 100644 app/src/main/res/layout-v24/layout_notification_expanded.xml

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 653b2f2d..ac82c657 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -128,10 +128,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
         return slidingMusicPanelLayout
     }
 
-    fun setAntiDragView(antiDragView: View) {
-        //slidingLayout.setAntiDragView(antiDragView)
-    }
-
     private fun collapsePanel() {
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
     }
diff --git a/app/src/main/res/layout-v24/layout_notification_collapsed.xml b/app/src/main/res/layout-v24/layout_notification_collapsed.xml
deleted file mode 100644
index cc70cd7d..00000000
--- a/app/src/main/res/layout-v24/layout_notification_collapsed.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/background"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:ignore="ContentDescription">
-
-    <RelativeLayout
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/content"
-        android:layout_alignParentEnd="true">
-
-        <ImageView
-            android:id="@+id/largeIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-
-        <ImageView
-            android:id="@+id/foregroundImage"
-            android:layout_width="96dp"
-            android:layout_height="match_parent"
-            android:layout_alignStart="@id/largeIcon"
-            android:src="@drawable/background_image"
-            tools:tint="?colorPrimary" />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/app"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="48dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingStart="8dp"
-        android:paddingTop="4dp"
-        android:paddingEnd="8dp">
-
-        <ImageView
-            android:id="@+id/smallIcon"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:layout_marginStart="8dp"
-            tools:src="@drawable/ic_audiotrack_black_24dp"
-            tools:tint="@color/md_black_1000" />
-
-        <TextView
-            android:id="@+id/appName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:ellipsize="end"
-            android:lines="1"
-            android:singleLine="true"
-            android:textSize="10sp"
-            tools:text="@string/app_name" />
-
-        <ImageView
-            android:id="@+id/arrow"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:layout_marginStart="2dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
-            android:tint="@color/md_black_1000"
-            tools:ignore="VectorDrawableCompat" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/app"
-        android:layout_alignParentStart="true"
-        android:layout_toStartOf="@id/actions"
-        android:orientation="vertical"
-        android:paddingStart="16dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="4dp">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:singleLine="true"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-
-        <TextView
-            android:id="@+id/subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:singleLine="true"
-            android:textSize="12sp"
-            tools:text="@tools:sample/lorem/random" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/actions"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/content"
-        android:layout_alignBottom="@id/content"
-        android:layout_alignParentEnd="true"
-        android:layout_gravity="bottom"
-        android:layout_marginEnd="24dp"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/action_prev"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_previous_round_white_32dp"
-            tools:tint="?colorOnPrimary" />
-
-        <ImageView
-            android:id="@+id/action_play_pause"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_pause_white_24dp"
-            tools:tint="?colorOnPrimary" />
-
-        <ImageView
-            android:id="@+id/action_next"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_next_round_white_32dp"
-            tools:tint="?colorOnPrimary" />
-
-        <ImageView
-            android:id="@+id/action_quit"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:scaleType="centerInside"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/fifth"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:scaleType="centerInside" />
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v24/layout_notification_expanded.xml b/app/src/main/res/layout-v24/layout_notification_expanded.xml
deleted file mode 100644
index 13b84b97..00000000
--- a/app/src/main/res/layout-v24/layout_notification_expanded.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/background"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/content"
-        android:layout_alignParentEnd="true">
-
-        <ImageView
-            android:id="@+id/largeIcon"
-            android:layout_width="@dimen/notification_big_image_size"
-            android:layout_height="@dimen/notification_big_image_size"
-            android:layout_alignParentEnd="true"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-
-        <ImageView
-            android:id="@+id/foregroundImage"
-            android:layout_width="96dp"
-            android:layout_height="match_parent"
-            android:layout_alignStart="@id/largeIcon"
-            android:src="@drawable/background_image" />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:orientation="vertical"
-        android:paddingStart="0dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="144dp">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/smallIcon"
-                android:layout_width="12dp"
-                android:layout_height="12dp"
-                android:layout_marginStart="16dp"
-                tools:src="@drawable/ic_audiotrack_black_24dp"
-                tools:tint="@color/md_black_1000" />
-
-            <TextView
-                android:id="@+id/appName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:ellipsize="end"
-                android:lines="1"
-                android:singleLine="true"
-                android:textSize="13sp"
-                tools:text="@tools:sample/lorem/random" />
-
-            <ImageView
-                android:id="@+id/arrow"
-                android:layout_width="12dp"
-                android:layout_height="12dp"
-                android:layout_marginStart="2dp"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_keyboard_arrow_up_24dp"
-                android:tint="@color/dark_grey"
-                tools:ignore="VectorDrawableCompat" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:paddingStart="16dp"
-            android:paddingEnd="0dp"
-            android:singleLine="true"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-
-        <TextView
-            android:id="@+id/subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:paddingStart="16dp"
-            android:paddingEnd="0dp"
-            android:singleLine="true"
-            tools:text="@tools:sample/lorem/random" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:paddingStart="8dp"
-            android:paddingEnd="0dp">
-
-            <ImageView
-                android:id="@+id/action_prev"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_previous_round_white_32dp"
-                tools:tint="?colorOnPrimary" />
-
-            <ImageView
-                android:id="@+id/action_play_pause"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:scaleType="centerInside"
-                tools:src="@drawable/ic_pause_white_48dp"
-                tools:tint="?colorOnPrimary" />
-
-            <ImageView
-                android:id="@+id/action_next"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_next_round_white_32dp"
-                tools:tint="?colorOnPrimary" />
-
-            <ImageView
-                android:id="@+id/action_quit"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:scaleType="centerInside"
-                tools:src="@drawable/ic_close_white_24dp"
-                tools:tint="?colorOnPrimary" />
-        </LinearLayout>
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_notification_collapsed.xml b/app/src/main/res/layout/layout_notification_collapsed.xml
index 9e66d97f..cd3576df 100644
--- a/app/src/main/res/layout/layout_notification_collapsed.xml
+++ b/app/src/main/res/layout/layout_notification_collapsed.xml
@@ -4,6 +4,7 @@
     android:id="@+id/background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    tools:background="@color/md_red_500"
     tools:ignore="ContentDescription">
 
     <RelativeLayout
@@ -39,14 +40,14 @@
         android:layout_marginEnd="48dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingStart="8dp"
+        android:paddingStart="4dp"
         android:paddingTop="4dp"
         android:paddingEnd="8dp">
 
         <ImageView
             android:id="@+id/smallIcon"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
             android:layout_marginStart="8dp"
             tools:src="@drawable/ic_audiotrack_black_24dp"
             tools:tint="@color/md_black_1000" />
@@ -64,8 +65,8 @@
 
         <ImageView
             android:id="@+id/arrow"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
             android:layout_marginStart="2dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
@@ -82,7 +83,8 @@
         android:layout_alignParentStart="true"
         android:layout_toStartOf="@id/actions"
         android:orientation="vertical"
-        android:paddingStart="16dp"
+        android:paddingStart="12dp"
+        android:paddingBottom="4dp"
         android:paddingEnd="12dp">
 
         <TextView