Enable nonTransitiveRClass.

Resolves #13757
2026-02-15 07:28:30 +00:00 · 2024-10-30 01:54:04 -05:00
parent c35242c525
commit 769a92943e
55 changed files with 116 additions and 95 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt
@@ -53,6 +53,7 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.BackupMessagesJob
 import org.thoughtcrime.securesms.jobs.BackupRestoreMediaJob
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.signal.core.ui.R as CoreUiR

 /**
 * Notifies the user of an issue with their backup.
@@ -159,7 +160,7 @@ private fun BackupAlertSheetContent(
    horizontalAlignment = Alignment.CenterHorizontally,
    modifier = Modifier
      .fillMaxWidth()
-      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
  ) {
    BottomSheets.Handle()

--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/CreateBackupBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/CreateBackupBottomSheet.kt
@@ -32,6 +32,7 @@ import org.signal.core.ui.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.jobs.BackupMessagesJob
+import org.signal.core.ui.R as CoreUiR

 /**
 * Bottom sheet allowing the user to immediately start a backup or delay.
@@ -84,7 +85,7 @@ private fun CreateBackupBottomSheetContent(
  Column(
    horizontalAlignment = Alignment.CenterHorizontally,
    modifier = Modifier.fillMaxWidth()
-      .padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
      .padding(bottom = 24.dp)
  ) {
    BottomSheets.Handle()
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusBanner.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusBanner.kt
@@ -230,7 +230,7 @@ sealed interface BackupStatusData {

    override val title: String
      @Composable
-      get() = stringResource(R.string.default_error_msg)
+      get() = stringResource(androidx.biometric.R.string.default_error_msg)

    override val iconColors: BackupsIconColors = BackupsIconColors.Warning
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt
@@ -39,6 +39,7 @@ import org.signal.core.ui.SignalPreview
 import org.signal.core.util.ByteSize
 import org.thoughtcrime.securesms.R
 import kotlin.math.roundToInt
+import org.signal.core.ui.R as CoreUiR

 /**
 * Backup status displayable as a row on a settings page.
@@ -53,7 +54,7 @@ fun BackupStatusRow(
    if (backupStatusData !is BackupStatusData.CouldNotCompleteBackup) {
      Row(
        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+        modifier = Modifier.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
      ) {
        LinearProgressIndicator(
          color = progressColor(backupStatusData),
@@ -76,7 +77,7 @@ fun BackupStatusRow(
      is BackupStatusData.RestoringMedia -> {
        Text(
          text = getRestoringMediaString(backupStatusData),
-          modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+          modifier = Modifier.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
        )
      }

@@ -87,7 +88,7 @@ fun BackupStatusRow(
            backupStatusData.requiredSpace,
            "%d".format((backupStatusData.progress * 100).roundToInt())
          ),
-          modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+          modifier = Modifier.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
        )

        Rows.TextRow(
@@ -116,7 +117,7 @@ fun BackupStatusRow(
            append(stringResource(R.string.BackupStatusRow__your_last_backup))
          },
          inlineContent = inlineContentMap,
-          modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+          modifier = Modifier.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
        )
      }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt
@@ -32,6 +32,7 @@ import org.signal.core.ui.Buttons
 import org.signal.core.ui.Previews
 import org.signal.core.ui.Scaffolds
 import org.thoughtcrime.securesms.R
+import org.signal.core.ui.R as CoreUiR

 /**
 * Educational content which allows user to proceed to set up automatic backups
@@ -52,7 +53,7 @@ fun MessageBackupsEducationScreen(
      modifier = Modifier
        .fillMaxSize()
        .padding(it)
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
    ) {
      LazyColumn(
        horizontalAlignment = Alignment.CenterHorizontally,
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyEducationScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyEducationScreen.kt
@@ -27,6 +27,7 @@ import org.signal.core.ui.Previews
 import org.signal.core.ui.Scaffolds
 import org.signal.core.ui.SignalPreview
 import org.thoughtcrime.securesms.R
+import org.signal.core.ui.R as CoreUiR

 /**
 * Screen detailing how a backups key is used to restore a backup
@@ -44,7 +45,7 @@ fun MessageBackupsKeyEducationScreen(
    Column(
      modifier = Modifier
        .padding(it)
-        .padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
        .fillMaxSize(),
      horizontalAlignment = Alignment.CenterHorizontally
    ) {
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyRecordScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyRecordScreen.kt
@@ -52,6 +52,7 @@ import org.signal.core.util.Hex
 import org.thoughtcrime.securesms.R
 import org.whispersystems.signalservice.api.backup.MessageBackupKey
 import kotlin.random.Random
+import org.signal.core.ui.R as CoreUiR

 /**
 * Screen displaying the backup key allowing the user to write it down
@@ -78,7 +79,7 @@ fun MessageBackupsKeyRecordScreen(
    Column(
      modifier = Modifier
        .padding(paddingValues)
-        .padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
        .fillMaxSize(),
      horizontalAlignment = Alignment.CenterHorizontally
    ) {
@@ -193,7 +194,7 @@ private fun BottomSheetContent(
    horizontalAlignment = Alignment.CenterHorizontally,
    modifier = Modifier
      .fillMaxWidth()
-      .padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
  ) {
    BottomSheets.Handle()
    Text(
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt
@@ -59,6 +59,7 @@ import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.util.ByteUnit
 import java.math.BigDecimal
 import java.util.Currency
+import org.signal.core.ui.R as CoreUiR

 /**
 * Screen which allows the user to select their preferred backup type.
@@ -83,7 +84,7 @@ fun MessageBackupsTypeSelectionScreen(
    Column(
      modifier = Modifier
        .padding(paddingValues)
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
        .fillMaxSize()
    ) {
      LazyColumn(
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GooglePayButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GooglePayButton.kt
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.badges.gifts.flow
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.FrameLayout
-import org.thoughtcrime.securesms.R

 /**
 * Wraps the google pay button in a convenient frame layout.
@@ -13,7 +12,7 @@ class GooglePayButton @JvmOverloads constructor(
  attrs: AttributeSet? = null
 ) : FrameLayout(context, attrs) {
  init {
-    inflate(context, R.layout.donate_with_googlepay_button, this)
+    inflate(context, org.signal.donations.R.layout.donate_with_googlepay_button, this)
  }

  fun setOnGooglePayClickListener(action: () -> Unit) {
--- a/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToEnableOptimizedStorageSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToEnableOptimizedStorageSheet.kt
@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeBl
 import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeIconColors
 import org.thoughtcrime.securesms.backup.v2.ui.subscription.testBackupTypes
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.signal.core.ui.R as CoreUiR

 /**
 * Sheet describing how users must upgrade to enable optimized storage.
@@ -84,7 +85,7 @@ private fun UpgradeToEnableOptimizedStorageSheetContent(
      style = MaterialTheme.typography.titleLarge,
      textAlign = TextAlign.Center,
      modifier = Modifier
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
    )

    Text(
@@ -94,7 +95,7 @@ private fun UpgradeToEnableOptimizedStorageSheetContent(
      textAlign = TextAlign.Center,
      modifier = Modifier
        .padding(top = 10.dp, bottom = 28.dp)
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
    )

    MessageBackupsTypeBlock(
@@ -107,7 +108,7 @@ private fun UpgradeToEnableOptimizedStorageSheetContent(
        it.copy(iconColorNormal = it.iconColorSelected)
      },
      modifier = Modifier
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
        .padding(bottom = 50.dp)
    )

@@ -116,7 +117,7 @@ private fun UpgradeToEnableOptimizedStorageSheetContent(
      onClick = onSubscribeClick,
      modifier = Modifier
        .defaultMinSize(minWidth = 256.dp)
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
        .padding(bottom = 8.dp)
    ) {
      val resources = LocalContext.current.resources
@@ -134,7 +135,7 @@ private fun UpgradeToEnableOptimizedStorageSheetContent(
      onClick = onCancelClick,
      modifier = Modifier
        .defaultMinSize(minWidth = 256.dp)
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
        .padding(bottom = 16.dp)
    ) {
      Text(
--- a/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToStartMediaBackupSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToStartMediaBackupSheet.kt
@@ -35,6 +35,7 @@ import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeBl
 import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeIconColors
 import org.thoughtcrime.securesms.backup.v2.ui.subscription.testBackupTypes
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.signal.core.ui.R as CoreUiR

 /**
 * Bottom sheet notifying user that the media they selected is no longer available. This
@@ -73,7 +74,7 @@ private fun UpgradeToStartMediaBackupSheetContent(
    horizontalAlignment = Alignment.CenterHorizontally,
    modifier = Modifier
      .fillMaxWidth()
-      .padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
  ) {
    BottomSheets.Handle()

@@ -114,7 +115,7 @@ private fun UpgradeToStartMediaBackupSheetContent(
      onClick = onSubscribeClick,
      modifier = Modifier
        .defaultMinSize(minWidth = 256.dp)
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
        .padding(bottom = 8.dp)
    ) {
      val resources = LocalContext.current.resources
@@ -132,7 +133,7 @@ private fun UpgradeToStartMediaBackupSheetContent(
      onClick = onCancelClick,
      modifier = Modifier
        .defaultMinSize(minWidth = 256.dp)
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
        .padding(bottom = 16.dp)
    ) {
      Text(
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt
@@ -84,7 +84,7 @@ class EditCallLinkNameDialogFragment : ComposeDialogFragment() {
        Column(
          modifier = Modifier
            .padding(
-              horizontal = dimensionResource(id = org.signal.core.ui.R.dimen.core_ui__gutter)
+              horizontal = dimensionResource(id = org.signal.core.ui.R.dimen.gutter)
            )
            .padding(top = 20.dp, bottom = 16.dp)
        ) {
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/SignalCallRow.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/SignalCallRow.kt
@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkState
 import java.time.Instant
+import org.signal.core.ui.R as CoreUiR

@SignalPreview
@Composable
@@ -103,7 +104,7 @@ fun SignalCallRow(
  Row(
    modifier = modifier
      .fillMaxWidth()
-      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
      .border(
        width = 1.25.dp,
        color = MaterialTheme.colorScheme.outline,
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt
@@ -60,6 +60,7 @@ import org.thoughtcrime.securesms.sharing.v2.ShareActivity
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.Util
 import java.time.Instant
+import org.signal.core.ui.R as CoreUiR

 /**
 * Bottom sheet for creating call links
@@ -313,7 +314,7 @@ private fun CreateCallLinkBottomSheetContent(
      Buttons.MediumTonal(
        onClick = onDoneClicked,
        modifier = Modifier
-          .padding(end = dimensionResource(id = R.dimen.core_ui__gutter))
+          .padding(end = dimensionResource(id = CoreUiR.dimen.gutter))
          .align(Alignment.End)
      ) {
        Text(text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__done))
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterView.java
@@ -40,7 +40,7 @@ public final class ContactFilterView extends FrameLayout {
  }

  public ContactFilterView(Context context, AttributeSet attrs) {
-    this(context, attrs, R.attr.toolbarStyle);
+    this(context, attrs, androidx.appcompat.R.attr.toolbarStyle);
  }

  public ContactFilterView(Context context, AttributeSet attrs, int defStyleAttr) {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.WindowUtil
+import com.google.android.material.R as MaterialR

 /**
 * Forces rounded corners on BottomSheet
@@ -59,8 +60,8 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr

    dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)

-    val bottomSheetStyle = ThemeUtil.getThemedResourceId(ContextThemeWrapper(requireContext(), themeResId), R.attr.bottomSheetStyle)
-    backgroundColor = ThemeUtil.getThemedColor(ContextThemeWrapper(requireContext(), bottomSheetStyle), R.attr.backgroundTint)
+    val bottomSheetStyle = ThemeUtil.getThemedResourceId(ContextThemeWrapper(requireContext(), themeResId), MaterialR.attr.bottomSheetStyle)
+    backgroundColor = ThemeUtil.getThemedColor(ContextThemeWrapper(requireContext(), bottomSheetStyle), MaterialR.attr.backgroundTint)
    dialogBackground.fillColor = ColorStateList.valueOf(backgroundColor)

    dialog.behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -57,7 +57,7 @@ public class SearchToolbar extends LinearLayout {

    this.searchItem = toolbar.getMenu().findItem(R.id.action_filter_search);
    SearchView searchView = (SearchView) searchItem.getActionView();
-    EditText   searchText = searchView.findViewById(R.id.search_src_text);
+    EditText   searchText = searchView.findViewById(androidx.appcompat.R.id.search_src_text);

    EditTextExtensionsKt.setIncognitoKeyboardEnabled(searchText, TextSecurePreferences.isIncognitoKeyboardEnabled(getContext()));

--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
@@ -35,7 +35,7 @@ public class EmojiEditText extends AppCompatEditText {
  }

  public EmojiEditText(Context context, AttributeSet attrs) {
-    this(context, attrs, R.attr.editTextStyle);
+    this(context, attrs, androidx.appcompat.R.attr.editTextStyle);
  }

  public EmojiEditText(Context context, AttributeSet attrs, int defStyleAttr) {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt
@@ -85,7 +85,7 @@ class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchL
  var segmentBackgroundColor: Int = Color.WHITE
    private set
  var segmentSelectedBackgroundColor: Int =
-    context.getThemeColor(R.attr.colorAccent)
+    context.getThemeColor(androidx.appcompat.R.attr.colorAccent)
    private set
  var segmentStrokeColor: Int = Color.BLACK
    private set
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
@@ -52,6 +52,7 @@ import java.math.BigDecimal
 import java.util.Currency
 import java.util.Locale
 import kotlin.time.Duration.Companion.seconds
+import org.signal.core.ui.R as CoreUiR

 /**
 * Top-level backups settings screen.
@@ -118,7 +119,7 @@ private fun BackupsSettingsContent(
          text = stringResource(R.string.RemoteBackupsSettingsFragment__back_up_your_message_history),
          color = MaterialTheme.colorScheme.onSurfaceVariant,
          style = MaterialTheme.typography.bodyMedium,
-          modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.core_ui__gutter), vertical = 16.dp)
+          modifier = Modifier.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter), vertical = 16.dp)
        )
      }

@@ -326,7 +327,7 @@ private fun LoadingBackupsRow() {
    modifier = Modifier
      .fillMaxWidth()
      .height(56.dp)
-      .padding(horizontal = dimensionResource(R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
  ) {
    CircularProgressIndicator()
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
@@ -105,6 +105,7 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
+import org.signal.core.ui.R as CoreUiR

 /**
 * Remote backups settings fragment.
@@ -272,7 +273,7 @@ class RemoteBackupsSettingsFragment : ComposeFragment() {
  private inner class AuthListener : BiometricPrompt.AuthenticationCallback() {
    override fun onAuthenticationFailed() {
      Log.w(TAG, "onAuthenticationFailed")
-      Toast.makeText(requireContext(), R.string.authentication_required, Toast.LENGTH_SHORT).show()
+      Toast.makeText(requireContext(), androidx.media3.session.R.string.authentication_required, Toast.LENGTH_SHORT).show()
    }

    override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
@@ -901,7 +902,7 @@ private fun InProgressBackupRow(
 ) {
  Row(
    modifier = Modifier
-      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
      .padding(top = 16.dp, bottom = 14.dp)
  ) {
    Column(
@@ -932,7 +933,7 @@ private fun LastBackupRow(
 ) {
  Row(
    modifier = Modifier
-      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
      .padding(top = 16.dp, bottom = 14.dp)
  ) {
    Column(
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt
@@ -34,6 +34,7 @@ import org.signal.core.ui.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.compose.StatusBarColorNestedScrollConnection
+import org.signal.core.ui.R as CoreUiR

 class PhoneNumberPrivacySettingsFragment : ComposeFragment() {

@@ -149,7 +150,7 @@ private fun Screen(
            ),
            style = MaterialTheme.typography.bodyMedium,
            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter), vertical = 16.dp)
+            modifier = Modifier.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter), vertical = 16.dp)
          )
        }

@@ -189,7 +190,7 @@ private fun Screen(
            ),
            style = MaterialTheme.typography.bodyMedium,
            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter), vertical = 16.dp)
+            modifier = Modifier.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter), vertical = 16.dp)
          )
        }
      }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt
@@ -30,6 +30,7 @@ import androidx.navigation.fragment.findNavController
 import org.signal.core.ui.Scaffolds
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeDialogFragment
+import org.signal.core.ui.R as CoreUiR

 /**
 * Dialog fragment for selecting the bank for the iDEAL donation.
@@ -93,7 +94,7 @@ private fun BankSelectionContent(
            .clickable { onBankSelected(it) }
            .fillMaxWidth()
            .defaultMinSize(minHeight = 56.dp)
-            .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter), vertical = 8.dp)
+            .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter), vertical = 8.dp)
        ) {
          Image(
            painter = painterResource(id = uiValues.icon),
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider.kt
@@ -36,6 +36,8 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.AvatarUtil
 import java.util.Arrays
+import androidx.media3.session.R as Media3SessionR
+import androidx.media3.ui.R as Media3UiR

 /**
 * This handles all of the notification and playback APIs for playing back a voice note.
@@ -192,9 +194,9 @@ class VoiceNoteMediaNotificationProvider(val context: Context) : MediaNotificati
      commandButtons.add(
        CommandButton.Builder()
          .setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM)
-          .setIconResId(R.drawable.exo_icon_rewind)
+          .setIconResId(Media3UiR.drawable.exo_icon_rewind)
          .setDisplayName(
-            context.getString(R.string.media3_controls_seek_to_previous_description)
+            context.getString(Media3SessionR.string.media3_controls_seek_to_previous_description)
          )
          .setExtras(commandButtonExtras)
          .build()
@@ -207,11 +209,11 @@ class VoiceNoteMediaNotificationProvider(val context: Context) : MediaNotificati
        CommandButton.Builder()
          .setPlayerCommand(Player.COMMAND_PLAY_PAUSE)
          .setIconResId(
-            if (showPauseButton) R.drawable.exo_notification_pause else R.drawable.exo_notification_play
+            if (showPauseButton) Media3UiR.drawable.exo_notification_pause else Media3UiR.drawable.exo_notification_play
          )
          .setExtras(commandButtonExtras)
          .setDisplayName(
-            if (showPauseButton) context.getString(R.string.media3_controls_pause_description) else context.getString(R.string.media3_controls_play_description)
+            if (showPauseButton) context.getString(Media3SessionR.string.media3_controls_pause_description) else context.getString(Media3SessionR.string.media3_controls_play_description)
          )
          .build()
      )
@@ -221,9 +223,9 @@ class VoiceNoteMediaNotificationProvider(val context: Context) : MediaNotificati
      commandButtons.add(
        CommandButton.Builder()
          .setPlayerCommand(Player.COMMAND_STOP)
-          .setIconResId(R.drawable.exo_notification_stop)
+          .setIconResId(Media3UiR.drawable.exo_notification_stop)
          .setExtras(commandButtonExtras)
-          .setDisplayName(context.getString(R.string.media3_controls_seek_to_next_description))
+          .setDisplayName(context.getString(Media3SessionR.string.media3_controls_seek_to_next_description))
          .build()
      )
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioPicker31.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioPicker31.kt
@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.webrtc.audio.AudioDeviceMapping
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager
+import org.signal.core.ui.R as CoreUiR

 /**
 * This launches the bottom sheet on Android 12+ devices for selecting which audio device to use during a call.
@@ -81,7 +82,7 @@ class WebRtcAudioPicker31(private val audioOutputChangedListener: OnAudioOutputC
        initialDeviceId = currentDeviceId,
        onDeviceSelected = onAudioDeviceSelected,
        modifier = Modifier.padding(
-          horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
+          horizontal = dimensionResource(id = CoreUiR.dimen.gutter)
        )
      )
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.viewModel
+import org.signal.core.ui.R as CoreUiR

 /**
 * Displayed when the user presses the user avatar in the call link join request
@@ -153,7 +154,7 @@ private fun CallLinkIncomingRequestSheetContent(
          text = state.groupsInCommon,
          textAlign = TextAlign.Center,
          style = MaterialTheme.typography.bodyMedium,
-          modifier = Modifier.padding(vertical = 6.dp, horizontal = dimensionResource(R.dimen.core_ui__gutter))
+          modifier = Modifier.padding(vertical = 6.dp, horizontal = dimensionResource(CoreUiR.dimen.gutter))
        )
      }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallAudioToggleButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallAudioToggleButton.kt
@@ -42,6 +42,7 @@ import org.thoughtcrime.securesms.components.webrtc.ToggleButtonOutputState
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioDevice
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioPicker31
+import org.signal.core.ui.R as CoreUiR

 private const val SHOW_PICKER_THRESHOLD = 3

@@ -221,13 +222,13 @@ private fun LegacyAudioPickerContent(
    modifier = Modifier
      .padding(8.dp)
      .padding(
-        horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
+        horizontal = dimensionResource(id = CoreUiR.dimen.gutter)
      )
  )

  LazyColumn(
    modifier = Modifier.padding(
-      horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
+      horizontal = dimensionResource(id = CoreUiR.dimen.gutter)
    )
  ) {
    items(
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt
@@ -215,7 +215,7 @@ internal object ConversationOptionsMenu {
        R.id.menu_conversation_settings -> callback.handleConversationSettings()
        R.id.menu_expiring_messages_off, R.id.menu_expiring_messages -> callback.handleSelectMessageExpiration()
        R.id.menu_create_bubble -> callback.handleCreateBubble()
-        R.id.home -> callback.handleGoHome()
+        androidx.appcompat.R.id.home -> callback.handleGoHome()
        R.id.menu_block -> callback.handleBlock()
        R.id.menu_unblock -> callback.handleUnblock()
        R.id.menu_report_spam -> callback.handleReportSpam()
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/moreoptions/MoreTransferOrRestoreOptionsSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/moreoptions/MoreTransferOrRestoreOptionsSheet.kt
@@ -42,6 +42,7 @@ import org.signal.core.ui.Previews
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.devicetransfer.newdevice.BackupRestorationType
+import org.signal.core.ui.R as CoreUiR

 /**
 * Lists a set of options the user can choose from for restoring backup or skipping restoration
@@ -112,7 +113,7 @@ private fun MoreOptionsSheetContent(
    horizontalAlignment = Alignment.CenterHorizontally,
    modifier = Modifier
      .fillMaxWidth()
-      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
  ) {
    BottomSheets.Handle()

--- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
@@ -36,7 +36,7 @@ public class GiphyActivityToolbar extends Toolbar {
  }

  public GiphyActivityToolbar(Context context, AttributeSet attrs) {
-    this(context, attrs, R.attr.toolbarStyle);
+    this(context, attrs, androidx.appcompat.R.attr.toolbarStyle);
  }

  public GiphyActivityToolbar(Context context, AttributeSet attrs, int defStyleAttr) {
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
@@ -303,7 +303,7 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
    dialogView.setText(spannableDialogText);
    dialogView.setMovementMethod(LongClickMovementMethod.getInstance(this));

-    ViewUtil.setPadding(dialogView, (int) ThemeUtil.getThemedDimen(this, R.attr.dialogPreferredPadding));
+    ViewUtil.setPadding(dialogView, (int) ThemeUtil.getThemedDimen(this, androidx.appcompat.R.attr.dialogPreferredPadding));

    builder.setView(dialogView);
    builder.show();
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
@@ -79,7 +79,7 @@ public class AvatarSelectionActivity extends AppCompatActivity implements Camera

  @Override
  public void onCameraError() {
-    Toast.makeText(this, R.string.default_error_msg, Toast.LENGTH_SHORT).show();
+    Toast.makeText(this, androidx.biometric.R.string.default_error_msg, Toast.LENGTH_SHORT).show();
    finish();
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameActivity.kt
@@ -12,7 +12,6 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -60,6 +59,7 @@ import org.thoughtcrime.securesms.avatar.AvatarImage
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 import org.thoughtcrime.securesms.util.viewModel
+import org.signal.core.ui.R as CoreUiR

 /**
 * Fragment allowing a user to set a custom nickname for the given recipient.
@@ -226,7 +226,7 @@ private fun NicknameContent(
    Column(
      modifier = Modifier
        .padding(paddingValues)
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
    ) {
      LazyColumn(modifier = Modifier.weight(1f)) {
        item {
@@ -407,7 +407,6 @@ private fun ClearableTextFieldPreview() {
  }
 }

-@OptIn(ExperimentalFoundationApi::class)
@Composable
 private fun ClearableTextField(
  value: String,
--- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/ViewNoteSheet.kt
@@ -41,6 +41,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiTextView
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.viewModel
+import org.signal.core.ui.R as CoreUiR

 /**
 * Allows user to view the full note for a given recipient.
@@ -117,7 +118,7 @@ private fun ViewNoteBottomSheetContent(
 ) {
  Column(
    horizontalAlignment = Alignment.CenterHorizontally,
-    modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+    modifier = Modifier.padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
  ) {
    BottomSheets.Handle()

@@ -151,7 +152,6 @@ private fun ViewNoteBottomSheetContent(
      factory = { context ->
        val view = EmojiTextView(context)

-        @Suppress("DEPRECATION")
        view.setTextAppearance(context, R.style.Signal_Text_BodyLarge)
        view.movementMethod = LinkMovementMethodCompat.getInstance()

--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt
@@ -43,6 +43,7 @@ import org.signal.core.ui.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.signal.core.ui.R as CoreUiR

 private const val PLACEHOLDER = "__TOGGLE_PLACEHOLDER__"

@@ -137,7 +138,7 @@ private fun TurnOnNotificationsSheetContent(
 ) {
  Column(
    modifier = Modifier
-      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
      .padding(bottom = 32.dp)
  ) {
    BottomSheets.Handle(
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/entry/PaymentsRecoveryEntryFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/entry/PaymentsRecoveryEntryFragment.java
@@ -60,7 +60,7 @@ public class PaymentsRecoveryEntryFragment extends Fragment {
      }
    });

-    ArrayAdapter<String> wordAdapter = new ArrayAdapter<>(requireContext(), R.layout.support_simple_spinner_dropdown_item, Mnemonic.BIP39_WORDS_ENGLISH);
+    ArrayAdapter<String> wordAdapter = new ArrayAdapter<>(requireContext(), com.google.android.material.R.layout.support_simple_spinner_dropdown_item, Mnemonic.BIP39_WORDS_ENGLISH);

    word.setAdapter(wordAdapter);
    word.addTextChangedListener(new AfterTextChanged(e -> viewModel.onWordChanged(e.toString())));
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
@@ -61,7 +61,7 @@ public abstract class CorrectedPreferenceFragment extends PreferenceFragmentComp
        if (preference instanceof PreferenceCategory) {
          setZeroPaddingToLayoutChildren(holder.itemView);
        } else {
-          View iconFrame = holder.itemView.findViewById(R.id.icon_frame);
+          View iconFrame = holder.itemView.findViewById(androidx.preference.R.id.icon_frame);
          if (iconFrame != null) {
            iconFrame.setVisibility(preference.getIcon() == null ? View.GONE : View.VISIBLE);
          }
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt
@@ -33,6 +33,7 @@ import org.signal.core.ui.Scaffolds
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeDialogFragment
 import org.thoughtcrime.securesms.profiles.manage.EditProfileActivity
+import org.signal.core.ui.R as CoreUiR

 /**
 * Displays an explanation page about usernames and gives the user
@@ -88,7 +89,7 @@ private fun NewWaysToConnectDialogContent(
            textAlign = TextAlign.Center,
            modifier = Modifier
              .fillMaxWidth()
-              .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+              .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
              .padding(top = 4.dp, bottom = 36.dp)
          )
        }
@@ -121,7 +122,7 @@ private fun NewWaysToConnectDialogContent(
      Buttons.LargeTonal(
        onClick = onSetUpUsernameClick,
        modifier = Modifier
-          .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+          .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
          .padding(top = 16.dp)
          .defaultMinSize(minWidth = 221.dp)
          .align(alignment = Alignment.CenterHorizontally)
@@ -135,8 +136,8 @@ private fun NewWaysToConnectDialogContent(
        onClick = onNotNowClick,
        modifier = Modifier
          .padding(
-            start = dimensionResource(id = R.dimen.core_ui__gutter),
-            end = dimensionResource(id = R.dimen.core_ui__gutter),
+            start = dimensionResource(id = CoreUiR.dimen.gutter),
+            end = dimensionResource(id = CoreUiR.dimen.gutter),
            top = 8.dp,
            bottom = 16.dp
          )
@@ -171,7 +172,7 @@ private fun NewWaysToConnectRowItem(
  Row(
    modifier = modifier
      .padding(
-        horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
+        horizontal = dimensionResource(id = CoreUiR.dimen.gutter)
      )
      .padding(
        bottom = 40.dp
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt
@@ -87,6 +87,7 @@ import org.thoughtcrime.securesms.registration.util.CountryPrefix
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 import org.thoughtcrime.securesms.util.viewModel
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter
+import org.signal.core.ui.R as CoreUiR

 /**
 * Allows the user to look up another Signal user by phone number or username and
@@ -391,7 +392,7 @@ private fun Content(
        style = MaterialTheme.typography.bodyMedium,
        color = MaterialTheme.colorScheme.onSurfaceVariant,
        modifier = Modifier
-          .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+          .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
          .padding(top = 8.dp)
      )

@@ -577,7 +578,7 @@ private fun CountryPrefixRowItem(
    modifier = Modifier
      .fillMaxWidth()
      .clickable(onClick = onClick)
-      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
      .padding(top = 16.dp, bottom = 14.dp)
  ) {
    Text(
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt
@@ -68,6 +68,7 @@ import org.thoughtcrime.securesms.restore.transferorrestore.TransferOrRestoreMor
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.Util
 import java.util.Locale
+import org.signal.core.ui.R as CoreUiR

 class RemoteRestoreActivity : BaseActivity() {
  companion object {
@@ -262,7 +263,7 @@ class RemoteRestoreActivity : BaseActivity() {
  ) {
    Column(
      modifier = Modifier
-        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter))
        .padding(top = 40.dp, bottom = 24.dp)
    ) {
      Text(
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt
@@ -127,7 +127,7 @@ class StoryGroupReplyFragment :

      val dialog = (parentFragment as FixedRoundedCornerBottomSheetDialogFragment).dialog as BottomSheetDialog
      BottomSheetBehaviorHack.setNestedScrollingChild(dialog.behavior, view)
-      dialog.findViewById<View>(R.id.design_bottom_sheet)?.invalidate()
+      dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)?.invalidate()
      return false
    }
  }
--- a/app/src/main/res/layout/choose_navigation_bar_style_fragment.xml
+++ b/app/src/main/res/layout/choose_navigation_bar_style_fragment.xml
@@ -18,7 +18,7 @@
            android:layout_height="wrap_content"
            android:background="@color/signal_colorBackground"
            android:importantForAccessibility="no"
-            android:paddingHorizontal="@dimen/core_ui__gutter"
+            android:paddingHorizontal="@dimen/gutter"
            android:paddingBottom="16dp"
            app:layout_constraintBottom_toTopOf="@id/title"
            app:layout_constraintEnd_toEndOf="parent"
@@ -30,7 +30,7 @@
            android:id="@+id/title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/core_ui__gutter"
+            android:layout_marginHorizontal="@dimen/gutter"
            android:layout_marginTop="24dp"
            android:text="@string/ChooseNavigationBarStyleFragment__navigation_bar_size"
            android:textAppearance="@style/Signal.Text.HeadlineSmall"
@@ -45,9 +45,9 @@
            android:id="@+id/toggle"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/core_ui__gutter"
+            android:layout_marginStart="@dimen/gutter"
            android:layout_marginTop="16dp"
-            android:layout_marginEnd="@dimen/core_ui__gutter"
+            android:layout_marginEnd="@dimen/gutter"
            app:layout_constraintBottom_toTopOf="@id/ok"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/contact_search_unknown_item.xml
+++ b/app/src/main/res/layout/contact_search_unknown_item.xml
@@ -22,7 +22,7 @@
        android:layout_width="40dp"
        android:layout_height="40dp"
        android:layout_marginVertical="12dp"
-        android:layout_marginStart="@dimen/core_ui__gutter"
+        android:layout_marginStart="@dimen/gutter"
        android:background="@color/signal_colorSurfaceVariant"
        android:importantForAccessibility="no"
        app:contentPadding="8dp"
@@ -38,7 +38,7 @@
        android:id="@+id/check_box"
        android:layout_width="24dp"
        android:layout_height="24dp"
-        android:layout_marginEnd="@dimen/core_ui__gutter"
+        android:layout_marginEnd="@dimen/gutter"
        android:background="?contactCheckboxBackground"
        android:button="@null"
        android:clickable="false"
@@ -64,7 +64,7 @@
        app:layout_constraintStart_toEndOf="@id/contact_photo_image"
        app:layout_constraintTop_toBottomOf="@id/contact_header"
        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_goneMarginEnd="@dimen/core_ui__gutter"
+        app:layout_goneMarginEnd="@dimen/gutter"
        tools:drawableStart="@drawable/ic_bell_24"
        tools:drawableTint="@color/signal_icon_tint_secondary"
        tools:text="@sample/contacts.json/data/name" />
@@ -86,7 +86,7 @@
        app:layout_constraintHorizontal_chainStyle="packed"
        app:layout_constraintStart_toEndOf="@id/contact_photo_image"
        app:layout_constraintTop_toBottomOf="@id/name"
-        app:layout_goneMarginEnd="@dimen/core_ui__gutter"
+        app:layout_goneMarginEnd="@dimen/gutter"
        tools:text="@sample/contacts.json/data/number" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/credit_card_fragment.xml
+++ b/app/src/main/res/layout/credit_card_fragment.xml
@@ -24,7 +24,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="12dp"
-        android:paddingHorizontal="@dimen/core_ui__gutter"
+        android:paddingHorizontal="@dimen/gutter"
        android:text="@string/CreditCardFragment__enter_your_card_details"
        android:textAppearance="@style/Signal.Text.BodyMedium"
        android:textColor="@color/signal_colorOnSurfaceVariant"
--- a/app/src/main/res/layout/exo_legacy_player_control_view.xml
+++ b/app/src/main/res/layout/exo_legacy_player_control_view.xml
@@ -38,7 +38,7 @@
            app:touch_target_height="55dp" />

        <TextView
-            android:id="@id/exo_duration"
+            android:id="@+id/exo_duration"
            style="@style/Signal.Text.BodyMedium"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
--- a/app/src/main/res/layout/fragment_review.xml
+++ b/app/src/main/res/layout/fragment_review.xml
@@ -13,7 +13,7 @@
        android:layout_height="wrap_content"
        android:layout_marginTop="12dp"
        android:layout_marginBottom="18dp"
-        android:layout_marginHorizontal="@dimen/core_ui__gutter"
+        android:layout_marginHorizontal="@dimen/gutter"
        android:textAppearance="@style/Signal.Text.BodyMedium"
        android:textColor="@color/signal_colorOnSurfaceVariant"
        tools:text="@string/ReviewCardDialogFragment__d_group_members_have_the_same_name" />
--- a/app/src/main/res/layout/review_card.xml
+++ b/app/src/main/res/layout/review_card.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/core_ui__gutter"
+    android:layout_marginHorizontal="@dimen/gutter"
    android:layout_marginBottom="16dp"
    android:background="@drawable/review_card_outline">

--- a/core-ui/src/main/java/org/signal/core/ui/DropdownMenus.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/DropdownMenus.kt
@@ -33,7 +33,7 @@ object DropdownMenus {
  fun Menu(
    controller: MenuController = remember { MenuController() },
    modifier: Modifier = Modifier,
-    offsetX: Dp = dimensionResource(id = R.dimen.core_ui__gutter),
+    offsetX: Dp = dimensionResource(id = R.dimen.gutter),
    offsetY: Dp = 0.dp,
    content: @Composable ColumnScope.(MenuController) -> Unit
  ) {
--- a/core-ui/src/main/java/org/signal/core/ui/ModifierExtensions.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/ModifierExtensions.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.unit.Dp
 */
@Composable
 fun Modifier.horizontalGutters(
-  gutterSize: Dp = dimensionResource(R.dimen.core_ui__gutter)
+  gutterSize: Dp = dimensionResource(R.dimen.gutter)
 ): Modifier {
  return padding(horizontal = gutterSize)
 }
--- a/core-ui/src/main/java/org/signal/core/ui/Rows.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/Rows.kt
@@ -200,7 +200,7 @@ object Rows {
  @Composable
  fun defaultPadding(): PaddingValues {
    return PaddingValues(
-      horizontal = dimensionResource(id = R.dimen.core_ui__gutter),
+      horizontal = dimensionResource(id = R.dimen.gutter),
      vertical = 16.dp
    )
  }
--- a/core-ui/src/main/java/org/signal/core/ui/Texts.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/Texts.kt
@@ -32,7 +32,7 @@ object Texts {
      style = MaterialTheme.typography.titleSmall,
      modifier = modifier
        .padding(
-          horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
+          horizontal = dimensionResource(id = R.dimen.gutter)
        )
        .padding(top = 16.dp, bottom = 12.dp)
    )
--- a/core-ui/src/main/res/values-sw360dp/dimens.xml
+++ b/core-ui/src/main/res/values-sw360dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="core_ui__gutter">24dp</dimen>
+    <dimen name="gutter">24dp</dimen>
 </resources>
--- a/core-ui/src/main/res/values/dimens.xml
+++ b/core-ui/src/main/res/values/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="core_ui__gutter">16dp</dimen>
+    <dimen name="gutter">16dp</dimen>
 </resources>
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,6 @@
 org.gradle.jvmargs=-Xmx6g -Xms256m -XX:MaxMetaspaceSize=1g
 android.useAndroidX=true
 android.experimental.androidTest.numManagedDeviceShards=4
-android.nonTransitiveRClass=false

 # Uncomment these to build libsignal from source.
 # libsignalClientPath=../libsignal
--- a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/TrashRenderer.kt
+++ b/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/TrashRenderer.kt
@@ -10,12 +10,12 @@ import android.view.animation.Interpolator
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import org.signal.core.util.DimensionUnit
-import org.signal.imageeditor.R
 import org.signal.imageeditor.core.Bounds
 import org.signal.imageeditor.core.Renderer
 import org.signal.imageeditor.core.RendererContext
+import org.signal.core.util.R as CoreUtilR

-internal class TrashRenderer : InvalidateableRenderer, Renderer, Parcelable {
+internal class TrashRenderer : InvalidateableRenderer(), Renderer, Parcelable {

  private val outlinePaint = Paint().apply {
    isAntiAlias = true
@@ -44,14 +44,12 @@ internal class TrashRenderer : InvalidateableRenderer, Renderer, Parcelable {

  private val buttonCenter = FloatArray(2)

-  constructor()
-
  override fun render(rendererContext: RendererContext) {
    super.render(rendererContext)

    val frameRenderTime = System.currentTimeMillis()

-    val trash: Drawable = requireNotNull(AppCompatResources.getDrawable(rendererContext.context, R.drawable.ic_trash_white_24))
+    val trash: Drawable = requireNotNull(AppCompatResources.getDrawable(rendererContext.context, CoreUtilR.drawable.ic_trash_white_24))
    trash.setBounds(0, 0, trashSize, trashSize)

    val diameter = getInterpolatedDiameter(frameRenderTime - startTime)