From 7d6cf9dd7b9842151c7760bbb018ac47f7b53de5 Mon Sep 17 00:00:00 2001 From: Omni Devel Date: Sun, 14 Jun 2026 19:31:38 +0300 Subject: [PATCH] fix: fixed card code image size --- .../src/main/java/ru/omni_devel/cards/Elements.kt | 2 ++ .../java/ru/omni_devel/cards/ShowCardActivity.kt | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mobile/src/main/java/ru/omni_devel/cards/Elements.kt b/mobile/src/main/java/ru/omni_devel/cards/Elements.kt index 06490f9..192b76c 100644 --- a/mobile/src/main/java/ru/omni_devel/cards/Elements.kt +++ b/mobile/src/main/java/ru/omni_devel/cards/Elements.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -42,6 +43,7 @@ fun Page(name: String, innerPadding: PaddingValues, content: @Composable () -> U Column( modifier = Modifier + .fillMaxSize() .padding(horizontal = 16.dp) .background(MaterialTheme.colorScheme.background) ) { diff --git a/mobile/src/main/java/ru/omni_devel/cards/ShowCardActivity.kt b/mobile/src/main/java/ru/omni_devel/cards/ShowCardActivity.kt index ac038ff..3e01f06 100644 --- a/mobile/src/main/java/ru/omni_devel/cards/ShowCardActivity.kt +++ b/mobile/src/main/java/ru/omni_devel/cards/ShowCardActivity.kt @@ -12,15 +12,18 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp import ru.omni_devel.cards.ui.theme.OmniCardsTheme class ShowCardActivity : ComponentActivity() { @@ -82,14 +85,18 @@ fun ShowCardPage(innerPadding: PaddingValues, cardInfo: CardInfo) { Page(cardInfo.name, innerPadding) { Column( modifier = Modifier.fillMaxSize(), - verticalArrangement = Arrangement.Center + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally ) { if (bitmap != null) { Image( bitmap = bitmap, contentDescription = cardInfo.codeValue, - modifier = Modifier.fillMaxWidth(), - contentScale = ContentScale.FillWidth + modifier = Modifier + .padding(bottom = 8.dp) + .fillMaxWidth() + .weight(1f, fill = false), + contentScale = ContentScale.Fit ) Text( cardInfo.codeValue,