diff --git a/app/src/main/java/com/app/whakaara/ui/clock/TimerCountdownDisplay.kt b/app/src/main/java/com/app/whakaara/ui/clock/TimerCountdownDisplay.kt index 746d542e..b1f5e0ce 100644 --- a/app/src/main/java/com/app/whakaara/ui/clock/TimerCountdownDisplay.kt +++ b/app/src/main/java/com/app/whakaara/ui/clock/TimerCountdownDisplay.kt @@ -3,10 +3,11 @@ package com.app.whakaara.ui.clock import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.tween +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons @@ -22,7 +23,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import com.app.whakaara.R import com.app.whakaara.ui.theme.FontScalePreviews -import com.app.whakaara.ui.theme.Spacings +import com.app.whakaara.ui.theme.Spacings.space275 +import com.app.whakaara.ui.theme.Spacings.spaceXLarge +import com.app.whakaara.ui.theme.Spacings.spaceXSmall +import com.app.whakaara.ui.theme.Spacings.spaceXxSmall import com.app.whakaara.ui.theme.ThemePreviews import com.app.whakaara.ui.theme.WhakaaraTheme import com.app.whakaara.ui.theme.primaryGreen @@ -43,41 +47,40 @@ fun TimerCountdownDisplay( label = "" ) - Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center + Column( + horizontalAlignment = Alignment.CenterHorizontally ) { - Column( - horizontalAlignment = Alignment.CenterHorizontally + Box( + contentAlignment = Alignment.Center ) { - Box( - contentAlignment = Alignment.Center + CircularProgressIndicator( + modifier = Modifier.size(space275), + progress = { animatedProgress }, + color = primaryGreen, + strokeWidth = spaceXSmall + ) + Column( + horizontalAlignment = Alignment.CenterHorizontally ) { - CircularProgressIndicator( - modifier = Modifier.size(Spacings.space250), - progress = { animatedProgress }, - color = primaryGreen, - strokeWidth = Spacings.spaceXSmall - ) Text( style = MaterialTheme.typography.headlineLarge, text = time ) - } - - Row( - modifier = Modifier.padding(top = Spacings.spaceXSmall) - ) { - Icon( - imageVector = Icons.Outlined.NotificationsActive, - contentDescription = stringResource( - id = R.string.system_time_icon_content_description + Row( + modifier = Modifier.offset(y = spaceXLarge), + horizontalArrangement = Arrangement.Center + ) { + Icon( + imageVector = Icons.Outlined.NotificationsActive, + contentDescription = stringResource( + id = R.string.system_time_icon_content_description + ) ) - ) - Text( - modifier = Modifier.padding(start = Spacings.spaceXxSmall), - text = finishTime - ) + Text( + modifier = Modifier.padding(start = spaceXxSmall), + text = finishTime + ) + } } } }