Add more compose preview annotations.

2026-04-21 09:20:19 +01:00 · 2025-10-01 09:11:25 -04:00
parent 87535a917a
commit 2c8144b32f
147 changed files with 518 additions and 560 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt
@@ -21,8 +21,8 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.horizontalGutters
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
@@ -88,7 +88,7 @@ fun BetaHeader(modifier: Modifier = Modifier) {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun BetaLabelPreview() {
  Previews.Preview {
@@ -113,7 +113,7 @@ fun LongTextBetaLabelPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun BetaHeaderPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/ConnectivityWarningBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/ConnectivityWarningBottomSheet.kt
@@ -26,8 +26,8 @@ import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentManager
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -102,7 +102,7 @@ private fun Sheet(onDismiss: () -> Unit = {}) {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ConnectivityWarningSheetPreview() {
  Previews.BottomSheetPreview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeleteSyncEducationDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeleteSyncEducationDialog.kt
@@ -26,8 +26,8 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.subjects.CompletableSubject
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -126,7 +126,7 @@ private fun Sheet(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SheetPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeviceSpecificNotificationBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeviceSpecificNotificationBottomSheet.kt
@@ -27,8 +27,8 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -124,7 +124,7 @@ private fun DeviceSpecificSheet(onContinue: () -> Unit = {}, onDismiss: () -> Un
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun DeviceSpecificSheetPreview() {
  Previews.BottomSheetPreview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/RoundCheckbox.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/RoundCheckbox.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
-import org.signal.core.ui.compose.SignalPreview
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R

@@ -98,13 +98,13 @@ fun RoundCheckbox(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun RoundCheckboxCheckedPreview() = SignalTheme {
  RoundCheckbox(checked = true, onCheckedChange = {})
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun RoundCheckboxUncheckedPreview() = SignalTheme {
  RoundCheckbox(checked = false, onCheckedChange = {})
--- a/app/src/main/java/org/thoughtcrime/securesms/components/contactsupport/ContactSupportDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/contactsupport/ContactSupportDialog.kt
@@ -10,9 +10,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.SupportEmailUtil
@@ -86,7 +86,7 @@ fun <Reason> SendSupportEmailEffect(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ContactSupportDialogPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/Emojifier.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/Emojifier.kt
@@ -18,8 +18,8 @@ import androidx.compose.ui.text.PlaceholderVerticalAlign
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.sp
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview

 /**
 * Applies Signal or System emoji to the given content based off user settings.
@@ -71,7 +71,7 @@ fun Emojifier(
 }

@Composable
-@SignalPreview
+@DayNightPreviews
 private fun EmojifierPreview() {
  Previews.Preview {
    Emojifier(text = "This message has an emoji ❤\uFE0F")
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
@@ -47,12 +47,12 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.IconButtons
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.horizontalGutters
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
@@ -674,7 +674,7 @@ private fun BioRow(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun AppSettingsContentPreview() {
  Previews.Preview {
@@ -710,7 +710,7 @@ private fun AppSettingsContentPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun BioRowPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
@@ -37,12 +37,12 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Texts
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
@@ -451,7 +451,7 @@ private fun DeleteAllDataConfirmationDialog(
  )
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun AccountSettingsScreenPreview() {
  Previews.Preview {
@@ -471,7 +471,7 @@ private fun AccountSettingsScreenPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun DeleteAllDataConfirmationDialogPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt
@@ -17,10 +17,10 @@ import androidx.compose.ui.res.vectorResource
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.appearance.navbar.ChooseNavigationBarStyleFragment
 import org.thoughtcrime.securesms.compose.ComposeFragment
@@ -175,7 +175,7 @@ private fun AppearanceSettingsScreen(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun AppearanceSettingsScreenPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconSelectionFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconSelectionFragment.kt
@@ -45,11 +45,11 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.fragment.findNavController
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.signal.core.util.logging.Log
@@ -306,20 +306,10 @@ fun CaveatWarning(onClick: () -> Unit, modifier: Modifier = Modifier) {
  )
 }

-@Preview(name = "Light Theme")
+@DayNightPreviews
@Composable
-private fun MainScreenPreviewLight() {
-  SignalTheme(isDarkMode = false) {
-    Surface {
-      IconSelectionScreen(AppIconPreset.DEFAULT, onItemConfirmed = {}, onWarningClick = {})
-    }
-  }
-}
-
-@Preview(name = "Dark Theme")
-@Composable
-private fun MainScreenPreviewDark() {
-  SignalTheme(isDarkMode = true) {
+private fun MainScreenPreview() {
+  SignalTheme {
    Surface {
      IconSelectionScreen(AppIconPreset.DEFAULT, onItemConfirmed = {}, onWarningClick = {})
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconTutorialFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconTutorialFragment.kt
@@ -28,9 +28,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.compose.DayNightPreviews
+import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
@@ -116,10 +117,12 @@ class AppIconTutorialFragment : ComposeFragment() {
    }
  }

-  @Preview
+  @DayNightPreviews
  @Composable
  private fun TutorialScreenPreview() {
-    TutorialScreen()
+    Previews.Preview {
+      TutorialScreen()
+    }
  }

  companion object {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
@@ -41,11 +41,11 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
 import kotlinx.coroutines.delay
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Texts
 import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.R
@@ -613,7 +613,7 @@ private fun InternalBackupOverrideRow(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun BackupsSettingsContentPreview() {
  Previews.Preview {
@@ -634,7 +634,7 @@ private fun BackupsSettingsContentPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun BackupsSettingsContentBackupTierInternalOverridePreview() {
  Previews.Preview {
@@ -649,7 +649,7 @@ private fun BackupsSettingsContentBackupTierInternalOverridePreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun WaitingForNetworkRowPreview() {
  Previews.Preview {
@@ -657,7 +657,7 @@ private fun WaitingForNetworkRowPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun InactiveBackupsRowPreview() {
  Previews.Preview {
@@ -665,7 +665,7 @@ private fun InactiveBackupsRowPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun NotFoundBackupRowPreview() {
  Previews.Preview {
@@ -673,7 +673,7 @@ private fun NotFoundBackupRowPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun PendingBackupRowPreview() {
  Previews.Preview {
@@ -681,7 +681,7 @@ private fun PendingBackupRowPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ActivePaidBackupsRowPreview() {
  Previews.Preview {
@@ -700,7 +700,7 @@ private fun ActivePaidBackupsRowPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ActivePaidBackupsRowNoPricePreview() {
  Previews.Preview {
@@ -719,7 +719,7 @@ private fun ActivePaidBackupsRowNoPricePreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ActiveFreeBackupsRowPreview() {
  Previews.Preview {
@@ -735,7 +735,7 @@ private fun ActiveFreeBackupsRowPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun NeverEnabledBackupsRowPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
@@ -71,12 +71,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Snackbars
 import org.signal.core.ui.compose.Texts
 import org.signal.core.ui.compose.horizontalGutters
@@ -1720,7 +1720,7 @@ private fun BackupReadyToDownloadRow(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun RemoteBackupsSettingsContentPreview() {
  Previews.Preview {
@@ -1748,7 +1748,7 @@ private fun RemoteBackupsSettingsContentPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun RemoteBackupsSettingsInternalUserContentPreview() {
  Previews.Preview {
@@ -1777,7 +1777,7 @@ private fun RemoteBackupsSettingsInternalUserContentPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun RedemptionErrorAlertPreview() {
  Previews.Preview {
@@ -1785,7 +1785,7 @@ private fun RedemptionErrorAlertPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun LoadingCardPreview() {
  Previews.Preview {
@@ -1793,7 +1793,7 @@ private fun LoadingCardPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ErrorCardPreview() {
  Previews.Preview {
@@ -1801,7 +1801,7 @@ private fun ErrorCardPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun PendingCardPreview() {
  Previews.Preview {
@@ -1811,7 +1811,7 @@ private fun PendingCardPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SubscriptionNotFoundCardPreview() {
  Previews.Preview {
@@ -1822,7 +1822,7 @@ private fun SubscriptionNotFoundCardPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SubscriptionMismatchMissingGooglePlayCardPreview() {
  Previews.Preview {
@@ -1840,7 +1840,7 @@ private fun SubscriptionMismatchMissingGooglePlayCardPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun BackupCardPreview() {
  Previews.Preview {
@@ -1934,7 +1934,7 @@ private fun BackupCardPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun BackupReadyToDownloadPreview() {
  Previews.Preview {
@@ -1945,7 +1945,7 @@ private fun BackupReadyToDownloadPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun BackupReadyToDownloadAfterCancelPreview() {
  Previews.Preview {
@@ -1963,7 +1963,7 @@ private fun BackupReadyToDownloadAfterCancelPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun LastBackupRowPreview() {
  Previews.Preview {
@@ -1976,7 +1976,7 @@ private fun LastBackupRowPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun InProgressRowPreview() {
  Previews.Preview {
@@ -2060,7 +2060,7 @@ private fun InProgressRowPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun FailedToTurnOffBackupDialogPreview() {
  Previews.Preview {
@@ -2070,7 +2070,7 @@ private fun FailedToTurnOffBackupDialogPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun TurnOffAndDeleteBackupsDialogPreview() {
  Previews.Preview {
@@ -2082,7 +2082,7 @@ private fun TurnOffAndDeleteBackupsDialogPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun DownloadingYourBackupDialogPreview() {
  Previews.Preview {
@@ -2092,7 +2092,7 @@ private fun DownloadingYourBackupDialogPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SkipDownloadDuringDeleteDialogPreview() {
  Previews.Preview {
@@ -2100,7 +2100,7 @@ private fun SkipDownloadDuringDeleteDialogPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SkipDownloadDialogPreview() {
  Previews.Preview {
@@ -2110,7 +2110,7 @@ private fun SkipDownloadDialogPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun BackupDeletionCardPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/SubscriptionNotFoundBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/SubscriptionNotFoundBottomSheet.kt
@@ -31,8 +31,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.horizontalGutters
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
@@ -164,7 +164,7 @@ private fun SubscriptionNotFoundReason(text: String) {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SubscriptionNotFoundContentPreview() {
  Previews.BottomSheetPreview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt
@@ -27,9 +27,9 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -111,7 +111,7 @@ fun ChangeNumberScreen(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun MessageBackupsEducationSheetPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
@@ -13,11 +13,11 @@ import androidx.compose.ui.res.vectorResource
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Texts
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
@@ -202,7 +202,7 @@ private fun ChatsSettingsScreen(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ChatsSettingsScreenPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersEducationSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersEducationSheet.kt
@@ -19,8 +19,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment

@@ -106,7 +106,7 @@ fun EducationRow(text: String, painter: Painter) {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun ChatFoldersEducationSheetPreview() {
  Previews.BottomSheetPreview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersFragment.kt
@@ -46,12 +46,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.DropdownMenus
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.copied.androidx.compose.DragAndDropEvent
 import org.signal.core.ui.compose.copied.androidx.compose.DraggableItem
 import org.signal.core.ui.compose.copied.androidx.compose.dragContainer
@@ -402,7 +402,7 @@ fun FolderRow(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ChatFolderPreview() {
  val previewFolders = listOf(
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
@@ -50,11 +50,11 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarImage
 import org.thoughtcrime.securesms.compose.ComposeFragment
@@ -445,7 +445,7 @@ private fun ShowMutedSection(state: ChatFoldersSettingsState, onToggleShowMuted:
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun CreateFolderPreview() {
  val previewFolder = ChatFolder(ChatFolderRecord(id = 1, name = "WIP"))
@@ -459,7 +459,7 @@ private fun CreateFolderPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun EditFolderPreview() {
  val previewFolder = ChatFolder(ChatFolderRecord(id = 1, name = "Work"))
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt
@@ -17,11 +17,11 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Texts
 import org.signal.core.util.bytes
 import org.thoughtcrime.securesms.R
@@ -249,7 +249,7 @@ private fun DataAndStorageSettingsScreen(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun DataAndStorageSettingsScreenPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
@@ -17,13 +17,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.fragment.findNavController
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Scaffolds
+import org.signal.core.ui.compose.theme.SignalTheme
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
@@ -71,10 +72,12 @@ fun LicenseScreen(licenseTextLines: List<String>, modifier: Modifier = Modifier)
  }
 }

-@Preview
+@DayNightPreviews
@Composable
 fun LicenseFragmentPreview() {
-  LicenseScreen(listOf("Lorem ipsum", "Delor"))
+  SignalTheme {
+    LicenseScreen(listOf("Lorem ipsum", "Delor"))
+  }
 }

 private fun InputStream.readToLines(): List<String> {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundFragment.kt
@@ -59,10 +59,10 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Snackbars
 import org.signal.core.ui.compose.TextFields.TextField
 import org.signal.core.util.Base64
@@ -639,7 +639,7 @@ private fun ImportCredentialsDialog(onSubmit: (aci: String, backupKey: String) -
  )
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun PreviewScreen() {
  Previews.Preview {
@@ -647,7 +647,7 @@ fun PreviewScreen() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun PreviewScreenExportInProgress() {
  Previews.Preview {
@@ -655,7 +655,7 @@ fun PreviewScreenExportInProgress() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun PreviewImportCredentialDialog() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/dataseeding/DataSeedingPlaygroundFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/dataseeding/DataSeedingPlaygroundFragment.kt
@@ -50,9 +50,9 @@ import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.database.model.ThreadRecord
@@ -321,7 +321,7 @@ private fun ThreadSelectionRow(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun PreviewScreen() {
  Previews.Preview {
@@ -336,7 +336,7 @@ fun PreviewScreen() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun PreviewScreenWithData() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt
@@ -25,11 +25,11 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -107,40 +107,27 @@ fun ResultItem(result: InternalSearchResult, modifier: Modifier = Modifier) {
  }
 }

-@Preview
-@Composable
-fun InternalSearchScreenPreviewLightTheme() {
-  SignalTheme(isDarkMode = false) {
-    InternalSearchScreenPreview()
-  }
-}
-
-@Preview
-@Composable
-fun InternalSearchScreenPreviewDarkTheme() {
-  SignalTheme(isDarkMode = true) {
-    InternalSearchScreenPreview()
-  }
-}
-
+@DayNightPreviews
@Composable
 fun InternalSearchScreenPreview() {
-  InternalSearchFragmentScreen(
-    query = "",
-    results = persistentListOf(
-      InternalSearchResult(
-        name = "Peter Parker",
-        id = RecipientId.from(1),
-        aci = UUID.randomUUID().toString(),
-        pni = UUID.randomUUID().toString()
+  SignalTheme {
+    InternalSearchFragmentScreen(
+      query = "",
+      results = persistentListOf(
+        InternalSearchResult(
+          name = "Peter Parker",
+          id = RecipientId.from(1),
+          aci = UUID.randomUUID().toString(),
+          pni = UUID.randomUUID().toString()
+        ),
+        InternalSearchResult(
+          name = "Mary Jane",
+          id = RecipientId.from(2),
+          aci = UUID.randomUUID().toString(),
+          pni = null
+        )
      ),
-      InternalSearchResult(
-        name = "Mary Jane",
-        id = RecipientId.from(2),
-        aci = UUID.randomUUID().toString(),
-        pni = null
-      )
-    ),
-    onSearchUpdated = {}
-  )
+      onSearchUpdated = {}
+    )
+  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/sqlite/InternalSqlitePlaygroundFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/sqlite/InternalSqlitePlaygroundFragment.kt
@@ -47,8 +47,8 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.libsignal.protocol.util.Hex
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.internal.sqlite.InternalSqlitePlaygroundViewModel.QueryResult
@@ -211,7 +211,7 @@ private fun List<Any?>.toCsv(): String {
  )
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ScreenPreview() {
  Previews.Preview {
@@ -229,7 +229,7 @@ private fun ScreenPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ScreenPreviewNoResults() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/storage/InternalStorageServicePlaygroundFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/storage/InternalStorageServicePlaygroundFragment.kt
@@ -40,11 +40,11 @@ import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Rows.TextAndLabel
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.util.Hex
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.internal.storage.InternalStorageServicePlaygroundViewModel.OneOffEvent
@@ -355,7 +355,7 @@ private fun RunButton(onClick: () -> Unit) {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun ScreenPreview() {
  Previews.Preview {
@@ -368,7 +368,7 @@ fun ScreenPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun ViewScreenPreview() {
  val storageRecords = listOf(
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
@@ -40,11 +40,11 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import kotlinx.coroutines.launch
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Texts
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
@@ -548,7 +548,7 @@ private fun getLedColor(ledColorString: String): Color {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun NotificationsSettingsScreenPreview() {
  Previews.Preview {
@@ -560,7 +560,7 @@ private fun NotificationsSettingsScreenPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun NotificationsSettingsScreenAPI21Preview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/AddAllowedMembersFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/AddAllowedMembersFragment.kt
@@ -27,10 +27,10 @@ import com.google.android.material.snackbar.Snackbar
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import kotlinx.coroutines.rx3.asFlow
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Snackbars
 import org.signal.core.ui.compose.Texts
 import org.signal.core.ui.compose.horizontalGutters
@@ -256,7 +256,7 @@ private fun AddAllowedMembersContent(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun AddAllowedMembersContentPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileComponents.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileComponents.kt
@@ -27,9 +27,9 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.horizontalGutters
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
@@ -122,7 +122,7 @@ fun NotificationProfileRecipient(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun NotificationProfileAddMembersPreview() {
  Previews.Preview {
@@ -132,7 +132,7 @@ fun NotificationProfileAddMembersPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun NotificationProfileRecipientPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt
@@ -34,11 +34,11 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.preference.PreferenceManager
 import kotlinx.coroutines.launch
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Texts
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
@@ -287,7 +287,7 @@ private fun AdvancedPrivacySettingsScreen(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun AdvancedPrivacySettingsScreenPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/screenlock/ScreenLockSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/screenlock/ScreenLockSettingsFragment.kt
@@ -44,9 +44,9 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BiometricDeviceAuthentication
 import org.thoughtcrime.securesms.BiometricDeviceLockContract
@@ -272,7 +272,7 @@ fun ScreenLockScreen(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun ScreenLockScreenPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
@@ -54,13 +54,13 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.navArgument
 import org.signal.core.ui.compose.Animations
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Rows.TextAndLabel
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Texts
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.signal.core.util.bytes
@@ -550,7 +550,7 @@ private fun SetCustomLengthLimitDialog(
  )
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun ManageStorageSettingsScreenPreview() {
  Previews.Preview {
@@ -565,7 +565,7 @@ private fun ManageStorageSettingsScreenPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SetKeepMessagesScreenPreview() {
  Previews.Preview {
@@ -573,7 +573,7 @@ private fun SetKeepMessagesScreenPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SetChatLengthLimitScreenPreview() {
  Previews.Preview {
@@ -583,7 +583,7 @@ private fun SetChatLengthLimitScreenPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun SetCustomLengthLimitDialogPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt
@@ -22,13 +22,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Texts
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
@@ -78,7 +78,7 @@ class DonationPendingBottomSheet : ComposeBottomSheetDialogFragment() {
  }
 }

-@Preview
+@DayNightPreviews
@Composable
 fun DonationPendingBottomSheetContentPreview() {
  SignalTheme {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt
@@ -31,12 +31,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeRepository
@@ -125,7 +125,7 @@ class TerminalDonationBottomSheet : ComposeBottomSheetDialogFragment() {
  }
 }

-@Preview
+@DayNightPreviews
@Composable
 private fun DonationPaymentFailureBottomSheet() {
  SignalTheme {
@@ -223,7 +223,7 @@ private fun DonationPaymentFailureBottomSheet(
  }
 }

-@Preview
+@DayNightPreviews
@Composable
 private fun DonationCompletedSheetContentPreview() {
  SignalTheme {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt
@@ -38,7 +38,6 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
@@ -50,6 +49,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.navigation.navGraphViewModels
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.Texts
 import org.signal.core.ui.compose.theme.SignalTheme
@@ -184,7 +184,7 @@ class BankTransferDetailsFragment : ComposeFragment(), InAppPaymentCheckoutDeleg
  }
 }

-@Preview
+@DayNightPreviews
@Composable
 private fun BankTransferDetailsContentPreview() {
  SignalTheme {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateFragment.kt
@@ -47,13 +47,13 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import kotlinx.coroutines.launch
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Texts
 import org.signal.core.ui.compose.theme.SignalTheme
@@ -126,7 +126,7 @@ class BankTransferMandateFragment : ComposeFragment() {
  }
 }

-@Preview
+@DayNightPreviews
@Composable
 fun BankTransferScreenPreview() {
  SignalTheme {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt
@@ -17,10 +17,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier
@@ -129,7 +129,7 @@ private fun rememberLastSuccessfulUpdateString(lastUpdateTime: Duration): String
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun AppUpdatesSettingsScreenPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerFragment.kt
@@ -36,7 +36,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
 import androidx.navigation.NavController
@@ -44,6 +43,7 @@ import androidx.navigation.fragment.findNavController
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeBadge
@@ -134,7 +134,9 @@ class UsernameLinkQrColorPickerFragment : ComposeFragment() {
  @Composable
  private fun ColorPicker(colors: ImmutableList<UsernameQrCodeColorScheme>, selected: UsernameQrCodeColorScheme, onSelectionChanged: (UsernameQrCodeColorScheme) -> Unit) {
    LazyVerticalGrid(
-      modifier = Modifier.padding(horizontal = 30.dp).heightIn(max = 880.dp),
+      modifier = Modifier
+        .padding(horizontal = 30.dp)
+        .heightIn(max = 880.dp),
      columns = GridCells.Adaptive(minSize = 88.dp)
    ) {
      colors.forEach { color ->
@@ -181,10 +183,10 @@ class UsernameLinkQrColorPickerFragment : ComposeFragment() {
    }
  }

-  @Preview
+  @DayNightPreviews
  @Composable
  private fun PreviewColorPickerItem() {
-    SignalTheme(isDarkMode = false) {
+    SignalTheme {
      Surface {
        Row(verticalAlignment = Alignment.CenterVertically) {
          ColorPickerItem(color = UsernameQrCodeColorScheme.Blue, selected = false, onClick = {})
@@ -194,10 +196,10 @@ class UsernameLinkQrColorPickerFragment : ComposeFragment() {
    }
  }

-  @Preview
+  @DayNightPreviews
  @Composable
  private fun PreviewColorPicker() {
-    SignalTheme(isDarkMode = false) {
+    SignalTheme {
      Surface {
        ColorPicker(
          colors = UsernameQrCodeColorScheme.entries.toImmutableList(),
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsFragment.kt
@@ -5,7 +5,6 @@ package org.thoughtcrime.securesms.components.settings.app.usernamelinks.main
 import android.Manifest
 import android.app.Activity
 import android.content.Intent
-import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.view.View
@@ -46,7 +45,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.app.ShareCompat
 import androidx.core.app.TaskStackBuilder
@@ -64,6 +62,7 @@ import com.google.accompanist.permissions.rememberPermissionState
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.CoroutineScope
 import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Snackbars
 import org.signal.core.ui.compose.theme.SignalTheme
@@ -347,8 +346,7 @@ private fun ResetDialog(onConfirm: () -> Unit, onDismiss: () -> Unit) {
  )
 }

-@Preview(name = "Light Theme", uiMode = Configuration.UI_MODE_NIGHT_NO)
-@Preview(name = "Dark Theme", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@DayNightPreviews
@Composable
 private fun AppBarPreview() {
  SignalTheme {
@@ -361,8 +359,7 @@ private fun AppBarPreview() {
  }
 }

-@Preview(name = "Light Theme", uiMode = Configuration.UI_MODE_NIGHT_NO)
-@Preview(name = "Dark Theme", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@DayNightPreviews
@Composable
 private fun MainScreenPreview() {
  SignalTheme {
@@ -378,8 +375,7 @@ private fun MainScreenPreview() {
  }
 }

-@Preview(name = "Light Theme", uiMode = Configuration.UI_MODE_NIGHT_NO)
-@Preview(name = "Dark Theme", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@DayNightPreviews
@Composable
 private fun ResetDialogPreview() {
  SignalTheme {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsScreen.kt
@@ -18,11 +18,11 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.AnnotatedString
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.Texts
 import org.signal.core.util.Hex.fromStringCondensed
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
@@ -412,7 +412,7 @@ private fun AreYouSureDialog(
  )
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun InternalConversationSettingsScreenPreview() {
  Previews.Preview {
@@ -423,7 +423,7 @@ fun InternalConversationSettingsScreenPreview() {
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun InternalConversationSettingsScreenGroupPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Banner.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Banner.kt
@@ -20,8 +20,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.unit.dp
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.horizontalGutters
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.databinding.DslBannerBinding
@@ -99,7 +99,7 @@ fun Banner(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 private fun BannerPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt
@@ -41,7 +41,7 @@ import androidx.fragment.app.setFragmentResult
 import kotlinx.coroutines.flow.map
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
-import org.signal.core.ui.compose.DarkPreview
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
@@ -132,7 +132,7 @@ class PendingParticipantsBottomSheet : ComposeBottomSheetDialogFragment() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun PendingParticipantsSheetPreview() {
  Previews.BottomSheetPreview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
@@ -33,8 +33,8 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import org.signal.core.ui.compose.BottomSheets
-import org.signal.core.ui.compose.DarkPreview
 import org.signal.core.ui.compose.Dividers
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.util.getParcelableCompat
@@ -103,7 +103,7 @@ class CallLinkIncomingRequestSheet : ComposeBottomSheetDialogFragment() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun CallLinkIncomingRequestSheetContentPreview() {
  Previews.BottomSheetPreview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/AdditionalActionsPopup.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/AdditionalActionsPopup.kt
@@ -33,7 +33,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
-import org.signal.core.ui.compose.DarkPreview
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.TriggerAlignedPopup
 import org.signal.core.ui.compose.TriggerAlignedPopupState
@@ -177,7 +177,7 @@ private fun CallScreenMenuOption(
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun CallScreenAdditionalActionsPopupPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallAudioToggleButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallAudioToggleButton.kt
@@ -33,8 +33,8 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.signal.core.ui.compose.DarkPreview
 import org.signal.core.ui.compose.IconButtons
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.thoughtcrime.securesms.R
@@ -263,7 +263,7 @@ private fun LegacyAudioPickerContent(
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun CallAudioPickerSheetContentPreview() {
  Previews.BottomSheetPreview {
@@ -280,7 +280,7 @@ private fun CallAudioPickerSheetContentPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun TwoDeviceCallAudioToggleButtonPreview() {
  val outputState = remember {
@@ -303,7 +303,7 @@ private fun TwoDeviceCallAudioToggleButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun ThreeDeviceCallAudioToggleButtonPreview() {
  val outputState = remember {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallButton.kt
@@ -24,8 +24,8 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.signal.core.ui.compose.Buttons
-import org.signal.core.ui.compose.DarkPreview
 import org.signal.core.ui.compose.IconButtons
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R

@@ -228,7 +228,7 @@ fun StartCallButton(
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun ToggleMicButtonPreview() {
  Previews.Preview {
@@ -246,7 +246,7 @@ private fun ToggleMicButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun ToggleVideoButtonPreview() {
  Previews.Preview {
@@ -264,7 +264,7 @@ private fun ToggleVideoButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun ToggleRingButtonPreview() {
  Previews.Preview {
@@ -284,7 +284,7 @@ private fun ToggleRingButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun AdditionalActionsButtonPreview() {
  Previews.Preview {
@@ -294,7 +294,7 @@ private fun AdditionalActionsButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun HangupButtonPreview() {
  Previews.Preview {
@@ -304,7 +304,7 @@ private fun HangupButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun VideoAcceptCallButtonPreview() {
  Previews.Preview {
@@ -315,7 +315,7 @@ private fun VideoAcceptCallButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun AcceptCallButtonPreview() {
  Previews.Preview {
@@ -326,7 +326,7 @@ private fun AcceptCallButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun AnswerWithoutVideoButtonPreview() {
  Previews.Preview {
@@ -336,7 +336,7 @@ private fun AnswerWithoutVideoButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun StartCallButtonPreview() {
  Previews.Preview {
@@ -347,7 +347,7 @@ private fun StartCallButtonPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun JoinCallButtonPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControls.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControls.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
-import org.signal.core.ui.compose.DarkPreview
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.TriggerAlignedPopupState.Companion.popupTrigger
 import org.signal.core.ui.compose.TriggerAlignedPopupState.Companion.rememberTriggerAlignedPopupState
@@ -143,7 +143,7 @@ fun CallControls(
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 fun CallControlsPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControlsChange.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallControlsChange.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.signal.core.ui.compose.DarkPreview
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R

@@ -80,7 +80,7 @@ fun CallStateUpdatePopup(
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun CallStateUpdatePopupPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenDialog.kt
@@ -7,8 +7,8 @@ package org.thoughtcrime.securesms.components.webrtc.v2

 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import org.signal.core.ui.compose.DarkPreview
 import org.signal.core.ui.compose.Dialogs
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R

@@ -49,7 +49,7 @@ private fun DeniedRequestToJoinCallDialog(onDialogDismissed: () -> Unit = {}) {
  )
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun RemovedFromCallLinkDialogPreview() {
  Previews.Preview {
@@ -57,7 +57,7 @@ private fun RemovedFromCallLinkDialogPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 private fun DeniedRequestToJoinCallDialogPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenTooltipBox.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenTooltipBox.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import kotlinx.coroutines.flow.drop
-import org.signal.core.ui.compose.DarkPreview
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R

@@ -69,7 +69,7 @@ fun CallScreenTooltipBox(
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 fun SwitchCameraTooltipBoxPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenTopBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenTopBar.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.signal.core.ui.compose.DarkPreview
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarImage
@@ -197,7 +197,7 @@ fun CallScreenTopAppBar(
  )
 }

-@DarkPreview
+@NightPreview
@Composable
 fun CallScreenTopBarPreview() {
  Previews.Preview {
@@ -208,7 +208,7 @@ fun CallScreenTopBarPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Composable
 fun CallScreenPreJoinOverlayPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/IncomingCallScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/IncomingCallScreen.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.signal.core.ui.compose.DarkPreview
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarImage
@@ -67,7 +67,8 @@ fun IncomingCallScreen(

    GlideImage(
      model = callRecipient.contactPhoto,
-      modifier = Modifier.fillMaxSize()
+      modifier = Modifier
+        .fillMaxSize()
        .blur(
          radiusX = 25.dp,
          radiusY = 25.dp,
@@ -279,7 +280,7 @@ private fun AnswerCallButtonAndLabel(
  }
 }

-@DarkPreview
+@NightPreview
@Preview(device = "spec:parent=pixel_5,orientation=landscape", uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
 fun IncomingVideoCallScreenPreview() {
@@ -295,7 +296,7 @@ fun IncomingVideoCallScreenPreview() {
  }
 }

-@DarkPreview
+@NightPreview
@Preview(device = "spec:parent=pixel_5,orientation=landscape", uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
 fun IncomingAudioCallScreenPreview() {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/PendingParticipants.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/PendingParticipants.kt
@@ -11,8 +11,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.viewinterop.AndroidView
+import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
-import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.components.webrtc.PendingParticipantsView
 import org.thoughtcrime.securesms.service.webrtc.PendingParticipantCollection

@@ -42,7 +42,7 @@ fun PendingParticipants(
  }
 }

-@SignalPreview
+@DayNightPreviews
@Composable
 fun PendingParticipantsPreview() {
  Previews.Preview {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/PictureInPicture.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/PictureInPicture.kt
@@ -37,7 +37,7 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import org.signal.core.ui.compose.DarkPreview
+import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
 import kotlin.math.pow
 import kotlin.math.roundToInt
@@ -185,7 +185,7 @@ private fun distance(a: IntOffset, b: IntOffset): Float {
  return sqrt((b.x - a.x).toDouble().pow(2) + (b.y - a.y).toDouble().pow(2)).toFloat()
 }

-@DarkPreview
+@NightPreview
@Composable
 fun PictureInPicturePreview() {
  Previews.Preview {