From 98580e6a6bf76ce083ae8d4ac755959b9ad43742 Mon Sep 17 00:00:00 2001
From: jeffrey-signal <jeffrey@signal.org>
Date: Fri, 9 Jan 2026 13:00:10 -0500
Subject: [PATCH] Move sticker preview classes to preview subpackage.

---
 app/src/main/AndroidManifest.xml                    |  2 +-
 .../conversation/v2/ConversationFragment.kt         |  2 +-
 .../stickers/manage/StickerManagementActivity.kt    |  2 +-
 .../stickers/manage/StickerManagementBottomSheet.kt |  2 +-
 .../{ => preview}/StickerPackPreviewActivity.java   |  6 +++++-
 .../{ => preview}/StickerPackPreviewActivityV2.kt   | 13 +++++++++----
 .../{ => preview}/StickerPackPreviewAdapter.java    |  4 +++-
 .../{ => preview}/StickerPackPreviewRepository.java |  3 ++-
 .../{ => preview}/StickerPackPreviewViewModel.java  |  4 ++--
 .../{ => preview}/StickerPackPreviewViewModelV2.kt  |  7 ++++---
 10 files changed, 29 insertions(+), 16 deletions(-)
 rename app/src/main/java/org/thoughtcrime/securesms/stickers/{ => preview}/StickerPackPreviewActivity.java (97%)
 rename app/src/main/java/org/thoughtcrime/securesms/stickers/{ => preview}/StickerPackPreviewActivityV2.kt (96%)
 rename app/src/main/java/org/thoughtcrime/securesms/stickers/{ => preview}/StickerPackPreviewAdapter.java (95%)
 rename app/src/main/java/org/thoughtcrime/securesms/stickers/{ => preview}/StickerPackPreviewRepository.java (98%)
 rename app/src/main/java/org/thoughtcrime/securesms/stickers/{ => preview}/StickerPackPreviewViewModel.java (95%)
 rename app/src/main/java/org/thoughtcrime/securesms/stickers/{ => preview}/StickerPackPreviewViewModelV2.kt (93%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a9e8b5aca..3298ff5e57 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -208,7 +208,7 @@
         </activity>
 
         <activity
-            android:name=".stickers.StickerPackPreviewActivity"
+            android:name=".stickers.preview.StickerPackPreviewActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:exported="true"
             android:launchMode="singleTask"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 38fa5250ab..4fab0772e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -322,8 +322,8 @@ import org.thoughtcrime.securesms.sms.MessageSender
 import org.thoughtcrime.securesms.stickers.StickerEventListener
 import org.thoughtcrime.securesms.stickers.StickerLocator
 import org.thoughtcrime.securesms.stickers.StickerPackInstallEvent
-import org.thoughtcrime.securesms.stickers.StickerPackPreviewActivity
 import org.thoughtcrime.securesms.stickers.manage.StickerManagementScreen
+import org.thoughtcrime.securesms.stickers.preview.StickerPackPreviewActivity
 import org.thoughtcrime.securesms.stories.StoryViewerArgs
 import org.thoughtcrime.securesms.stories.viewer.StoryViewerActivity
 import org.thoughtcrime.securesms.util.BottomSheetUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt
index 274836cde9..c6981baca1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt
@@ -25,8 +25,8 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
 import org.thoughtcrime.securesms.database.model.StickerPackId
 import org.thoughtcrime.securesms.database.model.StickerPackKey
 import org.thoughtcrime.securesms.sharing.MultiShareArgs
-import org.thoughtcrime.securesms.stickers.StickerPackPreviewActivity
 import org.thoughtcrime.securesms.stickers.StickerUrl
+import org.thoughtcrime.securesms.stickers.preview.StickerPackPreviewActivity
 import org.thoughtcrime.securesms.util.viewModel
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementBottomSheet.kt
index f043b2d289..0a424e8cec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementBottomSheet.kt
@@ -36,8 +36,8 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
 import org.thoughtcrime.securesms.database.model.StickerPackId
 import org.thoughtcrime.securesms.database.model.StickerPackKey
 import org.thoughtcrime.securesms.sharing.MultiShareArgs
-import org.thoughtcrime.securesms.stickers.StickerPackPreviewActivity
 import org.thoughtcrime.securesms.stickers.StickerUrl
+import org.thoughtcrime.securesms.stickers.preview.StickerPackPreviewActivity
 import org.thoughtcrime.securesms.util.viewModel
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivity.java
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
rename to app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivity.java
index 48703292b0..51cd8b3420 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivity.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.stickers;
+package org.thoughtcrime.securesms.stickers.preview;
 
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -27,7 +27,11 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
 import org.thoughtcrime.securesms.glide.cache.ApngOptions;
 import org.thoughtcrime.securesms.mms.DecryptableUri;
 import org.thoughtcrime.securesms.sharing.MultiShareArgs;
+import org.thoughtcrime.securesms.stickers.StickerManifest;
 import org.thoughtcrime.securesms.stickers.StickerManifest.Sticker;
+import org.thoughtcrime.securesms.stickers.StickerRemoteUri;
+import org.thoughtcrime.securesms.stickers.StickerRolloverTouchListener;
+import org.thoughtcrime.securesms.stickers.StickerUrl;
 import org.thoughtcrime.securesms.stickers.manage.StickerManagementRepository;
 import org.thoughtcrime.securesms.util.DeviceProperties;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivityV2.kt
rename to app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt
index 3e0ee7ff79..8a832021b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2025 Signal Messenger, LLC
+ * Copyright 2026 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.stickers
+package org.thoughtcrime.securesms.stickers.preview
 
 import android.content.Intent
 import android.os.Bundle
@@ -65,8 +65,13 @@ import org.thoughtcrime.securesms.database.model.StickerPackKey
 import org.thoughtcrime.securesms.database.model.StickerPackParams
 import org.thoughtcrime.securesms.mms.DecryptableUri
 import org.thoughtcrime.securesms.sharing.MultiShareArgs
-import org.thoughtcrime.securesms.stickers.StickerPackPreviewUiState.ContentState
-import org.thoughtcrime.securesms.stickers.StickerPackPreviewUiState.NavTarget
+import org.thoughtcrime.securesms.stickers.BlessedPacks
+import org.thoughtcrime.securesms.stickers.StickerManifest
+import org.thoughtcrime.securesms.stickers.StickerPreviewDataFactory
+import org.thoughtcrime.securesms.stickers.StickerRemoteUri
+import org.thoughtcrime.securesms.stickers.StickerUrl
+import org.thoughtcrime.securesms.stickers.preview.StickerPackPreviewUiState.ContentState
+import org.thoughtcrime.securesms.stickers.preview.StickerPackPreviewUiState.NavTarget
 import org.thoughtcrime.securesms.util.DeviceProperties
 import org.thoughtcrime.securesms.util.viewModel
 import java.text.NumberFormat
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewAdapter.java
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
rename to app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewAdapter.java
index 0083456471..ac5a488f88 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewAdapter.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.stickers;
+package org.thoughtcrime.securesms.stickers.preview;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +15,8 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.glide.cache.ApngOptions;
 import org.thoughtcrime.securesms.mms.DecryptableUri;
+import org.thoughtcrime.securesms.stickers.StickerManifest;
+import org.thoughtcrime.securesms.stickers.StickerRemoteUri;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewRepository.java
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
rename to app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewRepository.java
index f75dc01e43..3a983b560f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewRepository.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.stickers;
+package org.thoughtcrime.securesms.stickers.preview;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.database.model.StickerPackRecord;
 import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.signal.core.util.Hex;
+import org.thoughtcrime.securesms.stickers.StickerManifest;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModel.java
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
rename to app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModel.java
index c45f4dd550..f58c92591a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModel.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.stickers;
+package org.thoughtcrime.securesms.stickers.preview;
 
 import android.app.Application;
 import android.text.TextUtils;
@@ -11,7 +11,7 @@ import androidx.lifecycle.ViewModelProvider;
 
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
-import org.thoughtcrime.securesms.stickers.StickerPackPreviewRepository.StickerManifestResult;
+import org.thoughtcrime.securesms.stickers.preview.StickerPackPreviewRepository.StickerManifestResult;
 import org.thoughtcrime.securesms.stickers.manage.StickerManagementRepository;
 
 import java.util.Optional;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModelV2.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModelV2.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModelV2.kt
rename to app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModelV2.kt
index f63c0890dd..c4264b4deb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModelV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModelV2.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2025 Signal Messenger, LLC
+ * Copyright 2026 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.stickers
+package org.thoughtcrime.securesms.stickers.preview
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -14,8 +14,9 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.signal.core.util.orNull
 import org.thoughtcrime.securesms.database.model.StickerPackParams
-import org.thoughtcrime.securesms.stickers.StickerPackPreviewUiState.ContentState
+import org.thoughtcrime.securesms.stickers.StickerManifest
 import org.thoughtcrime.securesms.stickers.manage.StickerManagementRepository
+import org.thoughtcrime.securesms.stickers.preview.StickerPackPreviewUiState.ContentState
 import kotlin.jvm.optionals.getOrElse
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds