From 6e92ff5096acc62277674a65092929a6a4e1a30d Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 6 Feb 2026 12:29:27 -0400 Subject: [PATCH] Move fragments to core UI. --- .../InternalConversationSpringboardFragment.kt | 2 +- .../securesms/ContactSelectionListFragment.java | 1 + .../org/thoughtcrime/securesms/InviteFragment.kt | 2 +- .../org/thoughtcrime/securesms/MainActivity.kt | 2 +- .../org/thoughtcrime/securesms/MainFragment.java | 2 ++ .../backup/v2/ui/DownloadYourBackupTodayDialog.kt | 2 +- .../ui/subscription/MessageBackupsFlowFragment.kt | 2 +- .../ui/verify/ConfirmBackupKeyDisplayFragment.kt | 2 +- .../v2/ui/verify/ForgotBackupKeyFragment.kt | 2 +- .../calls/links/EditCallLinkNameDialogFragment.kt | 2 +- .../components/compose/ActionModeTopBarView.kt | 3 +-- .../ContactSupportDialogFragment.kt | 2 +- .../components/settings/DSLSettingsFragment.kt | 2 +- .../settings/app/AppSettingsFragment.kt | 2 +- .../app/account/AccountSettingsFragment.kt | 2 +- .../account/export/ExportAccountDataFragment.kt | 2 +- .../app/appearance/AppearanceSettingsFragment.kt | 2 +- .../appicon/AppIconSelectionFragment.kt | 2 +- .../appearance/appicon/AppIconTutorialFragment.kt | 2 +- .../app/backups/BackupsSettingsFragment.kt | 2 +- .../local/InternalNewLocalBackupCreateFragment.kt | 2 +- .../app/backups/local/LocalBackupsFragment.kt | 2 +- .../backups/remote/BackupKeyDisplayFragment.kt | 2 +- .../remote/RemoteBackupsSettingsFragment.kt | 2 +- .../ChangeNumberAccountLockedFragment.kt | 2 +- .../changenumber/ChangeNumberConfirmFragment.kt | 2 +- .../ChangeNumberCountryCodeFragment.kt | 2 +- .../changenumber/ChangeNumberEnterCodeFragment.kt | 2 +- .../ChangeNumberEnterPhoneNumberFragment.kt | 2 +- .../app/changenumber/ChangeNumberFragment.kt | 2 +- .../ChangeNumberPinDiffersFragment.kt | 2 +- .../ChangeNumberRegistrationLockFragment.kt | 2 +- .../changenumber/ChangeNumberVerifyFragment.kt | 2 +- .../settings/app/chats/ChatsSettingsFragment.kt | 2 +- .../app/chats/folders/ChatFoldersFragment.kt | 2 +- .../app/chats/folders/ChooseChatsFragment.kt | 2 +- .../app/chats/folders/CreateFoldersFragment.kt | 2 +- .../app/data/DataAndStorageSettingsFragment.kt | 2 +- .../settings/app/help/HelpSettingsFragment.kt | 2 +- .../settings/app/help/LicenseFragment.kt | 2 +- ...PendingOneTimeDonationConfigurationFragment.kt | 2 +- .../InternalStoryDialogLauncherFragment.kt | 6 ++---- ...ternalTerminalDonationConfigurationFragment.kt | 2 +- .../backup/InternalBackupPlaygroundFragment.kt | 2 +- .../dataseeding/DataSeedingPlaygroundFragment.kt | 2 +- .../InternalDonorErrorConfigurationFragment.kt | 6 ++---- .../app/internal/search/InternalSearchFragment.kt | 2 +- .../sqlite/InternalSqlitePlaygroundFragment.kt | 2 +- .../InternalStorageServicePlaygroundFragment.kt | 2 +- .../internal/svr/InternalSvrPlaygroundFragment.kt | 2 +- .../NotificationsSettingsFragment.kt | 2 +- .../profiles/AddAllowedMembersFragment.kt | 2 +- .../EditNotificationProfileScheduleFragment.kt | 2 +- .../NotificationProfileCreatedFragment.kt | 2 +- .../profiles/NotificationProfilesFragment.kt | 2 +- .../profiles/SelectRecipientsFragment.kt | 2 +- .../advanced/AdvancedPrivacySettingsFragment.kt | 2 +- .../privacy/expire/ExpireTimerSettingsFragment.kt | 5 ++--- .../pnp/PhoneNumberPrivacySettingsFragment.kt | 2 +- .../screenlock/ScreenLockSettingsFragment.kt | 2 +- .../app/storage/ManageStorageSettingsFragment.kt | 2 +- .../details/BankTransferDetailsFragment.kt | 2 +- .../ideal/IdealTransferDetailsFragment.kt | 2 +- .../mandate/BankTransferMandateFragment.kt | 2 +- .../app/updates/AppUpdatesSettingsFragment.kt | 2 +- .../UsernameLinkQrColorPickerFragment.kt | 2 +- .../main/UsernameLinkSettingsFragment.kt | 2 +- .../main/UsernameQrScannerActivity.kt | 4 +--- .../InternalConversationSettingsFragment.kt | 2 +- .../compose/ComposeBottomSheetDialogFragment.kt | 13 ++++++++----- .../compose/ComposeFullScreenDialogFragment.kt | 6 +----- .../clicklisteners/PollVotesFragment.kt | 2 +- .../ui/mentions/MentionsPickerFragment.java | 2 +- .../ui/mentions/MentionsPickerFragmentV2.kt | 2 +- .../conversation/v2/ConversationBannerView.kt | 3 +-- .../conversation/v2/ConversationFragment.kt | 2 +- .../conversation/v2/CreatePollFragment.kt | 2 +- .../v2/keyboard/AttachmentKeyboardFragment.kt | 2 +- .../delete/DeleteAccountCountryCodeFragment.kt | 2 +- .../DeviceTransferSetupFragment.java | 2 +- .../NewDeviceTransferCompleteFragment.java | 2 +- .../NewDeviceTransferInstructionsFragment.kt | 2 +- .../OldDeviceTransferCompleteFragment.java | 2 +- .../OldDeviceTransferInstructionsFragment.java | 2 +- .../groups/memberlabel/MemberLabelFragment.kt | 2 +- .../details/AddGroupDetailsFragment.java | 2 +- .../thoughtcrime/securesms/help/HelpFragment.java | 2 +- .../keyboard/gif/GifKeyboardPageFragment.kt | 2 +- .../sticker/StickerKeyboardPageFragment.kt | 2 +- .../securesms/linkdevice/AddLinkDeviceFragment.kt | 2 +- .../linkdevice/EditDeviceNameFragment.kt | 2 +- .../securesms/linkdevice/LinkDeviceFragment.kt | 2 +- .../securesms/lock/v2/BaseSvrPinFragment.java | 2 +- .../mediaoverview/MediaOverviewPageFragment.java | 2 +- .../mediapreview/MediaPreviewV2Fragment.kt | 2 +- .../securesms/mediasend/Camera1Fragment.java | 2 +- .../mediasend/CameraContactSelectionFragment.java | 2 +- .../securesms/mediasend/CameraXFragment.kt | 2 +- .../securesms/megaphone/MegaphoneComponent.kt | 3 +-- .../payments/create/CreatePaymentFragment.java | 2 +- .../payments/create/EditNoteFragment.java | 2 +- .../PaymentRecipientSelectionFragment.java | 2 +- .../preferences/PaymentsAllActivityFragment.java | 2 +- .../preferences/PaymentsHomeFragment.java | 2 +- .../preferences/PaymentsPagerItemFragment.java | 2 +- .../payments/preferences/SetCurrencyFragment.java | 2 +- .../addmoney/PaymentsAddMoneyFragment.java | 2 +- .../details/PaymentDetailsFragment.java | 2 +- .../transfer/PaymentsTransferFragment.java | 2 +- .../transfer/PaymentsTransferQrScanFragment.java | 2 +- .../securesms/pin/PinRestoreEntryFragment.java | 2 +- .../securesms/pin/PinRestoreLockedFragment.java | 2 +- .../preferences/AdvancedPinSettingsFragment.kt | 2 +- .../profiles/edit/CreateProfileFragment.java | 2 +- .../profiles/manage/EditProfileFragment.kt | 2 +- .../profiles/manage/UsernameEditFragment.java | 2 +- .../username/NewWaysToConnectDialogFragment.kt | 2 +- .../reactions/edit/EditReactionsFragment.kt | 2 +- .../ui/accountlocked/AccountLockedFragment.kt | 2 +- .../registration/ui/captcha/CaptchaFragment.kt | 2 +- .../ui/countrycode/CountryCodeFragment.kt | 2 +- .../ui/entercode/EnterCodeFragment.kt | 2 +- .../ui/link/RegisterLinkDeviceQrFragment.kt | 2 +- .../ui/permissions/GrantPermissionsFragment.kt | 2 +- .../ui/phonenumber/EnterPhoneNumberFragment.kt | 2 +- .../registrationlock/RegistrationLockFragment.kt | 2 +- .../ReRegisterWithPinFragment.kt | 2 +- .../ui/restore/EnterBackupKeyFragment.kt | 2 +- .../ui/restore/NoBackupToRestoreFragment.kt | 2 +- .../ui/restore/RestoreViaQrFragment.kt | 2 +- .../restore/SelectManualRestoreMethodFragment.kt | 2 +- .../local/InternalNewLocalBackupRestore.kt | 2 +- .../registration/ui/welcome/WelcomeFragment.kt | 2 +- .../restore/choosebackup/ChooseBackupFragment.kt | 2 +- .../devicetransfer/DeviceTransferFragment.kt | 2 +- .../PostRegistrationEnterBackupKeyFragment.kt | 2 +- .../RestoreLocalBackupFragment.kt | 2 +- .../selection/SelectRestoreMethodFragment.kt | 2 +- .../custom/PrivateStorySettingsFragment.kt | 2 +- core/ui/build.gradle.kts | 2 ++ .../core/ui}/compose/ComposeDialogFragment.kt | 15 ++++++++------- .../signal/core/ui}/compose/ComposeFragment.kt | 15 ++++++++------- .../signal/core/ui/logging}/LoggingFragment.java | 7 ++++++- 143 files changed, 174 insertions(+), 173 deletions(-) rename {app/src/main/java/org/thoughtcrime/securesms => core/ui/src/main/java/org/signal/core/ui}/compose/ComposeDialogFragment.kt (71%) rename {app/src/main/java/org/thoughtcrime/securesms => core/ui/src/main/java/org/signal/core/ui}/compose/ComposeFragment.kt (67%) rename {app/src/main/java/org/thoughtcrime/securesms => core/ui/src/main/java/org/signal/core/ui/logging}/LoggingFragment.java (89%) 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 0ecd55c7db..f805faa781 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 @@ -14,13 +14,13 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.navigation.fragment.findNavController import androidx.navigation.navGraphViewModels +import org.signal.core.ui.compose.ComposeFragment 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.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment /** * Configuration fragment for the internal conversation test fragment. diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java index 7e3399ba19..c457fe2e74 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -18,6 +18,7 @@ package org.thoughtcrime.securesms; import android.Manifest; +import org.signal.core.ui.logging.LoggingFragment; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/org/thoughtcrime/securesms/InviteFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/InviteFragment.kt index b0bd2b74ca..2f69312474 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/InviteFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/InviteFragment.kt @@ -28,11 +28,11 @@ import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.unit.dp +import org.signal.core.ui.compose.ComposeFragment 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.thoughtcrime.securesms.compose.ComposeFragment /** * Fragment when inviting someone to use Signal diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt index 6f458870aa..c558f8617c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt @@ -781,7 +781,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass CompositionLocalProvider(LocalSnackbarStateConsumerRegistry provides mainNavigationViewModel.snackbarRegistry) { - SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(this)) { + SignalTheme { val backgroundColor = if (!windowSizeClass.isSplitPane()) { MaterialTheme.colorScheme.surface } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainFragment.java b/app/src/main/java/org/thoughtcrime/securesms/MainFragment.java index fcac543807..61744c1ac4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MainFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MainFragment.java @@ -4,6 +4,8 @@ import android.content.Context; import androidx.annotation.NonNull; +import org.signal.core.ui.logging.LoggingFragment; + public class MainFragment extends LoggingFragment { @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/DownloadYourBackupTodayDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/DownloadYourBackupTodayDialog.kt index ebeec31623..b6e24f6454 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/DownloadYourBackupTodayDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/DownloadYourBackupTodayDialog.kt @@ -11,12 +11,12 @@ import androidx.compose.ui.res.stringResource import androidx.core.os.BundleCompat import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment +import org.signal.core.ui.compose.ComposeDialogFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.BackupRepository -import org.thoughtcrime.securesms.compose.ComposeDialogFragment /** * Displays a "last chance" dialog to the user to begin a media restore. 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 7294730f30..5cada423b9 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 @@ -29,6 +29,7 @@ import com.google.android.gms.common.GoogleApiAvailability import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import kotlinx.coroutines.rx3.asFlowable +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Dialogs import org.signal.core.util.concurrent.SignalDispatchers import org.signal.core.util.getSerializableCompat @@ -36,7 +37,6 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.DeletionState import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentCheckoutDelegate -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.Nav import org.thoughtcrime.securesms.database.InAppPaymentTable import org.thoughtcrime.securesms.dependencies.AppDependencies diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/ConfirmBackupKeyDisplayFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/ConfirmBackupKeyDisplayFragment.kt index 038b2a8c54..4de3739299 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/ConfirmBackupKeyDisplayFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/ConfirmBackupKeyDisplayFragment.kt @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.backup.v2.ui.verify import android.app.Activity.RESULT_OK import androidx.compose.runtime.Composable +import org.signal.core.ui.compose.ComposeFragment import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyVerifyScreen -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.keyvalue.SignalStore /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/ForgotBackupKeyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/ForgotBackupKeyFragment.kt index bc2f759c51..106928a00b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/ForgotBackupKeyFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/ForgotBackupKeyFragment.kt @@ -5,9 +5,9 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.signal.core.ui.compose.ComposeFragment import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyRecordMode import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyRecordScreen -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.viewModel 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 524c4d2301..d3bded65e1 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 @@ -40,12 +40,12 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.viewmodel.compose.viewModel import kotlinx.coroutines.launch import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeDialogFragment import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.signal.core.util.BreakIteratorCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.calls.links.details.CallLinkDetailsViewModel -import org.thoughtcrime.securesms.compose.ComposeDialogFragment import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId import org.thoughtcrime.securesms.window.isSplitPane 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 d3cb86bb81..9b5fb1a69c 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 @@ -17,7 +17,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.AbstractComposeView import org.signal.core.ui.compose.theme.SignalTheme -import org.thoughtcrime.securesms.util.DynamicTheme /** * A View wrapper for [ActionModeTopBar] so that we can use the same UI element in View and Compose land. @@ -33,7 +32,7 @@ class ActionModeTopBarView @JvmOverloads constructor( @Composable override fun Content() { - SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(context)) { + SignalTheme { Surface( color = Color.Transparent, contentColor = MaterialTheme.colorScheme.onSurface diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/contactsupport/ContactSupportDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/contactsupport/ContactSupportDialogFragment.kt index 32f48c1e65..2be1abb3bc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/contactsupport/ContactSupportDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/contactsupport/ContactSupportDialogFragment.kt @@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.core.os.bundleOf import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.thoughtcrime.securesms.compose.ComposeDialogFragment +import org.signal.core.ui.compose.ComposeDialogFragment import org.thoughtcrime.securesms.util.viewModel /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt index 4436c460dd..e94f95ba48 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt @@ -14,7 +14,7 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import org.thoughtcrime.securesms.LoggingFragment +import org.signal.core.ui.logging.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.util.Material3OnScrollHelper import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter 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 f0ba05716d..dbef9d2db2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt @@ -47,6 +47,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.IconButtons @@ -73,7 +74,6 @@ import org.thoughtcrime.securesms.components.settings.app.routes.AppSettingsRout import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImageMedium import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository import org.thoughtcrime.securesms.components.settings.app.subscription.completed.InAppPaymentsBottomSheetDelegate -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord import org.thoughtcrime.securesms.profiles.ProfileName diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt index c935ff4cd3..1912f80cbc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt @@ -37,6 +37,7 @@ import com.google.android.material.button.MaterialButton import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.launch +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Dividers @@ -45,7 +46,6 @@ import org.signal.core.ui.compose.Rows import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.Texts import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher import org.thoughtcrime.securesms.dependencies.AppDependencies 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 cb61e749b8..a3dcfac746 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 @@ -35,6 +35,7 @@ import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Rows import org.signal.core.ui.compose.Scaffolds @@ -43,7 +44,6 @@ 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 -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.SpanUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt index 697b88566f..a4bf3dc441 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt @@ -16,6 +16,7 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows @@ -23,7 +24,6 @@ import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.appearance.navbar.ChooseNavigationBarStyleFragment -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.keyvalue.SettingsValues import org.thoughtcrime.securesms.util.navigation.safeNavigate 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 287509593e..7e9fddd6f2 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 @@ -47,6 +47,7 @@ import androidx.compose.ui.unit.dp import androidx.navigation.fragment.findNavController import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds @@ -55,7 +56,6 @@ import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.appearance.appicon.util.AppIconPreset import org.thoughtcrime.securesms.components.settings.app.appearance.appicon.util.AppIconUtility -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.util.navigation.safeNavigate class AppIconSelectionFragment : ComposeFragment() { 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 cdd1ea7127..47b839a779 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconTutorialFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconTutorialFragment.kt @@ -28,13 +28,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment 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.util.logging.Log import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment class AppIconTutorialFragment : 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 2ad408fbeb..d16d389183 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 @@ -40,6 +40,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController import kotlinx.coroutines.delay import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -54,7 +55,6 @@ import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType import org.thoughtcrime.securesms.components.compose.TextWithBetaLabel import org.thoughtcrime.securesms.components.settings.app.subscription.MessageBackupsCheckoutLauncher.createBackupsCheckoutLauncher -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.payments.FiatMoneyUtil import org.thoughtcrime.securesms.util.DateUtils diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/InternalNewLocalBackupCreateFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/InternalNewLocalBackupCreateFragment.kt index dcf2d20122..db0cf6249b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/InternalNewLocalBackupCreateFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/InternalNewLocalBackupCreateFragment.kt @@ -29,6 +29,7 @@ import kotlinx.coroutines.flow.map import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows @@ -37,7 +38,6 @@ import org.signal.core.ui.compose.SignalIcons import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.LocalBackupV2Event -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle import org.thoughtcrime.securesms.jobs.LocalBackupJob import org.thoughtcrime.securesms.keyvalue.SignalStore diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsFragment.kt index 40a9c86216..6489c324d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsFragment.kt @@ -30,6 +30,7 @@ import androidx.navigation3.runtime.rememberNavBackStack import androidx.navigation3.ui.NavDisplay import androidx.navigationevent.compose.LocalNavigationEventDispatcherOwner import kotlinx.coroutines.launch +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyEducationScreen @@ -37,7 +38,6 @@ import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyEdu import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyRecordMode import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyRecordScreen import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyVerifyScreen -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.keyvalue.SignalStore private val TAG = Log.tag(LocalBackupsFragment::class) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayFragment.kt index 766b755e25..dde313eba4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayFragment.kt @@ -21,12 +21,12 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Dialogs import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyRecordMode import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyRecordScreen import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsKeyVerifyScreen -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.Nav import org.thoughtcrime.securesms.util.viewModel 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 1c5bed68d4..db7a1d9d7e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt @@ -71,6 +71,7 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Dividers @@ -106,7 +107,6 @@ import org.thoughtcrime.securesms.components.compose.rememberBiometricsAuthentic import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.components.settings.app.backups.BackupState import org.thoughtcrime.securesms.components.settings.app.subscription.MessageBackupsCheckoutLauncher.createBackupsCheckoutLauncher -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.StatusBarColorNestedScrollConnection import org.thoughtcrime.securesms.help.HelpFragment import org.thoughtcrime.securesms.keyvalue.SignalStore diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberAccountLockedFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberAccountLockedFragment.kt index f9e4ea245b..01bc58913e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberAccountLockedFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberAccountLockedFragment.kt @@ -13,8 +13,8 @@ import android.widget.TextView import androidx.activity.OnBackPressedCallback import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt index 8c0fcc56b7..0ac04774c5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt @@ -11,8 +11,8 @@ import android.widget.TextView import androidx.appcompat.widget.Toolbar import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.util.navigation.safeNavigate diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCountryCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCountryCodeFragment.kt index 087678f3e2..3dd7077318 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCountryCodeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCountryCodeFragment.kt @@ -15,9 +15,9 @@ import androidx.fragment.app.setFragmentResult import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.registration.ui.countrycode.Country import org.thoughtcrime.securesms.registration.ui.countrycode.CountryCodeSelectScreen import org.thoughtcrime.securesms.registration.ui.countrycode.CountryCodeViewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt index 8fa1506731..42f195a960 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt @@ -16,8 +16,8 @@ import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt index bafa6ac557..9411fbd6f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt @@ -14,8 +14,8 @@ import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.getParcelableCompat -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.FragmentChangeNumberEnterPhoneNumberBinding diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt index 1d483d283c..6eeadb88cc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt @@ -29,11 +29,11 @@ import androidx.compose.ui.unit.dp import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.util.navigation.safeNavigate class ChangeNumberFragment : ComposeFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt index 1db5e28081..7b97d9075b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt @@ -10,8 +10,8 @@ import android.view.View import androidx.activity.OnBackPressedCallback import androidx.activity.result.contract.ActivityResultContracts import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt index 15d7d6fcb2..a864c67269 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt @@ -16,8 +16,8 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt index caa485f43f..32ccdd53a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt @@ -13,9 +13,9 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess import org.thoughtcrime.securesms.keyvalue.SignalStore diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt index 009f3c9990..db07cb94f0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt @@ -11,6 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -19,7 +20,6 @@ import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.signal.core.ui.compose.Texts import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.util.navigation.safeNavigate 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 40cacd2558..b119cff25d 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 @@ -44,6 +44,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Dividers @@ -57,7 +58,6 @@ 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 import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.navigation.safeNavigate diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChooseChatsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChooseChatsFragment.kt index a1edbe0ac3..732b894edf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChooseChatsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChooseChatsFragment.kt @@ -8,9 +8,9 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import com.google.android.material.button.MaterialButton +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.ContactSelectionListFragment -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ContactFilterView import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode 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 9a536d265d..1d39f1cbd0 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,6 +50,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Dividers @@ -58,7 +59,6 @@ import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.util.navigation.safeNavigate diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt index 67b2d72faf..8082284e30 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt @@ -15,6 +15,7 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController import androidx.preference.PreferenceManager +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -24,7 +25,6 @@ import org.signal.core.ui.compose.SignalIcons import org.signal.core.ui.compose.Texts import org.signal.core.util.bytes import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.mms.SentMediaQuality import org.thoughtcrime.securesms.util.navigation.safeNavigate diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt index 7fb12a38b3..2aef9bdc9a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt @@ -19,6 +19,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.navigation.NavController import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Rows import org.signal.core.ui.compose.Rows.TextAndLabel @@ -27,7 +28,6 @@ import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.navigation.safeNavigate 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 894eb21260..2a44435b8a 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 @@ -20,13 +20,13 @@ import androidx.navigation.fragment.findNavController import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers +import org.signal.core.ui.compose.ComposeFragment 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.util.logging.Log import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import java.io.InputStream class LicenseFragment : 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 7595c649bd..13bdffdb96 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,13 +25,13 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment 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.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueCodeSelector import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueTypeSelector -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation import org.thoughtcrime.securesms.keyvalue.SignalStore 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 aec02ed08b..78554f38bc 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 @@ -7,8 +7,8 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows @@ -16,9 +16,7 @@ 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.stories.dialogs.StoryDialogs -import org.thoughtcrime.securesms.util.DynamicTheme /** * Internal tool for testing various story-related dialogs. @@ -29,7 +27,7 @@ class InternalStoryDialogLauncherFragment : ComposeFragment() { override fun FragmentContent() { val callback = remember { DefaultInternalStoryDialogLauncherCallback() } - SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(LocalContext.current)) { + SignalTheme { InternalStoryDialogLauncherScreen( callback = callback ) 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 8d57640af9..4631c05ce0 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 @@ -19,11 +19,11 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.navigation.fragment.findNavController import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows 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 import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation import org.thoughtcrime.securesms.database.model.databaseprotos.TerminalDonationQueue 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 66affe5ff5..62d8f7eda3 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 @@ -58,6 +58,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -74,7 +75,6 @@ import org.thoughtcrime.securesms.backup.v2.ui.BackupAlert import org.thoughtcrime.securesms.backup.v2.ui.BackupAlertBottomSheet import org.thoughtcrime.securesms.components.settings.app.internal.backup.InternalBackupPlaygroundViewModel.DialogState import org.thoughtcrime.securesms.components.settings.app.internal.backup.InternalBackupPlaygroundViewModel.ScreenState -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobs.ArchiveAttachmentBackfillJob import org.thoughtcrime.securesms.jobs.ArchiveAttachmentReconciliationJob diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/dataseeding/DataSeedingPlaygroundFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/dataseeding/DataSeedingPlaygroundFragment.kt index 15ecce8991..54825f4b30 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/dataseeding/DataSeedingPlaygroundFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/dataseeding/DataSeedingPlaygroundFragment.kt @@ -49,11 +49,11 @@ import androidx.compose.ui.unit.dp import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows import org.signal.core.ui.compose.SignalIcons -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.database.model.ThreadRecord class DataSeedingPlaygroundFragment : ComposeFragment() { 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 4625bcc206..fd0bba243f 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 @@ -14,11 +14,11 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows @@ -28,8 +28,6 @@ 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.util.DynamicTheme /** * Internal tool for configuring donor error states for testing. @@ -42,7 +40,7 @@ class InternalDonorErrorConfigurationFragment : ComposeFragment() { override fun FragmentContent() { val state by viewModel.state.collectAsStateWithLifecycle() - SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(LocalContext.current)) { + SignalTheme { InternalDonorErrorConfigurationScreen( state = state, callback = remember { DefaultInternalDonorErrorConfigurationCallback() } 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 0580105662..b7bd60e077 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 @@ -29,9 +29,9 @@ import androidx.compose.ui.unit.dp import androidx.fragment.app.viewModels import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment import java.util.UUID 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 f54a882561..b1583c4194 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,12 +46,12 @@ import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.SignalIcons import org.signal.libsignal.protocol.util.Hex import org.thoughtcrime.securesms.components.settings.app.internal.sqlite.InternalSqlitePlaygroundViewModel.QueryResult -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.util.Util class InternalSqlitePlaygroundFragment : ComposeFragment() { 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 d4c8aeb717..23456c7952 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/storage/InternalStorageServicePlaygroundFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/storage/InternalStorageServicePlaygroundFragment.kt @@ -40,6 +40,7 @@ import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import org.signal.core.models.MasterKey import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -49,7 +50,6 @@ import org.signal.core.ui.compose.SignalIcons import org.signal.core.util.Hex import org.thoughtcrime.securesms.components.settings.app.internal.storage.InternalStorageServicePlaygroundViewModel.OneOffEvent import org.thoughtcrime.securesms.components.settings.app.internal.storage.InternalStorageServicePlaygroundViewModel.StorageInsights -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobs.StorageForcePushJob import org.thoughtcrime.securesms.jobs.StorageSyncJob 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 72a990b428..542247992b 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 @@ -24,10 +24,10 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.fragment.app.viewModels import kotlinx.collections.immutable.persistentListOf +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.NightPreview import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows -import org.thoughtcrime.securesms.compose.ComposeFragment class InternalSvrPlaygroundFragment : ComposeFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt index 728892b71f..1d55a68be7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt @@ -38,6 +38,7 @@ import androidx.navigation.fragment.findNavController import androidx.preference.PreferenceManager import kotlinx.coroutines.launch import org.signal.core.ui.BottomSheetUtil +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -51,7 +52,6 @@ import org.thoughtcrime.securesms.components.PromptBatterySaverDialogFragment import org.thoughtcrime.securesms.components.settings.app.routes.AppSettingsRoute import org.thoughtcrime.securesms.components.settings.app.routes.AppSettingsRouter import org.thoughtcrime.securesms.components.settings.models.Banner -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.notifications.NotificationChannels import org.thoughtcrime.securesms.notifications.TurnOnNotificationsBottomSheet import org.thoughtcrime.securesms.util.RingtoneUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/AddAllowedMembersFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/AddAllowedMembersFragment.kt index 7fa80bf8bc..395c5cdb16 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/AddAllowedMembersFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/AddAllowedMembersFragment.kt @@ -25,6 +25,7 @@ import com.google.android.material.snackbar.Snackbar import io.reactivex.rxjava3.kotlin.subscribeBy import kotlinx.coroutines.rx3.asFlow import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows @@ -38,7 +39,6 @@ import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.emoji.EmojiStrings import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.AddAllowedMembersViewModel.NotificationProfileAndRecipients -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.database.RecipientTable import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleFragment.kt index 981070e16b..60eaccdc8a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleFragment.kt @@ -19,8 +19,8 @@ import com.google.android.material.materialswitch.MaterialSwitch import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat import io.reactivex.rxjava3.kotlin.subscribeBy +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.concurrent.LifecycleDisposable -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.EditNotificationProfileScheduleViewModel.SaveScheduleResult import org.thoughtcrime.securesms.util.ViewUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileCreatedFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileCreatedFragment.kt index a027c8a5a4..563dff2ebb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileCreatedFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileCreatedFragment.kt @@ -7,8 +7,8 @@ import android.widget.TextView import androidx.navigation.fragment.findNavController import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.kotlin.subscribeBy +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.concurrent.LifecycleDisposable -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.util.navigation.safeNavigate diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesFragment.kt index d342c77192..11729796f2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesFragment.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.unit.dp import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows @@ -39,7 +40,6 @@ import org.signal.core.ui.compose.horizontalGutters import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.emoji.EmojiStrings import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.models.NotificationProfileRow -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.conversation.colors.AvatarColor import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile import org.thoughtcrime.securesms.notifications.profiles.NotificationProfileId diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/SelectRecipientsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/SelectRecipientsFragment.kt index 50d503d781..1f551e83eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/SelectRecipientsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/SelectRecipientsFragment.kt @@ -9,9 +9,9 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import io.reactivex.rxjava3.kotlin.subscribeBy +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.concurrent.LifecycleDisposable import org.thoughtcrime.securesms.ContactSelectionListFragment -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ContactFilterView import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt index f7494a8683..45b938ba71 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt @@ -34,6 +34,7 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.preference.PreferenceManager import kotlinx.coroutines.launch +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -42,7 +43,6 @@ import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.signal.core.ui.compose.Texts import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.RemoteConfig 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 adbd19252a..b615d6f247 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 @@ -28,6 +28,7 @@ import androidx.navigation.fragment.NavHostFragment import kotlinx.coroutines.delay import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.CircularProgressWrapper +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows @@ -36,10 +37,8 @@ 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.groups.ui.GroupChangeFailureReason import org.thoughtcrime.securesms.groups.ui.GroupErrors -import org.thoughtcrime.securesms.util.DynamicTheme import org.thoughtcrime.securesms.util.ExpirationUtil import org.thoughtcrime.securesms.util.livedata.ProcessState import org.thoughtcrime.securesms.util.livedata.distinctUntilChanged @@ -87,7 +86,7 @@ class ExpireTimerSettingsFragment : ComposeFragment() { val state by viewModel.state.observeAsState(ExpireTimerSettingsState()) val callback = remember { DefaultExpireTimerSettingsScreenCallback(viewModel) } - SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(LocalContext.current)) { + SignalTheme { ExpireTimerSettingsScreen( state = state, callback = callback 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 1952bc9a21..c18fc691eb 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 @@ -24,6 +24,7 @@ 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.compose.ComposeFragment import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows @@ -33,7 +34,6 @@ import org.signal.core.ui.compose.Snackbars import org.signal.core.ui.compose.Texts import org.signal.core.ui.compose.showSnackbar import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.StatusBarColorNestedScrollConnection import org.signal.core.ui.R as CoreUiR 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 df7aa71c1d..6dfb5aa5fa 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,6 +42,7 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds @@ -50,7 +51,6 @@ import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.BiometricDeviceAuthentication import org.thoughtcrime.securesms.BiometricDeviceLockContract import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.service.KeyCachingService import org.thoughtcrime.securesms.util.ConversationUtil import org.thoughtcrime.securesms.util.ExpirationUtil 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 b9cacc5698..eb9d492c3c 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 @@ -52,6 +52,7 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.navArgument import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.Animations +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Dividers @@ -66,7 +67,6 @@ 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.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/subscription/donate/transfer/details/BankTransferDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt index 62969d5d4d..f34a8f922f 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 @@ -47,6 +47,7 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import androidx.navigation.navGraphViewModels import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds @@ -63,7 +64,6 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.donate.st import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressViewModel import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.BankTransferRequestKeys import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details.BankTransferDetailsViewModel.Field -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.database.InAppPaymentTable import org.thoughtcrime.securesms.payments.FiatMoneyUtil import org.thoughtcrime.securesms.util.SpanUtil 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 dda386ad3b..9d71de3902 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 @@ -43,6 +43,7 @@ import androidx.navigation.fragment.navArgs import androidx.navigation.navGraphViewModels import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.signal.core.ui.compose.Texts @@ -57,7 +58,6 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.donate.st import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressViewModel import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.BankTransferRequestKeys import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal.IdealTransferDetailsViewModel.Field -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.database.InAppPaymentTable import org.thoughtcrime.securesms.payments.FiatMoneyUtil import org.thoughtcrime.securesms.util.SpanUtil 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 a64ed0ee62..8c728b33d1 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 @@ -50,6 +50,7 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import kotlinx.coroutines.launch import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -57,7 +58,6 @@ 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.compose.ComposeFragment import org.thoughtcrime.securesms.compose.StatusBarColorAnimator import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData import org.thoughtcrime.securesms.util.SpanUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt index be5e724b7e..7dfcac128a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt @@ -15,13 +15,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Rows import org.signal.core.ui.compose.Scaffolds import org.signal.core.ui.compose.SignalIcons import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobs.ApkUpdateJob 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 19c69b48f3..dfe0952206 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 @@ -42,13 +42,13 @@ import androidx.navigation.fragment.findNavController import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.SignalIcons import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeBadge import org.thoughtcrime.securesms.components.settings.app.usernamelinks.UsernameQrCodeColorScheme -import org.thoughtcrime.securesms.compose.ComposeFragment /** * Gives the user the ability to change the color of their shareable username QR code with a live preview. 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 e5b1986c8f..c49bdea74d 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 @@ -61,6 +61,7 @@ import com.google.accompanist.permissions.rememberPermissionState import io.reactivex.rxjava3.disposables.CompositeDisposable import kotlinx.coroutines.CoroutineScope import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Previews @@ -74,7 +75,6 @@ import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeDa import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeState import org.thoughtcrime.securesms.components.settings.app.usernamelinks.UsernameQrCodeColorScheme import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkSettingsState.ActiveTab -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.util.CommunicationActions 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 6dbc950b6e..e4b2c053de 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 @@ -26,7 +26,6 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.lifecycle.LifecycleOwner import com.google.accompanist.permissions.ExperimentalPermissionsApi @@ -46,7 +45,6 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.DynamicTheme /** * Prompts the user to scan a username QR code. Uses the activity result to communicate the recipient that was found, or null if no valid usernames were scanned. @@ -88,7 +86,7 @@ class UsernameQrScannerActivity : AppCompatActivity() { val cameraPermissionState: PermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA) val state by viewModel.state - SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(LocalContext.current)) { + SignalTheme { Content( lifecycleOwner = this, diposables = disposables.disposables, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt index 8681134ae3..35a541fa4a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt @@ -16,6 +16,7 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.isAbsent import org.signal.core.util.logging.Log @@ -26,7 +27,6 @@ import org.signal.libsignal.zkgroup.profiles.ProfileKey import org.thoughtcrime.securesms.MainActivity import org.thoughtcrime.securesms.attachments.Attachment import org.thoughtcrime.securesms.attachments.UriAttachment -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.database.AttachmentTable import org.thoughtcrime.securesms.database.MessageType import org.thoughtcrime.securesms.database.SignalDatabase 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 a144637b9a..8e7b07b8b5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt @@ -1,5 +1,6 @@ package org.thoughtcrime.securesms.compose +import android.content.res.Configuration import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -9,12 +10,11 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.platform.ComposeView -import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalConfiguration 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 abstract class ComposeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() { @@ -24,9 +24,12 @@ abstract class ComposeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetD return ComposeView(requireContext()).apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - SignalTheme( - isDarkMode = forceDarkTheme || DynamicTheme.isDarkTheme(LocalContext.current) - ) { + val isDark = if (forceDarkTheme) { + true + } else { + LocalConfiguration.current.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES + } + SignalTheme(isDarkMode = isDark) { Surface( shape = RoundedCornerShape(cornerRadius.dp, cornerRadius.dp), color = SignalTheme.colors.colorSurface1, 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 db0f8518f8..c09ef39a68 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFullScreenDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFullScreenDialogFragment.kt @@ -6,12 +6,10 @@ import android.view.View import android.view.ViewGroup import androidx.compose.runtime.Composable 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 /** @@ -28,9 +26,7 @@ abstract class ComposeFullScreenDialogFragment : DialogFragment() { return ComposeView(requireContext()).apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - SignalTheme( - isDarkMode = DynamicTheme.isDarkTheme(LocalContext.current) - ) { + SignalTheme { DialogContent() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/clicklisteners/PollVotesFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/clicklisteners/PollVotesFragment.kt index b69e84789f..3badd31d35 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/clicklisteners/PollVotesFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/clicklisteners/PollVotesFragment.kt @@ -41,6 +41,7 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.setFragmentResult import androidx.lifecycle.compose.collectAsStateWithLifecycle import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeDialogFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -50,7 +51,6 @@ import org.signal.core.ui.compose.horizontalGutters import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.AvatarImage -import org.thoughtcrime.securesms.compose.ComposeDialogFragment import org.thoughtcrime.securesms.conversation.clicklisteners.PollVotesFragment.Companion.MAX_INITIAL_VOTER_COUNT import org.thoughtcrime.securesms.polls.PollOption import org.thoughtcrime.securesms.polls.PollRecord diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragment.java index bdf8eae83e..b1c6ccad1e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragment.java @@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.bottomsheet.BottomSheetBehavior; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.VibrateUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragmentV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragmentV2.kt index 4ea61ee4ea..9a84cb9910 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragmentV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragmentV2.kt @@ -12,9 +12,9 @@ import androidx.recyclerview.widget.RecyclerView import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback import io.reactivex.rxjava3.kotlin.subscribeBy +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.concurrent.addTo -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.conversation.ui.inlinequery.InlineQueryViewModelV2 import org.thoughtcrime.securesms.conversation.v2.ConversationRecipientRepository 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 9624367e72..2dea95e37b 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 @@ -30,7 +30,6 @@ import org.thoughtcrime.securesms.database.model.IdentityRecord import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.DynamicTheme import org.thoughtcrime.securesms.util.IdentityUtil import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.visible @@ -145,7 +144,7 @@ class ConversationBannerView @JvmOverloads constructor( val view = pinnedMessageStub.get() view.apply { setContent { - SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(context)) { + SignalTheme { PinnedMessagesBanner( messages = messages, canUnpin = canUnpin, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index d5435e7771..e8ae121712 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -103,6 +103,7 @@ import org.greenrobot.eventbus.ThreadMode import org.signal.core.models.media.Media import org.signal.core.models.media.TransformProperties import org.signal.core.ui.BottomSheetUtil +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.ui.util.ThemeUtil import org.signal.core.ui.view.Stub import org.signal.core.util.ByteLimitInputFilter @@ -121,7 +122,6 @@ import org.signal.ringrtc.CallLinkEpoch import org.signal.ringrtc.CallLinkRootKey import org.thoughtcrime.securesms.BlockUnblockDialog import org.thoughtcrime.securesms.GroupMembersDialog -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.MainActivity import org.thoughtcrime.securesms.MuteDialog import org.thoughtcrime.securesms.R diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/CreatePollFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/CreatePollFragment.kt index d1e3b401b1..a7170214b3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/CreatePollFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/CreatePollFragment.kt @@ -52,6 +52,7 @@ import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.launch import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeDialogFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -64,7 +65,6 @@ 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.logging.Log import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeDialogFragment import org.thoughtcrime.securesms.polls.Poll import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.ViewUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt index 00bfcec6da..5368fb60f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt @@ -15,10 +15,10 @@ import androidx.lifecycle.ViewModelProvider import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.kotlin.subscribeBy import org.signal.core.models.media.Media +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.concurrent.addTo import org.signal.core.util.permissions.PermissionCompat -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.conversation.AttachmentKeyboard import org.thoughtcrime.securesms.conversation.AttachmentKeyboardButton diff --git a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountCountryCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountCountryCodeFragment.kt index f37a884ecf..9768ad2cdd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountCountryCodeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountCountryCodeFragment.kt @@ -10,8 +10,8 @@ import androidx.fragment.app.setFragmentResult import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.registration.ui.countrycode.CountryCodeSelectScreen import org.thoughtcrime.securesms.registration.ui.countrycode.CountryCodeViewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferSetupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferSetupFragment.java index ecce80e032..529237ef14 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferSetupFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferSetupFragment.java @@ -31,7 +31,7 @@ import org.signal.core.util.logging.Log; import org.signal.devicetransfer.DeviceToDeviceTransferService; import org.signal.devicetransfer.TransferStatus; import org.signal.devicetransfer.WifiDirect; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity; import org.thoughtcrime.securesms.permissions.Permissions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferCompleteFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferCompleteFragment.java index c6f0d093b5..fff76077ab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferCompleteFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferCompleteFragment.java @@ -7,7 +7,7 @@ import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.restore.RestoreActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferInstructionsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferInstructionsFragment.kt index 9ec2cdca6c..9d6c5275a2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferInstructionsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferInstructionsFragment.kt @@ -4,8 +4,8 @@ import android.os.Bundle import android.view.View import androidx.navigation.fragment.findNavController import org.greenrobot.eventbus.EventBus +import org.signal.core.ui.logging.LoggingFragment import org.signal.devicetransfer.TransferStatus -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.util.navigation.safeNavigate diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferCompleteFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferCompleteFragment.java index 60a4301a44..8e0766e7b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferCompleteFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferCompleteFragment.java @@ -7,7 +7,7 @@ import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferInstructionsFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferInstructionsFragment.java index 89ae9ad332..4310696c4b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferInstructionsFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferInstructionsFragment.java @@ -15,7 +15,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.greenrobot.eventbus.EventBus; import org.signal.devicetransfer.DeviceToDeviceTransferService; import org.signal.devicetransfer.TransferStatus; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.util.navigation.SafeNavigation; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelFragment.kt index ef4d1d91d9..dfc8d6b70b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelFragment.kt @@ -38,12 +38,12 @@ import androidx.navigation.fragment.navArgs import org.signal.core.ui.compose.AllDevicePreviews import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.ClearableTextField +import org.signal.core.ui.compose.ComposeFragment 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.util.isNotNullOrBlank import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.groups.memberlabel.MemberLabelUiState.SaveState import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java index 7a9f51fbd0..2b7fd2d2cb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java @@ -32,7 +32,7 @@ import com.bumptech.glide.request.transition.Transition; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.signal.core.util.EditTextUtil; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.avatar.picker.AvatarPickerFragment; import org.thoughtcrime.securesms.components.settings.app.privacy.expire.ExpireTimerSettingsFragment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java index a32d2dc30c..70bbd96ebb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java @@ -25,7 +25,7 @@ import androidx.navigation.Navigation; import com.annimon.stream.Stream; import org.signal.core.util.ResourceUtil; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.emoji.EmojiImageView; import org.thoughtcrime.securesms.util.CommunicationActions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/gif/GifKeyboardPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/gif/GifKeyboardPageFragment.kt index 1a60102328..f236cafca5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/gif/GifKeyboardPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/gif/GifKeyboardPageFragment.kt @@ -7,7 +7,7 @@ import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.RecyclerView -import org.thoughtcrime.securesms.LoggingFragment +import org.signal.core.ui.logging.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.giph.mp4.GiphyMp4Fragment import org.thoughtcrime.securesms.giph.mp4.GiphyMp4SaveResult diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt index efffcce60b..a813919a66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.SmoothScroller import com.bumptech.glide.Glide import com.google.android.material.appbar.AppBarLayout -import org.thoughtcrime.securesms.LoggingFragment +import org.signal.core.ui.logging.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.database.DatabaseObserver import org.thoughtcrime.securesms.dependencies.AppDependencies 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 c481ec6c54..361fac9af8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt @@ -24,11 +24,11 @@ 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.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.util.VibrateUtil import org.thoughtcrime.securesms.util.navigation.safeNavigate 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 a207ad0a54..75b536c7e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt @@ -32,6 +32,7 @@ import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.Snackbar import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds @@ -39,7 +40,6 @@ import org.signal.core.ui.compose.SignalIcons import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment /** * Fragment for changing the name of a linked device 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 141616186a..886b80e835 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt @@ -57,6 +57,7 @@ import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.Snackbar import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Dividers @@ -69,7 +70,6 @@ import org.thoughtcrime.securesms.BiometricDeviceAuthentication import org.thoughtcrime.securesms.BiometricDeviceLockContract import org.thoughtcrime.securesms.DevicePinAuthEducationSheet import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.linkdevice.LinkDeviceSettingsState.DialogState import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.DateUtils diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java index 33dce70c78..40a2ccee75 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java @@ -21,7 +21,7 @@ import androidx.appcompat.widget.Toolbar; import com.google.android.material.button.MaterialButton; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.PassphraseRequiredActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.keyvalue.SignalStore; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java index 96248ce59a..9e1f81a0ca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java @@ -34,7 +34,7 @@ import org.signal.core.util.ByteSize; import org.signal.core.util.DimensionUnit; import org.signal.core.util.concurrent.LifecycleDisposable; import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.components.compose.DeleteSyncEducationDialog; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt index b266ef8bf3..c2af0b6df9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt @@ -41,10 +41,10 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import org.signal.core.models.media.Media +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.concurrent.addTo import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.attachments.AttachmentSaver import org.thoughtcrime.securesms.attachments.DatabaseAttachment diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java index e679c9e83f..cfc45bf0e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java @@ -43,7 +43,7 @@ import com.google.android.material.card.MaterialCardView; import org.signal.core.util.Stopwatch; import org.signal.core.util.logging.Log; import org.signal.core.models.media.Media; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.animation.AnimationCompleteListener; import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java index 99d50f850b..64cf2da688 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java @@ -24,7 +24,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity; import org.thoughtcrime.securesms.recipients.Recipient; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.kt index 222dbe7a78..2f8d991429 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.kt @@ -50,9 +50,9 @@ import org.signal.camera.hud.StandardCameraHud import org.signal.camera.hud.StandardCameraHudEvents import org.signal.camera.hud.StringResources import org.signal.core.ui.BottomSheetUtil +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.mediasend.camerax.CameraXModePolicy import org.thoughtcrime.securesms.permissions.PermissionDeniedBottomSheet.Companion.showPermissionFragment 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 161e6c5720..8f231a3066 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt @@ -56,7 +56,6 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.emoji.Emojifier import org.thoughtcrime.securesms.main.EmptyMegaphoneActionController import org.thoughtcrime.securesms.megaphone.Megaphones.Event -import org.thoughtcrime.securesms.util.DynamicTheme import kotlin.math.roundToInt /** @@ -64,7 +63,7 @@ import kotlin.math.roundToInt */ fun setContent(composeView: ComposeView, megaphone: Megaphone, megaphoneActionController: MegaphoneActionController) { composeView.setContent { - SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(composeView.context)) { + SignalTheme { MegaphoneComponent( megaphone, megaphoneActionController diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java index 02343fac71..ffdd608c60 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java @@ -21,7 +21,7 @@ import androidx.transition.TransitionManager; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.emoji.EmojiTextView; import org.thoughtcrime.securesms.payments.FiatMoneyUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/create/EditNoteFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/create/EditNoteFragment.java index af664991c2..299360aab8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/create/EditNoteFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/create/EditNoteFragment.java @@ -13,7 +13,7 @@ import androidx.appcompat.widget.Toolbar; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.Navigation; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.emoji.EmojiEditText; import org.thoughtcrime.securesms.util.ViewUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentRecipientSelectionFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentRecipientSelectionFragment.java index c5a2bb47d2..add01ff48a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentRecipientSelectionFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentRecipientSelectionFragment.java @@ -12,7 +12,7 @@ import androidx.navigation.Navigation; import org.signal.core.util.concurrent.SimpleTask; import org.thoughtcrime.securesms.ContactSelectionListFragment; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.ContactFilterView; import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsAllActivityFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsAllActivityFragment.java index 9e02e965fb..04dd9ef330 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsAllActivityFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsAllActivityFragment.java @@ -14,7 +14,7 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.tabs.TabLayout; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; public class PaymentsAllActivityFragment extends LoggingFragment { diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java index 999cf535f0..1989ddc213 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java @@ -24,7 +24,7 @@ import com.google.android.material.snackbar.Snackbar; import org.signal.core.util.logging.Log; import org.signal.core.ui.view.Stub; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.PaymentPreferencesDirections; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.banner.BannerManager; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsPagerItemFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsPagerItemFragment.java index 30762809e2..111e62a402 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsPagerItemFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsPagerItemFragment.java @@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModelProvider; import androidx.navigation.fragment.NavHostFragment; import androidx.recyclerview.widget.RecyclerView; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.PaymentPreferencesDirections; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.payments.preferences.model.PaymentItem; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyFragment.java index e481034476..f4e90f3212 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyFragment.java @@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModelProvider; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.settings.BaseSettingsAdapter; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyFragment.java index 913473e4c0..68997e4d48 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyFragment.java @@ -14,7 +14,7 @@ import androidx.appcompat.widget.Toolbar; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.Navigation; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.qr.QrView; import org.thoughtcrime.securesms.util.views.LearnMoreTextView; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/details/PaymentDetailsFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/details/PaymentDetailsFragment.java index 3940439100..c77ce68cd2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/details/PaymentDetailsFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/details/PaymentDetailsFragment.java @@ -22,7 +22,7 @@ import androidx.navigation.Navigation; import org.signal.core.util.StringUtil; import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.badges.BadgeImageView; import org.thoughtcrime.securesms.components.AvatarImageView; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferFragment.java index 6cc5d179e4..fe07aae815 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferFragment.java @@ -17,7 +17,7 @@ import androidx.navigation.Navigation; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.payments.MobileCoinPublicAddress; import org.thoughtcrime.securesms.payments.preferences.model.PayeeParcelable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferQrScanFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferQrScanFragment.java index 03e144a209..93ac8147a2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferQrScanFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferQrScanFragment.java @@ -13,7 +13,7 @@ import androidx.navigation.Navigation; import org.signal.core.util.logging.Log; import org.signal.qr.QrScannerView; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist; import org.thoughtcrime.securesms.payments.MobileCoinPublicAddress; diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java index a06ed04072..09605e3079 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java @@ -20,7 +20,7 @@ import com.google.android.material.button.MaterialButton; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.MainActivity; import org.thoughtcrime.securesms.PassphraseRequiredActivity; import org.thoughtcrime.securesms.R; diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreLockedFragment.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreLockedFragment.java index fa5ba51431..fa7d83facd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreLockedFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreLockedFragment.java @@ -8,7 +8,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.util.CommunicationActions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinSettingsFragment.kt index b8e870af54..d28a3cb710 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinSettingsFragment.kt @@ -25,6 +25,7 @@ import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Previews @@ -35,7 +36,6 @@ import org.signal.core.ui.compose.Snackbars import org.signal.core.ui.compose.showSnackbar import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.backups.remote.BackupKeyDisplayFragment -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity import org.thoughtcrime.securesms.payments.backup.PaymentsRecoveryStartFragmentArgs.Builder import org.thoughtcrime.securesms.payments.preferences.PaymentsActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java index bb49660ff1..48f683375b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java @@ -27,7 +27,7 @@ import org.signal.core.util.EditTextUtil; import org.signal.core.util.StreamUtil; import org.signal.core.util.concurrent.SimpleTask; import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.avatar.Avatars; import org.thoughtcrime.securesms.avatar.picker.AvatarPickerFragment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt index ff08924898..0bcff0070a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt @@ -23,10 +23,10 @@ import com.bumptech.glide.Glide import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import org.signal.core.models.media.Media +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.AvatarPreviewActivity -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.Avatars.getForegroundColor import org.thoughtcrime.securesms.avatar.Avatars.getTextSizeForLength diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java index 5fb842a9c7..506ecc5813 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java @@ -24,7 +24,7 @@ import com.google.android.material.textfield.TextInputLayout; import org.signal.core.util.EditTextUtil; import org.signal.core.util.concurrent.LifecycleDisposable; -import org.thoughtcrime.securesms.LoggingFragment; +import org.signal.core.ui.logging.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher; import org.thoughtcrime.securesms.databinding.UsernameEditFragmentBinding; 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 c8c6180097..4edd72de89 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,12 +27,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeDialogFragment 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.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeDialogFragment import org.thoughtcrime.securesms.profiles.manage.EditProfileActivity import org.signal.core.ui.R as CoreUiR diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsFragment.kt index 429875c814..6d35c1b959 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsFragment.kt @@ -14,7 +14,7 @@ import androidx.transition.ChangeBounds import androidx.transition.Transition import androidx.transition.TransitionManager import androidx.transition.TransitionSet -import org.thoughtcrime.securesms.LoggingFragment +import org.signal.core.ui.logging.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.animation.transitions.AlphaTransition import org.thoughtcrime.securesms.components.emoji.EmojiImageView diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt index 1d6f0ea6d6..139c7d9348 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt @@ -12,7 +12,7 @@ import android.view.View import android.widget.TextView import androidx.activity.OnBackPressedCallback import androidx.fragment.app.activityViewModels -import org.thoughtcrime.securesms.LoggingFragment +import org.signal.core.ui.logging.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt index 11f9078e4d..76cd2dd5ac 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt @@ -11,8 +11,8 @@ import android.view.View import android.webkit.WebView import android.webkit.WebViewClient import androidx.navigation.fragment.findNavController +import org.signal.core.ui.logging.LoggingFragment import org.thoughtcrime.securesms.BuildConfig -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.FragmentRegistrationCaptchaBinding diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeFragment.kt index b7983fb2fb..68a901bad2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeFragment.kt @@ -15,10 +15,10 @@ import androidx.fragment.app.setFragmentResult import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.util.getParcelableCompat import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment /** * Country picker fragment used in registration V3 diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt index c027600726..ebc30eafb7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt @@ -19,10 +19,10 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.ThreadUtil import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle 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 bebad8f1aa..bccef97f67 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 @@ -56,6 +56,7 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Previews @@ -64,7 +65,6 @@ 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.registration.ui.RegistrationViewModel import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsFragment.kt index f09092475d..8afd38cbe9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsFragment.kt @@ -16,8 +16,8 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.setFragmentResult import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.registration.fragments.WelcomePermissions import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt index 4c67881a73..18c5bd7ae2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt @@ -37,11 +37,11 @@ import com.google.i18n.phonenumbers.AsYouTypeFormatter import com.google.i18n.phonenumbers.NumberParseException import com.google.i18n.phonenumbers.PhoneNumberUtil import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.ThreadUtil import org.signal.core.util.getParcelableCompat import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterPhoneNumberBinding diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt index cc4861e525..d151c3b40b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt @@ -14,8 +14,8 @@ import android.widget.Toast import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.FragmentRegistrationLockBinding diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt index 6a368dd85a..14f32307e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt @@ -13,8 +13,8 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.FragmentRegistrationPinRestoreEntryV2Binding diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyFragment.kt index 251d664709..2bb55b9507 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyFragment.kt @@ -26,12 +26,12 @@ import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Dialogs import org.thoughtcrime.securesms.R 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.ComposeFragment import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt index 1582e53569..12a2f21d0c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt @@ -36,13 +36,13 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment 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.registration.proto.RegistrationProvisionMessage import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment 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/RestoreViaQrFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt index 865a2d423d..051a002c82 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 @@ -59,6 +59,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.DropdownMenus @@ -70,7 +71,6 @@ 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.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/SelectManualRestoreMethodFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectManualRestoreMethodFragment.kt index 5acef1107c..df09fc83db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectManualRestoreMethodFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectManualRestoreMethodFragment.kt @@ -18,11 +18,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.window.DialogProperties import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Dialogs import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel import org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberMode import org.thoughtcrime.securesms.restore.RestoreActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/InternalNewLocalBackupRestore.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/InternalNewLocalBackupRestore.kt index 88e8e67bcd..6be3c0dce2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/InternalNewLocalBackupRestore.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/InternalNewLocalBackupRestore.kt @@ -48,11 +48,11 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.flow.map import org.signal.core.models.AccountEntropyPool import org.signal.core.ui.compose.Buttons +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.fonts.MonoTypeface import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt index d755f13eba..28eaf7d715 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt @@ -12,10 +12,10 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.getSerializableCompat import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.BuildConfig -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.FragmentRegistrationWelcomeV3Binding diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupFragment.kt index 5c56cbb979..4631b82ec7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupFragment.kt @@ -17,8 +17,8 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.core.text.HtmlCompat import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.NavHostFragment +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.FragmentChooseBackupBinding diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferFragment.kt index efed2c8d53..cf87075ea7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferFragment.kt @@ -14,9 +14,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +import org.signal.core.ui.logging.LoggingFragment import org.signal.devicetransfer.DeviceToDeviceTransferService import org.signal.devicetransfer.TransferStatus -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.FragmentDeviceTransferBinding 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 bba1ed890b..853e68df1c 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 @@ -21,10 +21,10 @@ import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import org.signal.core.models.AccountEntropyPool +import org.signal.core.ui.compose.ComposeFragment 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 import org.thoughtcrime.securesms.registration.ui.restore.EnterBackupKeyScreen import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.navigation.safeNavigate diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt index 0c9a10ede0..36e687b601 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt @@ -27,9 +27,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +import org.signal.core.ui.logging.LoggingFragment import org.signal.core.util.bytes import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.BackupEvent import org.thoughtcrime.securesms.backup.BackupPassphrase 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 4a4293bafe..43c8a518cf 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 @@ -20,10 +20,10 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.Dialogs import org.thoughtcrime.securesms.MainActivity import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.registration.data.QuickRegistrationRepository import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity import org.thoughtcrime.securesms.registration.ui.restore.RestoreMethod 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 e74a0c921a..300b9d3578 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 @@ -28,6 +28,7 @@ import androidx.fragment.app.viewModels import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.compose.ComposeFragment import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Dividers @@ -40,7 +41,6 @@ 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.database.model.DistributionListId import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode import org.thoughtcrime.securesms.database.model.DistributionListRecord diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 171e6c8d0e..57f82aed3b 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -23,6 +23,8 @@ android { dependencies { lintChecks(project(":lintchecks")) + api(project(":core:util")) + platform(libs.androidx.compose.bom).let { composeBom -> api(composeBom) androidTestApi(composeBom) diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeDialogFragment.kt b/core/ui/src/main/java/org/signal/core/ui/compose/ComposeDialogFragment.kt similarity index 71% rename from app/src/main/java/org/thoughtcrime/securesms/compose/ComposeDialogFragment.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/ComposeDialogFragment.kt index dbe8b9b95f..7b82fb45da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeDialogFragment.kt +++ b/core/ui/src/main/java/org/signal/core/ui/compose/ComposeDialogFragment.kt @@ -1,4 +1,9 @@ -package org.thoughtcrime.securesms.compose +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.compose import android.os.Bundle import android.view.LayoutInflater @@ -6,23 +11,19 @@ import android.view.View import android.view.ViewGroup import androidx.compose.runtime.Composable 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 /** - * Generic ComposeFragment which can be subclassed to build UI with compose. + * Generic ComposeDialogFragment which can be subclassed to build UI with compose. */ abstract class ComposeDialogFragment : DialogFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { return ComposeView(requireContext()).apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - SignalTheme( - isDarkMode = DynamicTheme.isDarkTheme(LocalContext.current) - ) { + SignalTheme { DialogContent() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFragment.kt b/core/ui/src/main/java/org/signal/core/ui/compose/ComposeFragment.kt similarity index 67% rename from app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFragment.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/ComposeFragment.kt index bb6b4c5f59..d2ed4bb08b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeFragment.kt +++ b/core/ui/src/main/java/org/signal/core/ui/compose/ComposeFragment.kt @@ -1,24 +1,25 @@ -package org.thoughtcrime.securesms.compose +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.compose import android.os.Bundle import android.view.LayoutInflater import android.view.View 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 +import org.signal.core.ui.logging.LoggingFragment /** * Generic ComposeFragment which can be subclassed to build UI with compose. */ abstract class ComposeFragment : LoggingFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = content { - SignalTheme( - isDarkMode = DynamicTheme.isDarkTheme(LocalContext.current) - ) { + SignalTheme { FragmentContent() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/LoggingFragment.java b/core/ui/src/main/java/org/signal/core/ui/logging/LoggingFragment.java similarity index 89% rename from app/src/main/java/org/thoughtcrime/securesms/LoggingFragment.java rename to core/ui/src/main/java/org/signal/core/ui/logging/LoggingFragment.java index f6c7fd3fdc..fc3f6744ea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/LoggingFragment.java +++ b/core/ui/src/main/java/org/signal/core/ui/logging/LoggingFragment.java @@ -1,4 +1,9 @@ -package org.thoughtcrime.securesms; +/* + * Copyright 2025 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.ui.logging; import android.os.Bundle;