Merge pull request #1276 from radixdlt/task/add-xsmall-dimension

Add xsmall dimension
radixdlt · Dec 10, 2024 · 4e7cec5 · 4e7cec5
2 parents 4b68086 + 67ce433
commit 4e7cec5
Show file tree

Hide file tree

Showing 52 changed files with 86 additions and 85 deletions.
diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/account/AccountScreen.kt b/app/src/main/java/com/babylon/wallet/android/presentation/account/AccountScreen.kt
@@ -407,7 +407,7 @@ private fun AccountHeader(
                 Row(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(horizontal = RadixTheme.dimensions.paddingXSmall),
+                        .padding(horizontal = RadixTheme.dimensions.paddingXXSmall),
                     horizontalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingDefault)
                 ) {
                     if (accountAddress != null) {

diff --git a/.../main/java/com/babylon/wallet/android/presentation/account/composable/HistoryFilterTag.kt b/.../main/java/com/babylon/wallet/android/presentation/account/composable/HistoryFilterTag.kt
@@ -46,7 +46,7 @@ fun HistoryFilterTag(
             )
             .applyIf(selected, tagSelectedModifier)
             .applyIf(!selected, tagBorderModifier),
-        horizontalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingXSmall),
+        horizontalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingXXSmall),
         verticalAlignment = Alignment.CenterVertically
     ) {
         leadingIcon?.invoke()

diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/account/composable/MetadataView.kt b/app/src/main/java/com/babylon/wallet/android/presentation/account/composable/MetadataView.kt
@@ -242,7 +242,7 @@ fun MetadataValueView(
                 }
                 Icon(
                     modifier = Modifier
-                        .padding(start = RadixTheme.dimensions.paddingXSmall)
+                        .padding(start = RadixTheme.dimensions.paddingXXSmall)
                         .size(iconSize),
                     painter = painterResource(id = com.babylon.wallet.android.designsystem.R.drawable.ic_copy),
                     contentDescription = null,

diff --git a/...in/java/com/babylon/wallet/android/presentation/account/settings/AccountSettingsScreen.kt b/...in/java/com/babylon/wallet/android/presentation/account/settings/AccountSettingsScreen.kt
@@ -385,7 +385,7 @@ private fun BottomSheet(
     ) {
         IconButton(
             modifier = Modifier.padding(
-                start = RadixTheme.dimensions.paddingXSmall,
+                start = RadixTheme.dimensions.paddingXXSmall,
                 top = RadixTheme.dimensions.paddingMedium
             ),
             onClick = onClose

diff --git a/...ndroid/presentation/account/settings/delete/moveassets/DeletingAccountMoveAssetsScreen.kt b/...ndroid/presentation/account/settings/delete/moveassets/DeletingAccountMoveAssetsScreen.kt
@@ -233,7 +233,7 @@ private fun DeletingAccountMoveAssetsContent(
                     modifier = Modifier
                         .padding(
                             horizontal = RadixTheme.dimensions.paddingLarge,
-                            vertical = RadixTheme.dimensions.paddingXSmall
+                            vertical = RadixTheme.dimensions.paddingXXSmall
                         )
                         .background(
                             account.appearanceId.gradient(alpha = if (isEnabled) 1f else 0.3f),

diff --git a/...main/java/com/babylon/wallet/android/presentation/dialogs/address/AddressDetailsDialog.kt b/...main/java/com/babylon/wallet/android/presentation/dialogs/address/AddressDetailsDialog.kt
@@ -269,7 +269,7 @@ private fun FullAddress(
                     contentDescription = null,
                     tint = RadixTheme.colors.gray1
                 )
-                Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXSmall))
+                Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXXSmall))
                 Text(
                     text = stringResource(id = R.string.addressDetails_copy),
                     style = RadixTheme.typography.body1Header
@@ -287,7 +287,7 @@ private fun FullAddress(
                     contentDescription = null,
                     tint = RadixTheme.colors.gray1
                 )
-                Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXSmall))
+                Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXXSmall))
                 Text(
                     text = stringResource(id = R.string.addressDetails_enlarge),
                     style = RadixTheme.typography.body1Header
@@ -305,7 +305,7 @@ private fun FullAddress(
                     contentDescription = null,
                     tint = RadixTheme.colors.gray1
                 )
-                Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXSmall))
+                Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXXSmall))
                 Text(
                     text = stringResource(id = R.string.addressDetails_share),
                     style = RadixTheme.typography.body1Header

diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/dialogs/assets/AssetDialog.kt b/app/src/main/java/com/babylon/wallet/android/presentation/dialogs/assets/AssetDialog.kt
@@ -270,7 +270,7 @@ fun DescriptionSection(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = RadixTheme.dimensions.paddingSmall)
-                    .padding(top = RadixTheme.dimensions.paddingXSmall),
+                    .padding(top = RadixTheme.dimensions.paddingXXSmall),
                 url = infoUrl
             )
         }
@@ -393,7 +393,7 @@ fun TagsSection(
                     tags.forEach { tag ->
                         Tag(
                             modifier = Modifier
-                                .padding(RadixTheme.dimensions.paddingXSmall)
+                                .padding(RadixTheme.dimensions.paddingXXSmall)
                                 .border(
                                     width = 1.dp,
                                     color = RadixTheme.colors.gray4,

diff --git a/.../com/babylon/wallet/android/presentation/dialogs/assets/fungible/FungibleDialogContent.kt b/.../com/babylon/wallet/android/presentation/dialogs/assets/fungible/FungibleDialogContent.kt
@@ -104,7 +104,7 @@ fun FungibleDialogContent(
                 if (isLoadingBalance) {
                     ShimmeringView(
                         modifier = Modifier
-                            .padding(top = RadixTheme.dimensions.paddingXXSmall)
+                            .padding(top = RadixTheme.dimensions.paddingXXXSmall)
                             .height(12.dp)
                             .fillMaxWidth(0.2f),
                         isVisible = true

diff --git a/.../main/java/com/babylon/wallet/android/presentation/dialogs/assets/lsu/LSUDialogContent.kt b/.../main/java/com/babylon/wallet/android/presentation/dialogs/assets/lsu/LSUDialogContent.kt
@@ -333,7 +333,7 @@ private fun LSUResourceValue(
             if (isLoadingBalance) {
                 ShimmeringView(
                     modifier = Modifier
-                        .padding(top = RadixTheme.dimensions.paddingXXSmall)
+                        .padding(top = RadixTheme.dimensions.paddingXXXSmall)
                         .height(12.dp)
                         .fillMaxWidth(0.3f),
                     isVisible = true

diff --git a/...ylon/wallet/android/presentation/dialogs/preauthorization/PreAuthorizationStatusDialog.kt b/...ylon/wallet/android/presentation/dialogs/preauthorization/PreAuthorizationStatusDialog.kt
@@ -246,7 +246,7 @@ private fun PreAuthorizationId(
             color = RadixTheme.colors.gray1
         )
 
-        Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXSmall))
+        Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXXSmall))
 
         Row(
             modifier = Modifier.throttleClickable { onClick() },
@@ -259,7 +259,7 @@ private fun PreAuthorizationId(
                 style = RadixTheme.typography.body1HighImportance
             )
 
-            Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXSmall))
+            Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXXSmall))
 
             Icon(
                 modifier = Modifier.size(14.dp),

diff --git a/.../babylon/wallet/android/presentation/onboarding/restore/backup/RestoreFromBackupScreen.kt b/.../babylon/wallet/android/presentation/onboarding/restore/backup/RestoreFromBackupScreen.kt
@@ -365,7 +365,7 @@ private fun RestoredProfileListItem(
             Column(
                 modifier = Modifier
                     .weight(1f)
-                    .padding(start = RadixTheme.dimensions.paddingXSmall)
+                    .padding(start = RadixTheme.dimensions.paddingXXSmall)
             ) {
                 Text(
                     text = stringResource(

diff --git a/...va/com/babylon/wallet/android/presentation/settings/securitycenter/backup/BackupScreen.kt b/...va/com/babylon/wallet/android/presentation/settings/securitycenter/backup/BackupScreen.kt
@@ -414,7 +414,7 @@ private fun BackupStatusCard(
             color = RadixTheme.colors.gray1,
             style = RadixTheme.typography.body1Regular
         )
-        Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
+        Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXXSmall))
         BackupStatusSection(
             title = stringResource(id = R.string.configurationBackup_automated_accountsItemTitle),
             subtitle = stringResource(id = R.string.configurationBackup_automated_accountsItemSubtitle),
@@ -591,7 +591,7 @@ private fun ExportWalletBackupFileDialog(
                         .clickable(role = Role.Button) { onConfirm(true) }
                         .padding(
                             horizontal = RadixTheme.dimensions.paddingSmall,
-                            vertical = RadixTheme.dimensions.paddingXSmall
+                            vertical = RadixTheme.dimensions.paddingXXSmall
                         ),
                     text = stringResource(id = R.string.profileBackup_manualBackups_encryptBackupDialogConfirm),
                     color = RadixTheme.colors.red1
@@ -602,7 +602,7 @@ private fun ExportWalletBackupFileDialog(
                         .clickable(role = Role.Button) { onConfirm(false) }
                         .padding(
                             horizontal = RadixTheme.dimensions.paddingSmall,
-                            vertical = RadixTheme.dimensions.paddingXSmall
+                            vertical = RadixTheme.dimensions.paddingXXSmall
                         ),
                     text = stringResource(id = R.string.profileBackup_manualBackups_encryptBackupDialogDeny),
                     color = RadixTheme.colors.red1
@@ -615,7 +615,7 @@ private fun ExportWalletBackupFileDialog(
                     .clickable(role = Role.Button) { onDeny() }
                     .padding(
                         horizontal = RadixTheme.dimensions.paddingSmall,
-                        vertical = RadixTheme.dimensions.paddingXSmall
+                        vertical = RadixTheme.dimensions.paddingXXSmall
                     ),
                 text = stringResource(id = R.string.common_cancel),
                 color = RadixTheme.colors.blue2

diff --git a/...ylon/wallet/android/presentation/settings/securitycenter/seedphrases/SeedPhrasesScreen.kt b/...ylon/wallet/android/presentation/settings/securitycenter/seedphrases/SeedPhrasesScreen.kt
@@ -225,13 +225,13 @@ fun SeedPhraseCard(
             )
         }
         if (data.mnemonicState == DeviceFactorSourceWithEntities.MnemonicState.NotBackedUp) {
-            Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
+            Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXXSmall))
             WarningText(
                 text = AnnotatedString(stringResource(id = R.string.securityProblems_no3_seedPhrases)),
                 contentColor = RadixTheme.colors.orange1
             )
         }
-        Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
+        Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXXSmall))
         if (data.hasOnlyHiddenAccounts) {
             Text(
                 modifier = Modifier

diff --git a/...android/presentation/settings/securitycenter/seedphrases/reveal/RevealSeedPhraseScreen.kt b/...android/presentation/settings/securitycenter/seedphrases/reveal/RevealSeedPhraseScreen.kt
@@ -188,7 +188,7 @@ private fun SeedPhraseRow(
 
 @Composable
 private fun SingleWord(label: String, word: String, modifier: Modifier = Modifier) {
-    Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingXSmall)) {
+    Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingXXSmall)) {
         Text(
             text = label,
             style = RadixTheme.typography.body1HighImportance,

diff --git a/...ntation/settings/troubleshooting/accountrecoveryscan/chooseseed/ChooseSeedPhraseScreen.kt b/...ntation/settings/troubleshooting/accountrecoveryscan/chooseseed/ChooseSeedPhraseScreen.kt
@@ -242,7 +242,7 @@ fun SeedPhraseCard(
             )
         }
         if (data.allAccounts.isNotEmpty()) {
-            Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
+            Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXXSmall))
             data.allAccounts.forEach { account ->
                 SimpleAccountCard(
                     modifier = Modifier.fillMaxWidth(),

diff --git a/...roid/presentation/settings/troubleshooting/importlegacywallet/ImportLegacyWalletScreen.kt b/...roid/presentation/settings/troubleshooting/importlegacywallet/ImportLegacyWalletScreen.kt
@@ -793,7 +793,7 @@ private fun VerifyWithYourSeedPhrasePage(
                 modifier = Modifier.fillMaxWidth(),
                 text = AnnotatedString(stringResource(R.string.importOlympiaAccounts_verifySeedPhrase_warning))
             )
-            Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
+            Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXXSmall))
             SeedPhraseInputForm(
                 seedPhraseWords = seedPhraseWords,
                 onWordChanged = onWordChanged,

diff --git a/...let/android/presentation/settings/troubleshooting/importlegacywallet/LegacyAccountCard.kt b/...let/android/presentation/settings/troubleshooting/importlegacywallet/LegacyAccountCard.kt
@@ -49,7 +49,7 @@ fun LegacyAccountCard(
             style = RadixTheme.typography.secondaryHeader,
             color = Color.White
         )
-        Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
+        Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXXSmall))
         Text(
             text = stringResource(
                 id = when (accountType) {

diff --git a/.../babylon/wallet/android/presentation/settings/troubleshooting/reset/FactoryResetScreen.kt b/.../babylon/wallet/android/presentation/settings/troubleshooting/reset/FactoryResetScreen.kt
@@ -231,7 +231,7 @@ private fun DeleteWalletDialog(
                     .clickable(role = Role.Button) { onConfirm() }
                     .padding(
                         horizontal = RadixTheme.dimensions.paddingSmall,
-                        vertical = RadixTheme.dimensions.paddingXSmall
+                        vertical = RadixTheme.dimensions.paddingXXSmall
                     ),
                 text = stringResource(id = R.string.common_confirm),
                 color = RadixTheme.colors.red1
@@ -243,7 +243,7 @@ private fun DeleteWalletDialog(
                     .clickable(role = Role.Button) { onDeny() }
                     .padding(
                         horizontal = RadixTheme.dimensions.paddingSmall,
-                        vertical = RadixTheme.dimensions.paddingXSmall
+                        vertical = RadixTheme.dimensions.paddingXXSmall
                     ),
                 text = stringResource(id = R.string.common_cancel),
                 color = RadixTheme.colors.blue2

diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/survey/NPSSurveySheet.kt b/app/src/main/java/com/babylon/wallet/android/presentation/survey/NPSSurveySheet.kt
@@ -173,7 +173,7 @@ fun RatingContainer(
 
                 Box(
                     modifier = Modifier
-                        .padding(RadixTheme.dimensions.paddingXSmall)
+                        .padding(RadixTheme.dimensions.paddingXXSmall)
                         .clip(CircleShape)
                         .border(1.dp, Color.Black, CircleShape)
                         .size(45.dp)

diff --git a/.../main/java/com/babylon/wallet/android/presentation/transaction/TransactionReviewScreen.kt b/.../main/java/com/babylon/wallet/android/presentation/transaction/TransactionReviewScreen.kt
@@ -387,7 +387,7 @@ private fun TransactionPreviewContent(
                                     contentDescription = "copy"
                                 )
                                 Text(
-                                    modifier = Modifier.padding(start = RadixTheme.dimensions.paddingXSmall),
+                                    modifier = Modifier.padding(start = RadixTheme.dimensions.paddingXXSmall),
                                     text = stringResource(R.string.common_copy),
                                     style = RadixTheme.typography.body1Header
                                 )

diff --git a/.../wallet/android/presentation/transaction/composables/AccountDepositSettingsTypeContent.kt b/.../wallet/android/presentation/transaction/composables/AccountDepositSettingsTypeContent.kt
@@ -180,7 +180,7 @@ private fun SectionHeader(modifier: Modifier = Modifier, text: String) {
             modifier = Modifier
                 .size(24.dp)
                 .dashedCircleBorder(RadixTheme.colors.gray3)
-                .padding(RadixTheme.dimensions.paddingXSmall),
+                .padding(RadixTheme.dimensions.paddingXXSmall),
             painter = painterResource(
                 id = DSR.ic_deposit_changes_heading
             ),

diff --git a/...a/com/babylon/wallet/android/presentation/transaction/composables/BoundedAmountSection.kt b/...a/com/babylon/wallet/android/presentation/transaction/composables/BoundedAmountSection.kt
@@ -247,7 +247,7 @@ private fun AmountText(
 
         symbol?.let {
             Text(
-                modifier = Modifier.padding(bottom = RadixTheme.dimensions.paddingXXSmall),
+                modifier = Modifier.padding(bottom = RadixTheme.dimensions.paddingXXXSmall),
                 text = it,
                 style = symbolStyle,
                 color = symbolColor

diff --git a/.../com/babylon/wallet/android/presentation/transaction/composables/DepositAccountContent.kt b/.../com/babylon/wallet/android/presentation/transaction/composables/DepositAccountContent.kt
@@ -89,7 +89,7 @@ fun DepositAccountContent(
                 if (hasCustomisableGuarantees) {
                     RadixTextButton(
                         modifier = Modifier
-                            .padding(top = RadixTheme.dimensions.paddingXSmall),
+                            .padding(top = RadixTheme.dimensions.paddingXXSmall),
                         text = stringResource(id = R.string.interactionReview_customizeGuaranteesButtonTitle),
                         onClick = onEditGuaranteesClick
                     )

diff --git a/...com/babylon/wallet/android/presentation/transaction/composables/FeePayerSelectionSheet.kt b/...com/babylon/wallet/android/presentation/transaction/composables/FeePayerSelectionSheet.kt
@@ -106,7 +106,7 @@ private fun FeePayerSelectionContent(
             Box {
                 IconButton(
                     modifier = Modifier.padding(
-                        start = RadixTheme.dimensions.paddingXSmall,
+                        start = RadixTheme.dimensions.paddingXXSmall,
                         top = RadixTheme.dimensions.paddingMedium
                     ),
                     onClick = onClose
@@ -258,7 +258,7 @@ private fun FeePayerCard(
                 maxLines = 2
             )
 
-            Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXSmall))
+            Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXXSmall))
 
             RadixRadioButton(
                 selected = candidate.account.address == selectedCandidateAddress,
@@ -272,7 +272,7 @@ private fun FeePayerCard(
         }
 
         if (!candidate.hasEnoughBalance) {
-            Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
+            Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXXSmall))
 
             WarningText(
                 modifier = Modifier

diff --git a/...java/com/babylon/wallet/android/presentation/transaction/composables/NetworkFeeContent.kt b/...java/com/babylon/wallet/android/presentation/transaction/composables/NetworkFeeContent.kt
@@ -56,7 +56,7 @@ fun NetworkFeeContent(
                     style = RadixTheme.typography.body1Link,
                     color = RadixTheme.colors.gray2
                 )
-                Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXSmall))
+                Spacer(modifier = Modifier.width(RadixTheme.dimensions.paddingXXSmall))
                 InfoButton(
                     modifier = Modifier
                         .fillMaxHeight()

diff --git a/...om/babylon/wallet/android/presentation/transaction/composables/PresentingProofsContent.kt b/...om/babylon/wallet/android/presentation/transaction/composables/PresentingProofsContent.kt
@@ -52,7 +52,7 @@ fun PresentingProofsContent(
                         vertical = RadixTheme.dimensions.paddingSmall
                     )
                     .height(intrinsicSize = IntrinsicSize.Min),
-                horizontalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingXSmall)
+                horizontalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingXXSmall)
             ) {
                 Text(
                     text = stringResource(id = R.string.interactionReview_presentingHeading).uppercase(),

diff --git a/...m/babylon/wallet/android/presentation/transaction/composables/TransactionPreviewHeader.kt b/...m/babylon/wallet/android/presentation/transaction/composables/TransactionPreviewHeader.kt
@@ -100,7 +100,7 @@ fun TransactionPreviewHeader(
                     }
 
                     if (someDApp != null) {
-                        Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
+                        Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXXSmall))
 
                         Row(
                             verticalAlignment = Alignment.CenterVertically