Skip to content

Commit 5a390e4

Browse files
Fix text clipping and overlapping at large font scales (#1726)
- Replace fixed `height` with `heightIn(min = ...)` in `JetchatDrawer` items and `DayHeader` so containers can expand when text scales or wraps. - Update `BaselineHeightModifier` to accept `TextUnit` (`sp`) instead of `Dp` and update `Profile` baseline heights to use `.sp` so baseline spacing scales proportionally with the system font size.
2 parents fe26402 + 286d1ea commit 5a390e4

4 files changed

Lines changed: 13 additions & 11 deletions

File tree

‎Jetchat/app/src/main/java/com/example/compose/jetchat/components/BaseLineHeightModifier.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import androidx.compose.ui.layout.Measurable
2424
import androidx.compose.ui.layout.MeasureResult
2525
import androidx.compose.ui.layout.MeasureScope
2626
import androidx.compose.ui.unit.Constraints
27-
import androidx.compose.ui.unit.Dp
27+
import androidx.compose.ui.unit.TextUnit
2828

2929
/**
3030
* Applied to a Text, it sets the distance between the top and the first baseline. It
@@ -39,7 +39,7 @@ import androidx.compose.ui.unit.Dp
3939
* This modifier can be used to distribute multiple text elements using a certain distance between
4040
* baselines.
4141
*/
42-
data class BaselineHeightModifier(val heightFromBaseline: Dp) : LayoutModifier {
42+
data class BaselineHeightModifier(val heightFromBaseline: TextUnit) : LayoutModifier {
4343

4444
override fun MeasureScope.measure(measurable: Measurable, constraints: Constraints): MeasureResult {
4545

@@ -55,4 +55,4 @@ data class BaselineHeightModifier(val heightFromBaseline: Dp) : LayoutModifier {
5555
}
5656
}
5757

58-
fun Modifier.baselineHeight(heightFromBaseline: Dp): Modifier = this.then(BaselineHeightModifier(heightFromBaseline))
58+
fun Modifier.baselineHeight(heightFromBaseline: TextUnit): Modifier = this.then(BaselineHeightModifier(heightFromBaseline))

‎Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private fun ChatItem(text: String, selected: Boolean, onChatClicked: () -> Unit)
138138
}
139139
Row(
140140
modifier = Modifier
141-
.height(56.dp)
141+
.heightIn(min = 56.dp)
142142
.fillMaxWidth()
143143
.padding(horizontal = 12.dp)
144144
.clip(CircleShape)
@@ -179,7 +179,7 @@ private fun ProfileItem(text: String, @DrawableRes profilePic: Int?, selected: B
179179
}
180180
Row(
181181
modifier = Modifier
182-
.height(56.dp)
182+
.heightIn(min = 56.dp)
183183
.fillMaxWidth()
184184
.padding(horizontal = 12.dp)
185185
.clip(CircleShape)
@@ -247,7 +247,7 @@ private fun WidgetDiscoverability() {
247247
val context = LocalContext.current
248248
Row(
249249
modifier = Modifier
250-
.height(56.dp)
250+
.heightIn(min = 56.dp)
251251
.fillMaxWidth()
252252
.padding(horizontal = 12.dp)
253253
.clip(CircleShape)

‎Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import androidx.compose.foundation.layout.exclude
5454
import androidx.compose.foundation.layout.fillMaxSize
5555
import androidx.compose.foundation.layout.fillMaxWidth
5656
import androidx.compose.foundation.layout.height
57+
import androidx.compose.foundation.layout.heightIn
5758
import androidx.compose.foundation.layout.ime
5859
import androidx.compose.foundation.layout.imePadding
5960
import androidx.compose.foundation.layout.navigationBars
@@ -675,7 +676,7 @@ fun DayHeader(dayString: String) {
675676
Row(
676677
modifier = Modifier
677678
.padding(vertical = 12.dp, horizontal = 16.dp)
678-
.height(24.dp),
679+
.heightIn(min = 24.dp),
679680
verticalAlignment = Alignment.CenterVertically,
680681
) {
681682
DayHeaderLine()

‎Jetchat/app/src/main/java/com/example/compose/jetchat/profile/Profile.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import androidx.compose.ui.res.painterResource
5353
import androidx.compose.ui.res.stringResource
5454
import androidx.compose.ui.tooling.preview.Preview
5555
import androidx.compose.ui.unit.dp
56+
import androidx.compose.ui.unit.sp
5657
import com.example.compose.jetchat.FunctionalityNotAvailablePopup
5758
import com.example.compose.jetchat.R
5859
import com.example.compose.jetchat.components.AnimatingFabContent
@@ -112,13 +113,13 @@ private fun NameAndPosition(userData: ProfileScreenState) {
112113
Column(modifier = Modifier.padding(horizontal = 16.dp)) {
113114
Name(
114115
userData,
115-
modifier = Modifier.baselineHeight(32.dp),
116+
modifier = Modifier.baselineHeight(32.sp),
116117
)
117118
Position(
118119
userData,
119120
modifier = Modifier
120121
.padding(bottom = 20.dp)
121-
.baselineHeight(24.dp),
122+
.baselineHeight(24.sp),
122123
)
123124
}
124125
}
@@ -171,7 +172,7 @@ fun ProfileProperty(label: String, value: String, isLink: Boolean = false) {
171172
HorizontalDivider()
172173
Text(
173174
text = label,
174-
modifier = Modifier.baselineHeight(24.dp),
175+
modifier = Modifier.baselineHeight(24.sp),
175176
style = MaterialTheme.typography.bodySmall,
176177
color = MaterialTheme.colorScheme.onSurfaceVariant,
177178
)
@@ -182,7 +183,7 @@ fun ProfileProperty(label: String, value: String, isLink: Boolean = false) {
182183
}
183184
Text(
184185
text = value,
185-
modifier = Modifier.baselineHeight(24.dp),
186+
modifier = Modifier.baselineHeight(24.sp),
186187
style = style,
187188
)
188189
}

0 commit comments

Comments
 (0)