-
Notifications
You must be signed in to change notification settings - Fork 0
Fix: Workout Checkin Logging #117
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.
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
Open
melissavelasquezz
wants to merge
3
commits into
main
Choose a base branch
from
melissa/workoutcheckin
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
22 changes: 22 additions & 0 deletions
22
app/src/main/java/com/cornellappdev/uplift/data/repositories/WorkoutLogRepository.kt
This file contains hidden or 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,22 @@ | ||
| package com.cornellappdev.uplift.data.repositories | ||
|
|
||
| import kotlinx.coroutines.flow.MutableSharedFlow | ||
| import kotlinx.coroutines.flow.SharedFlow | ||
| import kotlinx.coroutines.flow.asSharedFlow | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| /** | ||
| * Broadcasts a signal whenever a workout is successfully logged, so that other currently-active | ||
| * screens (e.g. history/streaks) can refresh their data without polling or being tightly coupled | ||
| * to whatever triggered the log (check-in, manual entry, etc). | ||
| */ | ||
| @Singleton | ||
| class WorkoutLogRepository @Inject constructor() { | ||
| private val _workoutLoggedEvent = MutableSharedFlow<Unit>(extraBufferCapacity = 1) | ||
| val workoutLoggedEvent: SharedFlow<Unit> = _workoutLoggedEvent.asSharedFlow() | ||
|
|
||
| fun notifyWorkoutLogged() { | ||
| _workoutLoggedEvent.tryEmit(Unit) | ||
| } | ||
| } |
This file contains hidden or 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
79 changes: 79 additions & 0 deletions
79
app/src/main/java/com/cornellappdev/uplift/ui/components/profile/checkin/CheckInFailed.kt
This file contains hidden or 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,79 @@ | ||
| package com.cornellappdev.uplift.ui.components.profile.checkin | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material.Button | ||
| import androidx.compose.material.ButtonDefaults | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.cornellappdev.uplift.R | ||
| import com.cornellappdev.uplift.ui.theme.AppColors | ||
| import com.cornellappdev.uplift.ui.theme.AppTextStyles | ||
|
|
||
| @Composable | ||
| fun CheckInFailed( | ||
| onRetry: () -> Unit, | ||
| onClosePopUp: () -> Unit | ||
| ) { | ||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.SpaceBetween, | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Text( | ||
| text = "Couldn't log your workout.", | ||
| style = AppTextStyles.BodySemibold, | ||
| color = AppColors.Black | ||
| ) | ||
| Row( | ||
| modifier = Modifier.height(34.dp), | ||
| horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.Start), | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Button( | ||
| modifier = Modifier | ||
| .width(93.dp) | ||
| .height(34.dp), | ||
| shape = RoundedCornerShape(size = 11.05263.dp), | ||
| colors = ButtonDefaults.buttonColors( | ||
| backgroundColor = AppColors.LightYellow, | ||
| contentColor = AppColors.Black | ||
| ), | ||
| contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp), | ||
| onClick = onRetry | ||
| ) { | ||
| Text( | ||
| text = "Retry", | ||
| style = AppTextStyles.LabelBig, | ||
| color = AppColors.Black | ||
| ) | ||
| } | ||
|
|
||
| Image( | ||
| painter = painterResource(id = R.drawable.ic_close), | ||
| contentDescription = "close pop up", | ||
| contentScale = ContentScale.None, | ||
| modifier = Modifier.clickable { onClosePopUp() } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun CheckInFailedPreview() { | ||
| CheckInFailed({}, {}) | ||
| } |
This file contains hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🗄️ Data Integrity & Integration | 🟠 Major | 🏗️ Heavy lift
🔎 Supported by static analysis
🏁 Script executed:
Repository: cuappdev/uplift-android
Length of output: 6483
Make cooldown persistence observable without rerunning the workout.
CheckInRepository.markCheckInToday()launches a separate coroutine and catchesdataStore.editfailures, soonCheckIn()cannot observe or retry that failure. AfterlogWorkoutFromCheckIn()succeeds, the ViewModel still setsCheckInMode.Completeand callsnotifyWorkoutLogged().If the date write fails,
lastCheckInDateremains unchanged. After a later flow initialization, such as an app restart,checkInPromptAllowedcan show the prompt again and submit another workout. MakemarkCheckInToday()awaitable and report its result. Handle only the cooldown failure. Do not retry the workout mutation.🤖 Prompt for AI Agents