From 8a91d64cda59bc4aa8afaf78140bb2741b1bdd9a Mon Sep 17 00:00:00 2001
From: Moez Bhatti <moez.bhatti@gmail.com>
Date: Mon, 9 Apr 2018 18:24:52 -0400
Subject: [PATCH] Fix messages showing up under compose bar in QkReply

---
 .../java/feature/qkreply/QkReplyActivity.kt   |  5 +++-
 .../drawable/rounded_rectangle_bottom_4dp.xml | 29 +++++++++++++++++++
 .../src/main/res/layout/qkreply_activity.xml  | 23 +++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100755 presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml

diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt
index 4d1681c1..cb2d1409 100644
--- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt
+++ b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt
@@ -69,8 +69,11 @@ class QkReplyActivity : QkThemedActivity<QkReplyViewModel>(), QkReplyView {
         viewModel.bindView(this)
 
         colors.composeBackground
+                .doOnNext  { color -> background.setBackgroundTint(color) }
+                .doOnNext  { color -> composeBackground.setBackgroundTint(color) }
+                .doOnNext  { color -> composeBackgroundGradient.setBackgroundTint(color) }
                 .autoDisposable(scope())
-                .subscribe { color -> background.setBackgroundTint(color) }
+                .subscribe()
 
         colors.bubble
                 .autoDisposable(scope())
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml
new file mode 100755
index 00000000..4c52f25e
--- /dev/null
+++ b/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS 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.
+  ~
+  ~ QKSMS 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.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners
+                android:bottomLeftRadius="4dp"
+                android:bottomRightRadius="4dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/qkreply_activity.xml b/presentation/src/main/res/layout/qkreply_activity.xml
index cf6f3661..b67355ce 100644
--- a/presentation/src/main/res/layout/qkreply_activity.xml
+++ b/presentation/src/main/res/layout/qkreply_activity.xml
@@ -47,6 +47,29 @@
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         tools:listitem="@layout/message_list_item_in" />
 
+    <View
+        android:id="@+id/composeBackgroundGradient"
+        android:layout_width="0dp"
+        android:layout_height="8dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/compose_bar_background"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/message"
+        tools:backgroundTint="@color/backgroundLight" />
+
+    <View
+        android:id="@+id/composeBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/rounded_rectangle_bottom_4dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/composeBackgroundGradient"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:backgroundTint="@color/backgroundLight" />
+
     <common.widget.QkEditText
         android:id="@+id/message"
         style="@style/TextPrimary"