From 247c5de14023cd3ea067b7b48b0d9913771ada78 Mon Sep 17 00:00:00 2001 From: Jeffrey Starke Date: Fri, 21 Mar 2025 08:05:36 -0400 Subject: [PATCH] Add .compose and .view subpackages to core-ui module. --- ...InternalConversationSpringboardFragment.kt | 6 ++--- .../securesms/attachments/AttachmentSaver.kt | 4 ++-- .../avatar/fallback/FallbackAvatarImage.kt | 4 ++-- .../backup/v2/ui/BackupAlertBottomSheet.kt | 10 ++++----- .../backup/v2/ui/CreateBackupBottomSheet.kt | 8 +++---- .../backup/v2/ui/status/BackupStatusBanner.kt | 6 ++--- .../backup/v2/ui/status/BackupStatusRow.kt | 6 ++--- .../MessageBackupsEducationScreen.kt | 6 ++--- .../MessageBackupsFlowFragment.kt | 2 +- .../MessageBackupsKeyEducationScreen.kt | 8 +++---- .../MessageBackupsKeyRecordScreen.kt | 12 +++++----- .../subscription/MessageBackupsTypeFeature.kt | 4 ++-- .../MessageBackupsTypeSelectionScreen.kt | 12 +++++----- ...nationCanceledBottomSheetDialogFragment.kt | 8 +++---- .../securesms/banner/BannerManager.kt | 2 +- .../banner/banners/BubbleOptOutBanner.kt | 5 ++--- .../banner/banners/CdsPermanentErrorBanner.kt | 4 ++-- .../banner/banners/CdsTemporaryErrorBanner.kt | 4 ++-- .../banner/banners/DeprecatedBuildBanner.kt | 4 ++-- .../securesms/banner/banners/DozeBanner.kt | 4 ++-- .../banner/banners/EnclaveFailureBanner.kt | 4 ++-- .../GroupsV1MigrationSuggestionsBanner.kt | 4 ++-- .../banner/banners/OutdatedBuildBanner.kt | 4 ++-- .../banners/PendingGroupJoinRequestsBanner.kt | 4 ++-- .../banner/banners/ServiceOutageBanner.kt | 4 ++-- .../banner/banners/UnauthorizedBanner.kt | 4 ++-- .../banner/banners/UsernameOutOfSyncBanner.kt | 4 ++-- .../banner/ui/compose/DefaultBanner.kt | 4 ++-- .../UpgradeToEnableOptimizedStorageSheet.kt | 8 +++---- .../upgrade/UpgradeToPaidTierBottomSheet.kt | 2 +- .../upgrade/UpgradeToStartMediaBackupSheet.kt | 8 +++---- .../calls/YouAreAlreadyInACallSnackbar.kt | 2 +- .../links/EditCallLinkNameDialogFragment.kt | 4 ++-- .../securesms/calls/links/SignalCallRow.kt | 6 ++--- ...CreateCallLinkBottomSheetDialogFragment.kt | 12 +++++----- .../links/details/CallLinkDetailsFragment.kt | 10 ++++----- .../ConnectivityWarningBottomSheet.kt | 8 +++---- .../components/DeleteSyncEducationDialog.kt | 6 ++--- .../DeviceSpecificNotificationBottomSheet.kt | 8 +++---- .../securesms/components/emoji/Emojifier.kt | 4 ++-- .../settings/app/AppSettingsFragment.kt | 16 +++++++------- .../export/ExportAccountDataFragment.kt | 10 ++++----- .../appicon/AppIconSelectionFragment.kt | 4 ++-- .../appicon/AppIconTutorialFragment.kt | 2 +- .../app/backups/BackupsSettingsFragment.kt | 14 ++++++------ .../remote/RemoteBackupsSettingsFragment.kt | 22 +++++++++---------- .../remote/SubscriptionNotFoundBottomSheet.kt | 12 +++++----- .../folders/ChatFoldersEducationSheet.kt | 8 +++---- .../app/chats/folders/ChatFoldersFragment.kt | 20 ++++++++--------- .../chats/folders/CreateFoldersFragment.kt | 12 +++++----- .../settings/app/help/LicenseFragment.kt | 2 +- ...ingOneTimeDonationConfigurationFragment.kt | 8 +++---- ...alTerminalDonationConfigurationFragment.kt | 6 ++--- .../InternalBackupPlaygroundFragment.kt | 12 +++++----- .../internal/search/InternalSearchFragment.kt | 2 +- .../InternalSqlitePlaygroundFragment.kt | 6 ++--- ...nternalStorageServicePlaygroundFragment.kt | 12 +++++----- .../svr/InternalSvrPlaygroundFragment.kt | 4 ++-- .../pnp/PhoneNumberPrivacySettingsFragment.kt | 10 ++++----- .../screenlock/ScreenLockSettingsFragment.kt | 6 ++--- .../storage/ManageStorageSettingsFragment.kt | 20 ++++++++--------- .../DonationPendingBottomSheet.kt | 8 +++---- .../completed/TerminalDonationBottomSheet.kt | 6 ++--- .../details/BankTransferDetailsFragment.kt | 8 +++---- .../transfer/details/FindAccountInfoSheet.kt | 2 +- ...nsferDetailsBankSelectionDialogFragment.kt | 2 +- .../ideal/IdealTransferDetailsFragment.kt | 6 ++--- .../mandate/BankTransferMandateFragment.kt | 8 +++---- .../settings/app/usernamelinks/QrCodeBadge.kt | 2 +- .../UsernameLinkQrColorPickerFragment.kt | 4 ++-- .../main/UsernameLinkSettingsFragment.kt | 8 +++---- .../main/UsernameLinkShareBottomSheet.kt | 4 ++-- .../main/UsernameLinkShareScreen.kt | 6 ++--- .../main/UsernameQrScanScreen.kt | 4 ++-- .../main/UsernameQrScannerActivity.kt | 4 ++-- .../webrtc/PendingParticipantsBottomSheet.kt | 8 +++---- .../webrtc/WebRtcAudioOutputBottomSheet.kt | 2 +- .../webrtc/controls/CallInfoView.kt | 12 +++++----- .../webrtc/controls/RaiseHandSnackbar.kt | 2 +- .../requests/CallLinkIncomingRequestSheet.kt | 10 ++++----- .../webrtc/v2/AdditionalActionsPopup.kt | 10 ++++----- .../webrtc/v2/CallAudioToggleButton.kt | 8 +++---- .../components/webrtc/v2/CallButton.kt | 8 +++---- .../components/webrtc/v2/CallControls.kt | 8 +++---- .../webrtc/v2/CallControlsChange.kt | 4 ++-- .../components/webrtc/v2/CallScreen.kt | 6 ++--- .../components/webrtc/v2/CallScreenDialog.kt | 6 ++--- .../webrtc/v2/CallScreenTooltipBox.kt | 4 ++-- .../components/webrtc/v2/CallScreenTopBar.kt | 4 ++-- .../webrtc/v2/ComposeCallScreenMediator.kt | 2 +- .../webrtc/v2/IncomingCallScreen.kt | 4 ++-- .../webrtc/v2/PendingParticipants.kt | 4 ++-- .../components/webrtc/v2/PictureInPicture.kt | 4 ++-- .../ComposeBottomSheetDialogFragment.kt | 2 +- .../compose/ComposeDialogFragment.kt | 2 +- .../securesms/compose/ComposeFragment.kt | 2 +- .../ComposeFullScreenDialogFragment.kt | 2 +- .../v2/MediaNoLongerAvailableBottomSheet.kt | 10 ++++----- .../v2/SafetyTipsBottomSheetDialog.kt | 6 ++--- .../v2/UnverifiedProfileNameBottomSheet.kt | 8 +++---- .../AddToFolderBottomSheet.kt | 6 ++--- ...elinkDevicesReminderBottomSheetFragment.kt | 4 ++-- .../RestoreCompleteBottomSheetDialog.kt | 10 ++++----- .../linkdevice/AddLinkDeviceFragment.kt | 6 ++--- .../linkdevice/EditDeviceNameFragment.kt | 8 +++---- .../LinkDeviceAuthEducationSheet.kt | 8 +++---- .../LinkDeviceFinishedBottomSheet.kt | 8 +++---- .../linkdevice/LinkDeviceFragment.kt | 14 ++++++------ .../linkdevice/LinkDeviceIntroBottomSheet.kt | 8 +++---- .../LinkDeviceLearnMoreBottomSheetFragment.kt | 8 +++---- .../linkdevice/LinkDeviceQrScanScreen.kt | 2 +- .../linkdevice/LinkDeviceSyncBottomSheet.kt | 6 ++--- .../v2/review/QualitySelectorBottomSheet.kt | 4 ++-- .../securesms/nicknames/NicknameActivity.kt | 12 +++++----- .../securesms/nicknames/ViewNoteSheet.kt | 4 ++-- .../TurnOnNotificationsBottomSheet.kt | 6 ++--- .../PermissionDeniedBottomSheet.kt | 8 +++---- .../permissions/compose/Permissions.kt | 2 +- .../NewWaysToConnectDialogFragment.kt | 6 ++--- .../securesms/qr/QrScanScreens.kt | 2 +- .../recipients/ui/about/AboutSheet.kt | 6 ++--- .../recipients/ui/findby/FindByActivity.kt | 18 +++++++-------- .../compose/GrantPermissionsScreen.kt | 4 ++-- .../ContactSupportBottomSheetFragment.kt | 2 +- .../ui/countrycode/CountryCodeSelectScreen.kt | 10 ++++----- .../olddevice/TransferAccountActivity.kt | 16 +++++++------- .../ui/permissions/GrantPermissionsScreen.kt | 6 ++--- .../ui/restore/EnterBackupKeyFragment.kt | 2 +- .../ui/restore/EnterBackupKeyScreen.kt | 10 ++++----- .../ui/restore/NoBackupToRestoreFragment.kt | 6 ++--- .../ui/restore/RemoteRestoreActivity.kt | 10 ++++----- .../registrationv3/ui/restore/RestoreRow.kt | 6 ++--- .../ui/restore/RestoreViaQrFragment.kt | 12 +++++----- .../ui/restore/SelectRestoreMethodScreen.kt | 4 ++-- .../ui/shared/RegistrationScreen.kt | 6 ++--- .../ui/welcome/RestoreWelcomeBottomSheet.kt | 8 +++---- .../PostRegistrationEnterBackupKeyFragment.kt | 2 +- .../selection/SelectRestoreMethodFragment.kt | 2 +- .../core/ui/{ => compose}/Animations.kt | 4 ++-- .../core/ui/{ => compose}/BottomSheets.kt | 6 ++--- .../signal/core/ui/{ => compose}/Buttons.kt | 9 ++++++-- .../core/ui/{ => compose}/DarkPreview.kt | 2 +- .../core/ui/{ => compose}/DelayedState.kt | 2 +- .../signal/core/ui/{ => compose}/Dialogs.kt | 20 +++++++++++------ .../signal/core/ui/{ => compose}/Dividers.kt | 9 ++++++-- .../core/ui/{ => compose}/DropdownMenus.kt | 7 +++--- .../core/ui/{ => compose}/IconButtons.kt | 8 +++---- .../org/signal/core/ui/{ => compose}/Icons.kt | 7 +++--- .../ui/{ => compose}/ModifierExtensions.kt | 5 +++-- .../signal/core/ui/{ => compose}/Previews.kt | 6 ++--- .../org/signal/core/ui/{ => compose}/Rows.kt | 10 +++++++-- .../signal/core/ui/{ => compose}/Scaffolds.kt | 9 ++++++-- .../core/ui/{ => compose}/SignalPreview.kt | 2 +- .../signal/core/ui/{ => compose}/Snackbars.kt | 8 +++---- .../core/ui/{ => compose}/TextFields.kt | 2 +- .../org/signal/core/ui/{ => compose}/Texts.kt | 10 +++++++-- .../ui/{ => compose}/TriggerAlignedPopup.kt | 2 +- .../copied/androidx/compose/DragAndDrop.kt | 2 +- .../androidx/compose/DragGestureDetector.kt | 2 +- .../compose/material3/AndroidMenu.android.kt | 2 +- .../androidx/compose/material3/IconButton.kt | 2 +- .../copied/androidx/compose/material3/Menu.kt | 2 +- .../ui/{ => compose}/theme/ExtendedColors.kt | 2 +- .../ui/{ => compose}/theme/SignalTheme.kt | 2 +- .../ui/{ => compose}/theme/SnackbarColors.kt | 2 +- .../signal/core/ui/view}/DialogExtensions.kt | 2 +- 166 files changed, 545 insertions(+), 510 deletions(-) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Animations.kt (93%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/BottomSheets.kt (88%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Buttons.kt (98%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/DarkPreview.kt (91%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/DelayedState.kt (96%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Dialogs.kt (95%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Dividers.kt (89%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/DropdownMenus.kt (92%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/IconButtons.kt (94%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Icons.kt (90%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/ModifierExtensions.kt (82%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Previews.kt (84%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Rows.kt (98%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Scaffolds.kt (95%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/SignalPreview.kt (92%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Snackbars.kt (91%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/TextFields.kt (99%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/Texts.kt (92%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/TriggerAlignedPopup.kt (99%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/copied/androidx/compose/DragAndDrop.kt (99%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/copied/androidx/compose/DragGestureDetector.kt (98%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/copied/androidx/compose/material3/AndroidMenu.android.kt (96%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/copied/androidx/compose/material3/IconButton.kt (98%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/copied/androidx/compose/material3/Menu.kt (99%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/theme/ExtendedColors.kt (97%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/theme/SignalTheme.kt (99%) rename core-ui/src/main/java/org/signal/core/ui/{ => compose}/theme/SnackbarColors.kt (95%) rename {app/src/main/java/org/thoughtcrime/securesms/util => core-ui/src/main/java/org/signal/core/ui/view}/DialogExtensions.kt (97%) diff --git a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/springboard/InternalConversationSpringboardFragment.kt b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/springboard/InternalConversationSpringboardFragment.kt index 32f280abfc..a1bdfc5e12 100644 --- a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/springboard/InternalConversationSpringboardFragment.kt +++ b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/springboard/InternalConversationSpringboardFragment.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.navigation.fragment.findNavController import androidx.navigation.navGraphViewModels -import org.signal.core.ui.Rows -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Rows +import org.signal.core.ui.compose.Scaffolds +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentSaver.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentSaver.kt index 93409c6229..882bfb8cae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentSaver.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentSaver.kt @@ -12,6 +12,8 @@ import android.widget.Toast import androidx.fragment.app.Fragment import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.withContext +import org.signal.core.ui.view.AlertDialogResult +import org.signal.core.ui.view.awaitResult import org.signal.core.util.concurrent.SignalDispatchers import org.signal.core.util.logging.Log import org.signal.core.util.orNull @@ -21,11 +23,9 @@ import org.thoughtcrime.securesms.components.ProgressCardDialogFragmentArgs import org.thoughtcrime.securesms.database.model.MmsMessageRecord import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.permissions.Permissions -import org.thoughtcrime.securesms.util.AlertDialogResult import org.thoughtcrime.securesms.util.SaveAttachmentUtil import org.thoughtcrime.securesms.util.SaveAttachmentUtil.SaveAttachment import org.thoughtcrime.securesms.util.StorageUtil -import org.thoughtcrime.securesms.util.awaitResult import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine 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 324ff924dd..1d05ed7f0b 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.Previews -import org.signal.core.ui.SignalPreview +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 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 8226014264..566b1519c2 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 @@ -49,11 +49,11 @@ import androidx.core.os.BundleCompat import androidx.core.os.bundleOf import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.parcelize.Parcelize -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType 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 b587987229..aa841a76f1 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 @@ -25,10 +25,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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.jobs.BackupMessagesJob diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusBanner.kt index f0f29b245e..58dfa8236b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusBanner.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusBanner.kt @@ -35,9 +35,9 @@ import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.SignalPreview import org.signal.core.util.ByteSize import org.signal.core.util.bytes import org.signal.core.util.kibiBytes diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt index fa1d5f5fac..4ea6661113 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt @@ -35,9 +35,9 @@ 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.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.SignalPreview +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.ByteSize import org.thoughtcrime.securesms.R import kotlin.math.roundToInt 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 abdd0157fa..33f55d8001 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.stringResource 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.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.Scaffolds import org.thoughtcrime.securesms.R import org.signal.core.ui.R as CoreUiR diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt index d59b17ac3d..dd63fd58e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt @@ -21,7 +21,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import kotlinx.coroutines.rx3.asFlowable -import org.signal.core.ui.Dialogs +import org.signal.core.ui.compose.Dialogs import org.signal.core.util.getSerializableCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.MessageBackupTier 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 1f4b124df7..a46780c279 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 @@ -22,10 +22,10 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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 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 0238d9df10..4ea8041d5e 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 @@ -44,12 +44,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.coroutines.launch -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 kotlin.random.Random import kotlin.random.nextInt 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 adf33e4eff..612ece35dc 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 @@ -18,8 +18,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.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.SignalPreview import org.thoughtcrime.securesms.R /** 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 9dceca3b4e..fc22c26c1f 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 @@ -44,12 +44,12 @@ import androidx.compose.ui.text.withAnnotation import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import kotlinx.collections.immutable.persistentListOf -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +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.bytes import org.signal.core.util.money.FiatMoney import org.thoughtcrime.securesms.R diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt index 123ebbcafb..4b07f02c09 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt @@ -31,10 +31,10 @@ 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.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Texts -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Texts +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.badges.models.Badge diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt index 361b8d702b..a5b2b9f5f0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.flow.Flow -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.logging.Log /** 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 769e8af5d3..51ba0ff5eb 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 @@ -9,12 +9,11 @@ import android.os.Build import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +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 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 b1b10450ed..c69f60517c 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.Previews -import org.signal.core.ui.SignalPreview +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 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 a6b38b9d6e..467683b359 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.Previews -import org.signal.core.ui.SignalPreview +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 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 b766ae8134..fc0be6e62c 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.Previews -import org.signal.core.ui.SignalPreview +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 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 2a965e5c6a..8a8b4caac3 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.Previews -import org.signal.core.ui.SignalPreview +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 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 f3c9b83796..4f4d216640 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.Previews -import org.signal.core.ui.SignalPreview +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 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 15e95b42e6..a8c485a403 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.Previews -import org.signal.core.ui.SignalPreview +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 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 80081db3a1..159089df62 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.Previews -import org.signal.core.ui.SignalPreview +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 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 fff52dab96..45be350dac 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.Previews -import org.signal.core.ui.SignalPreview +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 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 86fc63db2a..a908bdc50a 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.Previews -import org.signal.core.ui.SignalPreview +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 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 87cf63a7cc..318c46f8b0 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.Previews -import org.signal.core.ui.SignalPreview +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 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 0b210ec258..f29998b37a 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.Previews -import org.signal.core.ui.SignalPreview +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 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 5abc9c998b..b51fb97ac7 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.Previews -import org.signal.core.ui.SignalPreview +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 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 415033cb65..77cd356a5b 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 @@ -24,10 +24,10 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToPaidTierBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToPaidTierBottomSheet.kt index 54f895216e..de661b03da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToPaidTierBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToPaidTierBottomSheet.kt @@ -16,7 +16,7 @@ import androidx.fragment.app.setFragmentResult import androidx.fragment.app.setFragmentResultListener import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.rx3.asFlowable -import org.signal.core.ui.Dialogs +import org.signal.core.ui.compose.Dialogs import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFlowViewModel import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsStage 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 09e8cc86e9..30c6620a39 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 @@ -25,10 +25,10 @@ import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/YouAreAlreadyInACallSnackbar.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/YouAreAlreadyInACallSnackbar.kt index d54f80847d..81c53da0f9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/YouAreAlreadyInACallSnackbar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/YouAreAlreadyInACallSnackbar.kt @@ -13,7 +13,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import com.google.android.material.snackbar.Snackbar -import org.signal.core.ui.Snackbars +import org.signal.core.ui.compose.Snackbars import org.thoughtcrime.securesms.R /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt index b74c4f602a..c11d1b68b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt @@ -35,8 +35,8 @@ import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult import androidx.navigation.fragment.navArgs -import org.signal.core.ui.Buttons -import org.signal.core.ui.Scaffolds +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Scaffolds import org.signal.core.util.BreakIteratorCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeDialogFragment 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 afeb7c7f6a..8557db71d5 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 @@ -35,9 +35,9 @@ import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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 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 ac3c8a242d..e072e7c0f3 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 @@ -35,12 +35,12 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController import io.reactivex.rxjava3.kotlin.subscribeBy -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt index 7331496cc0..8dcb5d87c0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt @@ -32,11 +32,11 @@ import androidx.navigation.fragment.navArgs import com.google.android.material.snackbar.Snackbar import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.kotlin.subscribeBy -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Dividers -import org.signal.core.ui.Rows -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Dialogs +import org.signal.core.ui.compose.Dividers +import org.signal.core.ui.compose.Rows +import org.signal.core.ui.compose.Scaffolds +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.logging.Log import org.signal.ringrtc.CallLinkState.Restrictions diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConnectivityWarningBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ConnectivityWarningBottomSheet.kt index a70226b58c..72e41b55fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ConnectivityWarningBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConnectivityWarningBottomSheet.kt @@ -17,10 +17,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DeleteSyncEducationDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/components/DeleteSyncEducationDialog.kt index 60255378dd..f2d994cafb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DeleteSyncEducationDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/DeleteSyncEducationDialog.kt @@ -25,9 +25,9 @@ import androidx.fragment.app.FragmentManager import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.subjects.CompletableSubject -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DeviceSpecificNotificationBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/DeviceSpecificNotificationBottomSheet.kt index c866398299..549f6b6e4f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DeviceSpecificNotificationBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/DeviceSpecificNotificationBottomSheet.kt @@ -18,10 +18,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 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 7b6e56b911..5cfbcac147 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.Previews -import org.signal.core.ui.SignalPreview +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. 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 0a4643e160..7dbd04f13b 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 @@ -46,14 +46,14 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.signal.core.ui.Dividers -import org.signal.core.ui.IconButtons -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters -import org.signal.core.ui.theme.SignalTheme +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 import org.thoughtcrime.securesms.avatar.AvatarImage import org.thoughtcrime.securesms.backup.v2.BackupRepository diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataFragment.kt index a4594a1f5a..154ea71b3a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataFragment.kt @@ -34,11 +34,11 @@ import androidx.core.app.ShareCompat import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Rows -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.Texts +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Dialogs +import org.signal.core.ui.compose.Rows +import org.signal.core.ui.compose.Scaffolds +import org.signal.core.ui.compose.Texts import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R 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 e923307cb2..f9831566dd 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 @@ -48,8 +48,8 @@ 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.Scaffolds -import org.signal.core.ui.theme.SignalTheme +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.components.settings.app.appearance.appicon.util.AppIconPreset 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 639204ad76..7a5b91954f 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 @@ -29,7 +29,7 @@ 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.Scaffolds +import org.signal.core.ui.compose.Scaffolds import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment 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 87c3ba1a08..b7125ae0bc 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 @@ -35,13 +35,13 @@ 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.Buttons -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.Texts +import org.signal.core.ui.compose.Buttons +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 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier 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 c36709a170..2056337f21 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 @@ -66,17 +66,17 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.Snackbars -import org.signal.core.ui.Texts -import org.signal.core.ui.horizontalGutters -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +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 +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.bytes import org.signal.core.util.gibiBytes import org.signal.core.util.logging.Log 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 5e2e90db3d..e82b4fa124 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 @@ -29,12 +29,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 /** 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 0525e35da7..e5da103d25 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 @@ -17,10 +17,10 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 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 c182669c0e..ba3f095813 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 @@ -43,16 +43,16 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController import androidx.navigation.fragment.findNavController -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Dividers -import org.signal.core.ui.DropdownMenus -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.copied.androidx.compose.DraggableItem -import org.signal.core.ui.copied.androidx.compose.dragContainer -import org.signal.core.ui.copied.androidx.compose.rememberDragDropState +import org.signal.core.ui.compose.Buttons +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.DraggableItem +import org.signal.core.ui.compose.copied.androidx.compose.dragContainer +import org.signal.core.ui.compose.copied.androidx.compose.rememberDragDropState import org.signal.core.util.toInt import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment 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 c1f17a962f..097ca0c2f6 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,12 +50,12 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController import androidx.navigation.fragment.findNavController -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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 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 7ac873bf2f..de0a47974e 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 @@ -22,7 +22,7 @@ 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.Scaffolds +import org.signal.core.ui.compose.Scaffolds import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt index 9171d0f34f..8fdba2091e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt @@ -25,10 +25,10 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController -import org.signal.core.ui.Buttons -import org.signal.core.ui.Rows -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Rows +import org.signal.core.ui.compose.Scaffolds +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueCodeSelector import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueTypeSelector diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalTerminalDonationConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalTerminalDonationConfigurationFragment.kt index 30680c563b..b2e2ff5895 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalTerminalDonationConfigurationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalTerminalDonationConfigurationFragment.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.navigation.fragment.findNavController -import org.signal.core.ui.Buttons -import org.signal.core.ui.Rows -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Rows +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueCodeSelector import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueTypeSelector import org.thoughtcrime.securesms.compose.ComposeFragment 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 d7185d3436..752c6f2695 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 @@ -70,12 +70,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.Snackbars -import org.signal.core.ui.TextFields.TextField +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.Hex import org.signal.core.util.getLength import org.thoughtcrime.securesms.R 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 c282b03f4e..01c0c70caa 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 @@ -30,7 +30,7 @@ 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.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment 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 71dbcc0cdb..eb7f9a1850 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 @@ -46,9 +46,9 @@ import androidx.compose.ui.unit.dp import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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 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 7079480167..1b7bb09615 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 @@ -39,12 +39,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.Rows.TextAndLabel -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundFragment.kt index 6c60d1fc1a..356ecaf30e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundFragment.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.fragment.app.viewModels import kotlinx.collections.immutable.persistentListOf -import org.signal.core.ui.Rows -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Rows +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.compose.ComposeFragment class InternalSvrPlaygroundFragment : ComposeFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt index a0cefcaa80..c292907fed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt @@ -26,11 +26,11 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.launch -import org.signal.core.ui.Dividers -import org.signal.core.ui.Rows -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.Texts -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Dividers +import org.signal.core.ui.compose.Rows +import org.signal.core.ui.compose.Scaffolds +import org.signal.core.ui.compose.Texts +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.StatusBarColorNestedScrollConnection 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 b5ecc34738..9b5a8d8d20 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 @@ -42,9 +42,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.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview +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 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 8d732e1321..6254d34cc2 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 @@ -51,16 +51,16 @@ import androidx.navigation.compose.dialog import androidx.navigation.compose.rememberNavController import androidx.navigation.fragment.findNavController import androidx.navigation.navArgument -import org.signal.core.ui.Animations -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.Rows.TextAndLabel -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.Texts -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Animations +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 import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.billing.upgrade.UpgradeToEnableOptimizedStorageSheet 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 380be4f8f8..6a99b20eee 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 @@ -25,10 +25,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Texts -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Texts +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.badges.Badges import org.thoughtcrime.securesms.badges.models.Badge 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 7cfc6e8ed9..2325303fa3 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 @@ -35,9 +35,9 @@ 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.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.badges.BadgeRepository import org.thoughtcrime.securesms.badges.models.Badge 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 b3b13e6a53..16dff7a9aa 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 @@ -48,10 +48,10 @@ import androidx.lifecycle.LifecycleOwner import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import androidx.navigation.navGraphViewModels -import org.signal.core.ui.Buttons -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.Texts -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Scaffolds +import org.signal.core.ui.compose.Texts +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.TemporaryScreenshotSecurity diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/FindAccountInfoSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/FindAccountInfoSheet.kt index 6f8525798b..fe29441c3e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/FindAccountInfoSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/FindAccountInfoSheet.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.signal.core.ui.BottomSheets +import org.signal.core.ui.compose.BottomSheets import org.thoughtcrime.securesms.R /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt index bc55998dd1..5e1c124b0b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult import androidx.navigation.fragment.findNavController -import org.signal.core.ui.Scaffolds +import org.signal.core.ui.compose.Scaffolds import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeDialogFragment import org.signal.core.ui.R as CoreUiR diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsFragment.kt index 5f3ee89075..dc9387d39e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsFragment.kt @@ -50,9 +50,9 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import androidx.navigation.navGraphViewModels import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.signal.core.ui.Buttons -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.Texts +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Scaffolds +import org.signal.core.ui.compose.Texts import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.TemporaryScreenshotSecurity 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 e8d4bf54af..ac30468a1e 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 @@ -52,10 +52,10 @@ import androidx.compose.ui.unit.dp import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import kotlinx.coroutines.launch -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dividers -import org.signal.core.ui.Texts -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Dividers +import org.signal.core.ui.compose.Texts +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.donations.PaymentSourceType import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/QrCodeBadge.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/QrCodeBadge.kt index 43870ad119..1512939d47 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/QrCodeBadge.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/QrCodeBadge.kt @@ -37,7 +37,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R /** 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 ad13bc21e2..0a40ae12f5 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 @@ -43,8 +43,8 @@ import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList -import org.signal.core.ui.Buttons -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeBadge import org.thoughtcrime.securesms.components.settings.app.usernamelinks.UsernameQrCodeColorScheme 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 23668e9e2c..336a297ce0 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 @@ -63,10 +63,10 @@ import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState import io.reactivex.rxjava3.disposables.CompositeDisposable import kotlinx.coroutines.CoroutineScope -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Snackbars -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Dialogs +import org.signal.core.ui.compose.Snackbars +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.concurrent.LifecycleDisposable import org.thoughtcrime.securesms.MainActivity import org.thoughtcrime.securesms.R diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt index 438d6027b2..1d26e8cc16 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt @@ -30,8 +30,8 @@ import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager import androidx.fragment.app.setFragmentResult -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.webrtc.requests.CallLinkIncomingRequestSheet import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt index a988d1bb32..1ee7ca2514 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt @@ -33,9 +33,9 @@ import androidx.compose.ui.unit.dp import androidx.navigation.NavController import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Dialogs +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeBadge import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeData diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScanScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScanScreen.kt index 3cf46e951a..263f9f9c30 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScanScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScanScreen.kt @@ -22,8 +22,8 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.LifecycleOwner import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign -import org.signal.core.ui.Dialogs -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Dialogs +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.qr.QrScannerView import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt index 5746bd0c20..33625fc570 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt @@ -37,8 +37,8 @@ import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberMultiplePermissionsState import com.google.accompanist.permissions.rememberPermissionState import io.reactivex.rxjava3.disposables.CompositeDisposable -import org.signal.core.ui.Dialogs -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Dialogs +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableExtraCompat import org.thoughtcrime.securesms.R 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 59dd596512..e5bd05d58d 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,10 +41,10 @@ import androidx.compose.ui.viewinterop.AndroidView import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult import kotlinx.coroutines.flow.map -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.DarkPreview -import org.signal.core.ui.Previews +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.Previews import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.AvatarImageView import org.thoughtcrime.securesms.components.webrtc.v2.WebRtcCallViewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt index e14beebcc5..5904868447 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt @@ -30,7 +30,7 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModel import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList -import org.signal.core.ui.BottomSheets +import org.signal.core.ui.compose.BottomSheets import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.util.BottomSheetUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt index 30e4e3cf1c..16b6120280 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt @@ -52,12 +52,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.core.Observable import kotlinx.coroutines.flow.map -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows -import org.signal.core.ui.theme.LocalExtendedColors -import org.signal.core.ui.theme.SignalTheme +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.theme.LocalExtendedColors +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarImage diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt index dfc671d099..befe02788f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt @@ -45,7 +45,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import kotlinx.coroutines.delay import kotlinx.coroutines.flow.map -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.webrtc.v2.WebRtcCallViewModel import org.thoughtcrime.securesms.dependencies.AppDependencies 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 e1698274a6..4194705b5e 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 @@ -32,11 +32,11 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.DarkPreview -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows +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.Previews +import org.signal.core.ui.compose.Rows import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage 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 418617a4ed..81a3da41d2 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,11 +33,11 @@ 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.DarkPreview -import org.signal.core.ui.Previews -import org.signal.core.ui.TriggerAlignedPopup -import org.signal.core.ui.TriggerAlignedPopupState -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.DarkPreview +import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.TriggerAlignedPopup +import org.signal.core.ui.compose.TriggerAlignedPopupState +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.emoji.Emojifier 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 a1ba489c64..c5c09a51df 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 @@ -32,10 +32,10 @@ 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.DarkPreview -import org.signal.core.ui.IconButtons -import org.signal.core.ui.Previews -import org.signal.core.ui.Rows +import org.signal.core.ui.compose.DarkPreview +import org.signal.core.ui.compose.IconButtons +import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.Rows import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.webrtc.AudioStateUpdater import org.thoughtcrime.securesms.components.webrtc.ToggleButtonOutputState 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 f87b1b1c24..872ea36d66 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 @@ -23,10 +23,10 @@ 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.Buttons -import org.signal.core.ui.DarkPreview -import org.signal.core.ui.IconButtons -import org.signal.core.ui.Previews +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.Previews import org.thoughtcrime.securesms.R private val defaultCallButtonIconSize: Dp = 24.dp 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 c251646702..179d92a90f 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 @@ -29,10 +29,10 @@ 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.DarkPreview -import org.signal.core.ui.Previews -import org.signal.core.ui.TriggerAlignedPopupState.Companion.popupTrigger -import org.signal.core.ui.TriggerAlignedPopupState.Companion.rememberTriggerAlignedPopupState +import org.signal.core.ui.compose.DarkPreview +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 import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState import org.thoughtcrime.securesms.components.webrtc.ToggleButtonOutputState 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 d488b79342..5b7cb8a59e 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,8 +24,8 @@ 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.DarkPreview -import org.signal.core.ui.Previews +import org.signal.core.ui.compose.DarkPreview +import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt index ff6e3b4a53..fbb88c0008 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt @@ -54,9 +54,9 @@ import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Previews -import org.signal.core.ui.TriggerAlignedPopupState +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.TriggerAlignedPopupState import org.signal.core.util.DimensionUnit import org.thoughtcrime.securesms.components.webrtc.WebRtcLocalRenderState import org.thoughtcrime.securesms.events.CallParticipant 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 1040557cd2..f317ee0f45 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,9 +7,9 @@ package org.thoughtcrime.securesms.components.webrtc.v2 import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import org.signal.core.ui.DarkPreview -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Previews +import org.signal.core.ui.compose.DarkPreview +import org.signal.core.ui.compose.Dialogs +import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R /** 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 3ea9613e50..a36a5c8b80 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 @@ -20,8 +20,8 @@ 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.DarkPreview -import org.signal.core.ui.Previews +import org.signal.core.ui.compose.DarkPreview +import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R /** 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 863d016b64..6c7e3f6ae8 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,8 +31,8 @@ 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.DarkPreview -import org.signal.core.ui.Previews +import org.signal.core.ui.compose.DarkPreview +import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage import org.thoughtcrime.securesms.recipients.Recipient diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/ComposeCallScreenMediator.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/ComposeCallScreenMediator.kt index 6ba115e8b5..5b3247f89f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/ComposeCallScreenMediator.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/ComposeCallScreenMediator.kt @@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.components.webrtc.CallParticipantListUpdate import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState 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 06bc77080d..15aee79390 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,8 +35,8 @@ 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.DarkPreview -import org.signal.core.ui.Previews +import org.signal.core.ui.compose.DarkPreview +import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage import org.thoughtcrime.securesms.compose.GlideImage 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 0180c0d957..29b797a298 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.Previews -import org.signal.core.ui.SignalPreview +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 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 b7c140d112..b056650589 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,8 +37,8 @@ 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.DarkPreview -import org.signal.core.ui.Previews +import org.signal.core.ui.compose.DarkPreview +import org.signal.core.ui.compose.Previews import kotlin.math.pow import kotlin.math.roundToInt import kotlin.math.sqrt diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt index 9a892d6900..5d1360ecc7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.compose.ui.unit.dp -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment import org.thoughtcrime.securesms.util.DynamicTheme diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeDialogFragment.kt index a27dcd422a..dbe8b9b95f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeDialogFragment.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.fragment.app.DialogFragment -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.util.DynamicTheme /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFragment.kt index 9b742676df..bb6b4c5f59 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFragment.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.fragment.compose.content -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.util.DynamicTheme diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFullScreenDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFullScreenDialogFragment.kt index 9e78d00e88..8e97b64887 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFullScreenDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFullScreenDialogFragment.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.fragment.app.DialogFragment -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.util.DynamicTheme 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 eb79c3ed4d..a4fc567298 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 @@ -23,11 +23,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 import org.thoughtcrime.securesms.components.settings.app.subscription.MessageBackupsCheckoutLauncher.createBackupsCheckoutLauncher 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 7895373d58..f2611ed3f3 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 @@ -45,9 +45,9 @@ import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager import kotlinx.coroutines.launch -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment 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 1f2550316c..0356556f27 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 @@ -31,10 +31,10 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters +import org.signal.core.ui.compose.BottomSheets +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 import org.thoughtcrime.securesms.util.BottomSheetUtil 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 82367a581b..0adee3ae74 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/AddToFolderBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/AddToFolderBottomSheet.kt @@ -32,9 +32,9 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RelinkDevicesReminderBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RelinkDevicesReminderBottomSheetFragment.kt index 49ef8af87c..b78a765af0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RelinkDevicesReminderBottomSheetFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RelinkDevicesReminderBottomSheetFragment.kt @@ -15,8 +15,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RestoreCompleteBottomSheetDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RestoreCompleteBottomSheetDialog.kt index ff39f24d60..718855a89c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RestoreCompleteBottomSheetDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RestoreCompleteBottomSheetDialog.kt @@ -23,11 +23,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 import org.thoughtcrime.securesms.keyvalue.SignalStore diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt index 63f33f4ec8..2a00b90add 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt @@ -22,9 +22,9 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.PermissionState import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview +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.permissions.Permissions diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt index 5d2c45feb2..1cd092f27c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt @@ -32,10 +32,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.Snackbar -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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.isNotNullOrBlank import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceAuthEducationSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceAuthEducationSheet.kt index ae43bd7d3f..ba2b4982be 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceAuthEducationSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceAuthEducationSheet.kt @@ -17,10 +17,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.activityViewModels -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFinishedBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFinishedBottomSheet.kt index c346803c85..32dc17b820 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFinishedBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFinishedBottomSheet.kt @@ -17,10 +17,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.activityViewModels -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 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 1d0b7ad369..d611409344 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt @@ -58,13 +58,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.Snackbar -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Dividers -import org.signal.core.ui.DropdownMenus -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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 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 16584118ce..7b3c85b611 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt @@ -19,10 +19,10 @@ import com.airbnb.lottie.compose.LottieAnimation import com.airbnb.lottie.compose.LottieCompositionSpec import com.airbnb.lottie.compose.LottieConstants import com.airbnb.lottie.compose.rememberLottieComposition -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 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 bec3e8db2d..a0939e0958 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt @@ -18,10 +18,10 @@ 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.BottomSheets -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.Texts +import org.signal.core.ui.compose.BottomSheets +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 import org.thoughtcrime.securesms.util.CommunicationActions diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt index 5773d6fbcf..d0fd8f2822 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.res.stringResource import androidx.navigation.NavController -import org.signal.core.ui.Dialogs +import org.signal.core.ui.compose.Dialogs import org.signal.qr.QrScannerView import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.linkdevice.LinkDeviceRepository.LinkDeviceResult 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 d44f475f48..067d79e18d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt @@ -23,9 +23,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/QualitySelectorBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/QualitySelectorBottomSheet.kt index d72172c639..fe545fdcbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/QualitySelectorBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/QualitySelectorBottomSheet.kt @@ -27,8 +27,8 @@ 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 org.signal.core.ui.BottomSheets -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel 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 58e5eb3f58..6dc349ac39 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt @@ -46,12 +46,12 @@ 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.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.TextFields -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +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.TextFields +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R 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 0fac901b9e..0bcce732ef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt @@ -33,8 +33,8 @@ 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.BottomSheets -import org.signal.core.ui.Previews +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Previews import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.emoji.EmojiTextView 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 a8ba1a4558..2f797a934f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt @@ -37,9 +37,9 @@ 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.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment 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 083bfc6e9a..d3da49daea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt @@ -23,10 +23,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.os.bundleOf -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt b/app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt index c2b5169c5c..f05f3371fa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.res.stringResource import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState -import org.signal.core.ui.Dialogs +import org.signal.core.ui.compose.Dialogs import org.thoughtcrime.securesms.R /** 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 2c9b8d648d..87a2e4c602 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.stringResource 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.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.Scaffolds import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeDialogFragment import org.thoughtcrime.securesms.profiles.manage.EditProfileActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/qr/QrScanScreens.kt b/app/src/main/java/org/thoughtcrime/securesms/qr/QrScanScreens.kt index 28cce53e46..2914767482 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/qr/QrScanScreens.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/qr/QrScanScreens.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.viewinterop.NoOpUpdate -import org.signal.core.ui.Buttons +import org.signal.core.ui.compose.Buttons import org.signal.qr.QrScannerView import org.thoughtcrime.securesms.R 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 0b3e3fc166..9a2e7623a8 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 @@ -39,9 +39,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.os.bundleOf import androidx.core.widget.TextViewCompat -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.SignalPreview +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.getParcelableCompat import org.signal.core.util.isNotNullOrBlank import org.thoughtcrime.securesms.AvatarPreviewActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt index 20fd9c52d3..db0fe3ae2e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt @@ -59,15 +59,15 @@ import androidx.navigation.compose.dialog import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument import kotlinx.coroutines.launch -import org.signal.core.ui.Animations.navHostSlideInTransition -import org.signal.core.ui.Animations.navHostSlideOutTransition -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Dividers -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.TextFields -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Animations.navHostSlideInTransition +import org.signal.core.ui.compose.Animations.navHostSlideOutTransition +import org.signal.core.ui.compose.Buttons +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.TextFields +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.E164Util import org.signal.core.util.getParcelableExtraCompat import org.thoughtcrime.securesms.PassphraseRequiredActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/compose/GrantPermissionsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/compose/GrantPermissionsScreen.kt index 666ee3b12c..24b68c4b01 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/compose/GrantPermissionsScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/compose/GrantPermissionsScreen.kt @@ -27,8 +27,8 @@ 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.Buttons -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R @Preview diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt index 7a625d5b7f..6b5cd8b0f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.fragment.app.FragmentManager -import org.signal.core.ui.BottomSheets +import org.signal.core.ui.compose.BottomSheets import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.util.CommunicationActions 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 d0b82a5a6c..1cfd96bb1d 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 @@ -51,11 +51,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.Dividers -import org.signal.core.ui.IconButtons.IconButton -import org.signal.core.ui.Previews -import org.signal.core.ui.Scaffolds -import org.signal.core.ui.SignalPreview +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 /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountActivity.kt index 2a760e6293..16b1e0b50f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountActivity.kt @@ -45,14 +45,14 @@ import androidx.lifecycle.lifecycleScope import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.Texts -import org.signal.core.ui.horizontalGutters -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.BiometricDeviceAuthentication import org.thoughtcrime.securesms.BiometricDeviceLockContract diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt index a8c19bc34c..654020beb3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt @@ -22,9 +22,9 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.SignalPreview import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyFragment.kt index e02d9c5f7d..1f5f0fc3f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyFragment.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import org.signal.core.ui.Dialogs +import org.signal.core.ui.compose.Dialogs import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt index a2ee6e1dcc..bf7352c4c8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt @@ -48,11 +48,11 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.coroutines.launch -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters +import org.signal.core.ui.compose.BottomSheets +import org.signal.core.ui.compose.Buttons +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 import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/NoBackupToRestoreFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/NoBackupToRestoreFragment.kt index c03302793b..c1619e29fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/NoBackupToRestoreFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/NoBackupToRestoreFragment.kt @@ -24,9 +24,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.fragment.findNavController -import org.signal.core.ui.Buttons -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview +import org.signal.core.ui.compose.Buttons +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.registrationv3.ui.shared.RegistrationScreen diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt index 9c6e511345..f602800ddc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt @@ -41,11 +41,11 @@ import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +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 import org.thoughtcrime.securesms.MainActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreRow.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreRow.kt index 3c6e982df9..d3d60daa48 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreRow.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreRow.kt @@ -24,9 +24,9 @@ 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.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.theme.SignalTheme +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 /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrFragment.kt index 31635784c7..23bc1bfbe4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrFragment.kt @@ -54,12 +54,12 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch -import org.signal.core.ui.Buttons -import org.signal.core.ui.Dialogs -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Buttons +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.signal.registration.proto.RegistrationProvisionMessage import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCode diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectRestoreMethodScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectRestoreMethodScreen.kt index 5b31c3b5e7..919bf1884c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectRestoreMethodScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectRestoreMethodScreen.kt @@ -13,8 +13,8 @@ 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.SignalPreview -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.SignalPreview +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/shared/RegistrationScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/shared/RegistrationScreen.kt index 8d82be9492..922795333d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/shared/RegistrationScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/shared/RegistrationScreen.kt @@ -34,9 +34,9 @@ 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.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/RestoreWelcomeBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/RestoreWelcomeBottomSheet.kt index c76ebdb173..dfa5638013 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/RestoreWelcomeBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/RestoreWelcomeBottomSheet.kt @@ -29,10 +29,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult -import org.signal.core.ui.BottomSheets -import org.signal.core.ui.Previews -import org.signal.core.ui.SignalPreview -import org.signal.core.ui.horizontalGutters +import org.signal.core.ui.compose.BottomSheets +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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt index a6db63ae58..b6d2011865 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt @@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import org.signal.core.ui.Dialogs +import org.signal.core.ui.compose.Dialogs import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/selection/SelectRestoreMethodFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/selection/SelectRestoreMethodFragment.kt index d0963f1728..36843b28dc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/restore/selection/SelectRestoreMethodFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/restore/selection/SelectRestoreMethodFragment.kt @@ -13,7 +13,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.signal.core.ui.Dialogs +import org.signal.core.ui.compose.Dialogs import org.thoughtcrime.securesms.MainActivity import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.registrationv3.data.QuickRegistrationRepository diff --git a/core-ui/src/main/java/org/signal/core/ui/Animations.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Animations.kt similarity index 93% rename from core-ui/src/main/java/org/signal/core/ui/Animations.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Animations.kt index 4d7103b053..413f94536f 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Animations.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Animations.kt @@ -1,9 +1,9 @@ /* - * Copyright 2024 Signal Messenger, LLC + * Copyright 2025 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import androidx.compose.animation.EnterTransition import androidx.compose.animation.ExitTransition diff --git a/core-ui/src/main/java/org/signal/core/ui/BottomSheets.kt b/core-ui/src/main/java/org/signal/core/ui/compose/BottomSheets.kt similarity index 88% rename from core-ui/src/main/java/org/signal/core/ui/BottomSheets.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/BottomSheets.kt index 899a4a40a9..dd251a4149 100644 --- a/core-ui/src/main/java/org/signal/core/ui/BottomSheets.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/BottomSheets.kt @@ -1,9 +1,9 @@ /* - * Copyright 2023 Signal Messenger, LLC + * Copyright 2025 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme object BottomSheets { /** diff --git a/core-ui/src/main/java/org/signal/core/ui/Buttons.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt similarity index 98% rename from core-ui/src/main/java/org/signal/core/ui/Buttons.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt index e101e0f0be..dd44f3be0a 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Buttons.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt @@ -1,4 +1,9 @@ -package org.signal.core.ui +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.compose import androidx.annotation.DrawableRes import androidx.annotation.StringRes @@ -38,7 +43,7 @@ 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 org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme object Buttons { diff --git a/core-ui/src/main/java/org/signal/core/ui/DarkPreview.kt b/core-ui/src/main/java/org/signal/core/ui/compose/DarkPreview.kt similarity index 91% rename from core-ui/src/main/java/org/signal/core/ui/DarkPreview.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/DarkPreview.kt index fc7c3840bc..1b5a50cfe8 100644 --- a/core-ui/src/main/java/org/signal/core/ui/DarkPreview.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/DarkPreview.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import android.content.res.Configuration import androidx.compose.ui.tooling.preview.Preview diff --git a/core-ui/src/main/java/org/signal/core/ui/DelayedState.kt b/core-ui/src/main/java/org/signal/core/ui/compose/DelayedState.kt similarity index 96% rename from core-ui/src/main/java/org/signal/core/ui/DelayedState.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/DelayedState.kt index a9e1fd39c9..9c07262950 100644 --- a/core-ui/src/main/java/org/signal/core/ui/DelayedState.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/DelayedState.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt similarity index 95% rename from core-ui/src/main/java/org/signal/core/ui/Dialogs.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt index d9e9be42cb..f8cd572e15 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt @@ -1,5 +1,11 @@ -package org.signal.core.ui +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ +package org.signal.core.ui.compose + +import android.R import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -31,11 +37,11 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties -import org.signal.core.ui.Dialogs.AdvancedAlertDialog -import org.signal.core.ui.Dialogs.PermissionRationaleDialog -import org.signal.core.ui.Dialogs.SimpleAlertDialog -import org.signal.core.ui.Dialogs.SimpleMessageDialog -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.Dialogs.AdvancedAlertDialog +import org.signal.core.ui.compose.Dialogs.PermissionRationaleDialog +import org.signal.core.ui.compose.Dialogs.SimpleAlertDialog +import org.signal.core.ui.compose.Dialogs.SimpleMessageDialog +import org.signal.core.ui.compose.theme.SignalTheme object Dialogs { @@ -352,7 +358,7 @@ object Dialogs { private fun PermissionRationaleDialogPreview() { Previews.Preview { PermissionRationaleDialog( - icon = painterResource(id = android.R.drawable.ic_menu_camera), + icon = painterResource(id = R.drawable.ic_menu_camera), rationale = "This is rationale text about why we need permission.", confirm = "Continue", dismiss = "Not now", diff --git a/core-ui/src/main/java/org/signal/core/ui/Dividers.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt similarity index 89% rename from core-ui/src/main/java/org/signal/core/ui/Dividers.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt index d489ed6fff..692b805987 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Dividers.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt @@ -1,4 +1,9 @@ -package org.signal.core.ui +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.compose import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -14,7 +19,7 @@ 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.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme /** * Thin divider lines for separating content. diff --git a/core-ui/src/main/java/org/signal/core/ui/DropdownMenus.kt b/core-ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt similarity index 92% rename from core-ui/src/main/java/org/signal/core/ui/DropdownMenus.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt index 5ec88baff5..0c3c2380d7 100644 --- a/core-ui/src/main/java/org/signal/core/ui/DropdownMenus.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt @@ -1,9 +1,9 @@ /* - * Copyright 2024 Signal Messenger, LLC + * Copyright 2025 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.PaddingValues @@ -20,7 +20,8 @@ import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp -import org.signal.core.ui.copied.androidx.compose.material3.DropdownMenu +import org.signal.core.ui.R +import org.signal.core.ui.compose.copied.androidx.compose.material3.DropdownMenu /** * Properly styled dropdown menus and items. diff --git a/core-ui/src/main/java/org/signal/core/ui/IconButtons.kt b/core-ui/src/main/java/org/signal/core/ui/compose/IconButtons.kt similarity index 94% rename from core-ui/src/main/java/org/signal/core/ui/IconButtons.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/IconButtons.kt index 6ae9563474..bbb7de86f6 100644 --- a/core-ui/src/main/java/org/signal/core/ui/IconButtons.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/IconButtons.kt @@ -1,9 +1,9 @@ /* - * Copyright 2024 Signal Messenger, LLC + * Copyright 2025 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -27,8 +27,8 @@ import androidx.compose.ui.graphics.Shape import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.signal.core.ui.copied.androidx.compose.material3.IconButtonColors -import org.signal.core.ui.copied.androidx.compose.material3.IconToggleButtonColors +import org.signal.core.ui.compose.copied.androidx.compose.material3.IconButtonColors +import org.signal.core.ui.compose.copied.androidx.compose.material3.IconToggleButtonColors object IconButtons { diff --git a/core-ui/src/main/java/org/signal/core/ui/Icons.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt similarity index 90% rename from core-ui/src/main/java/org/signal/core/ui/Icons.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt index 397871cd41..452e789292 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Icons.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt @@ -1,10 +1,11 @@ /* - * Copyright 2024 Signal Messenger, LLC + * Copyright 2025 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose +import android.R import androidx.compose.material3.Icon import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -49,7 +50,7 @@ object Icons { private fun BrushedForegroundPreview() { Previews.Preview { Icons.BrushedForeground( - painter = painterResource(id = android.R.drawable.ic_menu_camera), + painter = painterResource(id = R.drawable.ic_menu_camera), contentDescription = null, foregroundBrush = Brush.linearGradient(listOf(Color.Red, Color.Blue)) ) diff --git a/core-ui/src/main/java/org/signal/core/ui/ModifierExtensions.kt b/core-ui/src/main/java/org/signal/core/ui/compose/ModifierExtensions.kt similarity index 82% rename from core-ui/src/main/java/org/signal/core/ui/ModifierExtensions.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/ModifierExtensions.kt index f254aa4fec..fe07bf9c62 100644 --- a/core-ui/src/main/java/org/signal/core/ui/ModifierExtensions.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/ModifierExtensions.kt @@ -1,15 +1,16 @@ /* - * Copyright 2024 Signal Messenger, LLC + * Copyright 2025 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.unit.Dp +import org.signal.core.ui.R /** * Applies sensible horizontal padding to the given component. diff --git a/core-ui/src/main/java/org/signal/core/ui/Previews.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Previews.kt similarity index 84% rename from core-ui/src/main/java/org/signal/core/ui/Previews.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Previews.kt index 8adaa4cf0a..1f3fd252b1 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Previews.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Previews.kt @@ -1,16 +1,16 @@ /* - * Copyright 2024 Signal Messenger, LLC + * Copyright 2025 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme object Previews { @Composable diff --git a/core-ui/src/main/java/org/signal/core/ui/Rows.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt similarity index 98% rename from core-ui/src/main/java/org/signal/core/ui/Rows.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt index f9d386f232..5b3151d4b7 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Rows.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt @@ -1,4 +1,9 @@ -package org.signal.core.ui +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.compose import androidx.compose.animation.AnimatedContent import androidx.compose.animation.core.tween @@ -38,7 +43,8 @@ import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp -import org.signal.core.ui.Rows.TextAndLabel +import org.signal.core.ui.R +import org.signal.core.ui.compose.Rows.TextAndLabel object Rows { diff --git a/core-ui/src/main/java/org/signal/core/ui/Scaffolds.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt similarity index 95% rename from core-ui/src/main/java/org/signal/core/ui/Scaffolds.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt index 609c688316..70ca973c4c 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Scaffolds.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt @@ -1,4 +1,9 @@ -package org.signal.core.ui +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.compose import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues @@ -25,7 +30,7 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.SignalTheme @OptIn(ExperimentalMaterial3Api::class) object Scaffolds { diff --git a/core-ui/src/main/java/org/signal/core/ui/SignalPreview.kt b/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreview.kt similarity index 92% rename from core-ui/src/main/java/org/signal/core/ui/SignalPreview.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/SignalPreview.kt index ec457432cd..18d0081695 100644 --- a/core-ui/src/main/java/org/signal/core/ui/SignalPreview.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreview.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import android.content.res.Configuration import androidx.compose.ui.tooling.preview.Preview diff --git a/core-ui/src/main/java/org/signal/core/ui/Snackbars.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt similarity index 91% rename from core-ui/src/main/java/org/signal/core/ui/Snackbars.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt index 5a5ad104a8..2cbc3c05fa 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Snackbars.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt @@ -1,9 +1,9 @@ /* - * Copyright 2024 Signal Messenger, LLC + * Copyright 2025 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import android.content.res.Configuration import androidx.compose.material3.Snackbar @@ -15,8 +15,8 @@ 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.theme.LocalSnackbarColors -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.compose.theme.LocalSnackbarColors +import org.signal.core.ui.compose.theme.SignalTheme /** * Properly themed Snackbars. Since these use internal color state, we need to diff --git a/core-ui/src/main/java/org/signal/core/ui/TextFields.kt b/core-ui/src/main/java/org/signal/core/ui/compose/TextFields.kt similarity index 99% rename from core-ui/src/main/java/org/signal/core/ui/TextFields.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/TextFields.kt index fb6ff99067..8fc84f60d9 100644 --- a/core-ui/src/main/java/org/signal/core/ui/TextFields.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/TextFields.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/core-ui/src/main/java/org/signal/core/ui/Texts.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Texts.kt similarity index 92% rename from core-ui/src/main/java/org/signal/core/ui/Texts.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/Texts.kt index c95089872a..efcca515ef 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Texts.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/Texts.kt @@ -1,4 +1,9 @@ -package org.signal.core.ui +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.compose import android.text.Spanned import android.text.style.URLSpan @@ -16,7 +21,8 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.text.getSpans -import org.signal.core.ui.theme.SignalTheme +import org.signal.core.ui.R +import org.signal.core.ui.compose.theme.SignalTheme object Texts { /** diff --git a/core-ui/src/main/java/org/signal/core/ui/TriggerAlignedPopup.kt b/core-ui/src/main/java/org/signal/core/ui/compose/TriggerAlignedPopup.kt similarity index 99% rename from core-ui/src/main/java/org/signal/core/ui/TriggerAlignedPopup.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/TriggerAlignedPopup.kt index 29771e955d..876577cb3c 100644 --- a/core-ui/src/main/java/org/signal/core/ui/TriggerAlignedPopup.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/TriggerAlignedPopup.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui +package org.signal.core.ui.compose import android.graphics.drawable.ColorDrawable import androidx.compose.runtime.Composable diff --git a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/DragAndDrop.kt b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragAndDrop.kt similarity index 99% rename from core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/DragAndDrop.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragAndDrop.kt index c767318fb1..0a2d7da648 100644 --- a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/DragAndDrop.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragAndDrop.kt @@ -1,4 +1,4 @@ -package org.signal.core.ui.copied.androidx.compose +package org.signal.core.ui.compose.copied.androidx.compose import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.Spring diff --git a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/DragGestureDetector.kt b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragGestureDetector.kt similarity index 98% rename from core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/DragGestureDetector.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragGestureDetector.kt index 1b220667be..fc02c742cc 100644 --- a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/DragGestureDetector.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragGestureDetector.kt @@ -1,4 +1,4 @@ -package org.signal.core.ui.copied.androidx.compose +package org.signal.core.ui.compose.copied.androidx.compose import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown diff --git a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/AndroidMenu.android.kt b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/AndroidMenu.android.kt similarity index 96% rename from core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/AndroidMenu.android.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/AndroidMenu.android.kt index e80759e5a8..a97e689cb7 100644 --- a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/AndroidMenu.android.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/AndroidMenu.android.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui.copied.androidx.compose.material3 +package org.signal.core.ui.compose.copied.androidx.compose.material3 import androidx.compose.animation.core.MutableTransitionState import androidx.compose.foundation.layout.ColumnScope diff --git a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/IconButton.kt b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/IconButton.kt similarity index 98% rename from core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/IconButton.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/IconButton.kt index e2a290b553..4f4149fcd3 100644 --- a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/IconButton.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/IconButton.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui.copied.androidx.compose.material3 +package org.signal.core.ui.compose.copied.androidx.compose.material3 import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable diff --git a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/Menu.kt b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/Menu.kt similarity index 99% rename from core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/Menu.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/Menu.kt index 7b9dc93deb..458d186760 100644 --- a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/Menu.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/Menu.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui.copied.androidx.compose.material3 +package org.signal.core.ui.compose.copied.androidx.compose.material3 import androidx.compose.animation.core.LinearOutSlowInEasing import androidx.compose.animation.core.MutableTransitionState diff --git a/core-ui/src/main/java/org/signal/core/ui/theme/ExtendedColors.kt b/core-ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt similarity index 97% rename from core-ui/src/main/java/org/signal/core/ui/theme/ExtendedColors.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt index 7c7a8db8aa..a7c5677813 100644 --- a/core-ui/src/main/java/org/signal/core/ui/theme/ExtendedColors.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt @@ -1,4 +1,4 @@ -package org.signal.core.ui.theme +package org.signal.core.ui.compose.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core-ui/src/main/java/org/signal/core/ui/theme/SignalTheme.kt b/core-ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt similarity index 99% rename from core-ui/src/main/java/org/signal/core/ui/theme/SignalTheme.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt index bd3615c312..a87891789b 100644 --- a/core-ui/src/main/java/org/signal/core/ui/theme/SignalTheme.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt @@ -1,4 +1,4 @@ -package org.signal.core.ui.theme +package org.signal.core.ui.compose.theme import android.content.res.Configuration import androidx.compose.foundation.layout.Column diff --git a/core-ui/src/main/java/org/signal/core/ui/theme/SnackbarColors.kt b/core-ui/src/main/java/org/signal/core/ui/compose/theme/SnackbarColors.kt similarity index 95% rename from core-ui/src/main/java/org/signal/core/ui/theme/SnackbarColors.kt rename to core-ui/src/main/java/org/signal/core/ui/compose/theme/SnackbarColors.kt index f0e6087607..b9cd138b40 100644 --- a/core-ui/src/main/java/org/signal/core/ui/theme/SnackbarColors.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/theme/SnackbarColors.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.signal.core.ui.theme +package org.signal.core.ui.compose.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DialogExtensions.kt b/core-ui/src/main/java/org/signal/core/ui/view/DialogExtensions.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/util/DialogExtensions.kt rename to core-ui/src/main/java/org/signal/core/ui/view/DialogExtensions.kt index b59a92b358..b739bf513a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DialogExtensions.kt +++ b/core-ui/src/main/java/org/signal/core/ui/view/DialogExtensions.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.thoughtcrime.securesms.util +package org.signal.core.ui.view import androidx.appcompat.app.AlertDialog import kotlinx.coroutines.suspendCancellableCoroutine