From 24eeee9d50be4ba98bbf2d104c3a1144d8aca50e Mon Sep 17 00:00:00 2001 From: gy6543721 Date: Sat, 16 Sep 2023 12:40:36 +0900 Subject: [PATCH 1/5] AchievementImage modification --- .../confsched2023/achievements/component/AchievementImage.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt index 65a83ce88..408709f57 100644 --- a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt +++ b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt @@ -1,6 +1,7 @@ package io.github.droidkaigi.confsched2023.achievements.component import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -17,6 +18,7 @@ fun AchievementImage( painter = painterResource(id = achievementAnimation.getDrawableResId()), contentDescription = achievementAnimation.contentDescription, modifier = modifier + .fillMaxSize() .padding(horizontal = 21.dp), ) } From 0f0fb8799fe1203cac86f5619afedf84832c03ed Mon Sep 17 00:00:00 2001 From: gy6543721 Date: Sat, 16 Sep 2023 13:26:37 +0900 Subject: [PATCH 2/5] Delete inner padding --- .../achievements/component/AchievementImage.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt index 408709f57..224ca299a 100644 --- a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt +++ b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt @@ -2,11 +2,9 @@ package io.github.droidkaigi.confsched2023.achievements.component import androidx.compose.foundation.Image import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding 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.model.AchievementAnimation @Composable @@ -17,8 +15,6 @@ fun AchievementImage( Image( painter = painterResource(id = achievementAnimation.getDrawableResId()), contentDescription = achievementAnimation.contentDescription, - modifier = modifier - .fillMaxSize() - .padding(horizontal = 21.dp), + modifier = modifier.fillMaxSize(), ) } From f96c2e36cc8adc663d173d1da507d8e4869cb393 Mon Sep 17 00:00:00 2001 From: gy6543721 Date: Sat, 16 Sep 2023 15:27:22 +0900 Subject: [PATCH 3/5] AchievementImage size modification --- .../achievements/component/AchievementImage.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt index 224ca299a..0a170cf49 100644 --- a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt +++ b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt @@ -1,10 +1,12 @@ package io.github.droidkaigi.confsched2023.achievements.component import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp import io.github.droidkaigi.confsched2023.model.AchievementAnimation @Composable @@ -12,9 +14,12 @@ fun AchievementImage( achievementAnimation: AchievementAnimation, modifier: Modifier = Modifier, ) { + val configuration = LocalConfiguration.current + val screenWidth = configuration.screenWidthDp.dp + Image( painter = painterResource(id = achievementAnimation.getDrawableResId()), contentDescription = achievementAnimation.contentDescription, - modifier = modifier.fillMaxSize(), + modifier = modifier.width(screenWidth / 3), ) } From 9a5e13b29426915504b103ba008729caf0f30de6 Mon Sep 17 00:00:00 2001 From: gy6543721 Date: Sat, 16 Sep 2023 15:55:32 +0900 Subject: [PATCH 4/5] Replace modifier width with size --- .../confsched2023/achievements/component/AchievementImage.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt index 0a170cf49..7d5b603cb 100644 --- a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt +++ b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt @@ -1,6 +1,7 @@ package io.github.droidkaigi.confsched2023.achievements.component import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -20,6 +21,6 @@ fun AchievementImage( Image( painter = painterResource(id = achievementAnimation.getDrawableResId()), contentDescription = achievementAnimation.contentDescription, - modifier = modifier.width(screenWidth / 3), + modifier = modifier.size(screenWidth / 3), ) } From 1db093275d20b6cd4ad93dcff32b610fa2a19964 Mon Sep 17 00:00:00 2001 From: gy6543721 Date: Sat, 16 Sep 2023 16:04:35 +0900 Subject: [PATCH 5/5] Delete unused import --- .../confsched2023/achievements/component/AchievementImage.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt index 7d5b603cb..daf81996c 100644 --- a/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt +++ b/feature/achievements/src/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt @@ -2,7 +2,6 @@ package io.github.droidkaigi.confsched2023.achievements.component import androidx.compose.foundation.Image import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalConfiguration