Merge remote-tracking branch 'origin/main'

src/main/java/org/thoughtcrime/securesms/reactions/AddReactionView.java

@@ -105,7 +105,7 @@ public class AddReactionView extends LinearLayout {
         } else {
             x += offset;
         }
-        ViewUtil.setLeftMargin(this, x);
+        ViewUtil.setLeftMargin(this, Math.max(x, 0));
 
         int y = Math.max((int)parentView.getY() - offset, offset/2);
         ViewUtil.setTopMargin(this, y);

src/main/res/values/text_styles.xml

@@ -32,9 +32,9 @@
     </style>
 
     <style name="AddReaction" parent="Base.TextAppearance.AppCompat.Body1">
-        <item name="android:paddingLeft">8sp</item>
-        <item name="android:paddingRight">8sp</item>
-        <item name="android:textSize">28sp</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingRight">8dp</item>
+        <item name="android:textSize">28dp</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
 </resources>