From d0e399dbb62e50023a530d8813df87c63f0f20be Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Thu, 10 Sep 2020 10:15:29 +1000
Subject: [PATCH] Fix shadow clipping bug

---
 res/layout/activity_home.xml                      |  4 ++--
 .../loki/views/NewConversationButtonSetView.kt    | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 3e582f439f..cea2157d5e 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -100,8 +100,8 @@
 
         <org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
             android:id="@+id/newConversationButtonSet"
-            android:layout_width="252dp"
-            android:layout_height="212dp"
+            android:layout_width="276dp"
+            android:layout_height="236dp"
             android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true" />
 
diff --git a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
index 793ae44dea..e4578e5fa9 100644
--- a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
@@ -29,10 +29,10 @@ class NewConversationButtonSetView : RelativeLayout {
     var delegate: NewConversationButtonSetViewDelegate? = null
 
     // region Convenience
-    private val sessionButtonExpandedPosition: PointF get() { return PointF(width.toFloat() / 2 - sessionButton.expandedSize / 2, 0.0f) }
-    private val closedGroupButtonExpandedPosition: PointF get() { return PointF(width.toFloat() - closedGroupButton.expandedSize, height.toFloat() - bottomMargin - closedGroupButton.expandedSize) }
-    private val openGroupButtonExpandedPosition: PointF get() { return PointF(0.0f, height.toFloat() - bottomMargin - openGroupButton.expandedSize) }
-    private val buttonRestPosition: PointF get() { return PointF(width.toFloat() / 2 - mainButton.expandedSize / 2, height.toFloat() - bottomMargin - mainButton.expandedSize) }
+    private val sessionButtonExpandedPosition: PointF get() { return PointF(width.toFloat() / 2 - sessionButton.expandedSize / 2 - sessionButton.shadowMargin, 0.0f) }
+    private val closedGroupButtonExpandedPosition: PointF get() { return PointF(width.toFloat() - closedGroupButton.expandedSize - 2 * closedGroupButton.shadowMargin, height.toFloat() - bottomMargin - closedGroupButton.expandedSize - 2 * closedGroupButton.shadowMargin) }
+    private val openGroupButtonExpandedPosition: PointF get() { return PointF(0.0f, height.toFloat() - bottomMargin - openGroupButton.expandedSize - 2 * openGroupButton.shadowMargin) }
+    private val buttonRestPosition: PointF get() { return PointF(width.toFloat() / 2 - mainButton.expandedSize / 2 - mainButton.shadowMargin, height.toFloat() - bottomMargin - mainButton.expandedSize - 2 * mainButton.shadowMargin) }
     // endregion
 
     // region Settings
@@ -60,8 +60,9 @@ class NewConversationButtonSetView : RelativeLayout {
 
         val expandedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_expanded_size) }
         val collapsedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_collapsed_size) }
-        private val expandedImageViewPosition by lazy { PointF(0.0f, 0.0f) }
-        private val collapsedImageViewPosition by lazy { PointF((expandedSize - collapsedSize) / 2, (expandedSize - collapsedSize) / 2) }
+        val shadowMargin by lazy { toPx(6, resources).toFloat() }
+        private val expandedImageViewPosition by lazy { PointF(shadowMargin, shadowMargin) }
+        private val collapsedImageViewPosition by lazy { PointF(shadowMargin + (expandedSize - collapsedSize) / 2, shadowMargin + (expandedSize - collapsedSize) / 2) }
 
         private val imageView by lazy {
             val result = NewConversationButtonImageView(context)
@@ -95,7 +96,7 @@ class NewConversationButtonSetView : RelativeLayout {
             this.iconID = iconID
             this.isMain = isMain
             disableClipping()
-            val size = resources.getDimension(R.dimen.new_conversation_button_expanded_size).toInt()
+            val size = resources.getDimension(R.dimen.new_conversation_button_expanded_size).toInt() + 2 * shadowMargin.toInt()
             val layoutParams = LayoutParams(size, size)
             this.layoutParams = layoutParams
             addView(imageView)