Enable nonTransitiveRClass.

Resolves #13757
2026-04-23 18:30:20 +01: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(