Fix: Workout Checkin Logging #117
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
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
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
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
Oops, something went wrong.
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.
Should we be trying to merge this?
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.
I know we both had to change them locally to true and since the features/releases that needed the feature flags to be false aren't in progress anymore, I think it would be useful for main to have them on rather than everyone making the same change locally so that workout checkin and the onboarding flow work, especially as we wrap up profiles, but idk if this best practice.
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.
I think this diff in particular is fine since it's a debug build config field, but I'm not sure why the flags are on for the release build. @melissavelasquezz could you double check this?
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.
I turned them on back in this PR when I implemented the profile page: https://github.com/cuappdev/uplift-android/pull/105/changes#diff-51a0b488f963eb0be6c6599bf5df497313877cf5bdff3950807373912ac1cdc9
true means that user flow does go through onboarding/login and workout check ins are enabled. We had originally added the flags as false to block workout checkin from being released w/o profiles yet. Is this not what we would want in the profiles release?