Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable nonTransitiveRClass.

Browse Source 
Resolves #13757
This commit is contained in:
Jameson Williams
2024-10-30 01:54:04 -05:00
committed by Greyson Parrelli
parent c35242c525
commit 769a92943e
55 changed files with 116 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToEnableOptimizedStorageSheet.kt
View File

@@ -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(

7
app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToStartMediaBackupSheet.kt
View File

@@ -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(