[ETH-1756] Mobile MVP Bugs - Course Cards #4
Conversation
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
saksham115
force-pushed
the
saksham115/course-cards
branch
from
caa9f37
to
e2c4e46
Compare
saksham115
force-pushed
the
saksham115/course-cards
branch
from
e2c4e46
to
d0021eb
Compare
saksham115
changed the title
viadanna
requested changes
Sep 26, 2024
| @@ -445,6 +456,42 @@ private fun CourseItem( | |||
| maxLines = 2, | |||
| overflow = TextOverflow.Ellipsis | |||
| ) | |||
| Spacer(modifier = Modifier.height(4.dp)) | |||
| if (enrolledCourse.course.number.isNotEmpty()) { | |||
There was a problem hiding this comment.
The course.number cannot be empty at all, there's no need for this check
Comment on lines
460
to
475
| if (enrolledCourse.course.number.isNotEmpty()) { | ||
| Row( | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .background(MaterialTheme.appColors.background), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Text( | ||
| modifier = Modifier.testTag("txt_course_number"), | ||
| text = enrolledCourse.course.number, | ||
| color = MaterialTheme.appColors.textFieldHint, | ||
| style = MaterialTheme.appTypography.labelMedium | ||
| ) | ||
| } | ||
| Spacer(modifier = Modifier.height(4.dp)) | ||
| } |
There was a problem hiding this comment.
Instead of a row just for the course number, it can be added to the org text, the same as the web app.
--- a/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardFragment.kt
+++ b/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardFragment.kt
@@ -437,7 +437,7 @@ private fun CourseItem(
) {
Text(
modifier = Modifier.testTag("txt_course_org"),
- text = enrolledCourse.course.org,
+ text = enrolledCourse.course.org+"+"+enrolledCourse.course.number,
color = MaterialTheme.appColors.textFieldHint,
style = MaterialTheme.appTypography.labelMedium
)
Suggested change
| if (enrolledCourse.course.number.isNotEmpty()) { | |
| Row( | |
| Modifier | |
| .fillMaxWidth() | |
| .background(MaterialTheme.appColors.background), | |
| verticalAlignment = Alignment.CenterVertically, | |
| ) { | |
| Text( | |
| modifier = Modifier.testTag("txt_course_number"), | |
| text = enrolledCourse.course.number, | |
| color = MaterialTheme.appColors.textFieldHint, | |
| style = MaterialTheme.appTypography.labelMedium | |
| ) | |
| } | |
| Spacer(modifier = Modifier.height(4.dp)) | |
| } |
saksham115
force-pushed
the
saksham115/course-cards
branch
from
fc0a03d
to
15f5805
Compare
|
Updated the design @viadanna
|
viadanna
approved these changes
Sep 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adding course effort and course number to appear on the course cards