Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move sticker preview classes to preview subpackage.

Browse Source
This commit is contained in:
jeffrey-signal
2026-01-09 13:00:10 -05:00
committed by Michelle Tang
parent 2f0a63774f
commit 98580e6a6b
10 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -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"

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -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

2
app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt
View File

@@ -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
/**

2
app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementBottomSheet.kt
View File

@@ -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
/**

6
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java → app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivity.java
View File

@@ -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;

13
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivityV2.kt → app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt
View File

@@ -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

4
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java → app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewAdapter.java
View File

@@ -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;

3
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java → app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewRepository.java
View File

@@ -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;

4
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java → app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModel.java
View File

@@ -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;

7
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModelV2.kt → app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewViewModelV2.kt
View File

@@ -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