diff --git a/app/src/main/java/org/thoughtcrime/securesms/DevicePinAuthEducationSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/DevicePinAuthEducationSheet.kt index 23dc786187..34349d8caf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DevicePinAuthEducationSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/DevicePinAuthEducationSheet.kt @@ -21,8 +21,8 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.setFragmentResult 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.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.util.BottomSheetUtil @@ -106,7 +106,7 @@ fun DevicePinAuthEducationSheet( } } -@SignalPreview +@DayNightPreviews @Composable fun DevicePinAuthEducationSheetPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/InviteFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/InviteFragment.kt index fac9f76ff3..a2bf7cbe83 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/InviteFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/InviteFragment.kt @@ -30,9 +30,9 @@ import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.TextFieldValue 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.Scaffolds -import org.signal.core.ui.compose.SignalPreview import org.thoughtcrime.securesms.compose.ComposeFragment /** @@ -113,7 +113,7 @@ fun InviteScreen( } } -@SignalPreview +@DayNightPreviews @Composable private fun InviteScreenPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarImage.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarImage.kt index 1d05ed7f0b..a7210d4f42 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarImage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarImage.kt @@ -27,8 +27,8 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType 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.util.DimensionUnit import org.thoughtcrime.securesms.avatar.AvatarRenderer import org.thoughtcrime.securesms.avatar.Avatars @@ -94,7 +94,7 @@ fun FallbackAvatarImage( } } -@SignalPreview +@DayNightPreviews @Composable fun FallbackAvatarImagePreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt index 2aa2464c99..7abf1e327c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt @@ -37,8 +37,8 @@ import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.parcelize.Parcelize +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.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.BackupRepository @@ -434,7 +434,7 @@ private fun rememberSecondaryAction( } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertSheetContentPreviewGeneric() { Previews.BottomSheetPreview { @@ -446,7 +446,7 @@ private fun BackupAlertSheetContentPreviewGeneric() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertSheetContentPreviewPayment() { Previews.BottomSheetPreview { @@ -458,7 +458,7 @@ private fun BackupAlertSheetContentPreviewPayment() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertSheetContentPreviewDelete() { Previews.BottomSheetPreview { @@ -473,7 +473,7 @@ private fun BackupAlertSheetContentPreviewDelete() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertSheetContentPreviewDiskFull() { Previews.BottomSheetPreview { @@ -485,7 +485,7 @@ private fun BackupAlertSheetContentPreviewDiskFull() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertSheetContentPreviewBackupFailed() { Previews.BottomSheetPreview { @@ -497,7 +497,7 @@ private fun BackupAlertSheetContentPreviewBackupFailed() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertSheetContentPreviewCouldNotRedeemBackup() { Previews.BottomSheetPreview { @@ -509,7 +509,7 @@ private fun BackupAlertSheetContentPreviewCouldNotRedeemBackup() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertSheetContentPreviewSubscriptionExpired() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertSheetComponents.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertSheetComponents.kt index c517e47534..6e6d7024dd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertSheetComponents.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertSheetComponents.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.thoughtcrime.securesms.R import org.signal.core.ui.R as CoreUiR @@ -201,7 +201,7 @@ private fun BackupAlertSecondaryActionButton( } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertBottomSheetContainerPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/CreateBackupBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/CreateBackupBottomSheet.kt index f17532527a..51fd96b8c5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/CreateBackupBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/CreateBackupBottomSheet.kt @@ -27,8 +27,8 @@ import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult 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.components.settings.app.backups.BackupStateObserver import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment @@ -134,7 +134,7 @@ private fun CreateBackupBottomSheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun CreateBackupBottomSheetContentPaidPreview() { Previews.BottomSheetPreview { @@ -145,7 +145,7 @@ private fun CreateBackupBottomSheetContentPaidPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun CreateBackupBottomSheetContentFreePreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/DownloadYourBackupTodayDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/DownloadYourBackupTodayDialog.kt index def1204aa0..ebeec31623 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/DownloadYourBackupTodayDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/DownloadYourBackupTodayDialog.kt @@ -11,9 +11,9 @@ import androidx.compose.ui.res.stringResource import androidx.core.os.BundleCompat import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment +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.backup.v2.BackupRepository import org.thoughtcrime.securesms.compose.ComposeDialogFragment @@ -70,7 +70,7 @@ private fun DownloadYourBackupTodayDialogContent( ) } -@SignalPreview +@DayNightPreviews @Composable private fun DownloadYourBackupTodayDialogContentPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MediaBackupsAreOffBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MediaBackupsAreOffBottomSheet.kt index af67109c44..48d600dc59 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MediaBackupsAreOffBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MediaBackupsAreOffBottomSheet.kt @@ -18,9 +18,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector @@ -35,8 +33,8 @@ import androidx.core.os.BundleCompat import org.signal.core.ui.R 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.util.gibiBytes import org.signal.core.util.money.FiatMoney import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType @@ -158,7 +156,7 @@ private fun SheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun BackupAlertSheetContentPreviewMedia() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/NoManualBackupBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/NoManualBackupBottomSheet.kt index 0a735b42c6..a22dfe3b90 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/NoManualBackupBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/NoManualBackupBottomSheet.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource 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.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment @@ -71,7 +71,7 @@ private fun NoManualBackupSheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun NoManualBackupSheetContentPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/NoRemoteStorageSpaceAvailableBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/NoRemoteStorageSpaceAvailableBottomSheet.kt index 54310346d0..0fb71bed92 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/NoRemoteStorageSpaceAvailableBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/NoRemoteStorageSpaceAvailableBottomSheet.kt @@ -19,8 +19,8 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withLink import androidx.compose.ui.text.withStyle 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.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.components.contactsupport.ContactSupportDialogFragment @@ -108,7 +108,7 @@ private fun NoRemoteStorageSpaceAvailableBottomSheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun NoRemoteStorageSpaceAvailableBottomSheetContentPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupCreateErrorRow.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupCreateErrorRow.kt index 15a81f68c5..a978fe02ff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupCreateErrorRow.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupCreateErrorRow.kt @@ -29,8 +29,8 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withLink import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +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.signal.core.ui.R as CoreUiR @@ -112,7 +112,7 @@ private fun BackupAlertText(text: AnnotatedString, inlineContent: Map Unit, onLearnMoreClick: ) } -@SignalPreview +@DayNightPreviews @Composable private fun ServiceMissingDialogPreview() { Previews.Preview { @@ -198,7 +198,7 @@ private fun ServiceMissingDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ServiceUpdatingDialogPreview() { Previews.Preview { @@ -206,7 +206,7 @@ private fun ServiceUpdatingDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ServiceVersionUpdateRequiredDialogPreview() { Previews.Preview { @@ -214,7 +214,7 @@ private fun ServiceVersionUpdateRequiredDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ServiceDisabledDialogPreview() { Previews.Preview { @@ -222,7 +222,7 @@ private fun ServiceDisabledDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ServiceInvalidDialogPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt index 8be11962ac..dd859f816b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt @@ -28,9 +28,9 @@ 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 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.thoughtcrime.securesms.R @@ -144,7 +144,7 @@ fun MessageBackupsEducationScreen( } } -@Preview +@DayNightPreviews @Composable private fun MessageBackupsEducationSheetPreview() { Previews.Preview { @@ -156,7 +156,7 @@ private fun MessageBackupsEducationSheetPreview() { } } -@Preview +@DayNightPreviews @Composable private fun NotableFeatureRowPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyEducationScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyEducationScreen.kt index bd66c43f0e..9f1691258f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyEducationScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyEducationScreen.kt @@ -28,9 +28,9 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp 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.signal.core.ui.R as CoreUiR @@ -112,7 +112,7 @@ fun MessageBackupsKeyEducationScreen( } } -@SignalPreview +@DayNightPreviews @Composable private fun MessageBackupsKeyEducationScreenPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyRecordScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyRecordScreen.kt index cef7562daf..752060f3ff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyRecordScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyRecordScreen.kt @@ -47,10 +47,10 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp 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.Previews 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.horizontalGutters import org.signal.core.ui.compose.theme.SignalTheme @@ -421,7 +421,7 @@ private suspend fun saveKeyToCredentialManager( ) } -@SignalPreview +@DayNightPreviews @Composable private fun MessageBackupsKeyRecordScreenPreview() { Previews.Preview { @@ -438,7 +438,7 @@ private fun MessageBackupsKeyRecordScreenPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun SaveKeyConfirmationDialogPreview() { Previews.Preview { @@ -452,7 +452,7 @@ private fun SaveKeyConfirmationDialogPreview() { } @OptIn(ExperimentalMaterial3Api::class) -@SignalPreview +@DayNightPreviews @Composable private fun CreateNewBackupKeySheetContentPreview() { Previews.BottomSheetPreview { @@ -462,7 +462,7 @@ private fun CreateNewBackupKeySheetContentPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DownloadMediaDialogPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyVerifyScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyVerifyScreen.kt index c5a6415983..7d7d0f08a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyVerifyScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyVerifyScreen.kt @@ -34,9 +34,9 @@ import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch 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.Scaffolds -import org.signal.core.ui.compose.SignalPreview import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.keyvalue.SignalStore @@ -192,7 +192,7 @@ private fun BottomSheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun MessageBackupsKeyRecordScreenPreview() { Previews.Preview { @@ -202,7 +202,7 @@ private fun MessageBackupsKeyRecordScreenPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BottomSheetContentPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeFeature.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeFeature.kt index 32a9fce4d8..a59aef2841 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeFeature.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeFeature.kt @@ -19,8 +19,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource 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.thoughtcrime.securesms.R /** @@ -58,7 +58,7 @@ fun MessageBackupsTypeFeatureRow( } } -@SignalPreview +@DayNightPreviews @Composable private fun MessageBackupsTypeFeatureRowPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt index 65d31cf54f..f3b07d56b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt @@ -48,10 +48,10 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import kotlinx.collections.immutable.persistentListOf 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.Previews import org.signal.core.ui.compose.Scaffolds -import org.signal.core.ui.compose.SignalPreview import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.billing.BillingResponseCode import org.signal.core.util.bytes @@ -277,7 +277,7 @@ private fun UserNotSignedInDialog( ) } -@SignalPreview +@DayNightPreviews @Composable private fun MessageBackupsTypeSelectionScreenPreview() { var selectedBackupsType by remember { mutableStateOf(MessageBackupTier.FREE) } @@ -302,7 +302,7 @@ private fun MessageBackupsTypeSelectionScreenPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun MessageBackupsTypeSelectionScreenWithCurrentTierPreview() { var selectedBackupsType by remember { mutableStateOf(MessageBackupTier.FREE) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt index 347df24b53..7c799b01c6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withLink import androidx.compose.ui.text.withStyle 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.theme.SignalTheme import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.BiometricDeviceAuthentication @@ -188,7 +188,7 @@ fun VerifyBackupPinScreen( } } -@SignalPreview +@DayNightPreviews @Composable private fun VerifyBackupKeyScreen() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/BubbleOptOutBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/BubbleOptOutBanner.kt index 51ba0ff5eb..c63b42ae74 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/BubbleOptOutBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/BubbleOptOutBanner.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -49,7 +49,7 @@ private fun Banner(contentPadding: PaddingValues, actionListener: (Boolean) -> U ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/CdsPermanentErrorBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/CdsPermanentErrorBanner.kt index c69f60517c..b15a848408 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/CdsPermanentErrorBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/CdsPermanentErrorBanner.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -65,7 +65,7 @@ private fun Banner(contentPadding: PaddingValues, onLearnMoreClicked: () -> Unit ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/CdsTemporaryErrorBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/CdsTemporaryErrorBanner.kt index 467683b359..553b642a00 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/CdsTemporaryErrorBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/CdsTemporaryErrorBanner.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -56,7 +56,7 @@ private fun Banner(contentPadding: PaddingValues, onLearnMoreClicked: () -> Unit ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/DeprecatedBuildBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/DeprecatedBuildBanner.kt index fc0be6e62c..02c78d5a72 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/DeprecatedBuildBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/DeprecatedBuildBanner.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -60,7 +60,7 @@ private fun Banner(contentPadding: PaddingValues, onUpdateClicked: () -> Unit = ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/DozeBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/DozeBanner.kt index 8a8b4caac3..f4560d8ed1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/DozeBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/DozeBanner.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -67,7 +67,7 @@ private fun Banner(contentPadding: PaddingValues, onDismissListener: () -> Unit ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/EnclaveFailureBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/EnclaveFailureBanner.kt index 4f4d216640..ca4f22b6eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/EnclaveFailureBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/EnclaveFailureBanner.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -56,7 +56,7 @@ private fun Banner(contentPadding: PaddingValues, onUpdateNow: () -> Unit = {}) ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/GroupsV1MigrationSuggestionsBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/GroupsV1MigrationSuggestionsBanner.kt index a8c485a403..bc611b5aff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/GroupsV1MigrationSuggestionsBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/GroupsV1MigrationSuggestionsBanner.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -62,7 +62,7 @@ private fun Banner(contentPadding: PaddingValues, suggestionsSize: Int, onAddMem ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewSingular() { Previews.Preview { @@ -70,7 +70,7 @@ private fun BannerPreviewSingular() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewPlural() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/OutdatedBuildBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/OutdatedBuildBanner.kt index 159089df62..770cea96fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/OutdatedBuildBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/OutdatedBuildBanner.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -87,7 +87,7 @@ private fun Banner(contentPadding: PaddingValues, daysUntilExpiry: Int, onUpdate ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewExpireToday() { Previews.Preview { @@ -98,7 +98,7 @@ private fun BannerPreviewExpireToday() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewExpireTomorrow() { Previews.Preview { @@ -109,7 +109,7 @@ private fun BannerPreviewExpireTomorrow() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewExpireLater() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/PendingGroupJoinRequestsBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/PendingGroupJoinRequestsBanner.kt index 45be350dac..90a735a65c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/PendingGroupJoinRequestsBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/PendingGroupJoinRequestsBanner.kt @@ -15,8 +15,8 @@ import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -66,7 +66,7 @@ private fun Banner(contentPadding: PaddingValues, suggestionsSize: Int, onViewCl ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewSingular() { Previews.Preview { @@ -74,7 +74,7 @@ private fun BannerPreviewSingular() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewPlural() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/ServiceOutageBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/ServiceOutageBanner.kt index a908bdc50a..6d04cbb6d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/ServiceOutageBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/ServiceOutageBanner.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.DefaultBanner @@ -41,7 +41,7 @@ private fun Banner(contentPadding: PaddingValues) { ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt index 318c46f8b0..54da78b7e9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -59,7 +59,7 @@ private fun Banner(contentPadding: PaddingValues) { ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UsernameOutOfSyncBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UsernameOutOfSyncBanner.kt index f29998b37a..f3f52a4257 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UsernameOutOfSyncBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UsernameOutOfSyncBanner.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf +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.banner.Banner import org.thoughtcrime.securesms.banner.ui.compose.Action @@ -65,7 +65,7 @@ private fun Banner(contentPadding: PaddingValues, usernameSyncState: UsernameSyn ) } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewUsernameCorrupted() { Previews.Preview { @@ -73,7 +73,7 @@ private fun BannerPreviewUsernameCorrupted() { } } -@SignalPreview +@DayNightPreviews @Composable private fun BannerPreviewLinkCorrupted() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt index b51fb97ac7..0184d3a630 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt @@ -34,8 +34,8 @@ import androidx.compose.ui.res.pluralStringResource 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.SignalPreview import org.signal.core.util.isNotNullOrBlank import org.thoughtcrime.securesms.R @@ -195,7 +195,7 @@ enum class Importance { } @Composable -@SignalPreview +@DayNightPreviews private fun BubblesOptOutPreview() { Previews.Preview { DefaultBanner( @@ -212,7 +212,7 @@ private fun BubblesOptOutPreview() { } @Composable -@SignalPreview +@DayNightPreviews private fun ForcedUpgradePreview() { Previews.Preview { DefaultBanner( @@ -228,7 +228,7 @@ private fun ForcedUpgradePreview() { } @Composable -@SignalPreview +@DayNightPreviews private fun FullyLoadedErrorPreview() { val actions = listOf( Action(R.string.ExpiredBuildReminder_update_now) { }, diff --git a/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToEnableOptimizedStorageSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToEnableOptimizedStorageSheet.kt index 77cd356a5b..2be60818e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToEnableOptimizedStorageSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToEnableOptimizedStorageSheet.kt @@ -26,8 +26,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.backup.v2.ui.subscription.MessageBackupsType import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeBlock @@ -145,7 +145,7 @@ private fun UpgradeToEnableOptimizedStorageSheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun UpgradeToEnableOptimizedStorageSheetContentPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToStartMediaBackupSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToStartMediaBackupSheet.kt index 30c6620a39..34d1a7e241 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToStartMediaBackupSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToStartMediaBackupSheet.kt @@ -27,8 +27,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.backup.v2.ui.subscription.MessageBackupsType import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeBlock @@ -143,7 +143,7 @@ private fun UpgradeToStartMediaBackupSheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun UpgradeToStartMediaBackupSheetContentPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/SignalCallRow.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/SignalCallRow.kt index e9e571d5bd..8aa5e30fcc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/SignalCallRow.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/SignalCallRow.kt @@ -36,8 +36,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp 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.conversation.colors.AvatarColorPair import org.thoughtcrime.securesms.database.CallLinkTable @@ -49,7 +49,7 @@ import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkState import java.time.Instant import org.signal.core.ui.R as CoreUiR -@SignalPreview +@DayNightPreviews @Composable private fun SignalCallRowPreview() { val callLink = remember { diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt index 16dde42cb7..514f5bb913 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt @@ -39,10 +39,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import io.reactivex.rxjava3.kotlin.subscribeBy 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.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.util.concurrent.LifecycleDisposable import org.signal.core.util.logging.Log import org.signal.ringrtc.CallLinkState @@ -325,7 +325,7 @@ private fun CreateCallLinkBottomSheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun CreateCallLinkBottomSheetContentPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsScreen.kt index 5c8d498776..26b4ab1dc3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsScreen.kt @@ -23,7 +23,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext 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.core.app.ShareCompat import androidx.fragment.app.FragmentActivity @@ -31,6 +30,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.viewmodel.compose.viewModel 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.Rows @@ -320,7 +320,7 @@ private fun FailureSnackbar( } } -@Preview +@DayNightPreviews @Composable private fun CallLinkDetailsScreenPreview() { val callLink = remember { @@ -343,7 +343,7 @@ private fun CallLinkDetailsScreenPreview() { ) } - SignalTheme(false) { + SignalTheme { CallLinkDetailsScreen( CallLinkDetailsState( false, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt index a0d133fb4d..0c88fa28f7 100644 --- 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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/ConnectivityWarningBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/ConnectivityWarningBottomSheet.kt index 845bb9e6d3..06fe56d682 100644 --- 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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeleteSyncEducationDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeleteSyncEducationDialog.kt index 137ef0a12b..529adb4b2c 100644 --- 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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeviceSpecificNotificationBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeviceSpecificNotificationBottomSheet.kt index b431af6e26..2c375986c0 100644 --- 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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/RoundCheckbox.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/RoundCheckbox.kt index f422ad1e9d..985a4c7902 100644 --- 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 = {}) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/contactsupport/ContactSupportDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/components/contactsupport/ContactSupportDialog.kt index 67d78e6828..f4b1a2f204 100644 --- 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 SendSupportEmailEffect( } } -@SignalPreview +@DayNightPreviews @Composable private fun ContactSupportDialogPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/Emojifier.kt b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/Emojifier.kt index 5cfbcac147..0d4b6003d1 100644 --- 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") diff --git 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 index e4100bf9bb..c19f12af9d 100644 --- 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 { diff --git 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 index 6f1988a206..c935ff4cd3 100644 --- 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 { diff --git 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 index a8dc3772e2..8ad6d7647b 100644 --- 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 { diff --git 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 index 85adfbc8fb..aea7671063 100644 --- 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 = {}) } diff --git 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 index fcb23bc4e1..5bc088947b 100644 --- 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 { diff --git 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 index 356859eebe..ac7b3e8776 100644 --- 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 { diff --git 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 index 4f35249c1d..fcae09d3c6 100644 --- 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 { diff --git 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 index e82b4fa124..fcda22fd26 100644 --- 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 { diff --git 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 index f286961de4..2d327af6cd 100644 --- 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 { diff --git 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 index 36f72147d9..0b887cc5fe 100644 --- 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 { diff --git 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 index e5da103d25..e672313bb8 100644 --- 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 { diff --git 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 index caf6b7c7e3..04697ef75d 100644 --- 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( diff --git 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 index 08240a78bf..ab577bee15 100644 --- 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")) diff --git 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 index d0a8836837..e877c0eda2 100644 --- 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 { diff --git 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 index 16bcc3f872..5504f2fe18 100644 --- 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, modifier: Modifier = Modifier) } } -@Preview +@DayNightPreviews @Composable fun LicenseFragmentPreview() { - LicenseScreen(listOf("Lorem ipsum", "Delor")) + SignalTheme { + LicenseScreen(listOf("Lorem ipsum", "Delor")) + } } private fun InputStream.readToLines(): List { diff --git 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 index 97a7ebabd8..3ac8468fa4 100644 --- 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 { diff --git 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 index a2a6b7f8a7..cbbe93fcbf 100644 --- 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 { diff --git 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 index 01c0c70caa..f261c8de1a 100644 --- 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 = {} + ) + } } diff --git 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 index da0678406d..ea34ef7510 100644 --- 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.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 { diff --git 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 index e6b04565cd..84a13a5310 100644 --- 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( diff --git 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 index a56d5e5748..0ef42072fa 100644 --- 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 { diff --git 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 index 3841828166..e983645953 100644 --- 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 { diff --git 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 index 98e3dabeec..2bea1e938e 100644 --- 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 { diff --git 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 index 20bc1ebfb4..592413f1cc 100644 --- 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 { diff --git 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 index 147a26d3ee..dce4fdbb00 100644 --- 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 { diff --git 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 index 7d48766b06..370a34c8b0 100644 --- 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 { diff --git 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 index 89765df5b8..56be41f378 100644 --- 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 { diff --git 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 index 2325303fa3..041e8ddcab 100644 --- 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 { diff --git 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 index 027d47af5c..403608501b 100644 --- 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 { diff --git 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 index 3125b24a70..87c50908e2 100644 --- 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 { diff --git 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 index 43a7d4fa37..4ee4dd7731 100644 --- 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 { diff --git 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 index 1595a4aa2c..512ae68230 100644 --- 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, 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(), diff --git 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 index 336a297ce0..ef145904ee 100644 --- 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 { diff --git 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 index 9a9c63cf51..564d8d361d 100644 --- 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 { diff --git 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 index 947f3d260b..d4bab71486 100644 --- 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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt index 7594e23e24..1c7e0e3141 100644 --- 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 { diff --git 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 index 27dffeb614..74b43e2356 100644 --- 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 { diff --git 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 index 81a3da41d2..1a2c758313 100644 --- 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 { diff --git 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 index cda4c7eedd..7ac30ad5fd 100644 --- 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 { diff --git 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 index 872ea36d66..b477cbe0f2 100644 --- 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 { diff --git 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 index a2a5cff374..9b02e78ff6 100644 --- 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 { diff --git 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 index 5b7cb8a59e..573edac176 100644 --- 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 { diff --git 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 index f317ee0f45..ec561a65d4 100644 --- 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 { diff --git 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 index 0194458977..9717c0baa6 100644 --- 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 { diff --git 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 index d3be1f9d5f..85cad50bb5 100644 --- 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 { diff --git 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 index 15aee79390..decb258f63 100644 --- 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() { diff --git 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 index 29b797a298..5612e638f2 100644 --- 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 { diff --git 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 index b056650589..d2734791aa 100644 --- 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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MediaNoLongerAvailableBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MediaNoLongerAvailableBottomSheet.kt index a4fc567298..8f212e687b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MediaNoLongerAvailableBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MediaNoLongerAvailableBottomSheet.kt @@ -25,8 +25,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.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.MessageBackupTier @@ -115,7 +115,7 @@ private fun MediaNoLongerAvailableBottomSheetContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun MediaNoLongerAvailableBottomSheetContentPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/SafetyTipsBottomSheetDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/SafetyTipsBottomSheetDialog.kt index f2611ed3f3..db78ca1425 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/SafetyTipsBottomSheetDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/SafetyTipsBottomSheetDialog.kt @@ -47,6 +47,7 @@ import androidx.fragment.app.FragmentManager import kotlinx.coroutines.launch 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.compose.ComposeBottomSheetDialogFragment @@ -95,7 +96,7 @@ private val tips = listOf( SafetyTipData(heroImage = R.drawable.safety_tip4, titleText = R.string.SafetyTips_tip4_title, messageText = R.string.SafetyTips_tip4_message) ) -@Preview +@DayNightPreviews @Composable private fun SafetyTipsContentPreview() { SignalTheme { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt index 0356556f27..0d18592932 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt @@ -32,8 +32,8 @@ 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.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.compose.ComposeBottomSheetDialogFragment @@ -156,7 +156,7 @@ fun InfoRow(text: String) { } } -@SignalPreview +@DayNightPreviews @Composable private fun ProfileNameSheetPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/AddToFolderBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/AddToFolderBottomSheet.kt index f1ab173772..3cd102a0d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/AddToFolderBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/AddToFolderBottomSheet.kt @@ -34,8 +34,8 @@ import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.activityViewModels import org.signal.core.ui.compose.BottomSheets +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.util.getParcelableArrayListCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity @@ -248,7 +248,7 @@ private fun isThreadListAlreadyAdded(folder: ChatFolderRecord, threadIds: List Unit) { } } -@SignalPreview +@DayNightPreviews @Composable fun FinishedSheetSheetPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt index 41046fd6d2..fb2fe6d8c5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt @@ -59,12 +59,12 @@ import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.Snackbar 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.util.logging.Log import org.thoughtcrime.securesms.BiometricDeviceAuthentication import org.thoughtcrime.securesms.BiometricDeviceLockContract @@ -594,7 +594,7 @@ fun DeviceRow(device: Device, setDeviceToRemove: (Device) -> Unit, onEditDevice: } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenPreview() { Previews.Preview { @@ -610,7 +610,7 @@ private fun DeviceListScreenPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenLoadingPreview() { Previews.Preview { @@ -623,7 +623,7 @@ private fun DeviceListScreenLoadingPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenLinkingPreview() { Previews.Preview { @@ -636,7 +636,7 @@ private fun DeviceListScreenLinkingPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenUnlinkingPreview() { Previews.Preview { @@ -649,7 +649,7 @@ private fun DeviceListScreenUnlinkingPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenSyncingMessagesPreview() { Previews.Preview { @@ -662,7 +662,7 @@ private fun DeviceListScreenSyncingMessagesPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenSyncingFailedRetryPreview() { Previews.Preview { @@ -675,7 +675,7 @@ private fun DeviceListScreenSyncingFailedRetryPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenSyncingFailedPreview() { Previews.Preview { @@ -692,7 +692,7 @@ private fun DeviceListScreenSyncingFailedPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenContactSupportPreview() { Previews.Preview { @@ -705,7 +705,7 @@ private fun DeviceListScreenContactSupportPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenDeviceUnlinkedPreview() { Previews.Preview { @@ -718,7 +718,7 @@ private fun DeviceListScreenDeviceUnlinkedPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun DeviceListScreenNotEnoughStoragePreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt index 7b3c85b611..29bfb4ca6d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt @@ -21,8 +21,8 @@ import com.airbnb.lottie.compose.LottieConstants import com.airbnb.lottie.compose.rememberLottieComposition 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 @@ -73,7 +73,7 @@ fun EducationSheet(onClick: () -> Unit) { } } -@SignalPreview +@DayNightPreviews @Composable fun EducationSheetPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt index a0939e0958..aa6b57886e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt @@ -19,8 +19,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import org.signal.core.ui.compose.BottomSheets +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.Texts import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment @@ -113,7 +113,7 @@ private fun LinkedDeviceInformationRow( } } -@SignalPreview +@DayNightPreviews @Composable fun LearnMorePreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt index 4933131547..21377d46cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt @@ -24,8 +24,8 @@ import androidx.compose.ui.unit.dp import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import org.signal.core.ui.compose.BottomSheets +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 @@ -125,7 +125,7 @@ private fun SheetOption( } } -@SignalPreview +@DayNightPreviews @Composable fun SyncSheetSheetSheetPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainBottomChrome.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainBottomChrome.kt index d9b5bb9c9b..87fc588b0c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainBottomChrome.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainBottomChrome.kt @@ -21,6 +21,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview +import org.signal.core.ui.compose.AllDevicePreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Snackbars @@ -152,12 +153,7 @@ private fun MainSnackbar( } } -@Preview(device = "spec:width=360dp,height=640dp,orientation=portrait") -@Preview(device = "spec:width=640dp,height=360dp,orientation=landscape") -@Preview(device = "spec:width=600dp,height=1024dp,orientation=portrait") -@Preview(device = "spec:width=1024dp,height=600dp,orientation=landscape") -@Preview(device = "spec:width=840dp,height=1280dp,orientation=portrait") -@Preview(device = "spec:width=1280dp,height=840dp,orientation=landscape") +@AllDevicePreviews @Composable fun MainBottomChromePreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainFloatingActionButtons.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainFloatingActionButtons.kt index 3ec59beba8..5a9b744845 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainFloatingActionButtons.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainFloatingActionButtons.kt @@ -36,8 +36,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.Dp 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.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.window.Navigation @@ -242,7 +242,7 @@ private fun MainFloatingActionButton( } } -@SignalPreview +@DayNightPreviews @Composable private fun MainFloatingActionButtonsNavigationRailPreview() { var currentDestination by remember { mutableStateOf(MainNavigationListLocation.CHATS) } @@ -271,7 +271,7 @@ private fun MainFloatingActionButtonsNavigationRailPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun MainFloatingActionButtonsNavigationBarPreview() { var currentDestination by remember { mutableStateOf(MainNavigationListLocation.CHATS) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainMegaphoneContainer.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainMegaphoneContainer.kt index 27fea2a201..0369716645 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainMegaphoneContainer.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainMegaphoneContainer.kt @@ -12,8 +12,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember import androidx.fragment.app.DialogFragment +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.megaphone.Megaphone import org.thoughtcrime.securesms.megaphone.MegaphoneActionController import org.thoughtcrime.securesms.megaphone.MegaphoneComponent @@ -65,7 +65,7 @@ fun MainMegaphoneContainer( } } -@SignalPreview +@DayNightPreviews @Composable private fun MainMegaphoneContainerPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigation.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigation.kt index 38952536ea..3732c50274 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigation.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigation.kt @@ -52,8 +52,8 @@ import com.airbnb.lottie.compose.LottieCompositionSpec import com.airbnb.lottie.compose.rememberLottieComposition import com.airbnb.lottie.compose.rememberLottieDynamicProperties import com.airbnb.lottie.compose.rememberLottieDynamicProperty +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.theme.SignalTheme import org.thoughtcrime.securesms.R @@ -335,7 +335,7 @@ private fun formatCount(count: Int): String { return count.toString() } -@SignalPreview +@DayNightPreviews @Composable private fun MainNavigationRailPreview() { Previews.Preview { @@ -354,7 +354,7 @@ private fun MainNavigationRailPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun MainNavigationBarPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt index 1367351634..8c992c5143 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt @@ -65,12 +65,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics -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.DropdownMenus import org.signal.core.ui.compose.IconButtons import org.signal.core.ui.compose.Previews -import org.signal.core.ui.compose.SignalPreview import org.signal.core.ui.compose.TextFields import org.signal.core.ui.compose.Tooltips import org.signal.core.ui.compose.circularReveal @@ -730,8 +729,7 @@ private fun ChatDropdownItems(state: MainToolbarState, callback: MainToolbarCall ) } -@Preview -@SignalPreview +@DayNightPreviews @Composable private fun FullMainToolbarPreview() { Previews.Preview { @@ -760,7 +758,7 @@ private fun FullMainToolbarPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun SearchToolbarPreview() { Previews.Preview { @@ -774,7 +772,7 @@ private fun SearchToolbarPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ArchiveToolbarPreview() { Previews.Preview { @@ -787,7 +785,7 @@ private fun ArchiveToolbarPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun TooltipOverflowButtonPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt index 02ebc32cb6..4f09adab16 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt @@ -46,9 +46,9 @@ import com.airbnb.lottie.compose.rememberLottieComposition import com.google.accompanist.drawablepainter.rememberDrawablePainter import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.IconButtons import org.signal.core.ui.compose.Previews -import org.signal.core.ui.compose.SignalPreview import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.emoji.Emojifier @@ -323,7 +323,7 @@ private fun MegaphoneImage( } } -@SignalPreview +@DayNightPreviews @Composable private fun BasicMegaphonePreview() { Previews.Preview { @@ -334,7 +334,7 @@ private fun BasicMegaphonePreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun PopupMegaphonePreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphone.kt b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphone.kt index 73bf428472..015719cdca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphone.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphone.kt @@ -44,9 +44,9 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.IconButtons import org.signal.core.ui.compose.Previews -import org.signal.core.ui.compose.SignalPreview import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity @@ -176,7 +176,7 @@ private fun OnboardingMegaphoneListItem( } } -@SignalPreview +@DayNightPreviews @Composable private fun OnboardingMegaphonePreview() { Previews.Preview { @@ -187,7 +187,7 @@ private fun OnboardingMegaphonePreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun OnboardingMegaphoneListItemPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt index 303b485afe..3379d1d70c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt @@ -7,7 +7,6 @@ package org.thoughtcrime.securesms.nicknames import android.content.Context import android.content.Intent -import android.content.res.Configuration import android.os.Bundle import androidx.activity.compose.setContent import androidx.activity.result.contract.ActivityResultContract @@ -45,10 +44,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardCapitalization -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf 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.Previews import org.signal.core.ui.compose.Scaffolds @@ -181,8 +180,7 @@ private interface NicknameContentCallback { fun onNoteChanged(value: String) } -@Preview(name = "Light Theme", uiMode = Configuration.UI_MODE_NIGHT_NO) -@Preview(name = "Dark Theme", uiMode = Configuration.UI_MODE_NIGHT_YES) +@DayNightPreviews @Composable private fun NicknameContentPreview() { Previews.Preview { @@ -361,8 +359,7 @@ private fun NicknameContent( } } -@Preview(name = "Light Theme", uiMode = Configuration.UI_MODE_NIGHT_NO) -@Preview(name = "Dark Theme", uiMode = Configuration.UI_MODE_NIGHT_YES) +@DayNightPreviews @Composable private fun ClearableTextFieldPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt index 0bcce732ef..8d5da2c159 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt @@ -27,13 +27,13 @@ import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.res.dimensionResource 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.compose.ui.viewinterop.AndroidView import androidx.core.os.bundleOf import androidx.core.text.method.LinkMovementMethodCompat import androidx.core.text.util.LinkifyCompat import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R @@ -99,7 +99,7 @@ class ViewNoteSheet : ComposeBottomSheetDialogFragment() { } } -@Preview +@DayNightPreviews @Composable private fun ViewNoteBottomSheetContentPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt index 2f797a934f..331d2c5272 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt @@ -32,13 +32,13 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.Placeholder import androidx.compose.ui.text.PlaceholderVerticalAlign import androidx.compose.ui.text.buildAnnotatedString -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.os.BundleCompat import androidx.core.os.bundleOf 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.components.settings.app.AppSettingsActivity @@ -115,10 +115,10 @@ class TurnOnNotificationsBottomSheet private constructor() : ComposeBottomSheetD } } -@Preview +@DayNightPreviews @Composable private fun TurnOnNotificationsSheetContentPreview() { - SignalTheme(isDarkMode = false) { + SignalTheme { Surface { TurnOnNotificationsSheetContent( titleRes = R.string.TurnOnNotificationsBottomSheet__turn_on_notifications, diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt index d3da49daea..47e84ae24b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.unit.sp import androidx.core.os.bundleOf 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 @@ -74,7 +74,7 @@ class PermissionDeniedBottomSheet private constructor() : ComposeBottomSheetDial } } -@SignalPreview +@DayNightPreviews @Composable private fun PermissionDeniedSheetContentPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinSettingsFragment.kt index 79a2ef9100..5aa91e6872 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinSettingsFragment.kt @@ -26,11 +26,11 @@ import androidx.lifecycle.repeatOnLifecycle import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch +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.Snackbars import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment @@ -191,7 +191,7 @@ private fun RecordPaymentsRecoveryPhraseDialog( ) } -@SignalPreview +@DayNightPreviews @Composable private fun AdvancedPinSettingsFragmentContentEnabledPreview() { Previews.Preview { @@ -201,7 +201,7 @@ private fun AdvancedPinSettingsFragmentContentEnabledPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun AdvancedPinSettingsFragmentContentDisabledPreview() { Previews.Preview { @@ -211,7 +211,7 @@ private fun AdvancedPinSettingsFragmentContentDisabledPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun PinsAreRequiredForRegistrationLockDialogPreview() { Previews.Preview { @@ -219,7 +219,7 @@ private fun PinsAreRequiredForRegistrationLockDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RecordPaymentsRecoveryPhraseDialogPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt index 8e634763a5..4b0c36a621 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt @@ -27,9 +27,9 @@ 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 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.thoughtcrime.securesms.R @@ -61,7 +61,7 @@ class NewWaysToConnectDialogFragment : ComposeDialogFragment() { } } -@Preview +@DayNightPreviews @Composable private fun PreviewNewWaysToConnectDialogContent() { Previews.Preview { @@ -152,7 +152,7 @@ private fun NewWaysToConnectDialogContent( } } -@Preview +@DayNightPreviews @Composable private fun PreviewNewWaysToConnectRowItem() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt index b4af6cb786..d4a35df0df 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt @@ -40,7 +40,7 @@ import androidx.compose.ui.viewinterop.AndroidView import androidx.core.os.bundleOf import androidx.core.widget.TextViewCompat import org.signal.core.ui.compose.BottomSheets -import org.signal.core.ui.compose.SignalPreview +import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.getParcelableCompat import org.signal.core.util.isNotNullOrBlank @@ -583,7 +583,7 @@ private fun ContentPreviewNotAConnection() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ContentPreviewNotAConnectionNoGroups() { SignalTheme { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountActivity.kt index 820ea42ad0..f7e6b8ac10 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountActivity.kt @@ -47,9 +47,9 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch 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.Dialogs import org.signal.core.ui.compose.Previews -import org.signal.core.ui.compose.SignalPreview import org.signal.core.ui.compose.Texts import org.signal.core.ui.compose.horizontalGutters import org.signal.core.ui.compose.theme.SignalTheme @@ -302,7 +302,7 @@ fun TransferToNewDevice( } } -@SignalPreview +@DayNightPreviews @Composable private fun TransferToNewDevicePreview() { Previews.Preview { @@ -369,7 +369,7 @@ fun ContinueOnOtherDevice() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ContinueOnOtherDevicePreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt index d63ab2f8df..ae3612cb74 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt @@ -50,11 +50,11 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch +import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.IconButtons.IconButton 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 /** @@ -285,7 +285,7 @@ private fun SearchBar( ) } -@SignalPreview +@DayNightPreviews @Composable private fun ScreenPreview() { Previews.Preview { @@ -306,7 +306,7 @@ private fun ScreenPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun LoadingScreenPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt index b3bcfff7c6..b3c414850b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt @@ -57,9 +57,9 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch import kotlinx.coroutines.withContext 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.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 @@ -306,7 +306,7 @@ private fun InstructionRow( } } -@SignalPreview +@DayNightPreviews @Composable private fun InstructionRowPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsScreen.kt index 37ebf7e8f9..7adb4af9a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsScreen.kt @@ -23,8 +23,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp 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.registration.ui.shared.RegistrationScreen @@ -97,7 +97,7 @@ fun GrantPermissionsScreen( } } -@SignalPreview +@DayNightPreviews @Composable fun GrantPermissionsScreenPreview() { Previews.Preview { @@ -139,7 +139,7 @@ fun PermissionRow( } } -@SignalPreview +@DayNightPreviews @Composable fun PermissionRowPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyScreen.kt index 5b009a6154..ef27879de5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyScreen.kt @@ -51,8 +51,8 @@ import androidx.compose.ui.unit.sp import kotlinx.coroutines.launch 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.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.ui.BackupsIconColors @@ -214,7 +214,7 @@ private fun AccountEntropyPoolVerification.AEPValidationError.ValidationErrorMes } } -@SignalPreview +@DayNightPreviews @Composable private fun EnterBackupKeyScreenPreview() { Previews.Preview { @@ -229,7 +229,7 @@ private fun EnterBackupKeyScreenPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun EnterBackupKeyScreenErrorPreview() { Previews.Preview { @@ -322,7 +322,7 @@ private fun NoBackupKeyBottomSheet( } } -@SignalPreview +@DayNightPreviews @Composable private fun NoBackupKeyBottomSheetPreview() { Previews.BottomSheetPreview { @@ -332,7 +332,7 @@ private fun NoBackupKeyBottomSheetPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun NoBackupKeyBottomSheetNoSecondParagraphPreview() { Previews.BottomSheetPreview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt index aabece044b..42263da521 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp 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.SignalPreview import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen @@ -109,7 +109,7 @@ private fun StepRow( } } -@SignalPreview +@DayNightPreviews @Composable private fun NoBackupToRestoreContentPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt index 6b684ad22d..12031cfc4e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt @@ -55,9 +55,9 @@ import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode 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.Previews -import org.signal.core.ui.compose.SignalPreview import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.bytes import org.thoughtcrime.securesms.BaseActivity @@ -405,7 +405,7 @@ private fun BackupAvailableContent( } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreFromBackupContentPreview() { Previews.Preview { @@ -421,7 +421,7 @@ private fun RestoreFromBackupContentPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreFromBackupUnknownTierPreview() { Previews.Preview { @@ -438,7 +438,7 @@ private fun RestoreFromBackupUnknownTierPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreFromBackupContentLoadingPreview() { Previews.Preview { @@ -549,7 +549,7 @@ private fun RestoreProgressDialog(restoreProgress: RestoreV2Event?) { ) } -@SignalPreview +@DayNightPreviews @Composable private fun ProgressDialogPreview() { Previews.Preview { @@ -648,7 +648,7 @@ fun TierRestoreFailedDialog( } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreFailedDialogPreview() { Previews.Preview { @@ -656,7 +656,7 @@ private fun RestoreFailedDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreFailedWithLogPromptDialogPreview() { Previews.Preview { @@ -679,7 +679,7 @@ fun InvalidBackupVersionDialog( ) } -@SignalPreview +@DayNightPreviews @Composable private fun InvalidBackupVersionDialogPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreRow.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreRow.kt index 4fe1901f09..ef82c49f31 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreRow.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreRow.kt @@ -24,8 +24,8 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource 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.theme.SignalTheme import org.thoughtcrime.securesms.R @@ -73,7 +73,7 @@ fun RestoreRow( } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreMethodRowPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt index d7793b81fc..d5f7dae52a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt @@ -62,10 +62,10 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch 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.DropdownMenus 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.signal.registration.proto.RegistrationProvisionMessage @@ -335,7 +335,7 @@ private fun RestoreViaQrScreen( } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreViaQrScreenPreview() { Previews.Preview { @@ -349,7 +349,7 @@ private fun RestoreViaQrScreenPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreViaQrScreenLoadingPreview() { Previews.Preview { @@ -359,7 +359,7 @@ private fun RestoreViaQrScreenLoadingPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreViaQrScreenFailurePreview() { Previews.Preview { @@ -369,7 +369,7 @@ private fun RestoreViaQrScreenFailurePreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreViaQrScreenScannedPreview() { Previews.Preview { @@ -379,7 +379,7 @@ private fun RestoreViaQrScreenScannedPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreViaQrScreenRegisteringPreview() { Previews.Preview { @@ -389,7 +389,7 @@ private fun RestoreViaQrScreenRegisteringPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreViaQrScreenRegistrationFailedPreview() { Previews.Preview { @@ -424,7 +424,7 @@ private fun InstructionRow( } } -@SignalPreview +@DayNightPreviews @Composable private fun InstructionRowPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectRestoreMethodScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectRestoreMethodScreen.kt index a1d01002e1..65d0776163 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectRestoreMethodScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectRestoreMethodScreen.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -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 import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen @@ -53,7 +53,7 @@ fun SelectRestoreMethodScreen( } } -@SignalPreview +@DayNightPreviews @Composable private fun SelectRestoreMethodScreenPreview() { SignalTheme { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/shared/RegistrationScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/shared/RegistrationScreen.kt index ad7dee3ec0..0e72870f9c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/shared/RegistrationScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/shared/RegistrationScreen.kt @@ -34,8 +34,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.AnnotatedString 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.logsubmit.SubmitDebugLogActivity @@ -170,7 +170,7 @@ fun RegistrationScreen( } } -@SignalPreview +@DayNightPreviews @Composable private fun RegistrationScreenPreview() { Previews.Preview { @@ -188,7 +188,7 @@ private fun RegistrationScreenPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RegistrationScreenNoTitlePreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/RestoreWelcomeBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/RestoreWelcomeBottomSheet.kt index a62e834809..1c621be1d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/RestoreWelcomeBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/RestoreWelcomeBottomSheet.kt @@ -30,8 +30,8 @@ import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult import org.signal.core.ui.compose.BottomSheets +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.compose.ComposeBottomSheetDialogFragment @@ -102,7 +102,7 @@ private fun Sheet( } @Composable -@SignalPreview +@DayNightPreviews private fun SheetPreview() { Previews.BottomSheetPreview { Sheet() @@ -151,7 +151,7 @@ fun RestoreActionRow( } } -@SignalPreview +@DayNightPreviews @Composable private fun RestoreActionRowPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.kt index b54642746b..27154d5ab7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.kt @@ -69,12 +69,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle 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.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.Snackbars import org.signal.core.ui.compose.copied.androidx.compose.DragAndDropEvent import org.signal.core.ui.compose.copied.androidx.compose.DraggableItem @@ -663,7 +663,7 @@ private fun EmptyView( ) } -@SignalPreview +@DayNightPreviews @Composable private fun StickerManagementScreenEmptyStatePreview() { Previews.Preview { @@ -673,7 +673,7 @@ private fun StickerManagementScreenEmptyStatePreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun AvailableStickersContentPreview() { Previews.Preview { @@ -703,7 +703,7 @@ private fun AvailableStickersContentPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun InstalledStickersContentPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackListItems.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackListItems.kt index 2f0dec70e3..3e5a4df683 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackListItems.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackListItems.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.platform.LocalContext 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.DropdownMenus import org.signal.core.ui.compose.Previews -import org.signal.core.ui.compose.SignalPreview import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.nullIfBlank import org.thoughtcrime.securesms.R @@ -277,7 +277,7 @@ private fun StickerPackInfo( } } -@SignalPreview +@DayNightPreviews @Composable private fun StickerPackSectionHeaderPreview() = SignalTheme { StickerPackSectionHeader( @@ -285,7 +285,7 @@ private fun StickerPackSectionHeaderPreview() = SignalTheme { ) } -@SignalPreview +@DayNightPreviews @Composable private fun AvailableStickerPackRowPreviewBlessed() = SignalTheme { AvailableStickerPackRow( @@ -298,7 +298,7 @@ private fun AvailableStickerPackRowPreviewBlessed() = SignalTheme { ) } -@SignalPreview +@DayNightPreviews @Composable private fun AvailableStickerPackRowPreviewNotBlessed() = SignalTheme { AvailableStickerPackRow( @@ -312,7 +312,7 @@ private fun AvailableStickerPackRowPreviewNotBlessed() = SignalTheme { ) } -@SignalPreview +@DayNightPreviews @Composable private fun AvailableStickerPackRowPreviewDownloading() = SignalTheme { AvailableStickerPackRow( @@ -326,7 +326,7 @@ private fun AvailableStickerPackRowPreviewDownloading() = SignalTheme { ) } -@SignalPreview +@DayNightPreviews @Composable private fun AvailableStickerPackRowPreviewDownloaded() = SignalTheme { AvailableStickerPackRow( @@ -340,7 +340,7 @@ private fun AvailableStickerPackRowPreviewDownloaded() = SignalTheme { ) } -@SignalPreview +@DayNightPreviews @Composable private fun InstalledStickerPackRowPreview() = SignalTheme { InstalledStickerPackRow( @@ -354,7 +354,7 @@ private fun InstalledStickerPackRowPreview() = SignalTheme { ) } -@SignalPreview +@DayNightPreviews @Composable private fun InstalledStickerPackRowSelectModePreview() = SignalTheme { InstalledStickerPackRow( @@ -398,7 +398,7 @@ private fun MenuItem( ) } -@SignalPreview +@DayNightPreviews @Composable private fun MenuItemPreview() = Previews.Preview { MenuItem( diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivityV2.kt index e74ac13337..b3e7c8632a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivityV2.kt @@ -48,9 +48,9 @@ import com.bumptech.glide.load.Key import kotlinx.coroutines.delay import kotlinx.coroutines.launch 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.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.orNull import org.signal.core.util.toOptional @@ -382,7 +382,7 @@ private fun StickerImage( } } -@SignalPreview +@DayNightPreviews @Composable private fun HasDataPreview() { Previews.Preview { diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt index 048a58001a..5e1935e094 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt @@ -51,6 +51,7 @@ import androidx.compose.ui.zIndex import androidx.window.core.ExperimentalWindowCoreApi import androidx.window.core.layout.WindowHeightSizeClass import androidx.window.core.layout.WindowWidthSizeClass +import org.signal.core.ui.compose.AllDevicePreviews import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.main.MainFloatingActionButtonsCallback @@ -361,12 +362,7 @@ private fun ListAndNavigation( } @OptIn(ExperimentalMaterial3AdaptiveApi::class) -@Preview(device = "spec:width=360dp,height=640dp,orientation=portrait") -@Preview(device = "spec:width=640dp,height=360dp,orientation=landscape") -@Preview(device = "spec:width=600dp,height=1024dp,orientation=portrait") -@Preview(device = "spec:width=1024dp,height=600dp,orientation=landscape") -@Preview(device = "spec:width=840dp,height=1280dp,orientation=portrait") -@Preview(device = "spec:width=1280dp,height=840dp,orientation=landscape") +@AllDevicePreviews @Composable private fun AppScaffoldPreview() { Previews.Preview { diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/CircularProgressWrapper.kt b/core-ui/src/main/java/org/signal/core/ui/compose/CircularProgressWrapper.kt index 066b228da3..e0e1c6437b 100644 --- a/core-ui/src/main/java/org/signal/core/ui/compose/CircularProgressWrapper.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/CircularProgressWrapper.kt @@ -95,7 +95,7 @@ fun CircularProgressWrapper( } } -@SignalPreview +@DayNightPreviews @Composable fun CircularProgressWrapperPreview() { var isLoading by remember { diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/DarkPreview.kt b/core-ui/src/main/java/org/signal/core/ui/compose/DarkPreview.kt deleted file mode 100644 index 1b5a50cfe8..0000000000 --- a/core-ui/src/main/java/org/signal/core/ui/compose/DarkPreview.kt +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2024 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.signal.core.ui.compose - -import android.content.res.Configuration -import androidx.compose.ui.tooling.preview.Preview - -/** - * Only generates a dark preview. Useful for screens that - * are only ever rendered in dark mode (like calling) - */ -@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) -annotation class DarkPreview() diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt index 72bcb8e230..a6eb1dbbd9 100644 --- a/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt @@ -604,7 +604,7 @@ object Dialogs { } } -@SignalPreview +@DayNightPreviews @Composable private fun PermissionRationaleDialogPreview() { Previews.Preview { @@ -619,7 +619,7 @@ private fun PermissionRationaleDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun AlertDialogPreview() { Previews.Preview { @@ -634,7 +634,7 @@ private fun AlertDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun AdvancedAlertDialogPreview() { Previews.Preview { @@ -651,7 +651,7 @@ private fun AdvancedAlertDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun MessageDialogPreview() { Previews.Preview { @@ -663,7 +663,7 @@ private fun MessageDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun IndeterminateProgressDialogPreview() { Previews.Preview { @@ -671,7 +671,7 @@ private fun IndeterminateProgressDialogPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun IndeterminateProgressDialogMessagePreview() { Previews.Preview { @@ -679,7 +679,7 @@ private fun IndeterminateProgressDialogMessagePreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun IndeterminateProgressDialogCancellablePreview() { Previews.Preview { @@ -687,7 +687,7 @@ private fun IndeterminateProgressDialogCancellablePreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RadioListDialogPreview() { Previews.Preview { diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt index 692b805987..701fd63a31 100644 --- a/core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt @@ -16,7 +16,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import org.signal.core.ui.compose.theme.SignalTheme @@ -53,18 +52,18 @@ object Dividers { } } -@Preview +@DayNightPreviews @Composable private fun DefaultPreview() { - SignalTheme(isDarkMode = false) { + SignalTheme { Dividers.Default() } } -@Preview +@DayNightPreviews @Composable private fun VerticalPreview() { - SignalTheme(isDarkMode = false) { + SignalTheme { Dividers.Vertical(modifier = Modifier.height(20.dp)) } } diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt index ed6d0bf96a..eb16c94a0f 100644 --- a/core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.graphics.CompositingStrategy import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview object Icons { /** @@ -44,7 +43,7 @@ object Icons { } } -@Preview +@DayNightPreviews @Composable private fun BrushedForegroundPreview() { Previews.Preview { diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt index 1e4dbfc2b4..c1c5904916 100644 --- a/core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt @@ -50,7 +50,6 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import org.signal.core.ui.R import org.signal.core.ui.compose.Rows.TextAndLabel -import org.signal.core.ui.compose.Rows.TextRow object Rows { @@ -585,7 +584,7 @@ private data class ToggleState( val onCheckChanged: (Boolean) -> Unit ) -@SignalPreview +@DayNightPreviews @Composable private fun RadioRowPreview() { Previews.Preview { @@ -602,7 +601,7 @@ private fun RadioRowPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ToggleRowPreview() { Previews.Preview { @@ -619,7 +618,7 @@ private fun ToggleRowPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun ToggleLoadingRowPreview() { Previews.Preview { @@ -637,7 +636,7 @@ private fun ToggleLoadingRowPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun TextRowPreview() { Previews.Preview { @@ -649,7 +648,7 @@ private fun TextRowPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun TextAndLabelPreview() { Previews.Preview { @@ -667,7 +666,7 @@ private fun TextAndLabelPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun RadioListRowPreview() { var selectedValue by remember { mutableStateOf("b") } @@ -685,7 +684,7 @@ private fun RadioListRowPreview() { } } -@SignalPreview +@DayNightPreviews @Composable private fun MultiSelectRowPreview() { var selectedValues by remember { mutableStateOf(arrayOf("b")) } diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt index 82203e7b47..2e8ed4d4fb 100644 --- a/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt @@ -26,7 +26,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import org.signal.core.ui.compose.theme.SignalTheme @@ -111,10 +110,10 @@ object Scaffolds { } } -@Preview +@DayNightPreviews @Composable private fun SettingsScaffoldPreview() { - SignalTheme(isDarkMode = false) { + SignalTheme { val vector = remember { ImageVector.Builder( defaultWidth = 24.dp, @@ -146,10 +145,10 @@ private fun SettingsScaffoldPreview() { } } -@Preview +@DayNightPreviews @Composable private fun SettingsScaffoldNoNavIconPreview() { - SignalTheme(isDarkMode = false) { + SignalTheme { Scaffolds.Settings( "Settings Scaffold", onNavigationClick = {}, diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreview.kt b/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreview.kt deleted file mode 100644 index e3c432b1ee..0000000000 --- a/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreview.kt +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2024 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.signal.core.ui.compose - -import android.content.res.Configuration -import androidx.compose.ui.tooling.preview.Preview - -/** - * Our very own preview that will generate light and dark previews for - * composables - */ -@Preview(name = "Light Theme", uiMode = Configuration.UI_MODE_NIGHT_NO) -@Preview(name = "Dark Theme", uiMode = Configuration.UI_MODE_NIGHT_YES) -annotation class SignalPreview() diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt b/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt new file mode 100644 index 0000000000..f15a6c5569 --- /dev/null +++ b/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt @@ -0,0 +1,37 @@ +/* + * Copyright 2024 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.compose + +import android.content.res.Configuration +import androidx.compose.ui.tooling.preview.Preview + +/** + * Only generates a dark preview. Useful for screens that are only ever rendered in dark mode (like calling). + */ +@Preview(name = "night mode", uiMode = Configuration.UI_MODE_NIGHT_YES) +annotation class NightPreview() + +@Preview(name = "day mode", uiMode = Configuration.UI_MODE_NIGHT_NO) +@NightPreview +annotation class DayNightPreviews + +@Preview(name = "phone portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=360dp,height=640dp,orientation=portrait") +@Preview(name = "phone portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=360dp,height=640dp,orientation=portrait") +@Preview(name = "phone landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=640dp,height=360dp,orientation=landscape") +annotation class PhonePreviews + +@Preview(name = "foldable portrait (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=600dp,height=1024dp,orientation=portrait") +@Preview(name = "foldable landscape (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=1024dp,height=600dp,orientation=landscape") +annotation class FoldablePreviews + +@Preview(name = "tablet portrait (night)", uiMode = Configuration.UI_MODE_NIGHT_YES, device = "spec:width=840dp,height=1280dp,orientation=portrait") +@Preview(name = "tablet landscape (day)", uiMode = Configuration.UI_MODE_NIGHT_NO, device = "spec:width=1280dp,height=840dp,orientation=landscape") +annotation class TabletPreviews + +@PhonePreviews +@FoldablePreviews +@TabletPreviews +annotation class AllDevicePreviews diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt index db66034596..b3fb30c866 100644 --- a/core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt @@ -5,7 +5,6 @@ package org.signal.core.ui.compose -import android.content.res.Configuration import androidx.compose.material3.Snackbar import androidx.compose.material3.SnackbarData import androidx.compose.material3.SnackbarDuration @@ -14,7 +13,6 @@ import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarVisuals import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview import org.signal.core.ui.compose.theme.LocalSnackbarColors import org.signal.core.ui.compose.theme.SignalTheme @@ -45,17 +43,9 @@ object Snackbars { } } -@Preview +@DayNightPreviews @Composable -private fun SnackbarLightPreview() { - SignalTheme { - Snackbars.Default(snackbarData = SampleSnackbarData) - } -} - -@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) -@Composable -private fun SnackbarDarkPreview() { +private fun SnackbarPreview() { SignalTheme { Snackbars.Default(snackbarData = SampleSnackbarData) }