Merge pull request #476 from fucchi-senpai/use-r-drawable

Use "R" to reference icons
DroidKaigi · Aug 14, 2023 · 8ba2d9b · 8ba2d9b
2 parents 107cc21 + 47fa81d
commit 8ba2d9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...s/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt b/...s/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt
@@ -15,7 +15,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
-import io.github.droidkaigi.confsched2023.feature.sessions.R.drawable
+import io.github.droidkaigi.confsched2023.feature.sessions.R
 import io.github.droidkaigi.confsched2023.sessions.SessionsStrings.Search
 import io.github.droidkaigi.confsched2023.sessions.SessionsStrings.Timetable
 
@@ -34,7 +34,7 @@ fun TimetableTopArea(
     TopAppBar(
         title = {
             Image(
-                painter = painterResource(id = drawable.icon_droidkaigi_logo),
+                painter = painterResource(id = R.drawable.icon_droidkaigi_logo),
                 contentDescription = null,
             )
         },

diff --git a/...ions/src/main/java/io/github/droidkaigi/confsched2023/sessions/section/TimetableHeader.kt b/...ions/src/main/java/io/github/droidkaigi/confsched2023/sessions/section/TimetableHeader.kt
@@ -14,7 +14,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import io.github.droidkaigi.confsched2023.feature.sessions.R.drawable
+import io.github.droidkaigi.confsched2023.feature.sessions.R
 
 @Composable
 fun TimetableHeader(modifier: Modifier = Modifier) {
@@ -33,7 +33,7 @@ fun TimetableHeader(modifier: Modifier = Modifier) {
         }
         Image(
             modifier = Modifier.size(width = 212.dp, height = 168.dp),
-            painter = painterResource(id = drawable.img_droid_kun_in_bath),
+            painter = painterResource(id = R.drawable.img_droid_kun_in_bath),
             contentDescription = null,
         )
     }