From cae76a2f661a327a18a7bf2c84e5925ddc8c6c9f Mon Sep 17 00:00:00 2001
From: gmbnt <andriesseniels@gmail.com>
Date: Mon, 16 Mar 2020 15:35:14 +1100
Subject: [PATCH] Add home screen gradient

---
 res/drawable/home_activity_gradient.xml               | 11 +++++++++++
 res/layout/activity_home.xml                          |  6 ++++++
 .../loki/redesign/activities/HomeActivity.kt          |  9 +++++++++
 .../redesign/views/NewConversationButtonSetView.kt    |  2 ++
 4 files changed, 28 insertions(+)
 create mode 100644 res/drawable/home_activity_gradient.xml

diff --git a/res/drawable/home_activity_gradient.xml b/res/drawable/home_activity_gradient.xml
new file mode 100644
index 0000000000..91f5097ab9
--- /dev/null
+++ b/res/drawable/home_activity_gradient.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:startColor="@android:color/transparent"
+        android:endColor="#000000"
+        android:angle="270" />
+
+</shape>
\ No newline at end of file
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index bc0f97cbc3..8bbecbb576 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -58,6 +58,12 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        <View
+            android:id="@+id/gradientView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/home_activity_gradient" />
+
         <org.thoughtcrime.securesms.loki.redesign.views.NewConversationButtonSetView
             android:id="@+id/newConversationButtonSet"
             android:layout_width="252dp"
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
index af3df9afdb..cb1841060c 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
@@ -19,7 +19,9 @@ import android.support.v7.widget.helper.ItemTouchHelper
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
+import android.util.DisplayMetrics
 import android.view.View
+import android.widget.RelativeLayout
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_home.*
 import network.loki.messenger.R
@@ -124,6 +126,13 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
                 homeAdapter.changeCursor(null)
             }
         })
+        // Set up gradient view
+        val gradientViewLayoutParams = gradientView.layoutParams as RelativeLayout.LayoutParams
+        val displayMetrics = DisplayMetrics()
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+        val height = displayMetrics.heightPixels
+        gradientViewLayoutParams.topMargin = (0.15 * height.toFloat()).toInt()
+        // Set up new conversation button set
         newConversationButtonSet.delegate = this
         // Set up typing observer
         ApplicationContext.getInstance(this).typingStatusRepository.typingThreads.observe(this, Observer<Set<Long>> { threadIDs ->
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/NewConversationButtonSetView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/NewConversationButtonSetView.kt
index eb5bf152c0..3b1f5de593 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/views/NewConversationButtonSetView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/NewConversationButtonSetView.kt
@@ -209,7 +209,9 @@ class NewConversationButtonSetView : RelativeLayout {
     override fun onTouchEvent(event: MotionEvent): Boolean {
         val touch = PointF(event.x, event.y)
         val expandedButton = expandedButton
+        val allButtons = listOf( mainButton, sessionButton, closedGroupButton, openGroupButton )
         val buttonsExcludingMainButton = listOf( sessionButton, closedGroupButton, openGroupButton )
+        if (allButtons.none { it.contains(touch) }) { return false }
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
                 val vibrator = context.getSystemService(VIBRATOR_SERVICE) as Vibrator