Skip to content
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.

Sign up for GitHub

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

Add FIXEME comment #90

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Add FIXEME comment #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...in/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ private fun DescriptionSection(
description: String,
onLinkClick: (url: String) -> Unit,
) {
// TODO: switch color according to room type
var isExpand by remember { mutableStateOf(false) }

Column(modifier = Modifier.padding(8.dp)) {
Expand All @@ -103,6 +102,7 @@ private fun DescriptionSection(
Text(
text = "続きを読む",
style = MaterialTheme.typography.labelLarge,
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
color = Color(0xFF45E761),
)
}
Expand All @@ -116,11 +116,11 @@ private fun TargetAudienceSection(
timetableItem: TimetableItem,
modifier: Modifier = Modifier,
) {
// TODO: switch color according to room type
Column(modifier = modifier.padding(8.dp)) {
Text(
text = "対象者",
style = MaterialTheme.typography.titleLarge,
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
color = Color(0xFF45E761),
)
Spacer(Modifier.height(8.dp))
Expand All @@ -139,11 +139,11 @@ private fun ArchiveSection(
modifier: Modifier = Modifier,
onWatchVideoClick: (url: String) -> Unit,
) {
// TODO: switch color according to room type
Column(modifier = modifier.padding(8.dp)) {
Text(
text = "アーカイブ",
style = MaterialTheme.typography.titleLarge,
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
color = Color(0xFF45E761),
)
Spacer(Modifier.height(8.dp))
Expand All @@ -155,6 +155,7 @@ private fun ArchiveSection(
modifier = Modifier.weight(1f),
onClick = { onViewSlideClick(slideUrl) },
colors = ButtonDefaults.buttonColors().copy(
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
containerColor = Color(0xFF45E761),
),
) {
Expand All @@ -174,6 +175,7 @@ private fun ArchiveSection(
modifier = Modifier.weight(1f),
onClick = { onWatchVideoClick(videoUrl) },
colors = ButtonDefaults.buttonColors().copy(
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
containerColor = Color(0xFF45E761),
),
) {
Expand Down
3 changes: 2 additions & 1 deletion ...n/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailHeadline.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@ fun TimeTableItemDetailHeadline(
timetableItem: TimetableItem,
modifier: Modifier = Modifier,
) {
// TODO: switch color according to room type
Column(
modifier = modifier
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
.background(Color(0xFF132417))
.padding(8.dp),
) {
Row {
TagView(
tagText = timetableItem.room.name.currentLangTitle,
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
tagColor = Color(0xFF45E761),
)
timetableItem.language.labels.forEach { label ->
Expand Down
4 changes: 3 additions & 1 deletion ...otlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailSummaryCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ fun TimeTableItemDetailSummaryCard(
timetableItem: TimetableItem,
modifier: Modifier = Modifier,
) {
// TODO: switch color according to room type
Column(
modifier = modifier
.padding(
Expand All @@ -51,6 +50,7 @@ fun TimeTableItemDetailSummaryCard(
)
.drawBehind {
drawRoundRect(
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
color = Color(0xFF45E761),
style = Stroke(
width = 2f,
Expand Down Expand Up @@ -109,11 +109,13 @@ private fun SummaryCardRow(
modifier = modifier,
verticalAlignment = Alignment.CenterVertically,
) {
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
Icon(imageVector = imageVector, contentDescription = contentDescription, tint = Color(0xFF45E761))
Spacer(Modifier.width(8.dp))
Text(
text = title,
style = MaterialTheme.typography.titleSmall,
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
color = Color(0xFF45E761),
)
Spacer(Modifier.width(8.dp))
Expand Down
2 changes: 1 addition & 1 deletion .../kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailTopAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ fun TimetableItemDetailTopAppBar(
scrollBehavior: TopAppBarScrollBehavior,
modifier: Modifier = Modifier,
) {
// TODO: switch color according to room type
TopAppBar(
modifier = modifier,
colors = TopAppBarDefaults.topAppBarColors().copy(
// FIXME: Implement and use a theme color instead of fixed colors like RoomColors.primary and RoomColors.primaryDim
containerColor = Color(0xFF132417),
scrolledContainerColor = Color(0xFF132417),
),
Expand Down
Loading