Feature/58 timetable design #71
Merged
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
added 2 commits
June 25, 2024 01:07
Missing: Time sorting, correct shapes for room names, correct room names (data issue), warning data (canceled events), Favorite is misaligned. Also: Overall top bar, title, etc is still missing.
takahirom
reviewed
Jun 25, 2024
Comment on lines
178
to
209
| //@Composable | ||
| //fun testItem() { | ||
| // val isBookmarked = false | ||
| // Row { | ||
| // Text( | ||
| // text = "Placeholder",//timetableItem.title.currentLangTitle, | ||
| // modifier = Modifier | ||
| // .padding(horizontal = 16.dp) | ||
| // //.testTag(TimetableListItemTestTag) | ||
| // //.clickable { onTimetableItemClick(timetableItem) }, | ||
| // ) | ||
| // Spacer(modifier = Modifier.weight(1f)) | ||
| // TextButton( | ||
| // onClick = {} | ||
| // //onClick = { onBookmarkClick(timetableItem, true) }//, | ||
| // //modifier = Modifier.testTag(TimetableListItemBookmarkIconTestTag) | ||
| // ) { | ||
| // if (isBookmarked) { | ||
| // Icon(Icons.Filled.Favorite, contentDescription = "Bookmarked", tint= Color.Green) | ||
| // } else { | ||
| // Icon(Icons.Outlined.FavoriteBorder, contentDescription = "Not Bookmarked", tint= Color.White) | ||
| // } | ||
| // } | ||
| // } | ||
| //} | ||
| // | ||
| //@Preview @Composable | ||
| //fun previewItem() { | ||
| // testItem() | ||
| //} | ||
|
|
||
|
|
There was a problem hiding this comment.
If you want to use this later we can leave as it is. But if we don't need this I think we can remove.
Suggested change
| //@Composable | |
| //fun testItem() { | |
| // val isBookmarked = false | |
| // Row { | |
| // Text( | |
| // text = "Placeholder",//timetableItem.title.currentLangTitle, | |
| // modifier = Modifier | |
| // .padding(horizontal = 16.dp) | |
| // //.testTag(TimetableListItemTestTag) | |
| // //.clickable { onTimetableItemClick(timetableItem) }, | |
| // ) | |
| // Spacer(modifier = Modifier.weight(1f)) | |
| // TextButton( | |
| // onClick = {} | |
| // //onClick = { onBookmarkClick(timetableItem, true) }//, | |
| // //modifier = Modifier.testTag(TimetableListItemBookmarkIconTestTag) | |
| // ) { | |
| // if (isBookmarked) { | |
| // Icon(Icons.Filled.Favorite, contentDescription = "Bookmarked", tint= Color.Green) | |
| // } else { | |
| // Icon(Icons.Outlined.FavoriteBorder, contentDescription = "Not Bookmarked", tint= Color.White) | |
| // } | |
| // } | |
| // } | |
| //} | |
| // | |
| //@Preview @Composable | |
| //fun previewItem() { | |
| // testItem() | |
| //} |
There was a problem hiding this comment.
Sorry I had intended to split into sub components but I gave up part way s the previewer was not showing in this project. I was able to get the view up and running without needing the preview but left this commented out.
I will try to be more careful about comments in the future.
takahirom
approved these changes
Jun 25, 2024
|
Sorry I didn't fix them before you acted. I was at work. |
|
Thanks for putting in coil. I thought about just adding the library but did not know if there were restrictions on library usage at the time. |
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.
Issue
Overview (Required)
Links
Screenshot (Optional if screenshot test is present or unrelated to UI)
Movie (Optional)