From 110391c2cd50ca71a30bcc48be70ebc9123704ef Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:19:40 +1000
Subject: [PATCH] refactor: move new thumbnailview to utilities package

---
 .../components/v2/{ => utilities}/ThumbnailView.kt     |  2 +-
 .../v2/AlbumThumbnailView.kt                           |  3 ++-
 .../v2/utilities}/ThumbnailDimensDelegate.kt           |  2 +-
 app/src/main/res/layout/album_thumbnail_1.xml          |  2 +-
 app/src/main/res/layout/album_thumbnail_2.xml          |  4 ++--
 app/src/main/res/layout/album_thumbnail_3.xml          |  6 +++---
 app/src/main/res/layout/album_thumbnail_4.xml          |  8 ++++----
 app/src/main/res/layout/album_thumbnail_5.xml          | 10 +++++-----
 app/src/main/res/layout/album_thumbnail_many.xml       | 10 +++++-----
 9 files changed, 24 insertions(+), 23 deletions(-)
 rename app/src/main/java/org/thoughtcrime/securesms/components/v2/{ => utilities}/ThumbnailView.kt (99%)
 rename app/src/main/java/org/thoughtcrime/securesms/{components => conversation}/v2/AlbumThumbnailView.kt (97%)
 rename app/src/main/java/org/thoughtcrime/securesms/{components/v2 => conversation/v2/utilities}/ThumbnailDimensDelegate.kt (98%)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/v2/ThumbnailView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/v2/utilities/ThumbnailView.kt
similarity index 99%
rename from app/src/main/java/org/thoughtcrime/securesms/components/v2/ThumbnailView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/components/v2/utilities/ThumbnailView.kt
index 89af2faad9..69fe44ea2a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/v2/ThumbnailView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/v2/utilities/ThumbnailView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.components.v2
+package org.thoughtcrime.securesms.conversation.v2.utilities
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/v2/AlbumThumbnailView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/components/v2/AlbumThumbnailView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
index 0031033f39..a00cf92673 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/v2/AlbumThumbnailView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.components.v2
+package org.thoughtcrime.securesms.conversation.v2
 
 import android.content.Context
 import android.graphics.Canvas
@@ -9,6 +9,7 @@ import android.widget.FrameLayout
 import kotlinx.android.synthetic.main.album_thumbnail_view.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.components.CornerMask
+import org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.mms.GlideRequests
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/v2/ThumbnailDimensDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ThumbnailDimensDelegate.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/components/v2/ThumbnailDimensDelegate.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ThumbnailDimensDelegate.kt
index c4c7246d02..fb50d8de62 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/v2/ThumbnailDimensDelegate.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ThumbnailDimensDelegate.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.components.v2
+package org.thoughtcrime.securesms.conversation.v2.utilities
 
 class ThumbnailDimensDelegate {
 
diff --git a/app/src/main/res/layout/album_thumbnail_1.xml b/app/src/main/res/layout/album_thumbnail_1.xml
index 3946b674ec..c323b9e1d1 100644
--- a/app/src/main/res/layout/album_thumbnail_1.xml
+++ b/app/src/main/res/layout/album_thumbnail_1.xml
@@ -6,7 +6,7 @@
     android:layout_width="@dimen/media_bubble_default_dimens"
     android:layout_height="@dimen/media_bubble_default_dimens">
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/album_thumbnail_2.xml b/app/src/main/res/layout/album_thumbnail_2.xml
index a1c132c272..6ce179ea6a 100644
--- a/app/src/main/res/layout/album_thumbnail_2.xml
+++ b/app/src/main/res/layout/album_thumbnail_2.xml
@@ -7,13 +7,13 @@
     android:layout_width="@dimen/album_total_width"
     android:layout_height="@dimen/album_2_total_height">
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_1"
         android:layout_width="@dimen/album_2_cell_width"
         android:layout_height="@dimen/album_2_total_height"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_2"
         android:layout_width="@dimen/album_2_cell_width"
         android:layout_height="@dimen/album_2_total_height"
diff --git a/app/src/main/res/layout/album_thumbnail_3.xml b/app/src/main/res/layout/album_thumbnail_3.xml
index b1450c57b2..7df5ff2a48 100644
--- a/app/src/main/res/layout/album_thumbnail_3.xml
+++ b/app/src/main/res/layout/album_thumbnail_3.xml
@@ -6,20 +6,20 @@
     android:layout_width="@dimen/album_total_width"
     android:layout_height="@dimen/album_3_total_height">
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_1"
         android:layout_width="@dimen/album_3_cell_width_big"
         android:layout_height="@dimen/album_3_total_height"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_2"
         android:layout_width="@dimen/album_3_cell_size_small"
         android:layout_height="@dimen/album_3_cell_size_small"
         android:layout_gravity="right|end|top"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_3"
         android:layout_width="@dimen/album_3_cell_size_small"
         android:layout_height="@dimen/album_3_cell_size_small"
diff --git a/app/src/main/res/layout/album_thumbnail_4.xml b/app/src/main/res/layout/album_thumbnail_4.xml
index febab08fe4..f2af8a3ddb 100644
--- a/app/src/main/res/layout/album_thumbnail_4.xml
+++ b/app/src/main/res/layout/album_thumbnail_4.xml
@@ -6,27 +6,27 @@
     android:layout_width="@dimen/album_total_width"
     android:layout_height="@dimen/album_4_total_height">
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_1"
         android:layout_width="@dimen/album_4_cell_size"
         android:layout_height="@dimen/album_4_cell_size"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_2"
         android:layout_width="@dimen/album_4_cell_size"
         android:layout_height="@dimen/album_4_cell_size"
         android:layout_gravity="right|end|top"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_3"
         android:layout_width="@dimen/album_4_cell_size"
         android:layout_height="@dimen/album_4_cell_size"
         android:layout_gravity="left|start|bottom"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_4"
         android:layout_width="@dimen/album_4_cell_size"
         android:layout_height="@dimen/album_4_cell_size"
diff --git a/app/src/main/res/layout/album_thumbnail_5.xml b/app/src/main/res/layout/album_thumbnail_5.xml
index 56db3c6971..bed3980747 100644
--- a/app/src/main/res/layout/album_thumbnail_5.xml
+++ b/app/src/main/res/layout/album_thumbnail_5.xml
@@ -6,34 +6,34 @@
     android:layout_width="@dimen/album_total_width"
     android:layout_height="@dimen/album_5_total_height">
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_1"
         android:layout_width="@dimen/album_5_cell_size_big"
         android:layout_height="@dimen/album_5_cell_size_big"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_2"
         android:layout_width="@dimen/album_5_cell_size_big"
         android:layout_height="@dimen/album_5_cell_size_big"
         android:layout_gravity="right|end|top"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_3"
         android:layout_width="@dimen/album_5_cell_size_small"
         android:layout_height="@dimen/album_5_cell_size_small"
         android:layout_gravity="left|start|bottom"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_4"
         android:layout_width="@dimen/album_5_cell_size_small"
         android:layout_height="@dimen/album_5_cell_size_small"
         android:layout_gravity="center_horizontal|bottom"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_5"
         android:layout_width="@dimen/album_5_cell_size_small"
         android:layout_height="@dimen/album_5_cell_size_small"
diff --git a/app/src/main/res/layout/album_thumbnail_many.xml b/app/src/main/res/layout/album_thumbnail_many.xml
index 88d607e61e..7b274c794f 100644
--- a/app/src/main/res/layout/album_thumbnail_many.xml
+++ b/app/src/main/res/layout/album_thumbnail_many.xml
@@ -7,27 +7,27 @@
     android:layout_width="@dimen/album_total_width"
     android:layout_height="@dimen/album_5_total_height">
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_1"
         android:layout_width="@dimen/album_5_cell_size_big"
         android:layout_height="@dimen/album_5_cell_size_big"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_2"
         android:layout_width="@dimen/album_5_cell_size_big"
         android:layout_height="@dimen/album_5_cell_size_big"
         android:layout_gravity="right|end|top"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_3"
         android:layout_width="@dimen/album_5_cell_size_small"
         android:layout_height="@dimen/album_5_cell_size_small"
         android:layout_gravity="left|start|bottom"
         app:thumbnail_radius="0dp"/>
 
-    <org.thoughtcrime.securesms.components.v2.ThumbnailView
+    <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
         android:id="@+id/album_cell_4"
         android:layout_width="@dimen/album_5_cell_size_small"
         android:layout_height="@dimen/album_5_cell_size_small"
@@ -39,7 +39,7 @@
         android:layout_height="@dimen/album_5_cell_size_small"
         android:layout_gravity="right|end|bottom">
 
-        <org.thoughtcrime.securesms.components.v2.ThumbnailView
+        <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
             android:id="@+id/album_cell_5"
             android:layout_height="match_parent"
             android:layout_width="match_parent"