Skip to content

Desktop text scaling #3

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

Merged
merged 2 commits into from
Feb 27, 2025
Merged

Desktop text scaling #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c600c4e
Text size based on window height
jdamcd Feb 27, 2025
52bd383
Tweak size
jdamcd Feb 27, 2025
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
73 changes: 41 additions & 32 deletions desktop/src/main/kotlin/com/jdamcd/arrivals/desktop/ArrivalsView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -27,7 +28,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.jdamcd.arrivals.Arrival
Expand Down Expand Up @@ -64,23 +67,28 @@ private fun Loading() {
@Composable
private fun Data(state: ArrivalsState.Data, onClickRefresh: () -> Unit) {
Column {
Column(
modifier = Modifier
.padding(top = 20.dp, bottom = 8.dp, start = 32.dp, end = 32.dp)
.weight(1f)
.fillMaxWidth(),
verticalArrangement = Arrangement.SpaceEvenly
BoxWithConstraints(
modifier = Modifier.weight(1f)
.padding(top = 16.dp, bottom = 8.dp, start = 32.dp, end = 32.dp)
) {
state.result.arrivals.forEach {
ArrivalRow(it)
val rowHeight = maxHeight / 3
val textSize = (rowHeight * textScale).value.sp

Column(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.SpaceEvenly
) {
state.result.arrivals.forEach {
ArrivalRow(it, textSize)
}
}
}
Row(
modifier = Modifier
.background(color = Footer)
.padding(start = 32.dp, end = 28.dp)
.fillMaxWidth()
.height(70.dp),
.height(footerHeight),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Expand Down Expand Up @@ -121,46 +129,52 @@ private fun Data(state: ArrivalsState.Data, onClickRefresh: () -> Unit) {

@Composable
fun Error(message: String) {
Column(
modifier = Modifier
.padding(32.dp)
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(32.dp)
BoxWithConstraints(
modifier = Modifier.fillMaxSize()
.padding(top = 16.dp, bottom = 8.dp, start = 32.dp, end = 32.dp)
) {
LedText(message)
val rowHeight = (maxHeight - footerHeight) / 3 // Match text size in Data composable
val textSize = (rowHeight * textScale).value.sp

Column(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.SpaceEvenly
) {
LedText(message, textSize)
}
}
}

@Composable
fun ArrivalRow(arrival: Arrival) {
fun ArrivalRow(arrival: Arrival, textSize: TextUnit) {
Row(
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
LedText(arrival.destination)
LedText(arrival.destination, textSize)
if (arrival.secondsToStop < 60) {
FlashingLedText(arrival.time)
FlashingLedText(arrival.time, textSize)
} else {
LedText(arrival.time)
LedText(arrival.time, textSize)
}
}
}

@Composable
fun LedText(string: String) {
fun LedText(string: String, textSize: TextUnit, color: Color = LedYellow) {
Text(
text = string,
color = LedYellow,
color = color,
maxLines = 1,
style = TextStyle(
fontFamily = LurFontFamily,
fontSize = 58.sp
fontSize = textSize
)
)
}

@Composable
fun FlashingLedText(string: String) {
fun FlashingLedText(string: String, textSize: TextUnit) {
val infiniteTransition = rememberInfiniteTransition()
val alpha by infiniteTransition.animateFloat(
initialValue = 0f,
Expand All @@ -170,13 +184,8 @@ fun FlashingLedText(string: String) {
repeatMode = RepeatMode.Reverse
)
)
Text(
text = string,
color = LedYellow.copy(alpha = alpha),
maxLines = 1,
style = TextStyle(
fontFamily = LurFontFamily,
fontSize = 58.sp
)
)
LedText(string, textSize, LedYellow.copy(alpha = alpha))
}

private val textScale = 0.6f
private val footerHeight = 70.dp