-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
185 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
feature/goal/src/main/kotlin/br/com/weightcontrol/component/GoalCompleted.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package br.com.weightcontrol.component | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.Card | ||
| import androidx.compose.material3.CardDefaults | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.br.weightcontrol.designsystem.theme.WeiTheme | ||
|
|
||
| @Composable | ||
| fun GoalCompletionCard(modifier: Modifier = Modifier) { | ||
| Card( | ||
| colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primary), | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| ) { | ||
| Column( | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| modifier = Modifier | ||
| .padding(16.dp) | ||
| .fillMaxWidth() | ||
| ) { | ||
| Text( | ||
| text = "Goal Completion", | ||
| style = MaterialTheme.typography.titleMedium.copy(color = Color.White), | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun GoalCompletionCardPreview() { | ||
| WeiTheme { | ||
| GoalCompletionCard() | ||
| } | ||
| } |
48 changes: 34 additions & 14 deletions
48
feature/goal/src/main/kotlin/br/com/weightcontrol/component/GoalEmptyCard.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,53 @@ | ||
| package br.com.weightcontrol.component | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.dp | ||
| import com.br.weightcontrol.designsystem.icon.WeiIcons | ||
| import com.br.weightcontrol.goal.R | ||
|
|
||
| @Composable | ||
| internal fun GoalEmptyCard(navigateToGoal: () -> Unit) { | ||
| Text( | ||
| text = stringResource(R.string.goal_empty), | ||
| modifier = Modifier.padding(top = 16.dp), | ||
| ) | ||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(top = 16.dp) | ||
| ) { | ||
| Button( | ||
| onClick = { navigateToGoal() }, | ||
| modifier = Modifier.align(Alignment.CenterEnd) | ||
| Column(modifier = Modifier.padding(16.dp)) { | ||
| Row(verticalAlignment = Alignment.CenterVertically) { | ||
| Icon( | ||
| imageVector = WeiIcons.Flag, | ||
| contentDescription = null, | ||
| modifier = Modifier.size(24.dp) | ||
| ) | ||
| Text( | ||
| text = stringResource(R.string.goal), | ||
| modifier = Modifier.padding(start = 8.dp), | ||
| fontWeight = FontWeight.Bold | ||
| ) | ||
| } | ||
| Text( | ||
| text = stringResource(R.string.goal_empty), | ||
| modifier = Modifier.padding(top = 16.dp), | ||
| ) | ||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(top = 16.dp) | ||
| ) { | ||
| Text(text = stringResource(id = R.string.add)) | ||
| Button( | ||
| onClick = { navigateToGoal() }, | ||
| modifier = Modifier.align(Alignment.CenterEnd) | ||
| ) { | ||
| Text(text = stringResource(id = R.string.add)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
47 changes: 0 additions & 47 deletions
47
feature/goal/src/main/kotlin/br/com/weightcontrol/component/GoalFilledCard.kt
This file was deleted.
Oops, something went wrong.
70 changes: 70 additions & 0 deletions
70
feature/goal/src/main/kotlin/br/com/weightcontrol/component/GoalProgressCard.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package br.com.weightcontrol.component | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.dp | ||
| import br.com.weightcontrol.domain.calculateGoalPercentage | ||
| import com.br.weightcontrol.designsystem.icon.WeiIcons | ||
| import com.br.weightcontrol.goal.R | ||
| import com.br.weightcontrol.model.Goal | ||
| import com.br.weightcontrol.model.Track | ||
| import com.br.weightcontrol.ui.CustomLinearProgressIndicator | ||
| import com.br.weightcontrol.ui.VerticalLabeledText | ||
|
|
||
| @Composable | ||
| internal fun GoalProgressCard(goal: Goal?, currentTrack: Track?) { | ||
| goal ?: return | ||
| currentTrack ?: return | ||
| Column(modifier = Modifier.padding(16.dp)) { | ||
| Row(verticalAlignment = Alignment.CenterVertically) { | ||
| Icon( | ||
| imageVector = WeiIcons.Flag, | ||
| contentDescription = null, | ||
| modifier = Modifier.size(24.dp) | ||
| ) | ||
| Text( | ||
| text = stringResource(R.string.goal), | ||
| modifier = Modifier.padding(start = 8.dp), | ||
| fontWeight = FontWeight.Bold | ||
| ) | ||
| } | ||
| Row( | ||
| modifier = Modifier | ||
| .padding(top = 16.dp) | ||
| .padding(horizontal = 16.dp) | ||
| .fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.SpaceBetween, | ||
| ) { | ||
| VerticalLabeledText( | ||
| label = R.string.goal_begin, | ||
| weight = goal.start | ||
| ) | ||
| VerticalLabeledText( | ||
| label = R.string.goal_remaining, | ||
| weight = goal.remaining(currentTrack.weight) | ||
| ) | ||
| VerticalLabeledText( | ||
| label = R.string.goal_destination, | ||
| weight = goal.desire | ||
| ) | ||
| } | ||
| CustomLinearProgressIndicator( | ||
| targetProgress = calculateGoalPercentage(goal, currentTrack), | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(horizontal = 56.dp) | ||
| .padding(top = 16.dp) | ||
| ) | ||
| } | ||
| } |