From 398c67362d7fc51422c07c297f6775294690ce1d Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Tue, 19 Mar 2024 13:12:57 -0400
Subject: [PATCH] Improve layout for view once toast for older devices.

---
 .../v2/review/MediaReviewToastPopupWindow.kt  | 14 +---
 .../v2_media_review_quality_popup_window.xml  | 79 ++++++++-----------
 2 files changed, 34 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewToastPopupWindow.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewToastPopupWindow.kt
index a17fd4ce19..9c874d0059 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewToastPopupWindow.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewToastPopupWindow.kt
@@ -7,13 +7,11 @@ package org.thoughtcrime.securesms.mediasend.v2.review
 
 import android.view.Gravity
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.PopupWindow
 import android.widget.TextView
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.ViewUtil
 import kotlin.time.Duration.Companion.seconds
 
 /**
@@ -21,7 +19,7 @@ import kotlin.time.Duration.Companion.seconds
  */
 class MediaReviewToastPopupWindow private constructor(parent: ViewGroup, iconResource: Int, descriptionText: String) : PopupWindow(
   LayoutInflater.from(parent.context).inflate(R.layout.v2_media_review_quality_popup_window, parent, false),
-  ViewGroup.LayoutParams.MATCH_PARENT,
+  ViewGroup.LayoutParams.WRAP_CONTENT,
   ViewGroup.LayoutParams.WRAP_CONTENT
 ) {
 
@@ -29,7 +27,6 @@ class MediaReviewToastPopupWindow private constructor(parent: ViewGroup, iconRes
   private val description: TextView = contentView.findViewById(R.id.media_review_toast_popup_description)
 
   init {
-    elevation = ViewUtil.dpToPx(8).toFloat()
     animationStyle = R.style.StickerPopupAnimation
     icon.setImageResource(iconResource)
     description.text = descriptionText
@@ -37,18 +34,9 @@ class MediaReviewToastPopupWindow private constructor(parent: ViewGroup, iconRes
 
   private fun show(parent: ViewGroup) {
     showAtLocation(parent, Gravity.CENTER, 0, 0)
-    measureChild()
-    update()
     contentView.postDelayed({ dismiss() }, DURATION)
   }
 
-  private fun measureChild() {
-    contentView.measure(
-      View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
-      View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
-    )
-  }
-
   companion object {
     private val DURATION = 3.seconds.inWholeMilliseconds
 
diff --git a/app/src/main/res/layout/v2_media_review_quality_popup_window.xml b/app/src/main/res/layout/v2_media_review_quality_popup_window.xml
index 6219bc11c5..97a74ce124 100644
--- a/app/src/main/res/layout/v2_media_review_quality_popup_window.xml
+++ b/app/src/main/res/layout/v2_media_review_quality_popup_window.xml
@@ -1,58 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2024 Signal Messenger, LLC
   ~ SPDX-License-Identifier: AGPL-3.0-only
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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_width="wrap_content"
     android:layout_height="wrap_content"
-    android:minHeight="86dp"
-    tools:background="@color/signal_colorPrimary">
+    android:background="@drawable/rounded_rectangle_surface_2_18"
+    android:elevation="8dp"
+    android:minHeight="44dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/media_review_toast_popup_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="44dp"
-        android:layout_marginEnd="12dp"
-        android:background="@drawable/rounded_rectangle_surface_2_18"
-        android:elevation="8dp"
-        android:minHeight="44dp">
+        android:layout_marginStart="21dp"
+        android:paddingBottom="1dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/media_review_toast_popup_description"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/symbol_quality_high_24"
+        app:tint="@color/signal_colorOnSurface" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/media_review_toast_popup_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="21dp"
-            android:paddingBottom="1dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/media_review_toast_popup_description"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/signal_colorOnSurface"
-            app:srcCompat="@drawable/symbol_quality_high_24" />
+    <TextView
+        android:id="@+id/media_review_toast_popup_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="21dp"
+        android:gravity="center_vertical"
+        android:paddingBottom="2dp"
+        android:textAppearance="@style/TextAppearance.Signal.Body2"
+        android:textColor="@color/signal_colorOnSurface"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/media_review_toast_popup_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/first_names" />
 
-        <TextView
-            android:id="@+id/media_review_toast_popup_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="21dp"
-            android:gravity="center_vertical"
-            android:paddingBottom="2dp"
-            android:textAppearance="@style/TextAppearance.Signal.Body2"
-            android:textColor="@color/signal_colorOnSurface"
-            app:layout_constrainedWidth="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/media_review_toast_popup_icon"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/first_names" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file