Fix article cover resizing in ArticleDetails (#331)

PrimalHQ · Feb 21, 2025 · 2643d71 · 2643d71
1 parent f073bf6
commit 2643d71
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/app/src/main/kotlin/net/primal/android/notes/feed/note/ui/attachment/NoteAttachmentsExt.kt b/app/src/main/kotlin/net/primal/android/notes/feed/note/ui/attachment/NoteAttachmentsExt.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.DpSize
+import net.primal.android.attachments.domain.CdnResourceVariant
 import net.primal.android.attachments.domain.calculateImageSize
 import net.primal.android.attachments.domain.findNearestOrNull
 import net.primal.android.core.compose.attachment.model.NoteAttachmentUi
@@ -24,3 +25,14 @@ fun BoxWithConstraintsScope.findImageSize(attachment: NoteAttachmentUi): DpSize
         density = density,
     )
 }
+
+@Composable
+fun CdnResourceVariant?.findImageSize(maxWidth: Int): DpSize {
+    val density = LocalDensity.current.density
+    val maxHeight = (LocalConfiguration.current.screenHeightDp * MAX_SCREEN_HEIGHT_VISIBLE_AREA).toInt()
+    return calculateImageSize(
+        maxWidth = maxWidth,
+        maxHeight = maxHeight,
+        density = density,
+    )
+}
diff --git a/app/src/main/kotlin/net/primal/android/thread/articles/details/ui/ArticleDetailsHeader.kt b/app/src/main/kotlin/net/primal/android/thread/articles/details/ui/ArticleDetailsHeader.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -28,7 +29,9 @@ import java.util.*
 import net.primal.android.attachments.domain.CdnImage
 import net.primal.android.attachments.domain.findNearestOrNull
 import net.primal.android.core.compose.preview.PrimalPreview
+import net.primal.android.notes.feed.note.ui.attachment.findImageSize
 import net.primal.android.theme.AppTheme
+import net.primal.android.theme.domain.PrimalTheme
 import net.primal.android.thread.articles.details.ui.rendering.MarkdownRenderer
 import net.primal.android.thread.articles.details.ui.rendering.rememberPrimalMarkwon
 
@@ -73,9 +76,10 @@ fun ArticleDetailsHeader(
             ) {
                 val maxWidthPx = with(LocalDensity.current) { maxWidth.roundToPx() }
                 val variant = cover.variants.findNearestOrNull(maxWidthPx = maxWidthPx)
+                val maxWidth = maxWidth.value.toInt()
 
                 SubcomposeAsyncImage(
-                    modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier.size(variant.findImageSize(maxWidth)),
                     model = variant?.mediaUrl ?: cover.sourceUrl,
                     contentScale = ContentScale.FillWidth,
                     contentDescription = null,
@@ -132,7 +136,7 @@ private fun Instant.formatDate(): String {
 @Preview
 @Composable
 fun PreviewArticleDetailsHeader() {
-    PrimalPreview(primalTheme = net.primal.android.theme.domain.PrimalTheme.Sunset) {
+    PrimalPreview(primalTheme = PrimalTheme.Sunset) {
         Surface(modifier = Modifier.fillMaxWidth()) {
             ArticleDetailsHeader(
                 modifier = Modifier.fillMaxWidth(),