Skip to content

Commit

Permalink
Merge pull request #319 from kota-shiokara/feature/display_session_me…
Browse files Browse the repository at this point in the history
…ssage

feature: display session message
  • Loading branch information
takahirom authored Aug 12, 2024
2 parents 8573182 + 5eac2cf commit 88418e6
Showing 1 changed file with 21 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -15,6 +16,7 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.outlined.FavoriteBorder
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand All @@ -33,6 +35,7 @@ import conference_app_2024.core.ui.generated.resources.image
import conference_app_2024.core.ui.generated.resources.not_bookmarked
import io.github.droidkaigi.confsched.designsystem.theme.ProvideRoomTheme
import io.github.droidkaigi.confsched.model.TimetableItem
import io.github.droidkaigi.confsched.model.TimetableItem.Session
import io.github.droidkaigi.confsched.ui.UiRes
import io.github.droidkaigi.confsched.ui.rememberAsyncImagePainter
import org.jetbrains.compose.resources.stringResource
Expand Down Expand Up @@ -115,6 +118,24 @@ fun TimetableItemCard(
// TODO: Message goes here (missing from object we can access here?)
}
}
if (timetableItem is Session) {
timetableItem.message?.let {
Row(
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
Icon(
Icons.Filled.Info,
contentDescription = stringResource(UiRes.string.image),
tint = MaterialTheme.colorScheme.error,
)
Text(
text = it.currentLangTitle,
fontSize = 16.sp,
color = MaterialTheme.colorScheme.error,
)
}
}
}
}
// TODO: There is no data for the warning string right now. (Should go here)
}
Expand Down

0 comments on commit 88418e6

Please sign in to comment.