Skip to content

Commit 686b0aa

Browse files
committed
The untinted icon painter is now square
1 parent 150497f commit 686b0aa

1 file changed

Lines changed: 1 addition & 22 deletions

File tree

‎app/src/main/java/com/orange/ouds/app/ui/utilities/PainterResources.kt‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ package com.orange.ouds.app.ui.utilities
1515
import androidx.annotation.DrawableRes
1616
import androidx.compose.foundation.isSystemInDarkTheme
1717
import androidx.compose.runtime.Composable
18-
import androidx.compose.runtime.remember
19-
import androidx.compose.ui.geometry.Rect
20-
import androidx.compose.ui.geometry.Size
21-
import androidx.compose.ui.graphics.Path
22-
import androidx.compose.ui.graphics.drawscope.DrawScope
23-
import androidx.compose.ui.graphics.drawscope.clipPath
2418
import androidx.compose.ui.graphics.painter.Painter
2519
import androidx.compose.ui.res.painterResource
2620
import com.orange.ouds.app.R
@@ -34,20 +28,5 @@ fun painterResource(id: LightDarkResourceId): Painter {
3428

3529
@Composable
3630
fun rememberUntintedIconPainter(): Painter {
37-
val painter = painterResource(R.drawable.ic_untinted_icon)
38-
return remember(painter) {
39-
object : Painter() {
40-
override val intrinsicSize: Size
41-
get() = painter.intrinsicSize
42-
43-
override fun DrawScope.onDraw() {
44-
val path = Path().apply { addOval(Rect(0f, 0f, size.width, size.height)) }
45-
clipPath(path) {
46-
with(painter) {
47-
draw(size)
48-
}
49-
}
50-
}
51-
}
52-
}
31+
return painterResource(R.drawable.ic_untinted_icon)
5332
}

0 commit comments

Comments
 (0)