Skip to content

Commit

Permalink
[#677] Review: Set OdsImageCircleShape private
Browse files Browse the repository at this point in the history
  • Loading branch information
paulinea authored and florentmaitre committed Nov 8, 2023
1 parent ea44188 commit 56ba66d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
package com.orange.ods.compose.component.chip

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.ChipDefaults.LeadingIconOpacity
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.FilterChip
Expand All @@ -28,16 +30,20 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.DefaultAlpha
import androidx.compose.ui.graphics.painter.ColorPainter
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.orange.ods.R
import com.orange.ods.compose.component.OdsComposable
import com.orange.ods.compose.component.utilities.DisabledInteractionSource
import com.orange.ods.compose.component.utilities.OdsImageCircleShape
import com.orange.ods.compose.component.utilities.Preview
import com.orange.ods.compose.component.utilities.UiModePreviews
import com.orange.ods.compose.theme.OdsTheme
Expand Down Expand Up @@ -148,6 +154,25 @@ private fun OdsChipSelectedIcon(tint: Color = LocalContentColor.current.copy(alp
)
}

@Composable
private fun OdsImageCircleShape(
painter: Painter,
modifier: Modifier = Modifier,
contentDescription: String? = null,
circleSize: Dp = dimensionResource(id = R.dimen.avatar_size),
alpha: Float = DefaultAlpha
) {
Image(
painter = painter,
contentDescription = contentDescription,
contentScale = ContentScale.Crop,
modifier = modifier
.size(circleSize)
.clip(CircleShape),
alpha = alpha
)
}

@UiModePreviews.Chip
@Composable
private fun PreviewOdsFilterChip() = Preview {
Expand Down

This file was deleted.

0 comments on commit 56ba66d

Please sign in to comment.