فهرست منبع

photo improvements

Milan Jurkulak 3 سال پیش
والد
کامیت
a02b20a4e1

+ 8 - 4
tvlib/src/main/kotlin/org/mjdev/tvlib/ui/components/image/CircleImage.kt

@@ -13,6 +13,7 @@ import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
@@ -32,7 +33,7 @@ import org.mjdev.tvlib.extensions.ModifierExt.recomposeHighlighter
 @Composable
 fun CircleImage(
     modifier: Modifier = Modifier,
-    backGroundColor: Color = Color.Black,
+    backGroundColor: Color = Color.White,
     borderColor: Color = Color.White,
     borderSize: Dp = 3.dp,
     contentDescription: String = "",
@@ -40,12 +41,15 @@ fun CircleImage(
     src: Any? = R.drawable.person
 ) {
     Box(
-        modifier = modifier.padding(contentPadding).recomposeHighlighter(),
+        modifier = modifier
+            .padding(contentPadding)
+            .recomposeHighlighter()
+            .aspectRatio(1f),
         contentAlignment = Alignment.Center,
     ) {
-
         ImageAny(
-            modifier = modifier.recomposeHighlighter()
+            modifier = modifier
+                .recomposeHighlighter()
                 .clip(CircleShape)
                 .background(backGroundColor, CircleShape)
                 .border(

+ 4 - 4
tvlib/src/main/kotlin/org/mjdev/tvlib/ui/components/image/FadingPhotoImage.kt

@@ -19,7 +19,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.blur
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
@@ -28,7 +27,9 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.delay
+import org.mjdev.tvlib.annotations.TvPreview
 
+@TvPreview
 @Composable
 fun FadingPhotoImage(
     modifier: Modifier = Modifier,
@@ -58,9 +59,7 @@ fun FadingPhotoImage(
         animationSpec = tween(animationDuration)
     ) { targetState ->
         PhotoImage(
-            modifier = modifier
-                .alpha(alpha)
-                .blur(radius = blurRadius),
+            modifier = modifier.blur(radius = blurRadius),
             src = targetState,
             contrast = contrast,
             brightness = brightness,
@@ -69,6 +68,7 @@ fun FadingPhotoImage(
             borderSize = borderSize,
             borderColor = borderColor,
             shape = shape,
+            alpha = alpha,
             colorFilter = colorFilter,
             contentDescription = contentDescription,
             alignment = alignment