bugfix: track and goal visibility

joaooab · Jan 28, 2024 · ad17a95 · ad17a95
1 parent 462cd7e
commit ad17a95
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 7 deletions.
diff --git a/feature/goal/src/main/kotlin/br/com/weightcontrol/component/GoalCardSettings.kt b/feature/goal/src/main/kotlin/br/com/weightcontrol/component/GoalCardSettings.kt
@@ -20,19 +20,21 @@ import com.br.weightcontrol.designsystem.icon.WeiIcons
 import com.br.weightcontrol.designsystem.theme.WeiTheme
 import com.br.weightcontrol.goal.R
 import com.br.weightcontrol.model.Goal
+import com.br.weightcontrol.model.Track
 import com.br.weightcontrol.ui.HorizontalLabeledText
 import com.br.weightcontrol.util.todayAsString
 
 @Composable
 fun GoalCardSettings(
     goal: Goal?,
+    currentTrack: Track?,
     onEdit: () -> Unit,
     onDelete: (Goal) -> Unit,
     modifier: Modifier = Modifier
 ) {
     GoalCard(
         goal = goal,
-        currentTrack = null,
+        currentTrack = currentTrack,
         navigateToGoal = onEdit,
         onProgressGoal = {
             GoalCardProgressSettings(
@@ -104,6 +106,7 @@ internal fun GoalCardFilledSettingsPreview() {
     WeiTheme {
         GoalCardSettings(
             goal = Goal(start = 85.0, desire = 80.0, createdAt = todayAsString()),
+            currentTrack = Track(),
             onEdit = {},
             onDelete = {}
         )

diff --git a/feature/home/build.gradle.kts b/feature/home/build.gradle.kts
@@ -10,5 +10,6 @@ android {
 dependencies {
     implementation(project(":feature:bmi"))
     implementation(project(":feature:goal"))
+    implementation(project(":feature:track"))
     implementation(libs.kotlinx.datetime)
 }
diff --git a/feature/home/src/main/java/com/br/weightcontrol/home/HomeRoute.kt b/feature/home/src/main/java/com/br/weightcontrol/home/HomeRoute.kt
@@ -35,7 +35,7 @@ import com.br.weightcontrol.model.Goal
 import com.br.weightcontrol.model.Track
 import com.br.weightcontrol.model.User
 import com.br.weightcontrol.model.format
-import com.br.weightcontrol.ui.CurrentTrackCard
+import com.br.weightcontrol.track.component.TrackCard
 import com.br.weightcontrol.ui.TrackListResourcePreviewParameterProvider
 import com.br.weightcontrol.ui.chart.TrackListChart
 import com.br.weightcontrol.util.todayAsString
@@ -79,7 +79,7 @@ internal fun HomeScreen(
     Column(modifier.padding(16.dp)) {
         LazyColumn {
             item {
-                CurrentTrackCard(
+                TrackCard(
                     track = currentTrack,
                     onClickAdd = navigateToTrack,
                     modifier = Modifier.padding(top = 8.dp)

diff --git a/feature/home/src/main/java/com/br/weightcontrol/home/HomeViewModel.kt b/feature/home/src/main/java/com/br/weightcontrol/home/HomeViewModel.kt
@@ -34,7 +34,7 @@ class HomeViewModel(
     val currentTrack = trackRepository.getLastStream().filterNotNull().stateIn(
         scope = viewModelScope,
         started = SharingStarted.WhileSubscribed(5000L),
-        initialValue = Track()
+        initialValue = null
     )
 
     val user = userRepository.stream.stateIn(

diff --git a/feature/settings/src/main/java/com/br/weightcontrol/settings/navigation/SettingsRoute.kt b/feature/settings/src/main/java/com/br/weightcontrol/settings/navigation/SettingsRoute.kt
@@ -23,6 +23,7 @@ import br.com.weightcontrol.component.GoalCardSettings
 import com.br.weightcontrol.designsystem.icon.WeiIcons
 import com.br.weightcontrol.model.Gender
 import com.br.weightcontrol.model.Goal
+import com.br.weightcontrol.model.Track
 import com.br.weightcontrol.model.User
 import com.br.weightcontrol.settings.R
 import com.br.weightcontrol.ui.HorizontalLabeledText
@@ -41,6 +42,7 @@ internal fun SettingsRoute(
 ) {
     val user by viewModel.user.collectAsStateWithLifecycle()
     val goal by viewModel.goal.collectAsStateWithLifecycle()
+    val currentTrack by viewModel.currentTrack.collectAsStateWithLifecycle()
     val deleteDialogState by viewModel.showDeleteDialog.collectAsStateWithLifecycle()
 
     when (val state = deleteDialogState) {
@@ -57,6 +59,7 @@ internal fun SettingsRoute(
     SettingsScreen(
         user = user,
         goal = goal,
+        currentTrack = currentTrack,
         navigateToProfile = navigateToProfile,
         navigateToGoal = navigateToGoal,
         onDelete = viewModel::onDelete,
@@ -68,6 +71,7 @@ internal fun SettingsRoute(
 private fun SettingsScreen(
     user: User,
     goal: Goal?,
+    currentTrack: Track?,
     navigateToProfile: () -> Unit,
     navigateToGoal: () -> Unit,
     onDelete: (Goal) -> Unit,
@@ -86,6 +90,7 @@ private fun SettingsScreen(
         Spacer(modifier = Modifier.padding(top = 16.dp))
         GoalCardSettings(
             goal = goal,
+            currentTrack = currentTrack,
             onEdit = navigateToGoal,
             onDelete = onDelete
         )
@@ -155,6 +160,7 @@ fun SettingsScreenPreview() {
             gender = Gender.MALE
         ),
         goal = null,
+        currentTrack = Track(),
         navigateToProfile = {},
         navigateToGoal = {},
         onDelete = {},

diff --git a/feature/settings/src/main/java/com/br/weightcontrol/settings/navigation/SettingsViewModel.kt b/feature/settings/src/main/java/com/br/weightcontrol/settings/navigation/SettingsViewModel.kt
@@ -3,6 +3,7 @@ package com.br.weightcontrol.settings.navigation
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.br.weightcontrol.data.repository.GoalRepository
+import com.br.weightcontrol.data.repository.TrackRepository
 import com.br.weightcontrol.data.repository.UserRepository
 import com.br.weightcontrol.model.Goal
 import com.br.weightcontrol.model.User
@@ -17,6 +18,7 @@ import kotlinx.coroutines.launch
 
 class SettingsViewModel(
     userRepository: UserRepository,
+    trackRepository: TrackRepository,
     private val goalRepository: GoalRepository
 ) : ViewModel() {
 
@@ -32,6 +34,11 @@ class SettingsViewModel(
         initialValue = null,
     )
 
+    val currentTrack = trackRepository.getLastStream().filterNotNull().stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(5000L),
+        initialValue = null
+    )
 
     private val _showDeleteDialog = MutableStateFlow<DeleteDialogState<Goal>>(DeleteDialogState.Hide())
     val showDeleteDialog: StateFlow<DeleteDialogState<Goal>> = _showDeleteDialog.asStateFlow()

diff --git a/...m/br/weightcontrol/ui/CurrentTrackCard.kt → ...eightcontrol/track/component/TrackCard.kt b/...m/br/weightcontrol/ui/CurrentTrackCard.kt → ...eightcontrol/track/component/TrackCard.kt
@@ -1,4 +1,4 @@
-package com.br.weightcontrol.ui
+package com.br.weightcontrol.track.component
 
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.animateFloatAsState
@@ -32,16 +32,74 @@ import com.br.weightcontrol.designsystem.icon.WeiIcons
 import com.br.weightcontrol.designsystem.theme.WeiTheme
 import com.br.weightcontrol.model.Track
 import com.br.weightcontrol.model.formatWeight
+import com.br.weightcontrol.ui.text.TextWithIcon
 import com.br.weightcontrol.util.format
 import com.br.weightcontrol.util.today
+import com.br.weightcontrol.track.R as trackR
 
 @Composable
-fun CurrentTrackCard(
+fun TrackCard(
     track: Track?,
     onClickAdd: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    track ?: return
+    when (track) {
+        null -> EmptyTrackCard(
+            onClickAdd = onClickAdd,
+            modifier = modifier
+        )
+
+        else -> CurrentTrackCard(
+            track = track,
+            onClickAdd = onClickAdd,
+            modifier = modifier
+        )
+    }
+}
+
+@Composable
+private fun EmptyTrackCard(
+    onClickAdd: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Card(
+        modifier = modifier,
+        shape = RoundedCornerShape(16.dp)
+    ) {
+        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.current_weight),
+                    modifier = Modifier.padding(start = 8.dp),
+                    fontWeight = FontWeight.Bold
+                )
+                Spacer(modifier = Modifier.weight(1f))
+                IconButton(onClick = onClickAdd) {
+                    Icon(
+                        imageVector = WeiIcons.Add,
+                        contentDescription = null,
+                    )
+                }
+            }
+            TextWithIcon(
+                text = trackR.string.track_empty,
+                icon = WeiIcons.Add,
+            )
+        }
+    }
+}
+
+@Composable
+private fun CurrentTrackCard(
+    track: Track,
+    onClickAdd: () -> Unit,
+    modifier: Modifier = Modifier
+) {
     var progress by remember { mutableStateOf(0f) }
     val progressAnimation: Float by animateFloatAsState(
         targetValue = progress,
@@ -97,6 +155,14 @@ fun CurrentTrackCard(
     }
 }
 
+@Preview
+@Composable
+fun EmptyTrackCardPreview() {
+    WeiTheme {
+        EmptyTrackCard(onClickAdd = { })
+    }
+}
+
 @Preview
 @Composable
 fun CurrentTrackCardPreview() {

diff --git a/feature/track/src/main/res/values/strings.xml b/feature/track/src/main/res/values/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="track_which_day">Para qual dia?</string>
     <string name="track_which_weight">Qual o peso?</string>
+    <string name="track_empty">"Pressione o botão # para registrar seu peso atual"</string>
 </resources>