From 24fbc59b111e89592db2e7aa6b632fd435e71031 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Thu, 31 Oct 2019 22:36:13 +0530
Subject: [PATCH] Fix layout issue in notificaiton

---
 app/build.gradle                              |  2 +-
 .../name/monkey/retromusic/AppExecutors.kt    | 27 -------------------
 .../notification/PlayingNotificationOreo.kt   |  4 ---
 .../layout/layout_notification_collapsed.xml  | 14 +++-------
 .../layout/layout_notification_expanded.xml   |  9 +------
 build.gradle                                  |  2 +-
 6 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 app/src/main/java/code/name/monkey/retromusic/AppExecutors.kt

diff --git a/app/build.gradle b/app/build.gradle
index f60ad4e7..270ffddf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 385
+        versionCode 387
         versionName '3.4.500'
 
         multiDexEnabled true
diff --git a/app/src/main/java/code/name/monkey/retromusic/AppExecutors.kt b/app/src/main/java/code/name/monkey/retromusic/AppExecutors.kt
deleted file mode 100644
index 7d8c5aaf..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/AppExecutors.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic
-
-import kotlinx.coroutines.Dispatchers
-import kotlin.coroutines.CoroutineContext
-
-/**
- * Created by hemanths on 2019-10-23.
- */
-
-class AppExecutors constructor(
-        val ioContext: CoroutineContext = Dispatchers.IO,
-        val uiContext: CoroutineContext = Dispatchers.Main
-)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
index 8c5746ce..645e5e30 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
@@ -139,12 +139,8 @@ class PlayingNotificationOreo : PlayingNotification() {
                         }
 
                         private fun setBackgroundColor(color: Int) {
-
                             notificationLayout.setInt(R.id.image, "setBackgroundColor", color)
                             notificationLayoutBig.setInt(R.id.image, "setBackgroundColor", color)
-
-                            notificationLayout.setInt(R.id.foregroundImage, "setColorFilter", color)
-                            notificationLayoutBig.setInt(R.id.foregroundImage, "setColorFilter", color)
                         }
 
                         private fun setNotificationContent(dark: Boolean) {
diff --git a/app/src/main/res/layout/layout_notification_collapsed.xml b/app/src/main/res/layout/layout_notification_collapsed.xml
index cd3576df..e8d97665 100644
--- a/app/src/main/res/layout/layout_notification_collapsed.xml
+++ b/app/src/main/res/layout/layout_notification_collapsed.xml
@@ -23,14 +23,6 @@
             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
@@ -60,7 +52,7 @@
             android:ellipsize="end"
             android:lines="1"
             android:singleLine="true"
-            android:textSize="12sp"
+            android:textSize="10sp"
             tools:text="@string/app_name" />
 
         <ImageView
@@ -84,8 +76,8 @@
         android:layout_toStartOf="@id/actions"
         android:orientation="vertical"
         android:paddingStart="12dp"
-        android:paddingBottom="4dp"
-        android:paddingEnd="12dp">
+        android:paddingEnd="12dp"
+        android:paddingBottom="4dp">
 
         <TextView
             android:id="@+id/title"
diff --git a/app/src/main/res/layout/layout_notification_expanded.xml b/app/src/main/res/layout/layout_notification_expanded.xml
index 87bd1a73..bd8de1fd 100644
--- a/app/src/main/res/layout/layout_notification_expanded.xml
+++ b/app/src/main/res/layout/layout_notification_expanded.xml
@@ -20,13 +20,6 @@
             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
@@ -62,7 +55,7 @@
                 android:ellipsize="end"
                 android:lines="1"
                 android:singleLine="true"
-                android:textSize="13sp"
+                android:textSize="10sp"
                 tools:text="@string/app_name" />
 
             <ImageView
diff --git a/build.gradle b/build.gradle
index c6b783ca..373fd761 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.41'
     repositories {
         jcenter()
         google()