Skip to content

Commit

Permalink
chore: fix inconsistent terminology
Browse files Browse the repository at this point in the history
  • Loading branch information
Yamada-Ika committed Aug 6, 2024
1 parent 11fe1fe commit 39cfb84
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const val TimetableItemCardBookmarkIconTestTag = "TimetableListItemBookmarkIcon"
const val TimetableItemCardTestTag = "TimetableListItem"

@Composable
fun TimeTableItemCard(
fun TimetableItemCard(
isBookmarked: Boolean,
timetableItem: TimetableItem,
tags: @Composable RowScope.() -> Unit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp

@Composable
fun TimeTableItemTag(
fun TimetableItemTag(
tagText: String,
tagColor: Color,
modifier: Modifier = Modifier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
import io.github.droidkaigi.confsched.designsystem.theme.LocalRoomTheme
import io.github.droidkaigi.confsched.model.TimetableItem
import io.github.droidkaigi.confsched.model.fake
import io.github.droidkaigi.confsched.ui.component.TimeTableItemTag
import io.github.droidkaigi.confsched.ui.component.TimetableItemTag
import io.github.droidkaigi.confsched.ui.rememberAsyncImagePainter
import org.jetbrains.compose.ui.tooling.preview.Preview

Expand All @@ -41,13 +41,13 @@ fun TimetableItemDetailHeadline(
.fillMaxWidth(),
) {
Row {
TimeTableItemTag(
TimetableItemTag(
tagText = timetableItem.room.name.currentLangTitle,
tagColor = LocalRoomTheme.current.primaryColor,
)
timetableItem.language.labels.forEach { label ->
Spacer(modifier = Modifier.padding(4.dp))
TimeTableItemTag(
TimetableItemTag(
tagText = label,
tagColor = MaterialTheme.colorScheme.onSurfaceVariant,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import androidx.compose.ui.unit.dp
import io.github.droidkaigi.confsched.designsystem.theme.LocalRoomTheme
import io.github.droidkaigi.confsched.model.Timetable
import io.github.droidkaigi.confsched.model.TimetableItem
import io.github.droidkaigi.confsched.ui.component.TimeTableItemCard
import io.github.droidkaigi.confsched.ui.component.TimeTableItemTag
import io.github.droidkaigi.confsched.ui.component.TimetableItemCard
import io.github.droidkaigi.confsched.ui.component.TimetableItemTag
import io.github.droidkaigi.confsched.ui.icon
import kotlinx.collections.immutable.PersistentMap

Expand Down Expand Up @@ -45,20 +45,20 @@ fun TimetableList(
) {
items(uiState.timetable.timetableItems, key = { it.id.value }) { timetableItem ->
val isBookmarked = uiState.timetable.bookmarks.contains(timetableItem.id)
TimeTableItemCard(
TimetableItemCard(
isBookmarked = isBookmarked,
timetableItem = timetableItem,
onBookmarkClick = onBookmarkClick,
tags = {
TimeTableItemTag(
TimetableItemTag(
tagText = timetableItem.room.name.currentLangTitle,
icon = timetableItem.room.icon,
tagColor = LocalRoomTheme.current.primaryColor,
modifier = Modifier.background(LocalRoomTheme.current.containerColor),
)
Spacer(modifier = Modifier.padding(3.dp))
timetableItem.language.labels.forEach { label ->
TimeTableItemTag(tagText = label, tagColor = MaterialTheme.colorScheme.onSurfaceVariant)
TimetableItemTag(tagText = label, tagColor = MaterialTheme.colorScheme.onSurfaceVariant)
Spacer(modifier = Modifier.padding(3.dp))
}
Spacer(modifier = Modifier.weight(1f))
Expand Down

0 comments on commit 39cfb84

Please sign in to comment.