Skip to content
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

Jump to bottom

Ensures display TextStyles are propagated in Connected screen #4

Merged
merged 1 commit into from Nov 15, 2021
Merged

Ensures display TextStyles are propagated in Connected screen #4

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/src/main/java/com/garan/wearwind/screens/Connected.kt
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.LocalTextStyle
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
Expand All @@ -19,7 +18,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.sp
import androidx.constraintlayout.compose.ChainStyle
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.constraintlayout.compose.ConstraintSet
Expand Down Expand Up @@ -73,12 +71,14 @@ fun ConnectedScreen(
SpeedAndHrBox(
uiState = uiState,
screenStarted = screenStarted,
metricDisplayTypography = metricDisplayTypography,
hr = hr,
speed = speed)
} else {
SpeedLabel(
uiState = uiState,
screenStarted = screenStarted,
metricDisplayTypography = metricDisplayTypography,
speed = speed,
onSetSpeed = onSetSpeed)
}
Expand Down Expand Up @@ -111,6 +111,7 @@ fun SpeedAndHrBox(
SpeedAndHrPlaceholder()
} else {
SpeedAndHrLabel(
metricDisplayTypography = metricDisplayTypography,
hr = hr,
speed = speed
)
Expand Down