diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt index 148fc34777..6f458870aa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt @@ -85,6 +85,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.Snackbars +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getSerializableCompat import org.signal.core.util.logging.Log @@ -113,7 +114,6 @@ import org.thoughtcrime.securesms.components.snackbars.SnackbarHostKey import org.thoughtcrime.securesms.components.snackbars.SnackbarState import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.ConversationIntents import org.thoughtcrime.securesms.conversation.NewConversationActivity import org.thoughtcrime.securesms.conversation.v2.MotionEventRelay 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 24944b159a..a18365b69a 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 @@ -44,8 +44,8 @@ import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.signal.core.ui.compose.horizontalGutters +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.SignalTheme import org.signal.core.ui.R as CoreUiR enum class MessageBackupsKeyEducationScreenMode { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt index 72815b617a..ed4a7e2172 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt @@ -24,11 +24,11 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.ui.subscription.EnterKeyScreen import org.thoughtcrime.securesms.components.compose.rememberBiometricsAuthentication -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.CommunicationActions import kotlin.random.Random 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 eb528fd63c..31131bffa4 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 @@ -35,6 +35,7 @@ import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.SignalIcons 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 @@ -42,7 +43,6 @@ import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImage112 import org.thoughtcrime.securesms.components.settings.app.subscription.manage.ManageDonationsFragment import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.database.InAppPaymentTable import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.CommunicationActions 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 03a8dae61e..759152d24a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt @@ -15,8 +15,8 @@ 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.compose.theme.SignalTheme import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.compose.SignalTheme /** * A class that can be instantiated with a list of [Flow]s that produce [Banner]s, then applied to a [ComposeView], typically within a [Fragment]. diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsActivity.kt index 89767188a4..0b8e9c647c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsActivity.kt @@ -13,9 +13,9 @@ import androidx.activity.enableEdgeToEdge import androidx.compose.runtime.remember import androidx.core.os.bundleOf import androidx.fragment.app.FragmentActivity +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.getParcelableExtraCompat import org.thoughtcrime.securesms.calls.links.EditCallLinkNameDialogFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.main.MainNavigationDetailLocation import org.thoughtcrime.securesms.main.MainNavigationListLocation import org.thoughtcrime.securesms.main.MainNavigationRouter diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt index 7a868442d2..725a5dc56b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt @@ -36,12 +36,12 @@ import org.signal.core.ui.compose.AllDevicePreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.DropdownMenus import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.calls.new.NewCallUiState.CallType import org.thoughtcrime.securesms.calls.new.NewCallUiState.UserMessage import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.recipients.ui.RecipientLookupFailureMessage import org.thoughtcrime.securesms.recipients.ui.RecipientPicker import org.thoughtcrime.securesms.recipients.ui.RecipientPickerCallbacks diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/ActionModeTopBarView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/ActionModeTopBarView.kt index f7d7cfa948..d3cb86bb81 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/ActionModeTopBarView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/ActionModeTopBarView.kt @@ -16,7 +16,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.AbstractComposeView -import org.thoughtcrime.securesms.compose.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/components/settings/app/internal/InternalStoryDialogLauncherFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalStoryDialogLauncherFragment.kt index f7834443b9..aec02ed08b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalStoryDialogLauncherFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalStoryDialogLauncherFragment.kt @@ -14,9 +14,9 @@ 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.SignalIcons +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.stories.dialogs.StoryDialogs import org.thoughtcrime.securesms.util.DynamicTheme diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt index 341152aace..4625bcc206 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt @@ -24,11 +24,11 @@ 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.SignalIcons +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.donations.StripeDeclineCode import org.thoughtcrime.securesms.badges.models.Badge import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation import org.thoughtcrime.securesms.compose.ComposeFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.util.DynamicTheme /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsFragment.kt index 024e36aefb..adbd19252a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsFragment.kt @@ -34,9 +34,9 @@ import org.signal.core.ui.compose.Rows import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.signal.core.ui.compose.horizontalGutters +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason import org.thoughtcrime.securesms.groups.ui.GroupErrors import org.thoughtcrime.securesms.util.DynamicTheme 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 6c086ce3af..b9cacc5698 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 @@ -61,12 +61,12 @@ import org.signal.core.ui.compose.Rows.TextAndLabel import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons 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 import org.thoughtcrime.securesms.billing.upgrade.UpgradeToPaidTierBottomSheet import org.thoughtcrime.securesms.compose.ComposeFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.database.MediaTable import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration import org.thoughtcrime.securesms.keyvalue.SignalStore 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 b5dc896069..6dbc950b6e 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 @@ -38,11 +38,11 @@ import com.google.accompanist.permissions.rememberPermissionState import io.reactivex.rxjava3.disposables.CompositeDisposable import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.SignalIcons +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableExtraCompat import org.signal.core.util.permissions.PermissionCompat import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId 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 53120e6ac7..377cfc9437 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 @@ -56,12 +56,12 @@ import org.signal.core.ui.compose.NightPreview import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows import org.signal.core.ui.compose.SignalIcons +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 import org.thoughtcrime.securesms.components.AvatarImageView import org.thoughtcrime.securesms.components.webrtc.v2.WebRtcCallViewModel -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.colors.AvatarColor import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.events.CallParticipant 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 f8c260d58d..fa4f784dc8 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,10 +45,10 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.delay import kotlinx.coroutines.flow.map +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.ringrtc.GroupCall import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.webrtc.v2.WebRtcCallViewModel -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.events.CallParticipant import org.thoughtcrime.securesms.events.GroupCallRaiseHandEvent 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 368d0e0602..d5b4b680b6 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 @@ -55,11 +55,11 @@ import org.signal.core.ui.compose.AllNightPreviews 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.ui.compose.theme.SignalTheme import org.signal.core.util.DimensionUnit import org.thoughtcrime.securesms.components.emoji.EmojiStrings import org.thoughtcrime.securesms.components.webrtc.WebRtcLocalRenderState import org.thoughtcrime.securesms.components.webrtc.controls.RaiseHandSnackbar -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette import org.thoughtcrime.securesms.events.CallParticipant import org.thoughtcrime.securesms.events.CallParticipantId diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenJoiningOverlay.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenJoiningOverlay.kt index 835d61a85f..3e46db3ef5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenJoiningOverlay.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenJoiningOverlay.kt @@ -33,8 +33,8 @@ import androidx.compose.ui.unit.dp import androidx.window.core.layout.WindowSizeClass import org.signal.core.ui.compose.AllNightPreviews import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.events.CallParticipant import org.thoughtcrime.securesms.recipients.Recipient diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenPreJoinOverlay.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenPreJoinOverlay.kt index 61902b00c6..f88cc103a1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenPreJoinOverlay.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreenPreJoinOverlay.kt @@ -48,9 +48,9 @@ import org.signal.core.ui.compose.AllNightPreviews import org.signal.core.ui.compose.NightPreview import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.SignalIcons +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.events.CallParticipant import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.rememberRecipientField 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 44d7f890d6..2cb2e42c35 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 @@ -31,6 +31,7 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import org.signal.core.ui.compose.rememberIsInPipMode +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R @@ -41,7 +42,6 @@ import org.thoughtcrime.securesms.components.webrtc.WebRtcControls import org.thoughtcrime.securesms.components.webrtc.controls.CallInfoView import org.thoughtcrime.securesms.components.webrtc.controls.ControlsAndInfoViewModel import org.thoughtcrime.securesms.components.webrtc.controls.RaiseHandSnackbar -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.events.WebRtcViewModel import org.thoughtcrime.securesms.keyvalue.SignalStore 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 f4748e0a8e..a144637b9a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt @@ -12,6 +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.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 5945ebb761..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,6 +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.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 4f6cc25481..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,6 +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.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 a29b0b4cda..db0f8518f8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFullScreenDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFullScreenDialogFragment.kt @@ -9,6 +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.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.util.DynamicTheme import org.thoughtcrime.securesms.util.WindowUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/SignalTheme.kt b/app/src/main/java/org/thoughtcrime/securesms/compose/SignalTheme.kt deleted file mode 100644 index ba4341201e..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/SignalTheme.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2025 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.thoughtcrime.securesms.compose - -import android.content.res.Configuration -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.ui.platform.LocalConfiguration -import androidx.compose.ui.platform.LocalContext -import org.signal.core.ui.compose.theme.ExtendedColors -import org.thoughtcrime.securesms.util.TextSecurePreferences - -private typealias CoreSignalTheme = org.signal.core.ui.compose.theme.SignalTheme - -@Composable -fun SignalTheme( - isDarkMode: Boolean = LocalConfiguration.current.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES, - content: @Composable () -> Unit -) { - val context = LocalContext.current - val incognitoKeyboardEnabled = remember { - TextSecurePreferences.isIncognitoKeyboardEnabled(context) - } - - org.signal.core.ui.compose.theme.SignalTheme( - isDarkMode = isDarkMode, - incognitoKeyboardEnabled = incognitoKeyboardEnabled, - content = content - ) -} - -object SignalTheme { - val colors: ExtendedColors - @Composable - get() = CoreSignalTheme.colors -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt index c3914265e2..140f5019c2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt @@ -42,11 +42,11 @@ import org.signal.core.ui.compose.AllDevicePreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.DropdownMenus import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.BlockUnblockDialog import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.NewConversationUiState.UserMessage import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity import org.thoughtcrime.securesms.recipients.Recipient diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt index aced935b6b..5e7dc64299 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt @@ -49,9 +49,9 @@ import androidx.compose.ui.unit.sp import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.compose.RoundCheckbox -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.polls.PollOption import org.thoughtcrime.securesms.polls.PollRecord diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt index 1ac7db2b90..9624367e72 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt @@ -17,13 +17,13 @@ import androidx.appcompat.widget.LinearLayoutCompat import androidx.compose.ui.platform.ComposeView import androidx.core.transition.addListener import androidx.interpolator.view.animation.FastOutSlowInInterpolator +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.ui.view.Stub import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.banner.Banner import org.thoughtcrime.securesms.banner.BannerManager import org.thoughtcrime.securesms.components.identity.UnverifiedBannerView import org.thoughtcrime.securesms.components.voice.VoiceNotePlayerView -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.ConversationMessage import org.thoughtcrime.securesms.database.identity.IdentityRecordList import org.thoughtcrime.securesms.database.model.IdentityRecord diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt index e06fbfd29c..a9f74cdcc6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt @@ -35,6 +35,7 @@ import org.signal.core.ui.compose.AllDevicePreviews 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.theme.SignalTheme import org.signal.core.util.getParcelableArrayListExtraCompat import org.signal.core.util.getParcelableExtraCompat import org.signal.core.util.nullIfBlank @@ -42,7 +43,6 @@ import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.PushContactSelectionActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsEvent -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.contacts.SelectedContact import org.thoughtcrime.securesms.database.model.GroupRecord import org.thoughtcrime.securesms.groups.GroupId diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt index de38063ad9..7805c385b2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt @@ -29,11 +29,11 @@ import org.signal.core.ui.compose.AllDevicePreviews 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.theme.SignalTheme import org.signal.core.util.getParcelableArrayListExtraCompat import org.signal.core.util.getParcelableExtraCompat import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.contacts.SelectedContact import org.thoughtcrime.securesms.groups.SelectionLimits import org.thoughtcrime.securesms.groups.ui.GroupErrors diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt index 8f80a8f3bf..5dd3b50382 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt @@ -45,9 +45,9 @@ import org.signal.core.ui.compose.AllDevicePreviews 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.theme.SignalTheme import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.contacts.SelectedContact import org.thoughtcrime.securesms.groups.SelectionLimits import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupUiState.NavTarget diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/incommon/GroupsInCommonActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/incommon/GroupsInCommonActivity.kt index c32e84d08b..c60a944e0c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/incommon/GroupsInCommonActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/incommon/GroupsInCommonActivity.kt @@ -43,11 +43,11 @@ import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.getParcelableExtraCompat import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.compose.StatusBarColorNestedScrollConnection import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt index 64ac0f7819..161e6c5720 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt @@ -51,9 +51,9 @@ import kotlinx.coroutines.withContext import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.IconButtons import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.emoji.Emojifier -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.main.EmptyMegaphoneActionController import org.thoughtcrime.securesms.megaphone.Megaphones.Event import org.thoughtcrime.securesms.util.DynamicTheme 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 3700ba23d5..6c8a190797 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt @@ -45,11 +45,11 @@ 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.SignalIcons +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme import org.thoughtcrime.securesms.util.viewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/UpgradeLocalBackupCard.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/UpgradeLocalBackupCard.kt index 6f8932bff3..11a0599329 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/UpgradeLocalBackupCard.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/UpgradeLocalBackupCard.kt @@ -24,8 +24,8 @@ import androidx.compose.ui.unit.dp import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.SignalTheme object UpgradeLocalBackupCard { 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 3052457e02..f6e2bcfae1 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 @@ -68,12 +68,12 @@ import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons 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 import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameQrScannerActivity -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.invites.InviteActions import org.thoughtcrime.securesms.phonenumbers.PhoneNumberVisualTransformation import org.thoughtcrime.securesms.recipients.RecipientId diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/QuickTransferOldDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/QuickTransferOldDeviceActivity.kt index b3c0a79c9d..677bc925a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/QuickTransferOldDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/QuickTransferOldDeviceActivity.kt @@ -21,6 +21,7 @@ import androidx.navigationevent.compose.LocalNavigationEventDispatcherOwner import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch +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 @@ -28,7 +29,6 @@ import org.thoughtcrime.securesms.MainActivity import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActivity import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt index 106ffb71c8..bebad8f1aa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt @@ -61,10 +61,10 @@ import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.SignalIcons import org.signal.core.ui.compose.horizontalGutters +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCode import org.thoughtcrime.securesms.compose.ComposeFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt index 8a0c384ff3..e19a74b190 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt @@ -64,6 +64,7 @@ import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.SignalIcons +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.ThreadUtil import org.signal.core.util.bytes import org.thoughtcrime.securesms.BaseActivity @@ -77,7 +78,6 @@ import org.thoughtcrime.securesms.components.contactsupport.ContactSupportCallba import org.thoughtcrime.securesms.components.contactsupport.ContactSupportDialog import org.thoughtcrime.securesms.components.contactsupport.ContactSupportViewModel import org.thoughtcrime.securesms.components.contactsupport.SendSupportEmailEffect -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt index 6c72cb4a7a..865a2d423d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt @@ -65,12 +65,12 @@ import org.signal.core.ui.compose.DropdownMenus import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.SignalIcons 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 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeData import org.thoughtcrime.securesms.compose.ComposeFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/InternalNewLocalRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/InternalNewLocalRestoreActivity.kt index 7ec5f62a3f..f555d7db04 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/InternalNewLocalRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/InternalNewLocalRestoreActivity.kt @@ -31,6 +31,7 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.Result import org.signal.libsignal.zkgroup.profiles.ProfileKey import org.thoughtcrime.securesms.BaseActivity @@ -40,7 +41,6 @@ import org.thoughtcrime.securesms.backup.v2.RestoreV2Event import org.thoughtcrime.securesms.backup.v2.local.ArchiveFileSystem import org.thoughtcrime.securesms.backup.v2.local.LocalArchiver import org.thoughtcrime.securesms.backup.v2.local.SnapshotFileSystem -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle import org.thoughtcrime.securesms.database.model.databaseprotos.RestoreDecisionState import org.thoughtcrime.securesms.dependencies.AppDependencies diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt index c6981baca1..417a1f8e0f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementActivity.kt @@ -17,9 +17,9 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import kotlinx.coroutines.launch import org.signal.core.ui.compose.copied.androidx.compose.DragAndDropEvent +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs import org.thoughtcrime.securesms.database.model.StickerPackId diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt index 797b291a99..1ad8cd8e3e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt @@ -53,13 +53,13 @@ import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons +import org.signal.core.ui.compose.theme.SignalTheme import org.signal.core.util.orNull import org.signal.core.util.toOptional import org.signal.glide.compose.GlideImage import org.signal.glide.decryptableuri.DecryptableUri import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs import org.thoughtcrime.securesms.database.model.StickerPackId diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/custom/PrivateStorySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/custom/PrivateStorySettingsFragment.kt index 893c6d7c41..e74a0c921a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/custom/PrivateStorySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/custom/PrivateStorySettingsFragment.kt @@ -36,11 +36,11 @@ import org.signal.core.ui.compose.Rows import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.signal.core.ui.compose.Texts +import org.signal.core.ui.compose.theme.SignalTheme import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage import org.thoughtcrime.securesms.components.WrapperDialogFragment import org.thoughtcrime.securesms.compose.ComposeFragment -import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.database.model.DistributionListId import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode import org.thoughtcrime.securesms.database.model.DistributionListRecord diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt b/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt index c6a7a49532..fac68475a5 100644 --- a/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt +++ b/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt @@ -1,7 +1,6 @@ package org.signal.core.ui.compose.theme import android.content.res.Configuration -import androidx.annotation.Discouraged import androidx.compose.foundation.layout.Column import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -187,7 +186,6 @@ private val darkSnackbarColors = SnackbarColors( dismissActionContentColor = darkColorScheme.onSurfaceVariant ) -@Discouraged("Use org.thoughtcrime.securesms.compose.SignalTheme instead.") @Composable fun SignalTheme( isDarkMode: Boolean = LocalConfiguration.current.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES, @@ -268,7 +266,6 @@ private fun TypographyPreview() { } } -@Discouraged("Use org.thoughtcrime.securesms.compose.SignalTheme instead.") object SignalTheme { val colors: ExtendedColors @Composable