Improve compose previews.

2026-09-21 01:05:11 +01:00 · 2026-08-26 15:22:19 -04:00
parent 96bd5f5185
commit 003265c34b
368 changed files with 550 additions and 894 deletions
@@ -20,7 +20,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalResources
-import org.signal.core.ui.compose.AllDevicePreviews
+import org.signal.core.ui.compose.BreakpointPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Snackbars
 import org.signal.core.ui.compose.showSnackbar
@@ -145,7 +145,7 @@ fun MainSnackbar(
  }
 }

-@AllDevicePreviews
+@BreakpointPreviews
@Composable
 fun MainBottomChromePreview() {
  Previews.Preview {
@@ -29,7 +29,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.signal.core.ui.compose.AllDevicePreviews
+import org.signal.core.ui.compose.BreakpointPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
@@ -127,7 +127,7 @@ private fun BoxScope.FloatingActionButtonContainer(
  }
 }

-@AllDevicePreviews
+@BreakpointPreviews
@Composable
 private fun RecipientPickerScaffoldPreview() {
  Previews.Preview {
@@ -58,7 +58,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import kotlinx.coroutines.launch
 import org.signal.core.ui.WindowBreakpoint
-import org.signal.core.ui.compose.AllDevicePreviews
+import org.signal.core.ui.compose.BreakpointPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.getWindowBreakpoint
 import org.signal.core.ui.rememberIsSplitPane
@@ -399,7 +399,7 @@ private fun ListAndNavigation(
 }

@OptIn(ExperimentalMaterial3AdaptiveApi::class)
-@AllDevicePreviews
+@BreakpointPreviews
@Composable
 private fun AppScaffoldPreview() {
  Previews.Preview {
@@ -18,13 +18,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
-import org.signal.core.ui.compose.AllDevicePreviews
+import org.signal.core.ui.compose.BreakpointPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons

@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
-@AllDevicePreviews
+@BreakpointPreviews
@Composable
 private fun AppScaffoldWithTopBarPreview() {
  Previews.Preview {
@@ -8,6 +8,15 @@ package org.signal.core.ui.compose
 import android.content.res.Configuration
 import androidx.compose.ui.tooling.preview.Preview

+private const val PHONE_PORTRAIT = "spec:width=360dp,height=780dp,orientation=portrait"
+private const val PHONE_LANDSCAPE = "spec:width=780dp,height=360dp,orientation=landscape"
+private const val SMALL_FOLDABLE_PORTRAIT = "spec:width=620dp,height=720dp,orientation=portrait"
+private const val SMALL_FOLDABLE_LANDSCAPE = "spec:width=720dp,height=620dp,orientation=landscape"
+private const val FOLDABLE_PORTRAIT = "spec:width=850dp,height=881dp,orientation=portrait"
+private const val FOLDABLE_LANDSCAPE = "spec:width=881dp,height=850dp,orientation=landscape"
+private const val TABLET_PORTRAIT = "spec:width=800dp,height=1280dp,orientation=portrait"
+private const val TABLET_LANDSCAPE = "spec:width=1280dp,height=800dp,orientation=landscape"
+
 /**
 * Only generates a dark preview. Useful for screens that are only ever rendered in dark mode (like calling).
 */
@@ -18,116 +27,111 @@ annotation class NightPreview()
@NightPreview
 annotation class DayNightPreviews

-@Preview(name = "phone portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=360dp,height=640dp,orientation=portrait")
-annotation class PhonePortraitDayPreview
-
-@Preview(name = "phone landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=640dp,height=360dp,orientation=landscape")
-annotation class PhoneLandscapeDayPreview
-
-@PhonePortraitDayPreview
-@PhoneLandscapeDayPreview
-annotation class PhoneDayPreviews
-
-@Preview(name = "phone portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=360dp,height=640dp,orientation=portrait")
-annotation class PhonePortraitNightPreview
-
-@Preview(name = "phone landscape (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=640dp,height=360dp,orientation=landscape")
-annotation class PhoneLandscapeNightPreview
-
-@PhonePortraitNightPreview
-@PhoneLandscapeNightPreview
-annotation class PhoneNightPreviews
-
-@PhoneDayPreviews
-@PhoneLandscapeNightPreview
-annotation class PhonePreviews
-
-@Preview(name = "small foldable portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=620dp,height=720dp,orientation=portrait")
-annotation class SmallFoldablePortraitDayPreview
-
-@Preview(name = "small foldable landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=720dp,height=620dp,orientation=landscape")
-annotation class SmallFoldableLandscapeDayPreview
-
-@SmallFoldablePortraitDayPreview
-@SmallFoldableLandscapeDayPreview
-annotation class SmallFoldableDayPreviews
-
-@Preview(name = "small foldable portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=620dp,height=720dp,orientation=portrait")
-annotation class SmallFoldablePortraitNightPreview
-
-@Preview(name = "small foldable landscape (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=720dp,height=620dp,orientation=landscape")
-annotation class SmallFoldableLandscapeNightPreview
-
-@SmallFoldablePortraitNightPreview
-@SmallFoldableLandscapeNightPreview
-annotation class SmallFoldableNightPreviews
-
-@SmallFoldableDayPreviews
-@SmallFoldableLandscapeNightPreview
-annotation class SmallFoldablePreviews
-
-@Preview(name = "foldable portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=850dp,height=881dp,orientation=portrait")
-annotation class FoldablePortraitDayPreview
-
-@Preview(name = "foldable landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=881dp,height=850dp,orientation=landscape")
-annotation class FoldableLandscapeDayPreview
-
-@FoldablePortraitDayPreview
-@FoldableLandscapeDayPreview
-annotation class FoldableDayPreviews
-
-@Preview(name = "foldable portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=850dp,height=881dp,orientation=portrait")
-annotation class FoldablePortraitNightPreview
-
-@Preview(name = "foldable landscape (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=881dp,height=850dp,orientation=landscape")
-annotation class FoldableLandscapeNightPreview
-
-@FoldablePortraitNightPreview
-@FoldableLandscapeNightPreview
-annotation class FoldableNightPreviews
-
-@FoldableDayPreviews
-@FoldableLandscapeNightPreview
-annotation class FoldablePreviews
-
-@Preview(name = "tablet portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=800dp,height=1280dp,orientation=portrait")
-annotation class TabletPortraitDayPreview
-
-@Preview(name = "tablet landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=1280dp,height=800dp,orientation=landscape")
-annotation class TabletLandscapeDayPreview
-
-@TabletPortraitDayPreview
-@TabletLandscapeDayPreview
-annotation class TabletDayPreviews
-
-@Preview(name = "tablet portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=800dp,height=1280dp,orientation=portrait")
-annotation class TabletPortraitNightPreview
-
-@Preview(name = "tablet landscape (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=1280dp,height=800dp,orientation=landscape")
-annotation class TabletLandscapeNightPreview
-
-@TabletPortraitNightPreview
-@TabletLandscapeNightPreview
-annotation class TabletNightPreviews
-
-@TabletDayPreviews
-@TabletNightPreviews
-annotation class TabletPreviews
-
-@PhoneNightPreviews
-@SmallFoldableNightPreviews
-@FoldableNightPreviews
-@TabletNightPreviews
-annotation class AllNightPreviews
-
-@PhonePreviews
-@SmallFoldablePreviews
-@FoldablePreviews
-@TabletPreviews
-annotation class AllDevicePreviews
-
@Preview(name = "rtl", locale = "ar")
 annotation class RtlPreview

+@Preview(name = "phone portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = PHONE_PORTRAIT)
+annotation class PhonePortraitDayPreview
+
+@Preview(name = "phone portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = PHONE_PORTRAIT)
+annotation class PhonePortraitNightPreview
+
+@Preview(name = "phone landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = PHONE_LANDSCAPE)
+annotation class PhoneLandscapeDayPreview
+
+@Preview(name = "phone landscape (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = PHONE_LANDSCAPE)
+annotation class PhoneLandscapeNightPreview
+
+@Preview(name = "small foldable portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = SMALL_FOLDABLE_PORTRAIT)
+annotation class SmallFoldablePortraitDayPreview
+
+@Preview(name = "small foldable landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = SMALL_FOLDABLE_LANDSCAPE)
+annotation class SmallFoldableLandscapeDayPreview
+
+@Preview(name = "foldable portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = FOLDABLE_PORTRAIT)
+annotation class FoldablePortraitDayPreview
+
+@Preview(name = "foldable portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = FOLDABLE_PORTRAIT)
+annotation class FoldablePortraitNightPreview
+
+@Preview(name = "foldable landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = FOLDABLE_LANDSCAPE)
+annotation class FoldableLandscapeDayPreview
+
+@Preview(name = "tablet portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = TABLET_PORTRAIT)
+annotation class TabletPortraitDayPreview
+
+@Preview(name = "tablet portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = TABLET_PORTRAIT)
+annotation class TabletPortraitNightPreview
+
+@Preview(name = "tablet landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = TABLET_LANDSCAPE)
+annotation class TabletLandscapeDayPreview
+
+@Preview(name = "tablet landscape (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = TABLET_LANDSCAPE)
+annotation class TabletLandscapeNightPreview
+
+/**
+ * The device sizes worth eyeballing while working on a typical screen or component: a phone in both orientations,
+ * an unfolded foldable, and a tablet in both orientations, plus a dark-mode pass over one size per device.
+ */
+@PhonePortraitDayPreview
+@PhoneLandscapeDayPreview
+@FoldablePortraitDayPreview
+@TabletPortraitDayPreview
+@TabletLandscapeDayPreview
+@PhonePortraitNightPreview
+@FoldablePortraitNightPreview
+@TabletLandscapeNightPreview
+annotation class AllDevicePreviews
+
+/**
+ * The night-mode counterpart to [AllDevicePreviews], for screens that are only ever rendered in dark mode
+ * (like calling and the camera).
+ */
+@PhonePortraitNightPreview
+@PhoneLandscapeNightPreview
+@FoldablePortraitNightPreview
+@TabletPortraitNightPreview
+@TabletLandscapeNightPreview
+annotation class AllNightPreviews
+
+/**
+ * Every distinct WindowBreakpoint state, so that scaffolds and other layouts that switch structure on window size
+ * can be checked at each one. Reserved for those layouts -- use [AllDevicePreviews] for ordinary screens.
+ *
+ * The two foldable sizes straddle the expanded-width breakpoint (840dp): the small pair stays in medium width,
+ * the large pair crosses into expanded, which is what drives things like navigation rail vs. bar.
+ */
+@PhonePortraitDayPreview
+@PhoneLandscapeDayPreview
+@SmallFoldablePortraitDayPreview
+@SmallFoldableLandscapeDayPreview
+@FoldablePortraitDayPreview
+@FoldableLandscapeDayPreview
+@TabletPortraitDayPreview
+@TabletLandscapeDayPreview
+annotation class BreakpointPreviews
+
+/**
+ * The screenshot test matrix, sized to catch UI regressions rather than to enumerate configurations: each device
+ * in both orientations, a dark-mode pass over one representative size per device, and an RTL locale.
+ */
+@PhonePortraitDayPreview
+@PhoneLandscapeDayPreview
+@FoldablePortraitDayPreview
+@FoldableLandscapeDayPreview
+@TabletPortraitDayPreview
+@TabletLandscapeDayPreview
+@PhonePortraitNightPreview
+@FoldablePortraitNightPreview
+@TabletLandscapeNightPreview
+@RtlPreview
+annotation class ScreenshotPreviews
+
+@TabletPortraitDayPreview
+@TabletLandscapeDayPreview
+@TabletPortraitNightPreview
+@TabletLandscapeNightPreview
+annotation class TabletPreviews
+
@Preview(name = "large font", fontScale = 2f)
 annotation class LargeFontPreviews
@@ -38,8 +38,7 @@ import androidx.compose.ui.unit.sp
 import org.signal.camera.CameraDisplay
 import org.signal.camera.R
 import org.signal.camera.test.TestTags
-import org.signal.core.ui.compose.FoldableNightPreviews
-import org.signal.core.ui.compose.PhoneNightPreviews
+import org.signal.core.ui.compose.AllNightPreviews
 import org.signal.core.ui.compose.Previews

 private object ZoomBarColors {
@@ -184,14 +183,14 @@ private fun ZoomLevels(
  }
 }

-@PhoneNightPreviews
+@AllNightPreviews
@Composable
 private fun ZoomBarPreviews() {
  ZoomBarPreview()
 }

 /** Anything larger than a portrait phone runs the levels down the start side instead. */
-@FoldableNightPreviews
+@AllNightPreviews
@Composable
 private fun ZoomBarStackedPreviews() {
  ZoomBarPreview(cameraDisplay = CameraDisplay.LARGE_PORTRAIT)
@@ -39,7 +39,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.signal.core.ui.WindowBreakpoint
-import org.signal.core.ui.compose.AllDevicePreviews
+import org.signal.core.ui.compose.BreakpointPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.getWindowSizeClass
 import org.signal.core.ui.isHeightCompact
@@ -295,7 +295,7 @@ private fun PreviewPane(
  )
 }

-@AllDevicePreviews
+@BreakpointPreviews
@Composable
 private fun RegistrationScaffoldPreview() = Previews.Preview {
  when (val params = RegistrationScaffold.rememberLayoutParams()) {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.accountlocked

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class AccountLockedScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun AccountLockedScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.aepentry

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class EnterAepScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun EnterAepScreenPreview() {
    Previews.Preview {
@@ -11,15 +11,13 @@ import android.Manifest
 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews
 import org.signal.registration.screens.util.MockPermissionsState

 class AllowNotificationsScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun AllowNotificationsScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.countrycode

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class CountryCodePickerScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun CountryCodePickerScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.createprofile

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class CreateProfileScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun CreateProfileScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.devicetransfer.complete

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class DeviceTransferCompleteScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun DeviceTransferCompleteScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.devicetransfer.instructions

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class DeviceTransferInstructionsScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun DeviceTransferInstructionsScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.devicetransfer.progress

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class DeviceTransferProgressScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun DeviceTransferProgressScreenPreview() {
    Previews.Preview {
@@ -11,15 +11,13 @@ import android.Manifest
 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews
 import org.signal.registration.screens.util.MockPermissionsState

 class DeviceTransferSetupScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun DeviceTransferSetupScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.discoverability

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class PhoneNumberDiscoverabilityScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun PhoneNumberDiscoverabilityScreenPreview() {
    Previews.Preview {
@@ -7,16 +7,14 @@ package org.signal.registration.screens.linkaccount

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.QrCodeData
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews
 import org.signal.registration.screens.quickrestore.QrState

 class LinkAccountScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun LinkAccountScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.localbackuprestore

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class LocalBackupRestoreScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun LocalBackupRestoreScreenPreview() {
    Previews.Preview {
@@ -7,17 +7,15 @@ package org.signal.registration.screens.messagesync

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews
 import org.signal.core.util.kibiBytes
 import org.signal.core.util.mebiBytes
 import org.signal.registration.screens.messagesync.MessageSyncScreenState.Stage

 class MessageSyncScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun MessageSyncScreenPreview() {
    Previews.Preview {
@@ -31,8 +29,7 @@ class MessageSyncScreenScreenshotTests {
  }

  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun MessageSyncScreenPreparingPreview() {
    Previews.Preview {
@@ -44,8 +41,7 @@ class MessageSyncScreenScreenshotTests {
  }

  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun MessageSyncScreenRestoringPreview() {
    Previews.Preview {
@@ -59,8 +55,7 @@ class MessageSyncScreenScreenshotTests {
  }

  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun MessageSyncScreenFinishingPreview() {
    Previews.Preview {
@@ -11,16 +11,14 @@ import android.Manifest
 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews
 import org.signal.registration.screens.util.MockMultiplePermissionsState
 import org.signal.registration.screens.util.MockPermissionsState

 class PermissionsScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun PermissionsScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.phonenumber

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class PhoneNumberScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun PhoneNumberScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.pincreation

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class PinCreationScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun PinCreationScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.pinentry

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class PinEntryScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun PinEntryScreenPreview() {
    Previews.Preview {
@@ -7,15 +7,13 @@ package org.signal.registration.screens.quickrestore

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.QrCodeData
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class QuickRestoreQrScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun QuickRestoreQrScreenPreview() {
    Previews.Preview {
@@ -8,15 +8,13 @@ package org.signal.registration.screens.remotebackuprestore
 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
 import org.signal.core.models.AccountEntropyPool
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews
 import java.util.TimeZone

 class RemoteRestoreScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun RemoteRestoreScreenPreview() {
    TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
@@ -7,14 +7,12 @@ package org.signal.registration.screens.restoreselection

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class ArchiveRestoreSelectionScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun ArchiveRestoreSelectionScreenPreview() {
    Previews.Preview {
@@ -7,14 +7,12 @@ package org.signal.registration.screens.verificationcode

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews

 class VerificationCodeScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun VerificationCodeScreenPreview() {
    Previews.Preview {
@@ -7,15 +7,13 @@ package org.signal.registration.screens.welcome

 import androidx.compose.runtime.Composable
 import com.android.tools.screenshot.PreviewTest
-import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.RtlPreview
+import org.signal.core.ui.compose.ScreenshotPreviews
 import org.signal.core.ui.compose.TabletPreviews

 class WelcomeScreenScreenshotTests {
  @PreviewTest
-  @AllDevicePreviews
-  @RtlPreview
+  @ScreenshotPreviews
  @Composable
  fun WelcomeScreenPhonePreview() {
    Previews.Preview {
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc3794b0d07204b4ba83bf9feb7e50e239813f90c4c5ddfe4cb4be734faa1340
-size 78017
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5510d3fd250e12813593a0459f0e0692f449c5439258aad823c2e44283bfabd
+size 79345
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:228ecf13a8f8f0f681fee90ef78b3e8dfc6db7f9c826483b3e049553256a15cb
-size 54855
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9067270f17a22e99a56fec1842548983b060af76d62d84b617798ac0a6b17b5
+size 54055
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e2db697a4b0d3d999f65a17405c956a97314fddad82b9b8e5763bd00aed7237
-size 54734
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e0870d38fdfaceb065ed00de06a9a73ad3ef1ad648510a2742010cf45e7db2e
-size 61165
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a20ebab99171df881840d0ddf47281e000ae1f58de3ce31a0c51950c8817fa58
+size 63216
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80c0785daf7e90c18fb3479f50c9bba73d30bc008530c7059153adb6eef4f338
+size 63127
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4d9551037e34d5b1b786e8e4886fe336014eada5161de0561387f4ff5cb226e
-size 70730
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2cc915c8a8bd03c35f05a9be5515ca444d6e4edc6a7bcac2a0b7c012005567c9
-size 70573
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3320785f0ba6aba8717f9b41db82b12eb5ffe6ae8a446ee5b26266b333d3b1a
-size 73356
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31170a912678c4dd42ec92c2d6c6816fc62d85c0396e6cf8a4a5a8583fd15d83
-size 83125
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d8c9e44620f445cca81510af4a585e40e5cd51136d1021f6a55c25df927ecc9
-size 77270
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a2be089afb9986c10d2e5bf3ec5166a7308bc9bead00f8f4e467050505eddbd
+size 77732
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edcb2fdb301345119716494de7056f76b166c52bd9b4b72b3a0bfed5ed20123f
-size 42180
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de1df73e8dc65ea57b8e4b6a55a612cb036df4c86827698e2712aac7013e8c5a
+size 44618
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02588d1a706171fe5f842278dd5cdd0cff2283c0bce88ee2007e4ffc322f023a
-size 42184
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd4919531958f487d4eaa02a3fbb03aeb708cf4cca281cba8b77d6042213c0e5
-size 52747
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16a6e471fa6dcddb13bc0fa549070bf82a549b765251753b297b843d3c8fb510
+size 54972
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dff9f1aada259a601dfe6601838516c07a265444597d734b6ee249a96475ff1c
+size 55355
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d63bca6bbe80f1f008786f535aafac319d76508fd443d0e2df3aaa41b716ef14
-size 69819
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5f04c27942db3b828b7842db5e0b4287b16abd5cb554a6f2b5f81ec46fc62ce
-size 70058
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ecb049af024c9198a0c25fc5ac2566a6494c21bb4f3c9fb7416e559ce2f20be3
-size 72385
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d430ca7d7b77519743d26a29fc67ac543c1126477b1a6a4d33bb4a4bca4cca2a
-size 81994
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7d7a1c5af21af59662bb026e1befa5ab9d31c073dae5bbdaadb1d5283fbf7e6
-size 110308
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9aa561481a84877081033af6a47dab4f7a876c04cf2c8cc5b9bb1ae3f5e7e96
+size 107111
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f52f669fce070f69be1b08bb82c07cc08e29c7251b0bb52bd093aa6274908e4
-size 55951
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22f5e8ab6bff7e03df9f5b8a280b8070b2a549381d77c9797d630d017e0c2691
+size 57500
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:afb168813aba90295d11886c2b94a1f8702c12cc9e27d7f63ada2095d547c7b4
-size 54616
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:579f3743c05b92e4994fd44a48947e2841e20d86be263fbb11ca8d103bcb843d
-size 77519
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99f3c62258f21ee0ec510fe0b765cf7258b8ecf29a62fef5278ed158dc24e485
+size 79733
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:638a6a5efb6eef1ca08fe67f9626c4dce70d2f84ad527bd449029b42291e2bee
+size 78229
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:255f0065a287909bbf81db77a2d630d40b38c10844d99509793e473d6104c09a
-size 88129
+oid sha256:9f779e2304d4a319f28fb19c7469d8230d82a1301ba8332a3d6df0d95f06a88e
+size 88065
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b46ff19af8c4371fd54fd6ff37400443fdbdba7bd9e7cd73fae8f0b4e78cf09a
-size 93126
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4e4a2c5a4620713a721e3778f1244532363b4b8e56e8bae546b57c6bd0e361a
-size 91979
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3cd1c9e42904a2859f2c050e20ede096fe23367bee080d4653c6b7422e0ae50a
-size 91104
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c0f0bc6e35c81bc62100043f7ca823a901cd4316cbe30b313c81229eda3958f
-size 118296
+oid sha256:f5753f03c93b7e5277e55b4bb9e39b96387d3b50571544f4626215854a8a2966
+size 118248
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6c9e542a809451084dbf572fcb453af89a8e481ae81fcc620c6f807f5763ba2
-size 116683
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79e0575a93a6c5a5e010df065d60eac87d588a4b6b1b9f5395af1a6fb1fc1575
-size 84241
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8b6a324b470283323829e50e2ee4145102881d5d5bf6dcdf97ca9041aa71848
+size 84581
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7fef464021e7503f25bd8d18f25bcdfc46845ae9cc0db90f1e316c5611d17c1d
-size 52154
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81035a90a836141668bb94b02ee3fa27b963f03b4511e3a0c711a19e2b0b1eb0
+size 54589
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38dade0d563899106dbd9da32b83800c7b6d03ff06c1170dd41bfc10ea02030b
-size 52357
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa9c97dc084ac2dc3510b49328af2cfbe0f8f92c1743e1ffcdd5b0db56973a71
-size 62221
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe2e2e4254752fd3995cc0e1c48f40a662a6a6c8232864d1454eb07ddffbbb72
+size 64383
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13ea202c4376a38fefa5992460a76d73b36336ad2fe4570efeb99c19d6794942
+size 64700
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e74df538df892a91f12cbf5ec62d51b5b8be501de7539f0b2a6254be0b4b8647
-size 73482
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ee8d8c44f48d3f81a2ffaf076844e2a04863da8e07cb4e8bcc927283d8baeae
-size 73715
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a409650b638189b890d9534416f8a9ac4d4c586632d053cafdeef5df8471d03d
-size 76046
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:183b4af45d76b0f859a3743b09d59f806b201f770c665319b6d01919dea4284a
-size 91572
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ece183a9c7d961f805e2ecd6ea8d24b5e4b703a24e78a5ae40b16d856f299376
-size 91974
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f802d5ad6707db0884b5d4dad66bb32a452bfd8149348ca82b07fd055502b6f
+size 92303
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c192157bb6a5aef1ced97ae071865a59c587c711314900a4ab9104bb549f13df
-size 43393
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:694beaa30a8a2792b814a50b26d158be58584d0b0d01db87b48dd707a98b301b
+size 45982
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4be4e46f13ca43c87cc5f3a94b327b80abaac27ccd6cf8422ae3e5e5a8ece48
-size 44050
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edbeba4d75ba915e9ed55e9f4779f4306339f581291e8a65dd10b76bde7db631
-size 74169
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:398a1e34927155ecf52e70d1b4e5c1f764372df3acb9a5b5aac3e1fc4294a4bf
+size 76427
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58d07b3ddf2e14605485bf2af5410d4902f33fbaf5049d30679b9666db7019eb
+size 76912
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2aa90070eacb59a79f7da76cfe5734ccc6e1602bcfec66a14e7c9feac77a3d0b
-size 79768
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:262e10d8fcd4c766b6b034918b38d9c7f73bd5f410eb35ba1551974004d85e49
-size 80521
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94a80f83d4a0220f41f02fce2d23a3ba02e362f68c4fea6999092dff30683dc9
-size 80324
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a9403843944d11c1eea077a5618236a6945a05830590c6b7d28e119879206e3
-size 101962
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c4fb9208a6c2c76ca9c222130c1967a26793c72e64b0052c2cf9f3c13c88889
-size 48293
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb1d2bd857307b5dd862d26b1da6bed00785ef50c89ee05f56799542c0a0b772
+size 48725
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb74183238f9a3b78ebe2cf7138a3de9ce3ac168541919a400bc3c35c8e07cc0
-size 30479
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e646f0ad485af23c48469603a3b24e0edb584df4955563ca426e7cf4755cf90
+size 32555
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41a5f7e0b1a1c11cf603b3c04d7208e84f0694c37ad9c9c1d90f2f4832f36dea
-size 30843
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6fd38cd8ed50741e43d7361a36388923d4d90d2fb8e6c112f67849b4c6b1994
-size 31146
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7f58d3e55865eeeab078bb8d4271466837f7a98b25e61896e56ff5d766b0b12
+size 33220
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06f553e324d760e125414d2c2dac2b6248297127a175479cfddc2ed77a66f6e6
+size 33617
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebe0fb81f277707cb308838e26388da92cc686461216b5eaa1ace61ba630d332
-size 37726
--- a/Show More
+++ b/Show More