From b92346d4aefe24dce2d269d5874237408886a0a6 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 21 Feb 2023 14:42:04 -0500
Subject: [PATCH] Make our FABs rounded rects again.

---
 app/src/main/res/layout/conversation_list_fragment.xml | 2 ++
 app/src/main/res/layout/stories_landing_fragment.xml   | 2 ++
 app/src/main/res/values/signal_styles.xml              | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml
index d05fba792..6d3369a91 100644
--- a/app/src/main/res/layout/conversation_list_fragment.xml
+++ b/app/src/main/res/layout/conversation_list_fragment.xml
@@ -122,6 +122,7 @@
                 app:backgroundTint="@color/signal_colorSurfaceVariant"
                 app:srcCompat="@drawable/symbol_camera_24"
                 app:tint="@color/signal_colorOnSurface"
+                app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
                 tools:visibility="visible" />
 
             <org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
@@ -138,6 +139,7 @@
                 app:backgroundTint="@color/signal_colorPrimaryContainer"
                 app:srcCompat="@drawable/symbol_edit_24"
                 app:tint="@color/signal_colorOnSurface"
+                app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
                 tools:visibility="visible" />
 
             <ViewStub
diff --git a/app/src/main/res/layout/stories_landing_fragment.xml b/app/src/main/res/layout/stories_landing_fragment.xml
index 7946d029a..6819d4313 100644
--- a/app/src/main/res/layout/stories_landing_fragment.xml
+++ b/app/src/main/res/layout/stories_landing_fragment.xml
@@ -56,6 +56,7 @@
                 android:focusable="true"
                 android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
                 android:transitionName="camera_fab"
+                app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
                 app:backgroundTint="@color/signal_colorSurfaceVariant"
                 app:elevation="0dp"
                 app:srcCompat="@drawable/ic_camera_outline_24"
@@ -73,6 +74,7 @@
                 android:focusable="true"
                 android:theme="@style/Widget.Material3.FloatingActionButton.Primary"
                 android:transitionName="new_convo_fab"
+                app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
                 app:backgroundTint="@color/signal_colorPrimaryContainer"
                 app:srcCompat="@drawable/ic_camera_outline_24"
                 app:tint="@color/signal_colorOnSurface" />
diff --git a/app/src/main/res/values/signal_styles.xml b/app/src/main/res/values/signal_styles.xml
index 462fb3af5..a1a70433a 100644
--- a/app/src/main/res/values/signal_styles.xml
+++ b/app/src/main/res/values/signal_styles.xml
@@ -178,6 +178,11 @@
         <item name="cornerSize">8dp</item>
     </style>
 
+    <style name="Signal.ShapeOverlay.Rounded.Fab" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">18dp</item>
+    </style>
+
     <style name="ShapeAppearance.Signal.MaterialAlertDialog" parent="ShapeAppearance.Material3.MediumComponent">
         <item name="cornerFamily">rounded</item>
         <item name="cornerRadius">28dp</item>