From 329ee24c82bdf22ce8c0f4af48f97456dab6bbba Mon Sep 17 00:00:00 2001 From: Florent Maitre Date: Wed, 20 Sep 2023 14:39:17 +0200 Subject: [PATCH] [#597] Review: Circle size of OdsComponentCircleImage is now hardcoded --- .../ods/compose/component/banner/OdsBanner.kt | 12 +++--------- .../ods/compose/component/card/OdsCardsCommon.kt | 12 +++--------- .../component/content/OdsComponentCircleImage.kt | 13 ++++++------- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/lib/src/main/java/com/orange/ods/compose/component/banner/OdsBanner.kt b/lib/src/main/java/com/orange/ods/compose/component/banner/OdsBanner.kt index 08dc3a29f..089d9a0ae 100644 --- a/lib/src/main/java/com/orange/ods/compose/component/banner/OdsBanner.kt +++ b/lib/src/main/java/com/orange/ods/compose/component/banner/OdsBanner.kt @@ -26,7 +26,6 @@ import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewParameter -import androidx.compose.ui.unit.dp import com.orange.ods.R import com.orange.ods.compose.component.OdsComposable import com.orange.ods.compose.component.button.OdsTextButton @@ -123,18 +122,13 @@ class OdsBannerButton(private val text: String, private val onClick: () -> Unit) */ class OdsBannerImage : OdsComponentCircleImage { - private companion object { - - private val CircleSize = 40.dp - } - /** * Creates an instance of [OdsBannerImage]. * * @param painter The painter to draw. * @param contentDescription The content description associated to this [OdsBannerImage]. */ - constructor(painter: Painter, contentDescription: String) : super(painter, contentDescription, CircleSize) + constructor(painter: Painter, contentDescription: String) : super(painter, contentDescription) /** * Creates an instance of [OdsBannerImage]. @@ -142,7 +136,7 @@ class OdsBannerImage : OdsComponentCircleImage { * @param imageVector The image vector to draw. * @param contentDescription The content description associated to this [OdsBannerImage]. */ - constructor(imageVector: ImageVector, contentDescription: String) : super(imageVector, contentDescription, CircleSize) + constructor(imageVector: ImageVector, contentDescription: String) : super(imageVector, contentDescription) /** * Creates an instance of [OdsBannerImage]. @@ -150,7 +144,7 @@ class OdsBannerImage : OdsComponentCircleImage { * @param bitmap The image bitmap to draw. * @param contentDescription The content description associated to this [OdsBannerImage]. */ - constructor(bitmap: ImageBitmap, contentDescription: String) : super(bitmap, contentDescription, CircleSize) + constructor(bitmap: ImageBitmap, contentDescription: String) : super(bitmap, contentDescription) } @UiModePreviews.Default diff --git a/lib/src/main/java/com/orange/ods/compose/component/card/OdsCardsCommon.kt b/lib/src/main/java/com/orange/ods/compose/component/card/OdsCardsCommon.kt index 7b14b7b52..8077bc203 100644 --- a/lib/src/main/java/com/orange/ods/compose/component/card/OdsCardsCommon.kt +++ b/lib/src/main/java/com/orange/ods/compose/component/card/OdsCardsCommon.kt @@ -22,7 +22,6 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.unit.dp import com.orange.ods.compose.component.button.OdsTextButton import com.orange.ods.compose.component.button.OdsTextButtonStyle import com.orange.ods.compose.component.content.OdsComponentCircleImage @@ -133,18 +132,13 @@ class OdsCardImage private constructor( */ class OdsCardThumbnail : OdsComponentCircleImage { - private companion object { - - private val CircleSize = 40.dp - } - /** * Creates an instance of [OdsCardThumbnail]. * * @param painter The painter to draw. * @param contentDescription The content description associated to this [OdsCardThumbnail]. */ - constructor(painter: Painter, contentDescription: String) : super(painter, contentDescription, CircleSize) + constructor(painter: Painter, contentDescription: String) : super(painter, contentDescription) /** * Creates an instance of [OdsCardThumbnail]. @@ -152,7 +146,7 @@ class OdsCardThumbnail : OdsComponentCircleImage { * @param imageVector The image vector to draw. * @param contentDescription The content description associated to this [OdsCardThumbnail]. */ - constructor(imageVector: ImageVector, contentDescription: String) : super(imageVector, contentDescription, CircleSize) + constructor(imageVector: ImageVector, contentDescription: String) : super(imageVector, contentDescription) /** * Creates an instance of [OdsCardThumbnail]. @@ -160,5 +154,5 @@ class OdsCardThumbnail : OdsComponentCircleImage { * @param bitmap The image bitmap to draw. * @param contentDescription The content description associated to this [OdsCardThumbnail]. */ - constructor(bitmap: ImageBitmap, contentDescription: String) : super(bitmap, contentDescription, CircleSize) + constructor(bitmap: ImageBitmap, contentDescription: String) : super(bitmap, contentDescription) } diff --git a/lib/src/main/java/com/orange/ods/compose/component/content/OdsComponentCircleImage.kt b/lib/src/main/java/com/orange/ods/compose/component/content/OdsComponentCircleImage.kt index 8e77b82e1..f458096bc 100644 --- a/lib/src/main/java/com/orange/ods/compose/component/content/OdsComponentCircleImage.kt +++ b/lib/src/main/java/com/orange/ods/compose/component/content/OdsComponentCircleImage.kt @@ -19,12 +19,11 @@ import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp abstract class OdsComponentCircleImage private constructor( graphicsObject: Any, - contentDescription: String, - private val circleSize: Dp + contentDescription: String ) : OdsComponentImage(graphicsObject, contentDescription, contentScale = ContentScale.Crop) { /** @@ -33,7 +32,7 @@ abstract class OdsComponentCircleImage private constructor( * @param painter The painter to draw. * @param contentDescription The content description associated to this [OdsComponentCircleImage]. */ - constructor(painter: Painter, contentDescription: String, circleSize: Dp) : this(painter as Any, contentDescription, circleSize) + constructor(painter: Painter, contentDescription: String) : this(painter as Any, contentDescription) /** * Creates an instance of [OdsComponentCircleImage]. @@ -41,7 +40,7 @@ abstract class OdsComponentCircleImage private constructor( * @param imageVector The image vector to draw. * @param contentDescription The content description associated to this [OdsComponentCircleImage]. */ - constructor(imageVector: ImageVector, contentDescription: String, circleSize: Dp) : this(imageVector as Any, contentDescription, circleSize) + constructor(imageVector: ImageVector, contentDescription: String) : this(imageVector as Any, contentDescription) /** * Creates an instance of [OdsComponentCircleImage]. @@ -49,13 +48,13 @@ abstract class OdsComponentCircleImage private constructor( * @param bitmap The image bitmap to draw. * @param contentDescription The content description associated to this [OdsComponentCircleImage]. */ - constructor(bitmap: ImageBitmap, contentDescription: String, circleSize: Dp) : this(bitmap as Any, contentDescription, circleSize) + constructor(bitmap: ImageBitmap, contentDescription: String) : this(bitmap as Any, contentDescription) @Composable override fun Content(modifier: Modifier) { super.Content( modifier = modifier - .size(circleSize) + .size(40.dp) .clip(CircleShape) ) }