From 5038f49487bd9db1c10630c4dd60403cf97edc88 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 5 Aug 2019 15:26:48 -0400
Subject: [PATCH] Fix issue with sticker preview sizing.

---
 res/layout/sticker_preview_activity.xml                      | 4 ++--
 res/layout/sticker_preview_list_item.xml                     | 5 +++--
 res/values/dimens.xml                                        | 4 +++-
 .../securesms/stickers/StickerPackPreviewActivity.java       | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/res/layout/sticker_preview_activity.xml b/res/layout/sticker_preview_activity.xml
index 256eac34ee..ecdb6f2a43 100644
--- a/res/layout/sticker_preview_activity.xml
+++ b/res/layout/sticker_preview_activity.xml
@@ -84,8 +84,8 @@
         android:layout_height="0dp"
         android:layout_marginTop="24dp"
         android:layout_marginBottom="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="@dimen/sticker_preview_gutter_size"
+        android:layout_marginEnd="@dimen/sticker_preview_gutter_size"
         app:layout_constraintBottom_toTopOf="@id/sticker_install_bottom_barrier"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/sticker_preview_list_item.xml b/res/layout/sticker_preview_list_item.xml
index 464d98a8fb..c07b457e2e 100644
--- a/res/layout/sticker_preview_list_item.xml
+++ b/res/layout/sticker_preview_list_item.xml
@@ -2,5 +2,6 @@
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/sticker_install_item_image"
-    android:layout_width="@dimen/sticker_preview_sticker_size"
-    android:layout_height="@dimen/sticker_preview_sticker_size"/>
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/sticker_preview_sticker_size"
+    android:scaleType="centerInside"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8eb8b7535a..b28056ecc8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -76,10 +76,12 @@
     <dimen name="sticker_page_item_padding">8dp</dimen>
     <dimen name="sticker_page_item_divisor">88dp</dimen>
     <dimen name="sticker_page_item_multiplier">8dp</dimen>
-    <dimen name="sticker_preview_sticker_size">96dp</dimen>
 
     <dimen name="sticker_management_horizontal_margin">16dp</dimen>
 
+    <dimen name="sticker_preview_sticker_size">96dp</dimen>
+    <dimen name="sticker_preview_gutter_size">16dp</dimen>
+
     <dimen name="tooltip_popup_margin">8dp</dimen>
 
     <dimen name="conversation_list_fragment_archive_padding">16dp</dimen>
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
index 6027daa84d..86a7a51713 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
@@ -226,9 +226,10 @@ public final class StickerPackPreviewActivity extends PassphraseRequiredActionBa
     finish();
   }
 
-  private void onScreenWidthChanged(int newWidth) {
+  private void onScreenWidthChanged(int screenWidth) {
     if (layoutManager != null) {
-      layoutManager.setSpanCount(newWidth / getResources().getDimensionPixelOffset(R.dimen.sticker_preview_sticker_size));
+      int availableWidth = screenWidth - (2 * getResources().getDimensionPixelOffset(R.dimen.sticker_preview_gutter_size));
+      layoutManager.setSpanCount(availableWidth / getResources().getDimensionPixelOffset(R.dimen.sticker_preview_sticker_size));
     }
   }