diff --git a/app/src/main/java/com/pixelized/biblib/ui/composable/items/BookThumbnailComposable.kt b/app/src/main/java/com/pixelized/biblib/ui/composable/items/BookThumbnailComposable.kt index 3ba4ac0..7d07055 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/composable/items/BookThumbnailComposable.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/composable/items/BookThumbnailComposable.kt @@ -9,8 +9,6 @@ import androidx.compose.material.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.NavigateNext import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter @@ -24,7 +22,6 @@ import com.pixelized.biblib.data.ui.BookThumbnailUio import com.pixelized.biblib.ui.theme.BibLibTheme import com.pixelized.biblib.ui.theme.Teal200 import com.pixelized.biblib.utils.BitmapCache -import com.pixelized.biblib.utils.extention.toImage import com.pixelized.biblib.utils.injection.Bob import com.pixelized.biblib.utils.mock.BookThumbnailMock @@ -65,7 +62,7 @@ fun BookThumbnailComposable( verticalAlignment = Alignment.CenterVertically ) { Image( - modifier = Modifier + contentModifier = Modifier .width(60.dp) .height(96.dp), placeHolder = painterResource(id = R.drawable.ic_launcher_foreground), diff --git a/app/src/main/java/com/pixelized/biblib/ui/composable/items/Image.kt b/app/src/main/java/com/pixelized/biblib/ui/composable/items/Image.kt index 504acdd..0f24ff1 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/composable/items/Image.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/composable/items/Image.kt @@ -1,10 +1,8 @@ package com.pixelized.biblib.ui.composable.items import androidx.compose.animation.Crossfade -import androidx.compose.animation.core.MutableTransitionState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -21,6 +19,7 @@ fun Image( contentUrl: URL, contentDescription: String?, modifier: Modifier = Modifier, + contentModifier: Modifier = Modifier, alignment: Alignment = Alignment.Center, contentScale: ContentScale = ContentScale.Fit, alpha: Float = DefaultAlpha, @@ -28,12 +27,12 @@ fun Image( ) { val cover by remember { contentUrl.toImage(placeHolder) } - Crossfade(targetState = cover) { + Crossfade(modifier = modifier, targetState = cover) { if (it == placeHolder) { androidx.compose.foundation.Image( painter = placeHolder, contentDescription = contentDescription, - modifier = modifier, + modifier = contentModifier, alignment = alignment, contentScale = contentScale, alpha = alpha, @@ -43,7 +42,7 @@ fun Image( androidx.compose.foundation.Image( painter = cover, contentDescription = contentDescription, - modifier = modifier, + modifier = contentModifier, alignment = alignment, contentScale = contentScale, alpha = alpha, diff --git a/app/src/main/java/com/pixelized/biblib/ui/composable/pages/DetailPageComposable.kt b/app/src/main/java/com/pixelized/biblib/ui/composable/pages/DetailPageComposable.kt index e91d81e..9d11f4a 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/composable/pages/DetailPageComposable.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/composable/pages/DetailPageComposable.kt @@ -37,11 +37,12 @@ fun DetailPageComposable(book: BookUio) { .padding(horizontal = 16.dp) ) { Image( - modifier = Modifier - .fillMaxWidth() - .wrapContentHeight() + modifier = Modifier.align(Alignment.CenterHorizontally), + contentModifier = Modifier + .wrapContentWidth() + .height(480.dp) .padding(vertical = 16.dp), - contentScale = ContentScale.FillWidth, + contentScale = ContentScale.FillHeight, placeHolder = painterResource(id = R.drawable.ic_launcher_foreground), contentUrl = book.cover, colorFilter = if (MaterialTheme.colors.isLight) ColorFilter.tint(Teal200) else null,