From 372104cdfee035046feb53d202e2dbb9470e4788 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 21 Aug 2023 14:22:08 -0300
Subject: [PATCH] Fix typing indicator rendering.

---
 .../securesms/components/ClippedCardView.kt           | 11 +++++------
 .../conversation/v2/TypingIndicatorDecoration.kt      |  4 ++--
 app/src/main/res/layout/conversation_typing_view.xml  |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ClippedCardView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ClippedCardView.kt
index d3030626bb..cce0da636e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ClippedCardView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ClippedCardView.kt
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.components
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Path
-import android.graphics.Rect
 import android.graphics.RectF
 import android.util.AttributeSet
 import androidx.core.graphics.withClip
@@ -18,15 +17,15 @@ class ClippedCardView @JvmOverloads constructor(
   attrs: AttributeSet? = null
 ) : MaterialCardView(context, attrs) {
 
-  private val bounds = Rect()
   private val boundsF = RectF()
   private val path = Path()
 
-  override fun draw(canvas: Canvas) {
-    canvas.getClipBounds(bounds)
-    boundsF.set(bounds)
-    path.reset()
+  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+    boundsF.set(0f, 0f, w.toFloat(), h.toFloat())
+  }
 
+  override fun draw(canvas: Canvas) {
+    path.reset()
     path.addRoundRect(boundsF, radius, radius, Path.Direction.CW)
     canvas.withClip(path) {
       super.draw(canvas)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorDecoration.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorDecoration.kt
index d0aa4ea5a7..408810a56b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorDecoration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorDecoration.kt
@@ -141,8 +141,8 @@ class TypingIndicatorDecoration(
       layout(
         0,
         0,
-        typingView.measuredWidth,
-        typingView.measuredHeight
+        measuredWidth,
+        measuredHeight
       )
     }
   }
diff --git a/app/src/main/res/layout/conversation_typing_view.xml b/app/src/main/res/layout/conversation_typing_view.xml
index eeeb3864ef..294dbc85c0 100644
--- a/app/src/main/res/layout/conversation_typing_view.xml
+++ b/app/src/main/res/layout/conversation_typing_view.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ConversationTypingView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:paddingStart="8dp"
     android:paddingTop="2dp"
+    android:paddingEnd="8dp"
     android:paddingBottom="8dp"
-    android:paddingEnd="8dp">
+    tools:viewBindingIgnore="true">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
         android:id="@+id/typing_avatar_1"