From 39cfb84cc3d6e6ce68691726c0ee7003f9f348ba Mon Sep 17 00:00:00 2001 From: Yamada_Ika <73375669+Yamada-Ika@users.noreply.github.com> Date: Wed, 7 Aug 2024 02:30:04 +0900 Subject: [PATCH] chore: fix inconsistent terminology --- .../{TimeTableItemCard.kt => TimetableItemCard.kt} | 2 +- .../{TimeTableItemTag.kt => TimetableItemTag.kt} | 2 +- ...mDetailContent.kt => TimetableItemDetailContent.kt} | 0 ...etailHeadline.kt => TimetableItemDetailHeadline.kt} | 6 +++--- ...ummaryCard.kt => TimetableItemDetailSummaryCard.kt} | 0 .../confsched/sessions/section/TimetableList.kt | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) rename core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/{TimeTableItemCard.kt => TimetableItemCard.kt} (99%) rename core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/{TimeTableItemTag.kt => TimetableItemTag.kt} (98%) rename feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/{TimeTableItemDetailContent.kt => TimetableItemDetailContent.kt} (100%) rename feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/{TimeTableItemDetailHeadline.kt => TimetableItemDetailHeadline.kt} (96%) rename feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/{TimeTableItemDetailSummaryCard.kt => TimetableItemDetailSummaryCard.kt} (100%) diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimeTableItemCard.kt b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt similarity index 99% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimeTableItemCard.kt rename to core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt index 4e1730c0d..4bc493fb1 100644 --- a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimeTableItemCard.kt +++ b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt @@ -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, diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimeTableItemTag.kt b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemTag.kt similarity index 98% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimeTableItemTag.kt rename to core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemTag.kt index 3d5a5fabe..51ec58d6d 100644 --- a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimeTableItemTag.kt +++ b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemTag.kt @@ -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, diff --git a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailContent.kt b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailContent.kt similarity index 100% rename from feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailContent.kt rename to feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailContent.kt diff --git a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailHeadline.kt b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailHeadline.kt similarity index 96% rename from feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailHeadline.kt rename to feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailHeadline.kt index fa37f2cdd..a0a606dd7 100644 --- a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailHeadline.kt +++ b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailHeadline.kt @@ -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 @@ -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, ) diff --git a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailSummaryCard.kt b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailSummaryCard.kt similarity index 100% rename from feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimeTableItemDetailSummaryCard.kt rename to feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailSummaryCard.kt diff --git a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableList.kt b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableList.kt index 5ac18fceb..aa07b5052 100644 --- a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableList.kt +++ b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableList.kt @@ -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 @@ -45,12 +45,12 @@ 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, @@ -58,7 +58,7 @@ fun TimetableList( ) 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))