Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Remove fontFamily parameter. Must use style only.

Browse source
This commit is contained in:
Benoit Marty 2023-07-10 17:04:44 +02:00 • committed by Benoit Marty
parent f0d3b9da53
commit d10fde194f
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
View file

@ -18,7 +18,6 @@ package io.element.android.features.messages.impl.timeline.debug
import android.content.ClipData import android.content.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager
import android.content.Context
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.expandVertically import androidx.compose.animation.expandVertically
import androidx.compose.animation.shrinkVertically import androidx.compose.animation.shrinkVertically
@ -94,11 +93,12 @@ fun EventDebugInfoView(
}, },
modifier = modifier modifier = modifier
) { padding -> ) { padding ->
LazyColumn(modifier = Modifier LazyColumn(
.fillMaxWidth() modifier = Modifier
.padding(padding) // Window insets .fillMaxWidth()
.consumeWindowInsets(padding) .padding(padding) // Window insets
.padding(horizontal = 16.dp) // Internal padding .consumeWindowInsets(padding)
.padding(horizontal = 16.dp) // Internal padding
) { ) {
item { item {
Column(Modifier.padding(vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { Column(Modifier.padding(vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
@ -165,7 +165,11 @@ private fun CopyableText(
.padding(6.dp) .padding(6.dp)
.clickable { clipboardManager.setPrimaryClip(ClipData.newPlainText("JSON", text)) } .clickable { clipboardManager.setPrimaryClip(ClipData.newPlainText("JSON", text)) }
) { ) {
Text(text = text, fontFamily = FontFamily.Monospace, fontSize = 14.sp, modifier = Modifier.padding(8.dp)) Text(
text = text,
style = ElementTheme.typography.fontBodyMdRegular.copy(fontFamily = FontFamily.Monospace),
modifier = Modifier.padding(8.dp),
)
} }
} }

3
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt
View file

@ -60,8 +60,6 @@ fun Text(
fontSize: TextUnit = TextUnit.Unspecified, fontSize: TextUnit = TextUnit.Unspecified,
fontStyle: FontStyle? = null, fontStyle: FontStyle? = null,
// Will be removed, only style should be used // Will be removed, only style should be used
fontFamily: FontFamily? = null,
// Will be removed, only style should be used
letterSpacing: TextUnit = TextUnit.Unspecified, letterSpacing: TextUnit = TextUnit.Unspecified,
textDecoration: TextDecoration? = null, textDecoration: TextDecoration? = null,
textAlign: TextAlign? = null, textAlign: TextAlign? = null,
@ -80,7 +78,6 @@ fun Text(
color = color, color = color,
fontSize = fontSize, fontSize = fontSize,
fontStyle = fontStyle, fontStyle = fontStyle,
fontFamily = fontFamily,
letterSpacing = letterSpacing, letterSpacing = letterSpacing,
textDecoration = textDecoration, textDecoration = textDecoration,
textAlign = textAlign, textAlign = textAlign,