TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 14:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

renaming spacing to be more general

Browse Source
This commit is contained in:
ThomasSession 2024-07-15 10:51:24 +10:00
parent facbee99a5
commit bb630fc11b
19 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/DisappearingMessages.kt
View File

@ -46,7 +46,7 @@ fun DisappearingMessages(
.padding(bottom = 20.dp) .padding(bottom = 20.dp)
.verticalScroll(scrollState) .verticalScroll(scrollState)
.fadingEdges(scrollState), .fadingEdges(scrollState),
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing) verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)
) { ) {
state.cards.forEach { state.cards.forEach {
OptionsCard(it, callbacks) OptionsCard(it, callbacks)

6
app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
View File

@ -74,17 +74,17 @@ internal fun StartConversationScreen(
Column( Column(
modifier = Modifier modifier = Modifier
.padding(horizontal = LocalDimensions.current.margin) .padding(horizontal = LocalDimensions.current.margin)
.padding(top = LocalDimensions.current.itemSpacing) .padding(top = LocalDimensions.current.spacing)
.padding(bottom = LocalDimensions.current.margin) .padding(bottom = LocalDimensions.current.margin)
) { ) {
Text(stringResource(R.string.accountIdYours), style = LocalType.current.xl) Text(stringResource(R.string.accountIdYours), style = LocalType.current.xl)
Spacer(modifier = Modifier.height(LocalDimensions.current.xxxsItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.xxxsSpacing))
Text( Text(
text = stringResource(R.string.qrYoursDescription), text = stringResource(R.string.qrYoursDescription),
color = LocalColors.current.textSecondary, color = LocalColors.current.textSecondary,
style = LocalType.current.small style = LocalType.current.small
) )
Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
QrImage( QrImage(
string = accountId, string = accountId,
Modifier.contentDescription(R.string.AccessibilityId_qr_code), Modifier.contentDescription(R.string.AccessibilityId_qr_code),

10
app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt
View File

@ -36,7 +36,7 @@ internal fun InviteFriend(
Column(modifier = Modifier.background(LocalColors.current.backgroundSecondary)) { Column(modifier = Modifier.background(LocalColors.current.backgroundSecondary)) {
AppBar(stringResource(R.string.invite_a_friend), onBack = onBack, onClose = onClose) AppBar(stringResource(R.string.invite_a_friend), onBack = onBack, onClose = onClose)
Column( Column(
modifier = Modifier.padding(horizontal = LocalDimensions.current.itemSpacing), modifier = Modifier.padding(horizontal = LocalDimensions.current.spacing),
) { ) {
Text( Text(
accountId, accountId,
@ -49,19 +49,19 @@ internal fun InviteFriend(
style = LocalType.current.base style = LocalType.current.base
) )
Spacer(modifier = Modifier.height(LocalDimensions.current.xsItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.xsSpacing))
Text( Text(
stringResource(R.string.invite_your_friend_to_chat_with_you_on_session_by_sharing_your_account_id_with_them), stringResource(R.string.invite_your_friend_to_chat_with_you_on_session_by_sharing_your_account_id_with_them),
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
style = LocalType.current.small, style = LocalType.current.small,
color = LocalColors.current.textSecondary, color = LocalColors.current.textSecondary,
modifier = Modifier.padding(horizontal = LocalDimensions.current.smallItemSpacing) modifier = Modifier.padding(horizontal = LocalDimensions.current.smallSpacing)
) )
Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
Row(horizontalArrangement = spacedBy(LocalDimensions.current.smallItemSpacing)) { Row(horizontalArrangement = spacedBy(LocalDimensions.current.smallSpacing)) {
SlimOutlineButton( SlimOutlineButton(
stringResource(R.string.share), stringResource(R.string.share),
modifier = Modifier modifier = Modifier

18
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
View File

@ -151,8 +151,8 @@ fun MessageDetails(
Column( Column(
modifier = Modifier modifier = Modifier
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
.padding(vertical = LocalDimensions.current.smallItemSpacing), .padding(vertical = LocalDimensions.current.smallSpacing),
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing) verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)
) { ) {
state.record?.let { message -> state.record?.let { message ->
AndroidView( AndroidView(
@ -192,7 +192,7 @@ fun CellMetadata(
state.apply { state.apply {
if (listOfNotNull(sent, received, error, senderInfo).isEmpty()) return if (listOfNotNull(sent, received, error, senderInfo).isEmpty()) return
CellWithPaddingAndMargin { CellWithPaddingAndMargin {
Column(verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing)) { Column(verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)) {
TitledText(sent) TitledText(sent)
TitledText(received) TitledText(received)
TitledErrorText(error) TitledErrorText(error)
@ -250,7 +250,7 @@ fun Carousel(attachments: List<Attachment>, onClick: (Int) -> Unit) {
val pagerState = rememberPagerState { attachments.size } val pagerState = rememberPagerState { attachments.size }
Column(verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing)) { Column(verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)) {
Row { Row {
CarouselPrevButton(pagerState) CarouselPrevButton(pagerState)
Box(modifier = Modifier.weight(1f)) { Box(modifier = Modifier.weight(1f)) {
@ -259,7 +259,7 @@ fun Carousel(attachments: List<Attachment>, onClick: (Int) -> Unit) {
ExpandButton( ExpandButton(
modifier = Modifier modifier = Modifier
.align(Alignment.BottomEnd) .align(Alignment.BottomEnd)
.padding(LocalDimensions.current.xxsItemSpacing) .padding(LocalDimensions.current.xxsSpacing)
) { onClick(pagerState.currentPage) } ) { onClick(pagerState.currentPage) }
} }
CarouselNextButton(pagerState) CarouselNextButton(pagerState)
@ -339,8 +339,8 @@ fun FileDetails(fileDetails: List<TitledText>) {
Cell { Cell {
FlowRow( FlowRow(
modifier = Modifier.padding(horizontal = LocalDimensions.current.xsItemSpacing, vertical = LocalDimensions.current.itemSpacing), modifier = Modifier.padding(horizontal = LocalDimensions.current.xsSpacing, vertical = LocalDimensions.current.spacing),
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing) verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)
) { ) {
fileDetails.forEach { fileDetails.forEach {
BoxWithConstraints { BoxWithConstraints {
@ -348,7 +348,7 @@ fun FileDetails(fileDetails: List<TitledText>) {
it, it,
modifier = Modifier modifier = Modifier
.widthIn(min = maxWidth.div(2)) .widthIn(min = maxWidth.div(2))
.padding(horizontal = LocalDimensions.current.xsItemSpacing) .padding(horizontal = LocalDimensions.current.xsSpacing)
.width(IntrinsicSize.Max) .width(IntrinsicSize.Max)
) )
} }
@ -395,7 +395,7 @@ fun TitledText(
@Composable @Composable
fun TitledView(title: GetString, modifier: Modifier = Modifier, content: @Composable () -> Unit) { fun TitledView(title: GetString, modifier: Modifier = Modifier, content: @Composable () -> Unit) {
Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.xxxsItemSpacing)) { Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.xxxsSpacing)) {
Text(title.string(), style = LocalType.current.base.bold()) Text(title.string(), style = LocalType.current.base.bold())
content() content()
} }

2
app/src/main/java/org/thoughtcrime/securesms/home/EmptyView.kt
View File

@ -56,7 +56,7 @@ internal fun EmptyView(newAccount: Boolean) {
stringResource(R.string.conversationsNone), stringResource(R.string.conversationsNone),
style = LocalType.current.h8, style = LocalType.current.h8,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier.padding(bottom = LocalDimensions.current.xsItemSpacing)) modifier = Modifier.padding(bottom = LocalDimensions.current.xsSpacing))
Text( Text(
stringResource(R.string.onboardingHitThePlusButton), stringResource(R.string.onboardingHitThePlusButton),
style = LocalType.current.small, style = LocalType.current.small,

2
app/src/main/java/org/thoughtcrime/securesms/home/SeedReminder.kt
View File

@ -52,7 +52,7 @@ internal fun SeedReminder(startRecoveryPasswordActivity: () -> Unit) {
stringResource(R.string.save_your_recovery_password), stringResource(R.string.save_your_recovery_password),
style = LocalType.current.h8 style = LocalType.current.h8
) )
Spacer(Modifier.requiredWidth(LocalDimensions.current.xxsItemSpacing)) Spacer(Modifier.requiredWidth(LocalDimensions.current.xxsSpacing))
SessionShieldIcon() SessionShieldIcon()
} }
Text( Text(

12
app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt
View File

@ -115,7 +115,7 @@ internal fun LandingScreen(
style = LocalType.current.h4, style = LocalType.current.h4,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
Spacer(modifier = Modifier.height(LocalDimensions.current.itemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.spacing))
LazyColumn( LazyColumn(
state = listState, state = listState,
@ -123,7 +123,7 @@ internal fun LandingScreen(
.heightIn(min = LocalDimensions.current.minScrollableViewHeight) .heightIn(min = LocalDimensions.current.minScrollableViewHeight)
.fillMaxWidth() .fillMaxWidth()
.weight(3f), .weight(3f),
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing) verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)
) { ) {
items( items(
MESSAGES.take(count), MESSAGES.take(count),
@ -148,7 +148,7 @@ internal fun LandingScreen(
.contentDescription(R.string.AccessibilityId_create_account_button), .contentDescription(R.string.AccessibilityId_create_account_button),
onClick = createAccount onClick = createAccount
) )
Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
PrimaryOutlineButton( PrimaryOutlineButton(
stringResource(R.string.onboardingAccountExists), stringResource(R.string.onboardingAccountExists),
modifier = Modifier modifier = Modifier
@ -165,7 +165,7 @@ internal fun LandingScreen(
.contentDescription(R.string.AccessibilityId_open_url), .contentDescription(R.string.AccessibilityId_open_url),
onClick = { isUrlDialogVisible = true } onClick = { isUrlDialogVisible = true }
) )
Spacer(modifier = Modifier.height(LocalDimensions.current.xxsItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.xxsSpacing))
} }
} }
} }
@ -219,8 +219,8 @@ private fun MessageText(
style = LocalType.current.large, style = LocalType.current.large,
color = textColor, color = textColor,
modifier = Modifier.padding( modifier = Modifier.padding(
horizontal = LocalDimensions.current.smallItemSpacing, horizontal = LocalDimensions.current.smallSpacing,
vertical = LocalDimensions.current.xsItemSpacing vertical = LocalDimensions.current.xsSpacing
) )
) )
} }

10
app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt
View File

@ -74,7 +74,7 @@ private fun RecoveryPassword(state: State, onChange: (String) -> Unit = {}, onCo
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
) { ) {
Spacer(Modifier.weight(1f)) Spacer(Modifier.weight(1f))
Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
Column( Column(
modifier = Modifier.padding(horizontal = LocalDimensions.current.largeMargin) modifier = Modifier.padding(horizontal = LocalDimensions.current.largeMargin)
@ -84,19 +84,19 @@ private fun RecoveryPassword(state: State, onChange: (String) -> Unit = {}, onCo
text = stringResource(R.string.sessionRecoveryPassword), text = stringResource(R.string.sessionRecoveryPassword),
style = LocalType.current.h4 style = LocalType.current.h4
) )
Spacer(Modifier.width(LocalDimensions.current.xxsItemSpacing)) Spacer(Modifier.width(LocalDimensions.current.xxsSpacing))
Icon( Icon(
modifier = Modifier.align(Alignment.CenterVertically), modifier = Modifier.align(Alignment.CenterVertically),
painter = painterResource(id = R.drawable.ic_shield_outline), painter = painterResource(id = R.drawable.ic_shield_outline),
contentDescription = null, contentDescription = null,
) )
} }
Spacer(Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(Modifier.height(LocalDimensions.current.smallSpacing))
Text( Text(
stringResource(R.string.activity_link_enter_your_recovery_password_to_load_your_account_if_you_haven_t_saved_it_you_can_find_it_in_your_app_settings), stringResource(R.string.activity_link_enter_your_recovery_password_to_load_your_account_if_you_haven_t_saved_it_you_can_find_it_in_your_app_settings),
style = LocalType.current.base style = LocalType.current.base
) )
Spacer(Modifier.height(LocalDimensions.current.itemSpacing)) Spacer(Modifier.height(LocalDimensions.current.spacing))
SessionOutlinedTextField( SessionOutlinedTextField(
text = state.recoveryPhrase, text = state.recoveryPhrase,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@ -109,7 +109,7 @@ private fun RecoveryPassword(state: State, onChange: (String) -> Unit = {}, onCo
) )
} }
Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
Spacer(Modifier.weight(2f)) Spacer(Modifier.weight(2f))
ContinuePrimaryOutlineButton(modifier = Modifier.align(Alignment.CenterHorizontally), onContinue) ContinuePrimaryOutlineButton(modifier = Modifier.align(Alignment.CenterHorizontally), onContinue)

2
app/src/main/java/org/thoughtcrime/securesms/onboarding/loading/Loading.kt
View File

@ -26,7 +26,7 @@ internal fun LoadingScreen(progress: Float) {
stringResource(R.string.waitOneMoment), stringResource(R.string.waitOneMoment),
style = LocalType.current.h7 style = LocalType.current.h7
) )
Spacer(modifier = Modifier.height(LocalDimensions.current.xxxsItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.xxxsSpacing))
Text( Text(
stringResource(R.string.loadAccountProgressMessage), stringResource(R.string.loadAccountProgressMessage),
style = LocalType.current.base style = LocalType.current.base

2
app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
View File

@ -60,7 +60,7 @@ internal fun MessageNotificationsScreen(
Text(stringResource(R.string.notificationsMessage), style = LocalType.current.h4) Text(stringResource(R.string.notificationsMessage), style = LocalType.current.h4)
Spacer(Modifier.height(LocalDimensions.current.xsMargin)) Spacer(Modifier.height(LocalDimensions.current.xsMargin))
Text(stringResource(R.string.onboardingMessageNotificationExplaination), style = LocalType.current.base) Text(stringResource(R.string.onboardingMessageNotificationExplaination), style = LocalType.current.base)
Spacer(Modifier.height(LocalDimensions.current.itemSpacing)) Spacer(Modifier.height(LocalDimensions.current.spacing))
} }
NotificationRadioButton( NotificationRadioButton(

10
app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt
View File

@ -51,18 +51,18 @@ internal fun PickDisplayName(
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
) { ) {
Spacer(Modifier.weight(1f)) Spacer(Modifier.weight(1f))
Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
Column( Column(
modifier = Modifier.padding(horizontal = LocalDimensions.current.largeMargin) modifier = Modifier.padding(horizontal = LocalDimensions.current.largeMargin)
) { ) {
Text(stringResource(state.title), style = LocalType.current.h4) Text(stringResource(state.title), style = LocalType.current.h4)
Spacer(Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(Modifier.height(LocalDimensions.current.smallSpacing))
Text( Text(
stringResource(state.description), stringResource(state.description),
style = LocalType.current.base, style = LocalType.current.base,
modifier = Modifier.padding(bottom = LocalDimensions.current.xsItemSpacing)) modifier = Modifier.padding(bottom = LocalDimensions.current.xsSpacing))
Spacer(Modifier.height(LocalDimensions.current.itemSpacing)) Spacer(Modifier.height(LocalDimensions.current.spacing))
SessionOutlinedTextField( SessionOutlinedTextField(
text = state.displayName, text = state.displayName,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@ -75,7 +75,7 @@ internal fun PickDisplayName(
) )
} }
Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
Spacer(Modifier.weight(2f)) Spacer(Modifier.weight(2f))
ContinuePrimaryOutlineButton(modifier = Modifier.align(Alignment.CenterHorizontally), onContinue) ContinuePrimaryOutlineButton(modifier = Modifier.align(Alignment.CenterHorizontally), onContinue)

4
app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
View File

@ -431,7 +431,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
modifier = Modifier modifier = Modifier
.padding(horizontal = LocalDimensions.current.smallMargin) .padding(horizontal = LocalDimensions.current.smallMargin)
.padding(top = LocalDimensions.current.xxxsMargin), .padding(top = LocalDimensions.current.xxxsMargin),
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing), horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing),
) { ) {
PrimaryOutlineButton( PrimaryOutlineButton(
stringResource(R.string.share), stringResource(R.string.share),
@ -445,7 +445,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
) )
} }
Spacer(modifier = Modifier.height(LocalDimensions.current.itemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.spacing))
val hasPaths by hasPaths().collectAsState(initial = false) val hasPaths by hasPaths().collectAsState(initial = false)

4
app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPassword.kt
View File

@ -76,7 +76,7 @@ private fun RecoveryPasswordCell(
stringResource(R.string.sessionRecoveryPassword), stringResource(R.string.sessionRecoveryPassword),
style = LocalType.current.h8 style = LocalType.current.h8
) )
Spacer(Modifier.width(LocalDimensions.current.xxsItemSpacing)) Spacer(Modifier.width(LocalDimensions.current.xxsSpacing))
SessionShieldIcon() SessionShieldIcon()
} }
@ -107,7 +107,7 @@ private fun RecoveryPasswordCell(
AnimatedVisibility(!showQr) { AnimatedVisibility(!showQr) {
Row( Row(
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing), horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
SlimOutlineCopyButton( SlimOutlineCopyButton(

12
app/src/main/java/org/thoughtcrime/securesms/ui/AlertDialog.kt
View File

@ -73,15 +73,15 @@ fun AlertDialog(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(top = LocalDimensions.current.smallItemSpacing) .padding(top = LocalDimensions.current.smallSpacing)
.padding(horizontal = LocalDimensions.current.smallItemSpacing) .padding(horizontal = LocalDimensions.current.smallSpacing)
) { ) {
title?.let { title?.let {
Text( Text(
it, it,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
style = LocalType.current.h7, style = LocalType.current.h7,
modifier = Modifier.padding(bottom = LocalDimensions.current.xxsItemSpacing) modifier = Modifier.padding(bottom = LocalDimensions.current.xxsSpacing)
) )
} }
text?.let { text?.let {
@ -89,7 +89,7 @@ fun AlertDialog(
it, it,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
style = LocalType.current.large, style = LocalType.current.large,
modifier = Modifier.padding(bottom = LocalDimensions.current.xxsItemSpacing) modifier = Modifier.padding(bottom = LocalDimensions.current.xxsSpacing)
) )
} }
content() content()
@ -130,8 +130,8 @@ fun DialogButton(text: String, modifier: Modifier, color: Color = Color.Unspecif
style = LocalType.current.large.bold(), style = LocalType.current.large.bold(),
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier.padding( modifier = Modifier.padding(
top = LocalDimensions.current.smallItemSpacing, top = LocalDimensions.current.smallSpacing,
bottom = LocalDimensions.current.itemSpacing bottom = LocalDimensions.current.spacing
) )
) )
} }

4
app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
View File

@ -226,7 +226,7 @@ fun ItemButton(
text, text,
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = LocalDimensions.current.xsItemSpacing) .padding(vertical = LocalDimensions.current.xsSpacing)
.align(Alignment.CenterVertically), .align(Alignment.CenterVertically),
style = textStyle style = textStyle
) )
@ -269,7 +269,7 @@ fun CellWithPaddingAndMargin(
fun <T> TitledRadioButton(option: RadioOption<T>, onClick: () -> Unit) { fun <T> TitledRadioButton(option: RadioOption<T>, onClick: () -> Unit) {
val color = if (option.enabled) LocalColors.current.text else LocalColors.current.disabled val color = if (option.enabled) LocalColors.current.text else LocalColors.current.disabled
Row( Row(
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing), horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing),
modifier = Modifier modifier = Modifier
.runIf(option.enabled) { clickable { if (!option.selected) onClick() } } .runIf(option.enabled) { clickable { if (!option.selected) onClick() } }
.heightIn(min = 60.dp) .heightIn(min = 60.dp)

10
app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
View File

@ -96,7 +96,7 @@ fun MaybeScanQrCode(
style = LocalType.current.base, style = LocalType.current.base,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
Spacer(modifier = Modifier.size(LocalDimensions.current.itemSpacing)) Spacer(modifier = Modifier.size(LocalDimensions.current.spacing))
OutlineButton( OutlineButton(
stringResource(R.string.sessionSettings), stringResource(R.string.sessionSettings),
modifier = Modifier.align(Alignment.CenterHorizontally), modifier = Modifier.align(Alignment.CenterHorizontally),
@ -114,7 +114,7 @@ fun MaybeScanQrCode(
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
Text(stringResource(R.string.fragment_scan_qr_code_camera_access_explanation), Text(stringResource(R.string.fragment_scan_qr_code_camera_access_explanation),
style = LocalType.current.xl, textAlign = TextAlign.Center) style = LocalType.current.xl, textAlign = TextAlign.Center)
Spacer(modifier = Modifier.height(LocalDimensions.current.itemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.spacing))
PrimaryOutlineButton( PrimaryOutlineButton(
stringResource(R.string.cameraGrantAccess), stringResource(R.string.cameraGrantAccess),
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@ -186,11 +186,11 @@ fun ScanQrCode(errors: Flow<String>, onScan: (String) -> Unit) {
snackbarHost = { snackbarHost = {
SnackbarHost( SnackbarHost(
hostState = scaffoldState.snackbarHostState, hostState = scaffoldState.snackbarHostState,
modifier = Modifier.padding(LocalDimensions.current.smallItemSpacing) modifier = Modifier.padding(LocalDimensions.current.smallSpacing)
) { data -> ) { data ->
Snackbar( Snackbar(
snackbarData = data, snackbarData = data,
modifier = Modifier.padding(LocalDimensions.current.smallItemSpacing) modifier = Modifier.padding(LocalDimensions.current.smallSpacing)
) )
} }
} }
@ -204,7 +204,7 @@ fun ScanQrCode(errors: Flow<String>, onScan: (String) -> Unit) {
Box( Box(
Modifier Modifier
.aspectRatio(1f) .aspectRatio(1f)
.padding(LocalDimensions.current.itemSpacing) .padding(LocalDimensions.current.spacing)
.clip(shape = RoundedCornerShape(26.dp)) .clip(shape = RoundedCornerShape(26.dp))
.background(Color(0x33ffffff)) .background(Color(0x33ffffff))
.align(Alignment.Center) .align(Alignment.Center)

2
app/src/main/java/org/thoughtcrime/securesms/ui/components/QrImage.kt
View File

@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.util.QRCodeUtilities
fun QrImage( fun QrImage(
string: String?, string: String?,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
contentPadding: Dp = LocalDimensions.current.smallItemSpacing, contentPadding: Dp = LocalDimensions.current.smallSpacing,
icon: Int = R.drawable.session_shield icon: Int = R.drawable.session_shield
) { ) {
var bitmap: Bitmap? by remember { var bitmap: Bitmap? by remember {

2
app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt
View File

@ -130,7 +130,7 @@ fun SessionOutlinedTextField(
) )
} }
error?.let { error?.let {
Spacer(modifier = Modifier.height(LocalDimensions.current.xsItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.xsSpacing))
Text( Text(
it, it,
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()

10
app/src/main/java/org/thoughtcrime/securesms/ui/theme/Dimensions.kt
View File

@ -7,11 +7,11 @@ import androidx.compose.ui.unit.dp
val LocalDimensions = staticCompositionLocalOf { Dimensions() } val LocalDimensions = staticCompositionLocalOf { Dimensions() }
data class Dimensions( data class Dimensions(
val xxxsItemSpacing: Dp = 4.dp, val xxxsSpacing: Dp = 4.dp,
val xxsItemSpacing: Dp = 8.dp, val xxsSpacing: Dp = 8.dp,
val xsItemSpacing: Dp = 12.dp, val xsSpacing: Dp = 12.dp,
val smallItemSpacing: Dp = 16.dp, val smallSpacing: Dp = 16.dp,
val itemSpacing: Dp = 24.dp, val spacing: Dp = 24.dp,
val xxxsMargin: Dp = 8.dp, val xxxsMargin: Dp = 8.dp,
val xxsMargin: Dp = 12.dp, val xxsMargin: Dp = 12.dp,