Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix/#1237] achievements image size issue #1247

Merged
merged 13 commits into from
Sep 29, 2023
Merged

[fix/#1237] achievements image size issue #1247

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
24eeee9
AchievementImage modification
gy6543721 Sep 16, 2023
0f0fb87
Delete inner padding
gy6543721 Sep 16, 2023
8cdd0ad
Merge branch 'main' into fix/#1237-achievements-image-size-issue
gy6543721 Sep 16, 2023
f96c2e3
AchievementImage size modification
gy6543721 Sep 16, 2023
f1721b8
Merge branch 'main' into fix/#1237-achievements-image-size-issue
gy6543721 Sep 16, 2023
4fe9e1f
Merge branch 'main' into fix/#1237-achievements-image-size-issue
gy6543721 Sep 16, 2023
9a5e13b
Replace modifier width with size
gy6543721 Sep 16, 2023
008e872
Merge branch 'fix/#1237-achievements-image-size-issue' of https://git…
gy6543721 Sep 16, 2023
1e3688b
Merge branch 'main' into fix/#1237-achievements-image-size-issue
gy6543721 Sep 16, 2023
1db0932
Delete unused import
gy6543721 Sep 16, 2023
38e1631
Merge branch 'main' into fix/#1237-achievements-image-size-issue
gy6543721 Sep 18, 2023
f503367
Merge branch 'main' into fix/#1237-achievements-image-size-issue
gy6543721 Sep 21, 2023
33efe29
Merge branch 'main' into fix/#1237-achievements-image-size-issue
gy6543721 Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...c/main/java/io/github/droidkaigi/confsched2023/achievements/component/AchievementImage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package io.github.droidkaigi.confsched2023.achievements.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
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
Expand All @@ -13,10 +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
.padding(horizontal = 21.dp),
modifier = modifier.size(screenWidth / 3),
)
}
Loading