From 36b6122b0fbf8611f699faefa2ca4f69f91a9b70 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 4 Feb 2026 13:17:29 -0400 Subject: [PATCH] Move several Permissions dependencies to core. --- .../org/thoughtcrime/securesms/badges/BadgeImageView.kt | 2 +- .../org/thoughtcrime/securesms/badges/models/Badge.kt | 2 +- .../org/thoughtcrime/securesms/color/MaterialColor.java | 4 ++-- .../securesms/components/AlbumThumbnailView.java | 2 +- .../securesms/components/ConversationItemThumbnail.kt | 2 +- .../components/ConversationItemThumbnailState.kt | 2 +- .../FixedRoundedCornerBottomSheetDialogFragment.kt | 2 +- .../securesms/components/LinkPreviewView.java | 2 +- .../components/LinkPreviewViewThumbnailState.kt | 2 +- .../org/thoughtcrime/securesms/components/QuoteView.java | 2 +- .../thoughtcrime/securesms/components/ThumbnailView.java | 2 +- .../app/usernamelinks/main/UsernameQrScannerActivity.kt | 2 +- .../securesms/conversation/ConversationAdapter.java | 2 +- .../securesms/conversation/ConversationItem.java | 4 ++-- .../conversation/ConversationReactionDelegate.java | 2 +- .../securesms/conversation/ConversationUpdateItem.java | 2 +- .../securesms/conversation/colors/NameColor.kt | 2 +- .../conversation/colors/ui/ChatColorPreviewView.kt | 2 +- .../conversation/mutiselect/MultiselectItemDecoration.kt | 2 +- .../securesms/conversation/v2/ConversationBannerView.kt | 2 +- .../securesms/conversation/v2/ConversationFragment.kt | 4 ++-- .../v2/items/V2ConversationItemMediaBindingBridge.kt | 2 +- .../v2/items/V2ConversationItemTextOnlyViewHolder.kt | 2 +- .../conversation/v2/items/V2FooterPositionDelegate.kt | 2 +- .../v2/keyboard/AttachmentKeyboardFragment.kt | 2 +- .../ConversationListArchiveFragment.java | 2 +- .../conversationlist/ConversationListFragment.java | 2 +- .../securesms/database/model/LiveUpdateMessage.java | 2 +- .../GroupLinkInviteFriendsBottomSheetDialogFragment.java | 2 +- .../joining/GroupJoinBottomSheetDialogFragment.java | 2 +- ...GroupJoinUpdateRequiredBottomSheetDialogFragment.java | 2 +- .../GroupsLearnMoreBottomSheetDialogFragment.java | 2 +- .../GroupsV1MigrationInfoBottomSheetDialogFragment.java | 2 +- .../securesms/keyboard/KeyboardPagerFragment.kt | 2 +- .../emoji/EmojiKeyboardPageCategoryMappingModel.kt | 2 +- .../securesms/logsubmit/SubmitDebugLogActivity.java | 2 +- .../securesms/longmessage/LongMessageFragment.java | 4 ++-- .../mediasend/CameraContactSelectionFragment.java | 2 +- .../mediasend/v2/gallery/MediaGalleryFragment.kt | 2 +- .../mediasend/v2/review/AddMessageDialogFragment.kt | 2 +- .../thoughtcrime/securesms/mms/AttachmentManager.java | 4 ++-- .../payments/preferences/PaymentsHomeFragment.java | 2 +- .../thoughtcrime/securesms/permissions/Permissions.java | 6 +++--- .../securesms/permissions/RationaleDialog.java | 7 +++---- .../securesms/proxy/ProxyBottomSheetFragment.java | 2 +- .../GroupLinkBottomSheetDialogFragment.java | 2 +- .../qr/GroupLinkShareQrDialogFragment.java | 2 +- .../securesms/stories/StoryLinkPreviewView.kt | 2 +- .../securesms/stories/landing/StoriesLandingFragment.kt | 2 +- .../securesms/util/Material3OnScrollHelper.kt | 2 +- .../org/thoughtcrime/securesms/util/StorageUtil.java | 2 +- .../java/org/thoughtcrime/securesms/util/ViewUtil.java | 2 +- .../java/org/thoughtcrime/securesms/util/WindowUtil.java | 2 ++ .../securesms/util/views/LearnMoreTextView.java | 2 +- .../securesms/wallpaper/ChatWallpaperDimLevelUtil.java | 2 +- .../securesms/wallpaper/ChatWallpaperFragment.java | 2 +- app/src/main/res/values/attrs.xml | 2 -- app/src/main/res/values/strings.xml | 2 -- core/ui/build.gradle.kts | 1 + .../main/java/org/signal/core/ui}/compose/Permissions.kt | 9 ++++----- .../main/java/org/signal/core/ui}/util/ThemeUtil.java | 4 ++-- .../ui/src/main/java/org/signal/core/ui/view}/Stub.java | 2 +- core/ui/src/main/res/values/attrs.xml | 4 ++++ core/ui/src/main/res/values/strings.xml | 8 ++++++++ .../signal/core/util}/permissions/PermissionCompat.kt | 2 +- 65 files changed, 87 insertions(+), 78 deletions(-) rename {app/src/main/java/org/thoughtcrime/securesms/permissions => core/ui/src/main/java/org/signal/core/ui}/compose/Permissions.kt (91%) rename {app/src/main/java/org/thoughtcrime/securesms => core/ui/src/main/java/org/signal/core/ui}/util/ThemeUtil.java (97%) rename {app/src/main/java/org/thoughtcrime/securesms/util/views => core/ui/src/main/java/org/signal/core/ui/view}/Stub.java (95%) create mode 100644 core/ui/src/main/res/values/attrs.xml create mode 100644 core/ui/src/main/res/values/strings.xml rename {app/src/main/java/org/thoughtcrime/securesms => core/util/src/main/java/org/signal/core/util}/permissions/PermissionCompat.kt (96%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt index 1a07b6487f..e0e002aa9e 100644 --- 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, diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt index 683c87ea6c..ca55df1b1f 100644 --- 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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java b/app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java index 353102f9ab..c894d383c3 100644 --- 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"), diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java index 4a37f72d1c..e5612c1cc9 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt index 897d9c8a1b..ff43fd9e6c 100644 --- 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, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt index 4f8efc6366..eaf8171918 100644 --- 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] diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt index 3d94ee627b..82f539d0a9 100644 --- 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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java index 971e840dbe..c828a57726 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewViewThumbnailState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewViewThumbnailState.kt index b41dc76e49..bfa8eb9c61 100644 --- 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( diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java index 30fd988a01..fa0cc497b7 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java index 6a8673968c..f152a4c17f 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt index ad55e66d4a..b5dc896069 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt @@ -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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index 05559cc416..12d20479a6 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 0eb15586fc..8db8d9008f 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionDelegate.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionDelegate.java index 5899300588..403b33a570 100644 --- 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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java index 82aba5405c..72d6633027 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/NameColor.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/NameColor.kt index d55cbaf606..77567bb0dd 100644 --- 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. diff --git 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 index defd205726..f934f95286 100644 --- 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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration.kt index 7aa761cff8..cc2d824b67 100644 --- 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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt index aabac445be..1ac7db2b90 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt @@ -17,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 /** 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 de5820e3e8..8ea78e1a11 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -103,6 +103,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 diff --git 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 index 5a92696166..2d0f17f512 100644 --- 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. diff --git 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 index 69aa348a17..aafdee4fed 100644 --- 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 diff --git 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 index 4e60d08f5a..4433b836c0 100644 --- 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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt index b2741dd843..00bfcec6da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt @@ -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 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 5fdcd1a4b0..c732af856a 100644 --- 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; 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 59fe1c9671..ac70da52cb 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java index bd6baebdcd..92cdfa9056 100644 --- 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; 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 02bcbf3af2..a29bab95f2 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 @@ -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; 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 863d29f1e2..578ec56da4 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 @@ -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 { 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 79734b8325..39358ee32c 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 @@ -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 { 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 ceed5cfde7..43fab4e781 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 @@ -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 { 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 204b1c1a96..55c90ec0b5 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 @@ -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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/KeyboardPagerFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/KeyboardPagerFragment.kt index bf0b801792..4fb47b936d 100644 --- 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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageCategoryMappingModel.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageCategoryMappingModel.kt index 8341645b07..e9db7f9e75 100644 --- 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 { override val key: String = RecentEmojiPageModel.KEY diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java index 2e1995d853..ff3ca5e734 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageFragment.java index 5822a7fdf8..833635dea6 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java index 231c6e87c4..99d50f850b 100644 --- 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; diff --git 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 index adde8fa295..0781a3001b 100644 --- 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 diff --git 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 index 7057ef26a2..61dccb0b73 100644 --- 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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index c5622b0828..eda8bed8cf 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java index 18d2409bf7..999cf535f0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java @@ -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; 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 96b610e7b7..9d805895c4 100644 --- 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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java index ca03653045..8af56b9be4 100644 --- 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); 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 3dcf72c2a4..7eb494a8c5 100644 --- 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; 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 afe1367c33..a04a2a72b4 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 @@ -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; 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 446fef40f4..20eb0c57ca 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 @@ -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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt index bd4da75ec7..93379cc758 100644 --- 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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt index 7fc27f6a38..d3351fbebf 100644 --- 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 /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt index d329694195..965b37d35a 100644 --- 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 /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java index 728c4a8891..2b56d9b372 100644 --- 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java index 854fa25c16..d3387ce38c 100644 --- 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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java index fcbca52464..e8421486e0 100644 --- 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() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/LearnMoreTextView.java b/app/src/main/java/org/thoughtcrime/securesms/util/views/LearnMoreTextView.java index d44bab843f..a371703035 100644 --- 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. diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperDimLevelUtil.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperDimLevelUtil.java index df6f6185ff..5fcaa56abf 100644 --- 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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java index 4a6aa879d3..1b1a973d91 100644 --- 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; diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index aa60e16d66..2b22368e2b 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,7 +1,5 @@ - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 241c4b3c09..00ce14a020 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4832,8 +4832,6 @@ Loading… Connecting… Permission required - Continue - Not now Migrating Signal database Backup passphrase Backups will be saved to external storage and encrypted with the passphrase below. You must have this passphrase in order to restore a backup. diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 28f479e5de..93b7218179 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -37,4 +37,5 @@ dependencies { implementation(libs.kotlinx.serialization.json) api(libs.google.zxing.core) api(libs.material.material) + api(libs.accompanist.permissions) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Permissions.kt similarity index 91% rename from app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Permissions.kt index 2c85c30043..3f950f4956 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/permissions/compose/Permissions.kt +++ b/core/ui/src/main/java/org/signal/core/ui/compose/Permissions.kt @@ -3,8 +3,9 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.thoughtcrime.securesms.permissions.compose +package org.signal.core.ui.compose +import android.Manifest import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -15,9 +16,7 @@ import androidx.compose.ui.res.stringResource import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState -import org.signal.core.ui.compose.Dialogs -import org.signal.core.ui.compose.SignalIcons -import org.thoughtcrime.securesms.R +import org.signal.core.ui.R /** * Dialogs and state management for permissions requests in compose screens. @@ -40,7 +39,7 @@ object Permissions { onPermissionGranted: () -> Unit ): Controller { return permissionHandler( - permission = android.Manifest.permission.CAMERA, + permission = Manifest.permission.CAMERA, icon = SignalIcons.Camera.painter, rationale = rationale, onPermissionGranted = onPermissionGranted diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java b/core/ui/src/main/java/org/signal/core/ui/util/ThemeUtil.java similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java rename to core/ui/src/main/java/org/signal/core/ui/util/ThemeUtil.java index 6804861a72..6e038b9c5f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java +++ b/core/ui/src/main/java/org/signal/core/ui/util/ThemeUtil.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.util; +package org.signal.core.ui.util; import android.content.Context; import android.content.res.Configuration; @@ -16,7 +16,7 @@ import androidx.annotation.StyleRes; import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.view.ContextThemeWrapper; -import org.thoughtcrime.securesms.R; +import org.signal.core.ui.R; public class ThemeUtil { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java b/core/ui/src/main/java/org/signal/core/ui/view/Stub.java similarity index 95% rename from app/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java rename to core/ui/src/main/java/org/signal/core/ui/view/Stub.java index d3f3271c04..390802f457 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java +++ b/core/ui/src/main/java/org/signal/core/ui/view/Stub.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.util.views; +package org.signal.core.ui.view; import android.view.View; diff --git a/core/ui/src/main/res/values/attrs.xml b/core/ui/src/main/res/values/attrs.xml new file mode 100644 index 0000000000..ac52b3ba89 --- /dev/null +++ b/core/ui/src/main/res/values/attrs.xml @@ -0,0 +1,4 @@ + + + + diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml new file mode 100644 index 0000000000..2cf0630ce6 --- /dev/null +++ b/core/ui/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + + + + Continue + + Not now + diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionCompat.kt b/core/util/src/main/java/org/signal/core/util/permissions/PermissionCompat.kt similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionCompat.kt rename to core/util/src/main/java/org/signal/core/util/permissions/PermissionCompat.kt index 66b9b266e7..b0e236089f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionCompat.kt +++ b/core/util/src/main/java/org/signal/core/util/permissions/PermissionCompat.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.thoughtcrime.securesms.permissions +package org.signal.core.util.permissions import android.Manifest import android.os.Build