Merge pull request #117 from DroidKaigi/yamada-ika/brushup-contributo…

…r-screen Make the contributor screen icon round
DroidKaigi · Jul 11, 2024 · cebcae5 · cebcae5
2 parents 18506ae + 9c4539b
commit cebcae5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...s/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt b/...s/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt
@@ -24,7 +24,6 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.testTag
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import co.touchlab.kermit.Logger
 import io.github.droidkaigi.confsched.compose.rememberEventEmitter
 import io.github.droidkaigi.confsched.contributors.component.ContributorsItem
 import io.github.droidkaigi.confsched.model.Contributor
@@ -97,7 +96,6 @@ fun ContributorsScreen(
     isTopAppBarHidden: Boolean,
     modifier: Modifier = Modifier,
 ) {
-    Logger.d { "ContributorsScreen: $uiState" }
     val scrollBehavior =
         if (!isTopAppBarHidden) {
             TopAppBarDefaults.exitUntilCollapsedScrollBehavior()

diff --git a/...mmonMain/kotlin/io/github/droidkaigi/confsched/contributors/component/ContributorsItem.kt b/...mmonMain/kotlin/io/github/droidkaigi/confsched/contributors/component/ContributorsItem.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Person
 import androidx.compose.material3.MaterialTheme
@@ -23,7 +23,7 @@ import io.github.droidkaigi.confsched.model.Contributor
 import io.github.droidkaigi.confsched.ui.previewOverride
 import io.github.droidkaigi.confsched.ui.rememberAsyncImagePainter
 
-private val contributorIconShape = RoundedCornerShape(20.dp)
+private val contributorIconShape = CircleShape
 
 @Composable
 fun ContributorsItem(
@@ -46,7 +46,7 @@ fun ContributorsItem(
             },
             contentDescription = null,
             modifier = Modifier
-                .size(60.dp)
+                .size(52.dp)
                 .clip(contributorIconShape)
                 .border(
                     width = 1.dp,