diff --git a/app/src/main/java/org/thoughtcrime/securesms/DevicePinAuthEducationSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/DevicePinAuthEducationSheet.kt index 5d687219da..6ef0233f04 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DevicePinAuthEducationSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/DevicePinAuthEducationSheet.kt @@ -19,12 +19,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager import androidx.fragment.app.setFragmentResult +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Education sheet shown before authentication explaining that users should use their device credentials diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt index feeab4bb5a..0b2234c435 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt @@ -83,6 +83,7 @@ import kotlinx.coroutines.flow.distinctUntilChangedBy import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.Snackbars import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getSerializableCompat @@ -173,7 +174,6 @@ import org.thoughtcrime.securesms.stories.landing.StoriesLandingFragment import org.thoughtcrime.securesms.stories.settings.StorySettingsActivity import org.thoughtcrime.securesms.util.AppForegroundObserver import org.thoughtcrime.securesms.util.AppStartup -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CachedInflater import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheet.kt index 44f4d7d6c0..3ff20a2aa5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheet.kt @@ -2,13 +2,13 @@ package org.thoughtcrime.securesms.badges.gifts import android.os.Bundle import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.badges.gifts.ExpiredGiftSheetConfiguration.forExpiredBadge import org.thoughtcrime.securesms.badges.models.Badge import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment import org.thoughtcrime.securesms.components.settings.configure -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.fragments.requireListener /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt index ad091fd27c..8bf2e5a67b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.badges.gifts.thanks import android.os.Bundle import androidx.fragment.app.FragmentManager import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.DimensionUnit import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableCompat @@ -16,7 +17,6 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsText import org.thoughtcrime.securesms.components.settings.configure import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Displays a "Thank you" message in a conversation when redirected diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt index ac63ddb1fb..0719dbc41f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt @@ -10,6 +10,7 @@ import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.kotlin.subscribeBy +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.DimensionUnit import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableCompat @@ -38,7 +39,6 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil import java.util.concurrent.TimeUnit /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt index 3b55466940..25748e2af6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt @@ -4,6 +4,7 @@ import android.os.Bundle import androidx.fragment.app.FragmentManager import androidx.fragment.app.viewModels import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.DimensionUnit import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableCompat @@ -18,7 +19,6 @@ import org.thoughtcrime.securesms.components.settings.configure import org.thoughtcrime.securesms.database.model.MmsMessageRecord import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Handles all interactions for received gift badges. diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredOneTimeBadgeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredOneTimeBadgeBottomSheetDialogFragment.kt index 490d578a9f..acf8e598a6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredOneTimeBadgeBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredOneTimeBadgeBottomSheetDialogFragment.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.badges.self.expired import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.DimensionUnit import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R @@ -14,7 +15,6 @@ import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation import org.thoughtcrime.securesms.components.settings.configure import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt index 943ddc0c46..eb528fd63c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.Previews @@ -44,7 +45,6 @@ import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.compose.SignalTheme import org.thoughtcrime.securesms.database.InAppPaymentTable import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.SpanUtil import org.thoughtcrime.securesms.util.viewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt index 631a7798d8..3c2e84a799 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentManager import androidx.fragment.app.viewModels +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.DimensionUnit import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.badges.models.BadgePreview @@ -13,7 +14,6 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFrag import org.thoughtcrime.securesms.components.settings.DSLSettingsText import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.components.settings.configure -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.signal.core.ui.R as CoreUiR class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt index f6b33bb8e1..0bf3824625 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt @@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.viewModels import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayoutMediator +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.badges.BadgeRepository @@ -23,7 +24,6 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDona import org.thoughtcrime.securesms.databinding.ViewBadgeBottomSheetDialogFragmentBinding import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt index e4efddf1e6..4325859491 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt @@ -21,6 +21,7 @@ import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.kotlin.Flowables import io.reactivex.rxjava3.kotlin.subscribeBy import kotlinx.coroutines.launch +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.Snackbars import org.signal.core.util.DimensionUnit import org.signal.core.util.concurrent.LifecycleDisposable @@ -56,7 +57,6 @@ import org.thoughtcrime.securesms.main.MainToolbarMode import org.thoughtcrime.securesms.main.MainToolbarViewModel import org.thoughtcrime.securesms.main.Material3OnScrollHelperBinder import org.thoughtcrime.securesms.recipients.Recipient -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.doAfterNextLayout diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DebugLogsPromptDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/DebugLogsPromptDialogFragment.kt index 5a42298e57..fa581d525d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DebugLogsPromptDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/DebugLogsPromptDialogFragment.kt @@ -15,6 +15,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R @@ -22,7 +23,6 @@ import org.thoughtcrime.securesms.databinding.PromptLogsBottomSheetBinding import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.notifications.SlowNotificationHeuristics -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.DeviceProperties import org.thoughtcrime.securesms.util.NetworkUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt index 731c0b630b..4963e18a63 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt @@ -12,13 +12,13 @@ import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.databinding.PromptBatterySaverBottomSheetBinding import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.notifications.DeviceSpecificNotificationConfig -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.LocalMetrics import org.thoughtcrime.securesms.util.PowerManagerCompat import org.signal.core.ui.R as CoreUiR diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/ConnectivityWarningBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/ConnectivityWarningBottomSheet.kt index b142f9795a..62bdcc235e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/ConnectivityWarningBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/ConnectivityWarningBottomSheet.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews @@ -31,7 +32,6 @@ import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * A bottom sheet that warns the user when they haven't been able to connect to the websocket for some time. diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeviceSpecificNotificationBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeviceSpecificNotificationBottomSheet.kt index cc71016175..8ec3852cb6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeviceSpecificNotificationBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/DeviceSpecificNotificationBottomSheet.kt @@ -25,6 +25,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews @@ -33,7 +34,6 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.notifications.DeviceSpecificNotificationConfig -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions class DeviceSpecificNotificationBottomSheet : ComposeBottomSheetDialogFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt index 5549f92d0c..54b2541e38 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt @@ -13,6 +13,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.AppUtil import org.signal.core.util.ThreadUtil import org.signal.core.util.concurrent.SignalExecutors @@ -61,7 +62,6 @@ import org.thoughtcrime.securesms.payments.DataExportUtil import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.storage.StorageSyncHelper -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.ConversationUtil import org.thoughtcrime.securesms.util.Util import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter 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 38075fb979..728892b71f 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 @@ -37,6 +37,7 @@ import androidx.lifecycle.repeatOnLifecycle 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.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews @@ -53,7 +54,6 @@ 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.BottomSheetUtil import org.thoughtcrime.securesms.util.RingtoneUtil import org.thoughtcrime.securesms.util.navigation.safeNavigate import org.thoughtcrime.securesms.util.viewModel diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/manual/NotificationProfileSelectionFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/manual/NotificationProfileSelectionFragment.kt index 390d970b41..0256c35e70 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/manual/NotificationProfileSelectionFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/manual/NotificationProfileSelectionFragment.kt @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.notifications.manual import androidx.fragment.app.FragmentManager import androidx.fragment.app.viewModels +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.DimensionUnit import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.DSLConfiguration @@ -14,7 +15,6 @@ import org.thoughtcrime.securesms.components.settings.app.notifications.profiles import org.thoughtcrime.securesms.components.settings.configure import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile import org.thoughtcrime.securesms.notifications.profiles.NotificationProfiles -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * BottomSheetDialogFragment that allows a user to select a notification profile to manually enable/disable. diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt index d64959cab6..6963c5719b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt @@ -13,6 +13,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import com.google.android.material.textfield.TextInputLayout import io.reactivex.rxjava3.kotlin.subscribeBy +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.BreakIteratorCompat import org.signal.core.util.EditTextUtil import org.signal.core.util.concurrent.LifecycleDisposable @@ -22,7 +23,6 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.EditNotificationProfileViewModel.SaveNotificationProfileResult import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.models.NotificationProfileNamePreset import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter import org.thoughtcrime.securesms.util.navigation.safeNavigate 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 27fa793083..6c086ce3af 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 @@ -50,6 +50,7 @@ import androidx.navigation.compose.dialog import androidx.navigation.compose.rememberNavController 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.DayNightPreviews import org.signal.core.ui.compose.Dialogs @@ -71,7 +72,6 @@ import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity import org.thoughtcrime.securesms.preferences.widgets.StorageGraphView -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.viewModel import java.text.NumberFormat diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/MessageBackupsCheckoutLauncher.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/MessageBackupsCheckoutLauncher.kt index 9e246e7ac6..c71df05f5b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/MessageBackupsCheckoutLauncher.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/MessageBackupsCheckoutLauncher.kt @@ -7,12 +7,12 @@ package org.thoughtcrime.securesms.components.settings.app.subscription import androidx.activity.result.ActivityResultLauncher import androidx.fragment.app.Fragment +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.getSerializableCompat import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.backup.v2.ui.CreateBackupBottomSheet import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsCheckoutActivity import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction -import org.thoughtcrime.securesms.util.BottomSheetUtil object MessageBackupsCheckoutLauncher { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt index b834cb7fb8..e2d0532ab9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager import androidx.fragment.app.setFragmentResult +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.SignalIcons @@ -37,7 +38,6 @@ import org.thoughtcrime.securesms.components.webrtc.requests.CallLinkIncomingReq import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.toLink -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.Util class UsernameLinkShareBottomSheet : ComposeBottomSheetDialogFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt index 5904868447..88d5cc265e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt @@ -30,10 +30,10 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModel import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt index 5763e12529..0ca655ed79 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt @@ -32,6 +32,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.NightPreview @@ -46,7 +47,6 @@ import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.viewModel import org.signal.core.ui.R as CoreUiR diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallPermissionsDialogController.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallPermissionsDialogController.kt index d76339847e..d6d2dac82a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallPermissionsDialogController.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallPermissionsDialogController.kt @@ -8,10 +8,10 @@ package org.thoughtcrime.securesms.components.webrtc.v2 import android.Manifest import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +import org.signal.core.ui.BottomSheetUtil import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.permissions.PermissionDeniedBottomSheet.Companion.showPermissionFragment import org.thoughtcrime.securesms.permissions.Permissions -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Shared dialog controller for requesting different permissions specific to calling. diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt index ac59d50ac1..4a1dc2c3e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt @@ -41,6 +41,7 @@ import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.ThreadUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.concurrent.SignalExecutors @@ -74,7 +75,6 @@ import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet import org.thoughtcrime.securesms.service.webrtc.CallLinkDisconnectReason import org.thoughtcrime.securesms.service.webrtc.SignalCallManager import org.thoughtcrime.securesms.sms.MessageSender -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.EllapsedTimeFormatter import org.thoughtcrime.securesms.util.FullscreenHelper import org.thoughtcrime.securesms.util.RemoteConfig diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsPermanentErrorBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsPermanentErrorBottomSheet.kt index 902cde1522..bb7f0dfca5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsPermanentErrorBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsPermanentErrorBottomSheet.kt @@ -9,10 +9,10 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment import org.thoughtcrime.securesms.databinding.CdsPermanentErrorBottomSheetBinding -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsTemporaryErrorBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsTemporaryErrorBottomSheet.kt index 07c39f1145..5b9202f583 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsTemporaryErrorBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsTemporaryErrorBottomSheet.kt @@ -9,11 +9,11 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment import org.thoughtcrime.securesms.databinding.CdsTemporaryErrorBottomSheetBinding import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions import kotlin.time.Duration.Companion.milliseconds diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt index a3b617b843..b5b0f00436 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt @@ -13,6 +13,7 @@ import androidx.fragment.app.viewModels import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R @@ -36,7 +37,6 @@ import org.thoughtcrime.securesms.polls.PollOption import org.thoughtcrime.securesms.polls.PollRecord import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.NetworkUtil import org.thoughtcrime.securesms.util.StickyHeaderDecoration import org.thoughtcrime.securesms.util.fragments.findListener diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment.kt index 715ca01633..e9ce015d62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment.kt @@ -14,10 +14,10 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.ServiceUtil import org.thoughtcrime.securesms.util.fragments.findListener diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet.kt index 45abb6abd3..7652fbba31 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet.kt @@ -12,11 +12,11 @@ import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat +import org.signal.core.ui.BottomSheetUtil import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.databinding.ScheduleMessageTimePickerBottomSheetBinding -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.DateUtils import org.thoughtcrime.securesms.util.atMidnight import org.thoughtcrime.securesms.util.atUTC diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt index c8a023f2b5..f797fe3968 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt @@ -15,6 +15,8 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.BottomSheetUtil +import org.signal.core.ui.BottomSheetUtil.requireCoordinatorLayout import org.signal.core.util.StreamUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.concurrent.SimpleTask @@ -43,8 +45,6 @@ import org.thoughtcrime.securesms.mms.PartAuthority import org.thoughtcrime.securesms.mms.TextSlide import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil -import org.thoughtcrime.securesms.util.BottomSheetUtil.requireCoordinatorLayout import org.thoughtcrime.securesms.util.StickyHeaderDecoration import org.thoughtcrime.securesms.util.Util import org.thoughtcrime.securesms.util.fragments.requireListener diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ShowAdminsBottomSheetDialog.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ShowAdminsBottomSheetDialog.java index 3302534e5f..27e7c7ec56 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ShowAdminsBottomSheetDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ShowAdminsBottomSheetDialog.java @@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.database.model.GroupRecord; import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.groups.ui.GroupMemberListView; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.CommunicationActions; import org.signal.core.util.concurrent.LifecycleDisposable; import org.thoughtcrime.securesms.util.WindowUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt index 56ba0b9616..846dbf4178 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt @@ -27,6 +27,7 @@ import androidx.fragment.app.setFragmentResultListener import androidx.fragment.app.viewModels import androidx.recyclerview.widget.RecyclerView import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableArrayListCompat import org.signal.core.util.getParcelableCompat @@ -57,7 +58,6 @@ import org.thoughtcrime.securesms.stories.Stories.getHeaderAction import org.thoughtcrime.securesms.stories.settings.create.CreateStoryFlowDialogFragment import org.thoughtcrime.securesms.stories.settings.create.CreateStoryWithViewersFragment import org.thoughtcrime.securesms.stories.settings.privacy.ChooseInitialMyStoryMembershipBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.FullscreenHelper import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.ViewUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesBottomSheet.kt index 9bfe49788e..82112f0ffc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesBottomSheet.kt @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment @@ -41,7 +42,6 @@ import org.thoughtcrime.securesms.polls.PollOption import org.thoughtcrime.securesms.polls.PollRecord import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.StickyHeaderDecoration import org.thoughtcrime.securesms.util.fragments.findListener import java.util.Locale diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryDialog.kt index 7d0475d531..9f4e6dc329 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryDialog.kt @@ -14,6 +14,7 @@ import com.bumptech.glide.Glide import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import io.reactivex.rxjava3.kotlin.subscribeBy +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment @@ -39,7 +40,6 @@ import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.StickyHeaderDecoration import org.thoughtcrime.securesms.util.ViewModelFactory import org.thoughtcrime.securesms.util.fragments.requireListener 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 0738b2af90..de5820e3e8 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 @@ -102,6 +102,7 @@ import org.greenrobot.eventbus.Subscribe 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.util.ByteLimitInputFilter import org.signal.core.util.PendingIntentFlags import org.signal.core.util.Result @@ -326,7 +327,6 @@ import org.thoughtcrime.securesms.stickers.manage.StickerManagementScreen import org.thoughtcrime.securesms.stickers.preview.StickerPackPreviewActivity import org.thoughtcrime.securesms.stories.StoryViewerArgs import org.thoughtcrime.securesms.stories.viewer.StoryViewerActivity -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.BubbleUtil import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.ContextUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/JumpToDateValidator.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/JumpToDateValidator.kt index 8b34989d73..ad10b5650c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/JumpToDateValidator.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/JumpToDateValidator.kt @@ -8,9 +8,9 @@ package org.thoughtcrime.securesms.conversation.v2 import com.google.android.material.datepicker.CalendarConstraints.DateValidator import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize +import org.signal.core.util.LRUCache import org.signal.core.util.concurrent.SignalExecutors import org.thoughtcrime.securesms.database.SignalDatabase -import org.thoughtcrime.securesms.util.LRUCache import java.time.Instant import java.time.LocalDate import java.time.LocalDateTime diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinDisappearingMessageBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinDisappearingMessageBottomSheet.kt index f707c06024..781fbc7d33 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinDisappearingMessageBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinDisappearingMessageBottomSheet.kt @@ -16,13 +16,13 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Bottom sheet informing users about pinning disappearing messages diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt index 495fcc84cd..b4a3d6d45c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt @@ -31,13 +31,13 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.horizontalGutters import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Bottom sheet shown in message request state that explains that profile names are unverified diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java index 12f0814c26..5fdcd1a4b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java @@ -71,7 +71,7 @@ public class ConversationListArchiveFragment extends ConversationListFragment lifecycleDisposable.bindTo(getViewLifecycleOwner()); - coordinator = view.findViewById(R.id.coordinator); + coordinator = view.findViewById(org.signal.core.ui.R.id.coordinator); list = view.findViewById(R.id.list); emptyState = new Stub<>(view.findViewById(R.id.empty_state)); foldersList = view.findViewById(R.id.chat_folder_list); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java index 3732d5cab4..59fe1c9671 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java @@ -152,7 +152,7 @@ import org.thoughtcrime.securesms.search.MessageResult; import org.thoughtcrime.securesms.sms.MessageSender; import org.thoughtcrime.securesms.util.AppForegroundObserver; import org.thoughtcrime.securesms.util.AppStartup; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.CachedInflater; import org.thoughtcrime.securesms.util.ConversationUtil; import org.thoughtcrime.securesms.util.ServiceUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RelinkDevicesReminderBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RelinkDevicesReminderBottomSheetFragment.kt index b78a765af0..603b515bc0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RelinkDevicesReminderBottomSheetFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RelinkDevicesReminderBottomSheetFragment.kt @@ -15,12 +15,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Bottom Sheet Dialog to remind a user who has just re-registered to re-link their linked devices. diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RestoreCompleteBottomSheetDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RestoreCompleteBottomSheetDialog.kt index c5e9fff551..1003ec8a13 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RestoreCompleteBottomSheetDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/RestoreCompleteBottomSheetDialog.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews @@ -31,7 +32,6 @@ import org.signal.core.ui.compose.horizontalGutters import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Bottom sheet dialog shown on an old device after the user has decided to transfer/restore to a new device. diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java index 59dd7c6217..2bb34a9dc4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java @@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.util.IdentityUtil; -import org.thoughtcrime.securesms.util.LRUCache; +import org.signal.core.util.LRUCache; import org.whispersystems.signalservice.api.SignalSessionLock; import org.signal.core.models.ServiceId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyDeliveryReceiptCache.java b/app/src/main/java/org/thoughtcrime/securesms/database/EarlyDeliveryReceiptCache.java index 6e65b72452..820a2010f5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyDeliveryReceiptCache.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/EarlyDeliveryReceiptCache.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.thoughtcrime.securesms.util.LRUCache; +import org.signal.core.util.LRUCache; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PendingPniSignatureMessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/PendingPniSignatureMessageTable.kt index 9c2547237f..a897492de1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PendingPniSignatureMessageTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PendingPniSignatureMessageTable.kt @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.database import android.content.Context import androidx.core.content.contentValuesOf +import org.signal.core.util.LRUCache import org.signal.core.util.delete import org.signal.core.util.deleteAll import org.signal.core.util.exists @@ -9,7 +10,6 @@ import org.signal.core.util.logging.Log import org.signal.core.util.update import org.signal.core.util.withinTransaction import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.LRUCache import org.whispersystems.signalservice.api.messages.SendMessageResult import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.withLock diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt index 94e2d14d51..80e0c09227 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt @@ -12,6 +12,7 @@ import org.json.JSONObject import org.jsoup.helper.StringUtil import org.signal.core.models.ServiceId import org.signal.core.util.CursorUtil +import org.signal.core.util.LRUCache import org.signal.core.util.SqlUtil import org.signal.core.util.Stopwatch import org.signal.core.util.delete @@ -69,7 +70,6 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.util.ConversationUtil import org.thoughtcrime.securesms.util.JsonUtils import org.thoughtcrime.securesms.util.JsonUtils.SaneJSONObject -import org.thoughtcrime.securesms.util.LRUCache import org.thoughtcrime.securesms.util.TextSecurePreferences import org.thoughtcrime.securesms.util.isPoll import org.thoughtcrime.securesms.util.isScheduled diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt index ac20876d3d..a25b3890a1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt @@ -13,12 +13,12 @@ import kotlinx.serialization.Transient import okio.ByteString import org.signal.core.util.DatabaseId import org.signal.core.util.Hex +import org.signal.core.util.LRUCache import org.signal.libsignal.protocol.kdf.HKDF import org.signal.libsignal.zkgroup.InvalidInputException import org.signal.libsignal.zkgroup.groups.GroupIdentifier import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.signal.libsignal.zkgroup.groups.GroupSecretParams -import org.thoughtcrime.securesms.util.LRUCache import org.thoughtcrime.securesms.util.Util import java.io.IOException import java.security.SecureRandom diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invite/GroupLinkInviteFriendsBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invite/GroupLinkInviteFriendsBottomSheetDialogFragment.java index 504891fcfd..02bcbf3af2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invite/GroupLinkInviteFriendsBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invite/GroupLinkInviteFriendsBottomSheetDialogFragment.java @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.groups.BadGroupIdException; import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.recipients.ui.sharablegrouplink.GroupLinkBottomSheetDialogFragment; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.WindowUtil; import org.thoughtcrime.securesms.util.views.SimpleProgressDialog; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesFragment.java index 82b5a9289d..bda659d69d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesFragment.java @@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.groups.ui.AdminActionsListener; import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry; import org.thoughtcrime.securesms.groups.ui.GroupMemberListView; import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java index 8a4e443eff..863d29f1e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java @@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.conversation.colors.AvatarColor; import org.thoughtcrime.securesms.groups.ui.managegroup.dialogs.GroupDescriptionDialog; import org.thoughtcrime.securesms.groups.v2.GroupDescriptionUtil; import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.LongClickMovementMethod; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.WindowUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinUpdateRequiredBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinUpdateRequiredBottomSheetDialogFragment.java index ff70d6a0e7..79734b8325 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinUpdateRequiredBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinUpdateRequiredBottomSheetDialogFragment.java @@ -15,7 +15,7 @@ import androidx.fragment.app.FragmentManager; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.PlayStoreUtil; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.WindowUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/requesting/RequestingMembersFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/requesting/RequestingMembersFragment.java index 332c427507..8c248b7a88 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/requesting/RequestingMembersFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/requesting/RequestingMembersFragment.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry; import org.thoughtcrime.securesms.groups.ui.GroupMemberListView; import org.thoughtcrime.securesms.groups.v2.GroupLinkUrlAndStatus; import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupsLearnMoreBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupsLearnMoreBottomSheetDialogFragment.java index f7d2e880c3..ceed5cfde7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupsLearnMoreBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupsLearnMoreBottomSheetDialogFragment.java @@ -13,7 +13,7 @@ import androidx.fragment.app.FragmentManager; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.WindowUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationInfoBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationInfoBottomSheetDialogFragment.java index 9c02e18fa7..204b1c1a96 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationInfoBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationInfoBottomSheetDialogFragment.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange; import org.thoughtcrime.securesms.groups.ui.GroupMemberListView; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.WindowUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobTracker.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobTracker.java index e37508e5ef..a4791382c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobTracker.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobTracker.java @@ -7,7 +7,7 @@ import androidx.annotation.Nullable; import com.annimon.stream.Stream; import org.signal.core.util.concurrent.SignalExecutors; -import org.thoughtcrime.securesms.util.LRUCache; +import org.signal.core.util.LRUCache; import java.util.ArrayList; import java.util.Collection; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.kt index 4e5be8af81..fc7d002c9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.kt @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.jobs import androidx.annotation.VisibleForTesting import kotlinx.collections.immutable.toImmutableSet +import org.signal.core.util.LRUCache import org.signal.core.util.Stopwatch import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.database.JobDatabase @@ -11,7 +12,6 @@ import org.thoughtcrime.securesms.jobmanager.persistence.DependencySpec import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage -import org.thoughtcrime.securesms.util.LRUCache import java.util.TreeSet import java.util.concurrent.atomic.AtomicInteger import java.util.function.Predicate 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 ac04465be2..b9102e9c13 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.kt @@ -46,6 +46,7 @@ import org.signal.camera.VideoOutput 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.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment @@ -53,7 +54,6 @@ import org.thoughtcrime.securesms.mediasend.camerax.CameraXModePolicy import org.thoughtcrime.securesms.permissions.PermissionDeniedBottomSheet.Companion.showPermissionFragment import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.stories.Stories -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.MemoryFileDescriptor import org.thoughtcrime.securesms.video.VideoUtil import java.io.ByteArrayOutputStream diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java index 33bd454ab8..bb17fa0117 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java @@ -46,6 +46,7 @@ import java.util.stream.Collectors; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.schedulers.Schedulers; +import kotlin.collections.MapsKt; /** * Handles the retrieval of media present on the user's device. diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/QuickRestoreInfoDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/QuickRestoreInfoDialog.kt index 6dac96c044..73b8b260e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/QuickRestoreInfoDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/QuickRestoreInfoDialog.kt @@ -16,13 +16,13 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Bottom sheet dialog displayed when users scan a quick restore with the system camera and then diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt index 4c6e1844f4..85f43f5fff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt @@ -32,6 +32,7 @@ import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.imageview.ShapeableImageView import org.signal.core.models.media.Media +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.bytes import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.concurrent.SimpleTask @@ -57,7 +58,6 @@ import org.thoughtcrime.securesms.mms.SentMediaQuality import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.scribbles.ImageEditorFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.SystemWindowInsetsSetter import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt index 9c3e15fa83..cd1bbf5a4a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt @@ -13,6 +13,7 @@ import com.squareup.wire.internal.toUnmodifiableList import org.signal.core.models.ServiceId import org.signal.core.models.ServiceId.ACI import org.signal.core.models.ServiceId.PNI +import org.signal.core.util.LRUCache import org.signal.core.util.PendingIntentFlags import org.signal.core.util.UuidUtil import org.signal.core.util.isAbsent @@ -57,7 +58,6 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels import org.thoughtcrime.securesms.notifications.NotificationIds import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.LRUCache import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.asChain import org.whispersystems.signalservice.api.InvalidMessageStructureException diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java index e46f52c398..621579da06 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java @@ -42,7 +42,7 @@ import org.thoughtcrime.securesms.payments.Payee; import org.thoughtcrime.securesms.payments.preferences.PaymentsHomeFragmentDirections; import org.thoughtcrime.securesms.payments.preferences.RecipientHasNotEnabledPaymentsDialog; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.WindowUtil; import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java index a82fa4ad40..96b610e7b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java +++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java @@ -26,9 +26,8 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.util.BottomSheetUtil; -import org.thoughtcrime.securesms.util.LRUCache; -import org.thoughtcrime.securesms.util.ServiceUtil; +import org.signal.core.ui.BottomSheetUtil; +import org.signal.core.util.LRUCache; import java.lang.ref.WeakReference; import java.security.SecureRandom; @@ -325,7 +324,7 @@ public class Permissions { abstract void requestPermissions(int requestCode, String... permissions); int getWindowWidth() { - WindowManager windowManager = ServiceUtil.getWindowManager(getContext()); + WindowManager windowManager = ContextCompat.getSystemService(getContext(), WindowManager.class); Display display = windowManager.getDefaultDisplay(); DisplayMetrics metrics = new DisplayMetrics(); display.getMetrics(metrics); diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java index a73865bbf1..adfd0a5f70 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment; import org.thoughtcrime.securesms.stories.settings.my.SignalConnectionsBottomSheetDialogFragment; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; public class ReviewCardDialogFragment extends FullScreenDialogFragment { diff --git a/app/src/main/java/org/thoughtcrime/securesms/proxy/ProxyBottomSheetFragment.java b/app/src/main/java/org/thoughtcrime/securesms/proxy/ProxyBottomSheetFragment.java index ad7d3b1db3..3dcf72c2a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/proxy/ProxyBottomSheetFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/proxy/ProxyBottomSheetFragment.java @@ -19,7 +19,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.preferences.EditProxyViewModel; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.signal.core.util.concurrent.LifecycleDisposable; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.WindowUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofBottomSheetFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofBottomSheetFragment.java index a58012b758..769e504c1f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofBottomSheetFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofBottomSheetFragment.java @@ -16,7 +16,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.WindowUtil; /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java index 55e216b623..e328f35fcf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.ThreadTable; import org.thoughtcrime.securesms.database.model.ThreadRecord; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.signal.core.util.CursorUtil; -import org.thoughtcrime.securesms.util.LRUCache; +import org.signal.core.util.LRUCache; import org.signal.core.util.Stopwatch; import org.thoughtcrime.securesms.util.concurrent.FilteredExecutor; import org.signal.core.models.ServiceId.ACI; diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt index 0f4808bb4b..22e4b6f662 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt @@ -23,6 +23,7 @@ import androidx.lifecycle.repeatOnLifecycle import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.avatar.view.AvatarView @@ -41,7 +42,6 @@ import org.thoughtcrime.securesms.recipients.RecipientExporter import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.recipients.RecipientUtil import org.thoughtcrime.securesms.recipients.ui.about.AboutSheet -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.ContextUtil import org.thoughtcrime.securesms.util.SpanUtil import org.thoughtcrime.securesms.util.ViewUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/GroupLinkBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/GroupLinkBottomSheetDialogFragment.java index 247158b326..afe1367c33 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/GroupLinkBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/GroupLinkBottomSheetDialogFragment.java @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.groups.LiveGroup; import org.thoughtcrime.securesms.recipients.ui.sharablegrouplink.qr.GroupLinkShareQrDialogFragment; import org.thoughtcrime.securesms.sharing.MultiShareArgs; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.WindowUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/qr/GroupLinkShareQrDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/qr/GroupLinkShareQrDialogFragment.java index eb4bcd351a..446fef40f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/qr/GroupLinkShareQrDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/qr/GroupLinkShareQrDialogFragment.java @@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.components.qr.QrView; import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.qr.QrCodeUtil; -import org.thoughtcrime.securesms.util.BottomSheetUtil; +import org.signal.core.ui.BottomSheetUtil; import org.thoughtcrime.securesms.util.ThemeUtil; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt index c6651e26a8..6e45a88106 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt @@ -12,6 +12,7 @@ import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.schedulers.Schedulers import org.signal.core.models.media.Media import org.signal.core.models.media.TransformProperties +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.ThreadUtil import org.signal.core.util.logging.Log import org.signal.core.util.orNull @@ -33,7 +34,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.recipients.RecipientUtil import org.thoughtcrime.securesms.sms.MessageSender import org.thoughtcrime.securesms.storage.StorageSyncHelper -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.hasLinkPreview import java.util.concurrent.CountDownLatch diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipBottomSheetDialogFragment.kt index 4cb03b653e..25ccc980cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipBottomSheetDialogFragment.kt @@ -9,6 +9,7 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.viewModels import com.google.android.material.radiobutton.MaterialRadioButton +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment @@ -17,7 +18,6 @@ import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.stories.settings.connections.ViewAllSignalConnectionsFragment import org.thoughtcrime.securesms.stories.settings.select.BaseStoryRecipientSelectionFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.fragments.findListener import org.thoughtcrime.securesms.util.visible diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt index 57a55d0c71..567359df0f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt @@ -4,6 +4,7 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.ConcatAdapter +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.dp import org.thoughtcrime.securesms.R @@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.stories.GroupStoryEducationSheet import org.thoughtcrime.securesms.stories.dialogs.StoryDialogs import org.thoughtcrime.securesms.stories.settings.create.CreateStoryFlowDialogFragment import org.thoughtcrime.securesms.stories.settings.create.CreateStoryWithViewersFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter import org.thoughtcrime.securesms.util.adapter.mapping.PagingMappingAdapter import org.thoughtcrime.securesms.util.navigation.safeNavigate diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt index 51193a86e3..10181e806b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt @@ -47,6 +47,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.kotlin.subscribeBy import kotlinx.coroutines.launch +import org.signal.core.ui.BottomSheetUtil import org.signal.core.util.DimensionUnit import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.dp @@ -90,7 +91,6 @@ import org.thoughtcrime.securesms.stories.viewer.reply.reaction.OnReactionSentVi import org.thoughtcrime.securesms.stories.viewer.reply.tabs.StoryViewsAndRepliesDialogFragment import org.thoughtcrime.securesms.stories.viewer.views.StoryViewsBottomSheetDialogFragment import org.thoughtcrime.securesms.util.AvatarUtil -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.DateUtils import org.thoughtcrime.securesms.util.Debouncer import org.thoughtcrime.securesms.util.LinkUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyBottomSheetDialogFragment.kt index c00dc10bed..6ceb657eb0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyBottomSheetDialogFragment.kt @@ -11,6 +11,7 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.viewModels import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog +import org.signal.core.ui.BottomSheetUtil.requireCoordinatorLayout import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R @@ -19,7 +20,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.stories.viewer.page.StoryViewerPageViewModel import org.thoughtcrime.securesms.stories.viewer.reply.BottomSheetBehaviorDelegate import org.thoughtcrime.securesms.stories.viewer.reply.reaction.OnReactionSentView -import org.thoughtcrime.securesms.util.BottomSheetUtil.requireCoordinatorLayout import kotlin.math.min import kotlin.math.roundToInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/tabs/StoryViewsAndRepliesDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/tabs/StoryViewsAndRepliesDialogFragment.kt index 88d520c1d8..446c60f2c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/tabs/StoryViewsAndRepliesDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/tabs/StoryViewsAndRepliesDialogFragment.kt @@ -15,6 +15,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator +import org.signal.core.ui.BottomSheetUtil.requireCoordinatorLayout import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.getParcelableCompat import org.thoughtcrime.securesms.R @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.stories.viewer.reply.StoryViewsAndRepliesPager import org.thoughtcrime.securesms.stories.viewer.reply.StoryViewsAndRepliesPagerParent import org.thoughtcrime.securesms.stories.viewer.reply.group.StoryGroupReplyFragment import org.thoughtcrime.securesms.stories.viewer.reply.reaction.OnReactionSentView -import org.thoughtcrime.securesms.util.BottomSheetUtil.requireCoordinatorLayout import kotlin.math.min import kotlin.math.roundToInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/EarlyMessageCache.java b/app/src/main/java/org/thoughtcrime/securesms/util/EarlyMessageCache.java index 7b4986e319..d7d87bfbef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/EarlyMessageCache.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/EarlyMessageCache.java @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.util; import androidx.annotation.NonNull; +import org.signal.core.util.LRUCache; import org.thoughtcrime.securesms.database.model.ServiceMessageId; import org.thoughtcrime.securesms.recipients.RecipientId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt b/app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt index a1d577e502..315065a196 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.util import android.os.SystemClock +import org.signal.core.util.LRUCache import org.signal.core.util.ThreadUtil import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.logging.Log diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SignalE164Util.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SignalE164Util.kt index 29eddd217f..17d033438c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SignalE164Util.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SignalE164Util.kt @@ -7,6 +7,7 @@ package org.thoughtcrime.securesms.util import org.signal.core.util.BidiUtil import org.signal.core.util.E164Util +import org.signal.core.util.LRUCache import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/EncryptionVerifiedSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/EncryptionVerifiedSheet.kt index cf6e965809..97b93dd799 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/verify/EncryptionVerifiedSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/verify/EncryptionVerifiedSheet.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews @@ -26,7 +27,6 @@ import org.signal.core.ui.compose.horizontalGutters import org.signal.core.util.getSerializableCompat import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment -import org.thoughtcrime.securesms.util.BottomSheetUtil /** * Bottom sheet info explaining the results of automatic key verification diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/SelfVerificationFailureSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/SelfVerificationFailureSheet.kt index 232a6759f1..be984036f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/verify/SelfVerificationFailureSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/verify/SelfVerificationFailureSheet.kt @@ -34,6 +34,7 @@ import androidx.compose.ui.unit.dp import androidx.fragment.app.FragmentManager import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews @@ -42,7 +43,6 @@ import org.signal.core.ui.compose.horizontalGutters import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.SupportEmailUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyAutomaticallyEducationSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyAutomaticallyEducationSheet.kt index 5c16888fec..2746b6ee87 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyAutomaticallyEducationSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyAutomaticallyEducationSheet.kt @@ -21,6 +21,7 @@ import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager import androidx.fragment.app.setFragmentResult +import org.signal.core.ui.BottomSheetUtil import org.signal.core.ui.compose.BottomSheets import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.DayNightPreviews @@ -28,7 +29,6 @@ import org.signal.core.ui.compose.Previews import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CommunicationActions /** diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index 3cd649b9c7..b03512ee37 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -1,6 +1,5 @@ - diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 54dc41a4c2..28f479e5de 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -36,4 +36,5 @@ dependencies { api(libs.androidx.fragment.compose) implementation(libs.kotlinx.serialization.json) api(libs.google.zxing.core) + api(libs.material.material) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BottomSheetUtil.kt b/core/ui/src/main/java/org/signal/core/ui/BottomSheetUtil.kt similarity index 90% rename from app/src/main/java/org/thoughtcrime/securesms/util/BottomSheetUtil.kt rename to core/ui/src/main/java/org/signal/core/ui/BottomSheetUtil.kt index e528b1e6a3..cec38e0a9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BottomSheetUtil.kt +++ b/core/ui/src/main/java/org/signal/core/ui/BottomSheetUtil.kt @@ -1,9 +1,8 @@ -package org.thoughtcrime.securesms.util +package org.signal.core.ui import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.fragment.app.FragmentManager import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import org.thoughtcrime.securesms.R object BottomSheetUtil { const val STANDARD_BOTTOM_SHEET_FRAGMENT_TAG = "BOTTOM" diff --git a/core/ui/src/main/res/values/ids.xml b/core/ui/src/main/res/values/ids.xml new file mode 100644 index 0000000000..64c42e6f67 --- /dev/null +++ b/core/ui/src/main/res/values/ids.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java b/core/util-jvm/src/main/java/org/signal/core/util/LRUCache.java similarity index 74% rename from app/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java rename to core/util-jvm/src/main/java/org/signal/core/util/LRUCache.java index ea15ecc24a..97780c5388 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java +++ b/core/util-jvm/src/main/java/org/signal/core/util/LRUCache.java @@ -1,4 +1,9 @@ -package org.thoughtcrime.securesms.util; +/* + * Copyright 2026 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.util; import java.util.LinkedHashMap; import java.util.Map; diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 49a64aec58..b943e2493f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3701,6 +3701,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3725,6 +3730,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3792,6 +3802,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + +