Move several Permissions dependencies to core.

2026-04-19 00:01:08 +01:00 · 2026-02-04 13:17:29 -04:00
parent a74651d915
commit 36b6122b0f
65 changed files with 87 additions and 78 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
@@ -7,6 +7,7 @@ import androidx.core.content.res.use
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
+import org.signal.core.ui.util.ThemeUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.load.BadgeSpriteTransformation
 import org.thoughtcrime.securesms.badges.load.GiftBadgeModel
@@ -15,7 +16,6 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImag
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.ScreenDensity
-import org.thoughtcrime.securesms.util.ThemeUtil

 class BadgeImageView @JvmOverloads constructor(
  context: Context,
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
@@ -13,11 +13,11 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
+import org.signal.core.ui.util.ThemeUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.load.BadgeSpriteTransformation
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.serialization.UriSerializer
-import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
--- a/app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java
@@ -8,12 +8,12 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;

 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;

 import java.util.HashMap;
 import java.util.Map;

-import static org.thoughtcrime.securesms.util.ThemeUtil.isDarkTheme;
+import static org.signal.core.ui.util.ThemeUtil.isDarkTheme;

 public enum MaterialColor {
  CRIMSON    (R.color.conversation_crimson,     R.color.conversation_crimson_tint,     R.color.conversation_crimson_shade,     "red"),
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
@@ -18,13 +18,13 @@ import androidx.annotation.Nullable;

 import com.bumptech.glide.RequestManager;

+import org.signal.core.ui.view.Stub;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.transfercontrols.TransferControlView;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.views.Stub;

 import java.util.List;

--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt
@@ -17,6 +17,7 @@ import androidx.annotation.Px
 import androidx.annotation.UiThread
 import androidx.core.os.bundleOf
 import com.bumptech.glide.RequestManager
+import org.signal.core.ui.view.Stub
 import org.signal.core.util.dp
 import org.signal.core.util.getParcelableCompat
 import org.thoughtcrime.securesms.R
@@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.mms.Slide
 import org.thoughtcrime.securesms.mms.SlideClickListener
 import org.thoughtcrime.securesms.mms.SlidesClickedListener
 import org.thoughtcrime.securesms.util.Projection.Corners
-import org.thoughtcrime.securesms.util.views.Stub

 class ConversationItemThumbnail @JvmOverloads constructor(
  context: Context,
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt
@@ -11,9 +11,9 @@ import android.view.View
 import android.view.View.OnLongClickListener
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
+import org.signal.core.ui.view.Stub
 import org.thoughtcrime.securesms.mms.SlideClickListener
 import org.thoughtcrime.securesms.mms.SlidesClickedListener
-import org.thoughtcrime.securesms.util.views.Stub

 /**
 * Parcelable state object for [ConversationItemThumbnail]
--- a/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
@@ -15,8 +15,8 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
+import org.signal.core.ui.util.ThemeUtil
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.WindowUtil
 import org.thoughtcrime.securesms.window.getWindowSizeClass
--- a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
@@ -18,6 +18,7 @@ import androidx.annotation.StringRes;

 import com.bumptech.glide.RequestManager;

+import org.signal.core.ui.view.Stub;
 import org.signal.ringrtc.CallLinkRootKey;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar;
@@ -30,7 +31,6 @@ import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.views.Stub;

 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewViewThumbnailState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewViewThumbnailState.kt
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.components
 import android.os.Parcelable
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
+import org.signal.core.ui.view.Stub
 import org.thoughtcrime.securesms.mms.SlidesClickedListener
-import org.thoughtcrime.securesms.util.views.Stub

@Parcelize
 data class LinkPreviewViewThumbnailState(
--- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
@@ -24,6 +24,7 @@ import com.google.android.material.shape.ShapeAppearanceModel;

 import org.signal.core.util.DimensionUnit;
 import org.signal.core.util.logging.Log;
+import org.signal.core.ui.view.Stub;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.components.emoji.EmojiImageView;
@@ -45,7 +46,6 @@ import org.thoughtcrime.securesms.stories.StoryTextPostModel;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.views.Stub;

 import java.io.IOException;
 import java.util.List;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -39,6 +39,7 @@ import org.signal.core.util.concurrent.ListenableFuture;
 import org.signal.core.util.concurrent.SettableFuture;
 import org.signal.core.util.logging.Log;
 import org.signal.blurhash.BlurHash;
+import org.signal.core.ui.view.Stub;
 import org.signal.glide.decryptableuri.DecryptableUri;
 import org.signal.glide.load.SignalDownsampleStrategy;
 import org.thoughtcrime.securesms.R;
@@ -59,7 +60,6 @@ import org.thoughtcrime.securesms.stories.StoryTextPostModel;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.views.Stub;

 import java.util.Arrays;
 import java.util.Collections;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt
@@ -40,9 +40,9 @@ import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.SignalIcons
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.getParcelableExtraCompat
+import org.signal.core.util.permissions.PermissionCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.SignalTheme
-import org.thoughtcrime.securesms.permissions.PermissionCompat
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -58,7 +58,7 @@ import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ProjectionList;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;

 import java.util.Calendar;
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -74,6 +74,7 @@ import org.signal.core.util.BidiUtil;
 import org.signal.core.util.DimensionUnit;
 import org.signal.core.util.StringUtil;
 import org.signal.core.util.logging.Log;
+import org.signal.core.ui.view.Stub;
 import org.thoughtcrime.securesms.BindableConversationItem;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
@@ -146,13 +147,12 @@ import org.thoughtcrime.securesms.util.PlaceholderURLSpan;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ProjectionList;
 import org.thoughtcrime.securesms.util.SearchUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.UrlClickHandler;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.VibrateUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.NullableStub;
-import org.thoughtcrime.securesms.util.views.Stub;

 import java.util.ArrayList;
 import java.util.Collections;
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionDelegate.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionDelegate.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;

 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.views.Stub;
+import org.signal.core.ui.view.Stub;

 /**
 * Delegate class that mimics the ConversationReactionOverlay public API
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -54,7 +54,7 @@ import org.thoughtcrime.securesms.util.MessageRecordUtil;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ProjectionList;
 import org.thoughtcrime.securesms.util.SpanUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.ViewUtil;
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/NameColor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/NameColor.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.conversation.colors

 import android.content.Context
 import androidx.annotation.ColorInt
-import org.thoughtcrime.securesms.util.ThemeUtil
+import org.signal.core.ui.util.ThemeUtil

 /**
 * Class which stores information for a Recipient's name color in a group.
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorPreviewView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorPreviewView.kt
@@ -11,6 +11,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import org.signal.core.ui.util.ThemeUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.DeliveryStatusView
@@ -19,7 +20,6 @@ import org.thoughtcrime.securesms.conversation.colors.Colorizer
 import org.thoughtcrime.securesms.conversation.colors.ColorizerView
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.Projection
-import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
 import java.util.Locale
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration.kt
@@ -31,13 +31,13 @@ import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.lottie.SimpleColorFilter
 import com.google.android.material.animation.ArgbEvaluatorCompat
+import org.signal.core.ui.util.ThemeUtil
 import org.signal.core.util.SetUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.conversation.ConversationAdapterBridge
 import org.thoughtcrime.securesms.conversation.ConversationAdapterBridge.PulseRequest
 import org.thoughtcrime.securesms.conversation.v2.items.InteractiveConversationElement
 import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord
-import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
 import java.lang.Integer.max
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt
@@ -17,6 +17,7 @@ import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.transition.addListener
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import org.signal.core.ui.view.Stub
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.banner.Banner
 import org.thoughtcrime.securesms.banner.BannerManager
@@ -32,7 +33,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.DynamicTheme
 import org.thoughtcrime.securesms.util.IdentityUtil
 import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.views.Stub
 import org.thoughtcrime.securesms.util.visible

 /**
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -103,6 +103,8 @@ import org.greenrobot.eventbus.ThreadMode
 import org.signal.core.models.media.Media
 import org.signal.core.models.media.TransformProperties
 import org.signal.core.ui.BottomSheetUtil
+import org.signal.core.ui.util.ThemeUtil
+import org.signal.core.ui.view.Stub
 import org.signal.core.util.ByteLimitInputFilter
 import org.signal.core.util.PendingIntentFlags
 import org.signal.core.util.Result
@@ -347,7 +349,6 @@ import org.thoughtcrime.securesms.util.PlayStoreUtil
 import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.atMidnight
 import org.thoughtcrime.securesms.util.atUTC
@@ -365,7 +366,6 @@ import org.thoughtcrime.securesms.util.padding
 import org.thoughtcrime.securesms.util.setIncognitoKeyboardEnabled
 import org.thoughtcrime.securesms.util.toMillis
 import org.thoughtcrime.securesms.util.viewModel
-import org.thoughtcrime.securesms.util.views.Stub
 import org.thoughtcrime.securesms.util.visible
 import org.thoughtcrime.securesms.verify.VerifyAutomaticallyEducationSheet
 import org.thoughtcrime.securesms.verify.VerifyIdentityActivity
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemMediaBindingBridge.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemMediaBindingBridge.kt
@@ -6,10 +6,10 @@
 package org.thoughtcrime.securesms.conversation.v2.items

 import android.widget.Space
+import org.signal.core.ui.view.Stub
 import org.thoughtcrime.securesms.components.QuoteView
 import org.thoughtcrime.securesms.databinding.V2ConversationItemMediaIncomingBinding
 import org.thoughtcrime.securesms.databinding.V2ConversationItemMediaOutgoingBinding
-import org.thoughtcrime.securesms.util.views.Stub

 /**
 * Pass-through interface for bridging incoming and outgoing media message views.
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
@@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.RecyclerView
+import org.signal.core.ui.util.ThemeUtil
 import org.signal.core.util.StringUtil
 import org.signal.core.util.dp
 import org.thoughtcrime.securesms.R
@@ -53,7 +54,6 @@ import org.thoughtcrime.securesms.util.Projection
 import org.thoughtcrime.securesms.util.ProjectionList
 import org.thoughtcrime.securesms.util.SearchUtil
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
-import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.VibrateUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate.kt
@@ -7,13 +7,13 @@ package org.thoughtcrime.securesms.conversation.v2.items

 import android.view.View
 import android.widget.Space
+import org.signal.core.ui.view.Stub
 import org.signal.core.util.BidiUtil
 import org.signal.core.util.dp
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.padding
-import org.thoughtcrime.securesms.util.views.Stub
 import org.thoughtcrime.securesms.util.visible
 import kotlin.math.max

--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt
@@ -17,6 +17,7 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import org.signal.core.models.media.Media
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.concurrent.addTo
+import org.signal.core.util.permissions.PermissionCompat
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.conversation.AttachmentKeyboard
@@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.conversation.AttachmentKeyboardButton
 import org.thoughtcrime.securesms.conversation.ManageContextMenu
 import org.thoughtcrime.securesms.conversation.v2.ConversationViewModel
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.permissions.PermissionCompat
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.RemoteConfig
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
@@ -31,13 +31,13 @@ import androidx.recyclerview.widget.RecyclerView;

 import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.ui.view.Stub;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.snackbars.SnackbarState;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.main.MainNavigationListLocation;
 import org.thoughtcrime.securesms.main.MainSnackbarHostKey;
 import org.thoughtcrime.securesms.util.ConversationUtil;
-import org.thoughtcrime.securesms.util.views.Stub;

 import java.util.Set;

--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -153,6 +153,7 @@ import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.signal.core.ui.BottomSheetUtil;
+import org.signal.core.ui.view.Stub;
 import org.thoughtcrime.securesms.util.CachedInflater;
 import org.thoughtcrime.securesms.util.ConversationUtil;
 import org.thoughtcrime.securesms.util.ServiceUtil;
@@ -161,7 +162,6 @@ import org.thoughtcrime.securesms.util.SignalProxyUtil;
 import org.thoughtcrime.securesms.util.SnapToTopDataObserver;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.adapter.mapping.PagingMappingAdapter;
-import org.thoughtcrime.securesms.util.views.Stub;
 import org.thoughtcrime.securesms.verify.SelfVerificationFailureSheet;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper;
 import org.thoughtcrime.securesms.window.WindowSizeClassExtensionsKt;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java
@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.fonts.SignalSymbols.Weight;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.SpanUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;

 import java.util.List;
--- 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
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.groups.BadGroupIdException;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.recipients.ui.sharablegrouplink.GroupLinkBottomSheetDialogFragment;
 import org.signal.core.ui.BottomSheetUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;

--- 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
@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.groups.v2.GroupDescriptionUtil;
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
 import org.signal.core.ui.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;

 public final class GroupJoinBottomSheetDialogFragment extends BottomSheetDialogFragment {
--- 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
@@ -17,7 +17,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import org.thoughtcrime.securesms.R;
 import org.signal.core.ui.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.PlayStoreUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;

 public final class GroupJoinUpdateRequiredBottomSheetDialogFragment extends BottomSheetDialogFragment {
--- 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
@@ -14,7 +14,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment;

 import org.thoughtcrime.securesms.R;
 import org.signal.core.ui.BottomSheetUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;

 public final class GroupsLearnMoreBottomSheetDialogFragment extends BottomSheetDialogFragment {
--- 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
@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
 import org.thoughtcrime.securesms.groups.ui.GroupMemberListView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.signal.core.ui.BottomSheetUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;

 import java.util.List;
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/KeyboardPagerFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/KeyboardPagerFragment.kt
@@ -8,13 +8,13 @@ import android.view.Window
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
+import org.signal.core.ui.util.ThemeUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.InputAwareConstraintLayout
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard
 import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardPageFragment
 import org.thoughtcrime.securesms.keyboard.gif.GifKeyboardPageFragment
 import org.thoughtcrime.securesms.keyboard.sticker.StickerKeyboardPageFragment
-import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.ThemedFragment.themeResId
 import org.thoughtcrime.securesms.util.ThemedFragment.themedInflate
 import org.thoughtcrime.securesms.util.ThemedFragment.withTheme
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageCategoryMappingModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageCategoryMappingModel.kt
@@ -2,11 +2,11 @@ package org.thoughtcrime.securesms.keyboard.emoji

 import android.content.Context
 import android.graphics.drawable.Drawable
+import org.signal.core.ui.util.ThemeUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel
 import org.thoughtcrime.securesms.emoji.EmojiCategory
 import org.thoughtcrime.securesms.keyboard.KeyboardPageCategoryIconMappingModel
-import org.thoughtcrime.securesms.util.ThemeUtil

 class RecentsMappingModel(override val selected: Boolean) : KeyboardPageCategoryIconMappingModel<RecentsMappingModel> {
  override val key: String = RecentEmojiPageModel.KEY
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
@@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.components.SearchView;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.LongClickCopySpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton;

--- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageFragment.java
@@ -14,6 +14,7 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.ViewModelProvider;

+import org.signal.core.ui.view.Stub;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.ConversationItemFooter;
 import org.thoughtcrime.securesms.components.FullScreenDialogFragment;
@@ -26,8 +27,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.Projection;
-import org.thoughtcrime.securesms.util.ThemeUtil;
-import org.thoughtcrime.securesms.util.views.Stub;
+import org.signal.core.ui.util.ThemeUtil;

 import java.util.Collections;
 import java.util.Locale;
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java
@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;

 import java.util.List;

--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt
@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.ItemTouchHelper
 import org.signal.core.models.media.Media
 import org.signal.core.util.Stopwatch
+import org.signal.core.util.permissions.PermissionCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
 import org.thoughtcrime.securesms.conversation.ManageContextMenu
@@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.databinding.V2MediaGalleryFragmentBinding
 import org.thoughtcrime.securesms.mediasend.MediaRepository
 import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil
 import org.thoughtcrime.securesms.mediasend.v2.review.MediaGalleryGridItemTouchListener
-import org.thoughtcrime.securesms.permissions.PermissionCompat
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.util.Material3OnScrollHelper
 import org.thoughtcrime.securesms.util.StorageUtil
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
@@ -14,6 +14,7 @@ import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
+import org.signal.core.ui.view.Stub
 import org.signal.core.util.ByteLimitInputFilter
 import org.signal.core.util.EditTextUtil
 import org.thoughtcrime.securesms.R
@@ -41,7 +42,6 @@ import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.MessageUtil
 import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.views.Stub
 import org.thoughtcrime.securesms.util.visible

 class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_add_message_dialog_fragment) {
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -43,6 +43,7 @@ import org.signal.core.util.concurrent.ListenableFuture.Listener;
 import org.signal.core.util.concurrent.SettableFuture;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
+import org.signal.core.ui.view.Stub;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.AudioView;
 import org.thoughtcrime.securesms.components.DocumentView;
@@ -65,7 +66,7 @@ import org.thoughtcrime.securesms.payments.create.CreatePaymentFragmentArgs;
 import org.thoughtcrime.securesms.payments.preferences.PaymentsActivity;
 import org.thoughtcrime.securesms.payments.preferences.RecipientHasNotEnabledPaymentsDialog;
 import org.thoughtcrime.securesms.payments.preferences.model.PayeeParcelable;
-import org.thoughtcrime.securesms.permissions.PermissionCompat;
+import org.signal.core.util.permissions.PermissionCompat;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.providers.DeprecatedPersistentBlobProvider;
@@ -78,7 +79,6 @@ import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ProfileUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
-import org.thoughtcrime.securesms.util.views.Stub;
 import org.whispersystems.signalservice.api.util.ExpiringProfileCredentialUtil;

 import java.io.IOException;
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
@@ -23,6 +23,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;

 import org.signal.core.util.logging.Log;
+import org.signal.core.ui.view.Stub;
 import org.thoughtcrime.securesms.LoggingFragment;
 import org.thoughtcrime.securesms.PaymentPreferencesDirections;
 import org.thoughtcrime.securesms.R;
@@ -43,7 +44,6 @@ import org.thoughtcrime.securesms.util.PlayStoreUtil;
 import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-import org.thoughtcrime.securesms.util.views.Stub;

 import java.util.List;
 import java.util.concurrent.TimeUnit;
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionCompat.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionCompat.kt
@@ -1,49 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.permissions
-
-import android.Manifest
-import android.os.Build
-
-/**
- * Compatibility object for requesting specific permissions that have become more
- * granular as the APIs have evolved.
- */
-object PermissionCompat {
-  @JvmStatic
-  fun forImages(): Array<String> {
-    return if (Build.VERSION.SDK_INT >= 34) {
-      arrayOf(Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
-    } else if (Build.VERSION.SDK_INT == 33) {
-      arrayOf(Manifest.permission.READ_MEDIA_IMAGES)
-    } else {
-      arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
-    }
-  }
-
-  private fun forVideos(): Array<String> {
-    return if (Build.VERSION.SDK_INT >= 34) {
-      arrayOf(Manifest.permission.READ_MEDIA_VIDEO, Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
-    } else if (Build.VERSION.SDK_INT == 33) {
-      arrayOf(Manifest.permission.READ_MEDIA_VIDEO)
-    } else {
-      arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
-    }
-  }
-
-  @JvmStatic
-  fun forImagesAndVideos(): Array<String> {
-    return setOf(*(forImages() + forVideos())).toTypedArray()
-  }
-
-  fun getRequiredPermissionsForDenial(): Array<String> {
-    return if (Build.VERSION.SDK_INT >= 34) {
-      arrayOf(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
-    } else {
-      forImagesAndVideos()
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -198,8 +198,8 @@ public class Permissions {
      MaterialAlertDialogBuilder builder = (rationaleDialogMessage != null)
                                         ? RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogMessage, rationalDialogHeader)
                                         : RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogTitle, rationaleDialogDetails, rationalDialogHeader);
-      builder.setPositiveButton(R.string.Permissions_continue, (dialog, which) -> executePermissionsRequest(request))
-             .setNegativeButton(R.string.Permissions_not_now, (dialog, which) -> executeNoPermissionsRequest(request))
+      builder.setPositiveButton(org.signal.core.ui.R.string.Permissions_continue, (dialog, which) -> executePermissionsRequest(request))
+             .setNegativeButton(org.signal.core.ui.R.string.Permissions_not_now, (dialog, which) -> executeNoPermissionsRequest(request))
             .setBackgroundInsetTop(0)
             .setBackgroundInsetBottom(0)
             .setCancelable(rationaleDialogCancelable);
@@ -426,7 +426,7 @@ public class Permissions {
            .setTitle(R.string.Permissions_permission_required)
            .setMessage(message)
            .setCancelable(false)
-            .setPositiveButton(R.string.Permissions_continue, (dialog, which) -> context.startActivity(getApplicationSettingsIntent(context)))
+            .setPositiveButton(org.signal.core.ui.R.string.Permissions_continue, (dialog, which) -> context.startActivity(getApplicationSettingsIntent(context)))
            .setNegativeButton(android.R.string.cancel, null)
            .setOnDismissListener(d -> {
              if (onDialogDismissed != null) {
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
@@ -22,8 +22,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;

 import org.signal.core.util.DimensionUnit;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ThemeUtil;
-import org.thoughtcrime.securesms.util.ViewUtil;
+import org.signal.core.ui.util.ThemeUtil;

 import java.util.Objects;

@@ -54,7 +53,7 @@ public class RationaleDialog {
        plus.setTextColor(Color.WHITE);

        LayoutParams layoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-        layoutParams.setMargins(ViewUtil.dpToPx(context, 20), 0, ViewUtil.dpToPx(context, 20), 0);
+        layoutParams.setMargins((int) DimensionUnit.DP.toPixels(20f), 0, (int) DimensionUnit.DP.toPixels(20f), 0);

        plus.setLayoutParams(layoutParams);
        header.addView(plus);
@@ -91,7 +90,7 @@ public class RationaleDialog {
        plus.setTextColor(Color.WHITE);

        LayoutParams layoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-        layoutParams.setMargins(ViewUtil.dpToPx(context, 20), 0, ViewUtil.dpToPx(context, 20), 0);
+        layoutParams.setMargins((int) DimensionUnit.DP.toPixels(20f), 0, (int) DimensionUnit.DP.toPixels(20f), 0);

        plus.setLayoutParams(layoutParams);
        header.addView(plus);
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt
@@ -1,98 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.permissions.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.res.stringResource
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.isGranted
-import com.google.accompanist.permissions.rememberPermissionState
-import org.signal.core.ui.compose.Dialogs
-import org.signal.core.ui.compose.SignalIcons
-import org.thoughtcrime.securesms.R
-
-/**
- * Dialogs and state management for permissions requests in compose screens.
- */
-object Permissions {
-
-  interface Controller {
-    fun request()
-  }
-
-  private enum class RequestState {
-    NONE,
-    RATIONALE,
-    SYSTEM
-  }
-
-  @Composable
-  fun cameraPermissionHandler(
-    rationale: String,
-    onPermissionGranted: () -> Unit
-  ): Controller {
-    return permissionHandler(
-      permission = android.Manifest.permission.CAMERA,
-      icon = SignalIcons.Camera.painter,
-      rationale = rationale,
-      onPermissionGranted = onPermissionGranted
-    )
-  }
-
-  /**
-   * Generic permissions rationale dialog and state management for single permissions.
-   */
-  @OptIn(ExperimentalPermissionsApi::class)
-  @Composable
-  fun permissionHandler(
-    permission: String,
-    icon: Painter,
-    rationale: String,
-    onPermissionGranted: () -> Unit
-  ): Controller {
-    var requestState by remember {
-      mutableStateOf(RequestState.NONE)
-    }
-
-    val permissionState = rememberPermissionState(permission = permission) {
-      if (it && requestState == RequestState.SYSTEM) {
-        onPermissionGranted()
-      }
-    }
-
-    if (requestState == RequestState.RATIONALE) {
-      Dialogs.PermissionRationaleDialog(
-        icon = icon,
-        rationale = rationale,
-        confirm = stringResource(id = R.string.Permissions_continue),
-        dismiss = stringResource(id = R.string.Permissions_not_now),
-        onConfirm = {
-          requestState = RequestState.SYSTEM
-          permissionState.launchPermissionRequest()
-        },
-        onDismiss = {
-          requestState = RequestState.NONE
-        }
-      )
-    }
-
-    return object : Controller {
-      override fun request() {
-        if (permissionState.status.isGranted) {
-          requestState = RequestState.NONE
-          onPermissionGranted()
-        } else {
-          requestState = RequestState.RATIONALE
-        }
-      }
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/proxy/ProxyBottomSheetFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/proxy/ProxyBottomSheetFragment.java
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.preferences.EditProxyViewModel;
 import org.signal.core.ui.BottomSheetUtil;
 import org.signal.core.util.concurrent.LifecycleDisposable;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton;

--- 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
@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.groups.LiveGroup;
 import org.thoughtcrime.securesms.recipients.ui.sharablegrouplink.qr.GroupLinkShareQrDialogFragment;
 import org.thoughtcrime.securesms.sharing.MultiShareArgs;
 import org.signal.core.ui.BottomSheetUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.WindowUtil;

--- 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
@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.qr.QrCodeUtil;
 import org.signal.core.ui.BottomSheetUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt
@@ -8,6 +8,7 @@ import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.bumptech.glide.Glide
+import org.signal.core.ui.view.Stub
 import org.signal.core.util.concurrent.ListenableFuture
 import org.signal.core.util.concurrent.SettableFuture
 import org.signal.core.util.isAbsent
@@ -19,7 +20,6 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewState
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil
 import org.thoughtcrime.securesms.mms.ImageSlide
 import org.thoughtcrime.securesms.mms.Slide
-import org.thoughtcrime.securesms.util.views.Stub
 import org.thoughtcrime.securesms.util.visible
 import java.text.DateFormat
 import java.text.SimpleDateFormat
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import kotlinx.coroutines.launch
+import org.signal.core.ui.view.Stub
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
@@ -48,7 +49,6 @@ import org.thoughtcrime.securesms.stories.viewer.StoryViewerActivity
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.fragments.requireListener
-import org.thoughtcrime.securesms.util.views.Stub
 import org.thoughtcrime.securesms.util.visible

 /**
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt
@@ -12,7 +12,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.animation.ArgbEvaluatorCompat
 import com.google.android.material.appbar.AppBarLayout
-import org.thoughtcrime.securesms.util.views.Stub
+import org.signal.core.ui.view.Stub
 import org.signal.core.ui.R as CoreUiR

 /**
--- a/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
-import org.thoughtcrime.securesms.permissions.PermissionCompat;
+import org.signal.core.util.permissions.PermissionCompat;
 import org.thoughtcrime.securesms.permissions.Permissions;

 import java.io.File;
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
@@ -1,102 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-
-import androidx.annotation.AttrRes;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.view.ContextThemeWrapper;
-
-import org.thoughtcrime.securesms.R;
-
-public class ThemeUtil {
-
-  public static boolean isDarkNotificationTheme(@NonNull Context context) {
-    return (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
-  }
-
-  public static boolean isDarkTheme(@NonNull Context context) {
-    return getAttribute(context, R.attr.theme_type, "light").equals("dark");
-  }
-
-  public static int getThemedResourceId(@NonNull Context context, @AttrRes int attr) {
-    TypedValue      typedValue = new TypedValue();
-    Resources.Theme theme      = context.getTheme();
-
-    if (theme.resolveAttribute(attr, typedValue, true)) {
-      return typedValue.resourceId;
-    }
-
-    return -1;
-  }
-
-  public static boolean getThemedBoolean(@NonNull Context context, @AttrRes int attr) {
-    TypedValue      typedValue = new TypedValue();
-    Resources.Theme theme      = context.getTheme();
-
-    if (theme.resolveAttribute(attr, typedValue, true)) {
-      return typedValue.data != 0;
-    }
-
-    return false;
-  }
-
-  public static @ColorInt int getThemedColor(@NonNull Context context, @AttrRes int attr) {
-    TypedValue typedValue = new TypedValue();
-    Resources.Theme theme = context.getTheme();
-
-    if (theme.resolveAttribute(attr, typedValue, true)) {
-      return typedValue.data;
-    }
-    return Color.RED;
-  }
-
-  public static @Nullable Drawable getThemedDrawable(@NonNull Context context, @AttrRes int attr) {
-    TypedValue      typedValue = new TypedValue();
-    Resources.Theme theme      = context.getTheme();
-
-    if (theme.resolveAttribute(attr, typedValue, true)) {
-      return AppCompatResources.getDrawable(context, typedValue.resourceId);
-    }
-
-    return null;
-  }
-
-  public static LayoutInflater getThemedInflater(@NonNull Context context, @NonNull LayoutInflater inflater, @StyleRes int theme) {
-    Context contextThemeWrapper = new ContextThemeWrapper(context, theme);
-    return inflater.cloneInContext(contextThemeWrapper);
-  }
-
-  public static float getThemedDimen(@NonNull Context context, @AttrRes int attr) {
-    TypedValue typedValue = new TypedValue();
-    Resources.Theme theme = context.getTheme();
-
-    if (theme.resolveAttribute(attr, typedValue, true)) {
-      return typedValue.getDimension(context.getResources().getDisplayMetrics());
-    }
-
-    return 0;
-  }
-
-  private static String getAttribute(Context context, int attribute, String defaultValue) {
-    TypedValue outValue = new TypedValue();
-
-    if (context.getTheme().resolveAttribute(attribute, outValue, true)) {
-      CharSequence charSequence = outValue.coerceToString();
-      if (charSequence != null) {
-        return charSequence.toString();
-      }
-    }
-
-    return defaultValue;
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
@@ -48,7 +48,7 @@ import androidx.lifecycle.Lifecycle;

 import org.signal.core.util.concurrent.ListenableFuture;
 import org.signal.core.util.concurrent.SettableFuture;
-import org.thoughtcrime.securesms.util.views.Stub;
+import org.signal.core.ui.view.Stub;

 public final class ViewUtil {

--- a/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java
@@ -11,6 +11,8 @@ import android.view.WindowManager;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;

+import org.signal.core.ui.util.ThemeUtil;
+
 public final class WindowUtil {

  private WindowUtil() {
--- a/app/src/main/java/org/thoughtcrime/securesms/util/views/LearnMoreTextView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/views/LearnMoreTextView.java
@@ -20,7 +20,7 @@ import androidx.core.content.ContextCompat;

 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;

 /**
 * Appends an optional "Learn more" link to a given piece of text.
--- a/app/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java
@@ -1,54 +0,0 @@
-package org.thoughtcrime.securesms.util.views;
-
-
-import android.view.View;
-import android.view.ViewStub;
-
-import androidx.annotation.NonNull;
-
-public class Stub<T extends View> {
-
-  private ViewStub viewStub;
-  private T        view;
-
-  public Stub(@NonNull ViewStub viewStub) {
-    this.viewStub = viewStub;
-  }
-
-  public int getId() {
-    return (viewStub != null) ? viewStub.getId() : view.getId();
-  }
-
-  public T get() {
-    if (view == null) {
-      //noinspection unchecked
-      view     = (T) viewStub.inflate();
-      viewStub = null;
-    }
-
-    return view;
-  }
-
-  public boolean resolved() {
-    return view != null;
-  }
-
-  public void setVisibility(int visibility) {
-    if (resolved() || visibility == View.VISIBLE) {
-      get().setVisibility(visibility);
-    }
-  }
-
-  public int getVisibility() {
-    if (resolved()) {
-      return get().getVisibility();
-    } else {
-      return View.GONE;
-    }
-  }
-
-  public boolean isVisible() {
-    return getVisibility() == View.VISIBLE;
-  }
-
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperDimLevelUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperDimLevelUtil.java
@@ -10,7 +10,7 @@ import androidx.annotation.Nullable;

 import com.airbnb.lottie.SimpleColorFilter;

-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;

 public final class ChatWallpaperDimLevelUtil {

--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java
@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.conversation.colors.ColorizerView;
 import org.thoughtcrime.securesms.util.DisplayMetricsUtil;
 import org.thoughtcrime.securesms.util.Projection;
-import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.signal.core.ui.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;