Skip to content

SES-4550 : Long display names get truncated instead of being shown fully #1491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

SES-4550 : Long display names get truncated instead of being shown fully #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ import org.thoughtcrime.securesms.ui.LoadingDialog
import org.thoughtcrime.securesms.ui.OpenURLAlertDialog
import org.thoughtcrime.securesms.ui.PathDot
import org.thoughtcrime.securesms.ui.ProBadgeText
import org.thoughtcrime.securesms.ui.ProBadgeTextInline
import org.thoughtcrime.securesms.ui.RadioOption
import org.thoughtcrime.securesms.ui.components.AcccentOutlineCopyButton
import org.thoughtcrime.securesms.ui.components.AccentOutlineButton
Expand Down Expand Up @@ -252,7 +253,7 @@ fun Settings(
Spacer(modifier = Modifier.height(LocalDimensions.current.spacing))

// name
ProBadgeText(
ProBadgeTextInline(
modifier = Modifier.qaTag(R.string.AccessibilityId_displayName)
.clickable(
interactionSource = remember { MutableInteractionSource() },
Expand Down
84 changes: 77 additions & 7 deletions app/src/main/java/org/thoughtcrime/securesms/ui/ProComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.InlineTextContent
import androidx.compose.foundation.text.appendInlineContent
import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Text
Expand All @@ -53,7 +55,10 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.text.Placeholder
import androidx.compose.ui.text.PlaceholderVerticalAlign
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -140,7 +145,8 @@ fun ProBadgeText(
showBadge: Boolean = true,
badgeColors: ProBadgeColors = proBadgeColorStandard(),
badgeAtStart: Boolean = false,
onBadgeClick: (() -> Unit)? = null
onBadgeClick: (() -> Unit)? = null,
maxLines: Int = Int.MAX_VALUE
) {
Row(
modifier = modifier.qaTag(stringResource(R.string.qa_pro_badge_component)),
Expand All @@ -156,7 +162,8 @@ fun ProBadgeText(
}
}
ProBadge(
modifier = proBadgeModifier.height(textStyle.lineHeight.value.dp * 0.8f)
modifier = proBadgeModifier
.height(textStyle.lineHeight.value.dp * 0.8f)
.qaTag(stringResource(R.string.qa_pro_badge_icon)),
colors = badgeColors
)
Expand All @@ -165,7 +172,8 @@ fun ProBadgeText(

val textContent = @Composable {
Text(
modifier = Modifier.weight(1f, fill = false)
modifier = Modifier
.weight(1f, fill = false)
.qaTag(stringResource(R.string.qa_pro_badge_text)),
text = text,
style = textStyle,
Expand All @@ -184,14 +192,71 @@ fun ProBadgeText(
}
}

@Composable
fun ProBadgeTextInline(
text: String,
modifier: Modifier = Modifier,
textStyle: TextStyle = LocalType.current.h5,
showBadge: Boolean = true,
badgeColors: ProBadgeColors = proBadgeColorStandard(),
onBadgeClick: (() -> Unit)? = null,
maxLines: Int = Int.MAX_VALUE
) {
val badgeId = "proBadge"

val annotatedText = buildAnnotatedString {
append(text)
if (showBadge) {
appendInlineContent(badgeId, "[pro]") // placeholder
}
}

val inlineContent = mapOf(
badgeId to InlineTextContent(
Placeholder(
width = textStyle.fontSize * 1.8,
height = textStyle.fontSize * 1.8,
placeholderVerticalAlign = PlaceholderVerticalAlign.Center
)
) {
var badgeModifier: Modifier = Modifier
if (onBadgeClick != null) {
badgeModifier = badgeModifier.clickable { onBadgeClick() }
}

ProBadge(
modifier = badgeModifier
.padding(start = 4.dp)
.height(textStyle.fontSize.value.dp * 1.8f)
.qaTag(stringResource(R.string.qa_pro_badge_icon)),
colors = badgeColors
)
}
)

Text(
modifier = modifier
.fillMaxWidth()
.qaTag(stringResource(R.string.qa_pro_badge_text)),
text = annotatedText,
textAlign = TextAlign.Center,
style = textStyle,
inlineContent = inlineContent,
maxLines = maxLines,
overflow = TextOverflow.Ellipsis
)
}

@Preview
@Composable
private fun PreviewProBadgeText(
@PreviewParameter(SessionColorsParameterProvider::class) colors: ThemeColors
) {
PreviewTheme(colors) {
Column(
modifier = Modifier.fillMaxWidth().padding(LocalDimensions.current.smallSpacing),
modifier = Modifier
.fillMaxWidth()
.padding(LocalDimensions.current.smallSpacing),
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.xxsSpacing)
) {
ProBadgeText(text = "Hello Pro", textStyle = LocalType.current.base)
Expand Down Expand Up @@ -270,7 +335,9 @@ fun SessionProCTA(
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.xsSpacing),
) {
AccentFillButtonRect(
modifier = Modifier.weight(1f).shimmerOverlay(),
modifier = Modifier
.weight(1f)
.shimmerOverlay(),
text = stringResource(R.string.theContinue),
onClick = onUpgrade
)
Expand Down Expand Up @@ -943,7 +1010,10 @@ fun SessionProSettingsHeader(
.background(
Brush.radialGradient(
// Gradient runs from our washed-out accent colour in the center to the background colour at the edges
colors = listOf(accentColourWithLowAlpha, LocalColors.current.background),
colors = listOf(
accentColourWithLowAlpha,
LocalColors.current.background
),
)
)
)
Expand All @@ -957,7 +1027,7 @@ fun SessionProSettingsHeader(
.onSizeChanged { newSizeDp ->
headerSize = newSizeDp
}
.clearAndSetSemantics{
.clearAndSetSemantics {
contentDescription = NonTranslatableStringConstants.APP_PRO
},
horizontalAlignment = Alignment.CenterHorizontally
Expand Down