Merge pull request #171 from DroidKaigi/takahirom/rename-res-class/20…

…24-07-28 Rename SessionRes to SessionsRes
DroidKaigi · Jul 28, 2024 · 41ef278 · 41ef278
2 parents b3b972f + f1a50a0
commit 41ef278
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...oidkaigi/confsched/sessions/SessionRes.kt → ...idkaigi/confsched/sessions/SessionsRes.kt b/...oidkaigi/confsched/sessions/SessionRes.kt → ...idkaigi/confsched/sessions/SessionsRes.kt
@@ -2,7 +2,7 @@ package io.github.droidkaigi.confsched.sessions
 
 import conference_app_2024.feature.sessions.generated.resources.Res
 
-object SessionRes {
+object SessionsRes {
     val string = Res.string
     val drawable = Res.drawable
 }
diff --git a/.../commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridItem.kt b/.../commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridItem.kt
@@ -54,7 +54,7 @@ import io.github.droidkaigi.confsched.model.TimetableRoom
 import io.github.droidkaigi.confsched.model.TimetableSessionType
 import io.github.droidkaigi.confsched.model.TimetableSpeaker
 import io.github.droidkaigi.confsched.model.fake
-import io.github.droidkaigi.confsched.sessions.SessionRes
+import io.github.droidkaigi.confsched.sessions.SessionsRes
 import io.github.droidkaigi.confsched.sessions.section.TimetableSizes
 import io.github.droidkaigi.confsched.ui.previewOverride
 import io.github.droidkaigi.confsched.ui.rememberAsyncImagePainter
@@ -130,7 +130,7 @@ fun TimetableGridItem(
                     Icon(
                         modifier = Modifier.height(TimetableGridItemSizes.scheduleHeight),
                         imageVector = Icons.Default.Schedule,
-                        contentDescription = stringResource(SessionRes.string.content_description_schedule_icon),
+                        contentDescription = stringResource(SessionsRes.string.content_description_schedule_icon),
                     )
                     Spacer(modifier = Modifier.width(4.dp))
                     var scheduleTextStyle = MaterialTheme.typography.bodySmall
@@ -182,7 +182,7 @@ fun TimetableGridItem(
                             modifier = Modifier
                                 .size(TimetableGridItemSizes.errorHeight),
                             imageVector = Icons.Default.Error,
-                            contentDescription = stringResource(SessionRes.string.content_description_error_icon),
+                            contentDescription = stringResource(SessionsRes.string.content_description_error_icon),
                             tint = MaterialTheme.colorScheme.errorContainer,
                         )
                     }
@@ -238,7 +238,7 @@ private fun SpeakerIcon(
         painter = previewOverride(previewPainter = { rememberVectorPainter(image = Icons.Default.Person) }) {
             rememberAsyncImagePainter(iconUrl)
         },
-        contentDescription = stringResource(SessionRes.string.content_description_user_icon),
+        contentDescription = stringResource(SessionsRes.string.content_description_user_icon),
         modifier = modifier
             .size(TimetableGridItemSizes.speakerHeight)
             .clip(RoundedCornerShape(8.dp))

diff --git a/...tlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailBottomAppBar.kt b/...tlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailBottomAppBar.kt
@@ -17,7 +17,7 @@ import conference_app_2024.feature.sessions.generated.resources.calendar_add_on
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.model.TimetableItem
 import io.github.droidkaigi.confsched.model.fake
-import io.github.droidkaigi.confsched.sessions.SessionRes
+import io.github.droidkaigi.confsched.sessions.SessionsRes
 import io.github.droidkaigi.confsched.sessions.TimetableItemDetailBookmarkIconTestTag
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
@@ -42,7 +42,7 @@ fun TimetableItemDetailBottomAppBar(
             }
             IconButton(onClick = { onCalendarRegistrationClick(timetableItem) }) {
                 Icon(
-                    painter = painterResource(SessionRes.drawable.calendar_add_on),
+                    painter = painterResource(SessionsRes.drawable.calendar_add_on),
                     contentDescription = "Calendar",
                 )
             }