Avatar tweaks

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/ui/ProComponents.kt

@@ -80,6 +80,7 @@ import org.thoughtcrime.securesms.ui.theme.LocalType
 import org.thoughtcrime.securesms.ui.theme.PreviewTheme
 import org.thoughtcrime.securesms.ui.theme.SessionColorsParameterProvider
 import org.thoughtcrime.securesms.ui.theme.ThemeColors
+import org.thoughtcrime.securesms.util.AvatarBadge
 import org.thoughtcrime.securesms.util.AvatarUIData
 
 
@@ -750,7 +751,7 @@ fun AvatarQrWidget(
         label = "corner_radius"
     )
 
-    // Scale animations for content
+    // Scale animations for content (used when going from QR back to avatar)
     val avatarScale by animateFloatAsState(
         targetValue = if (showQR) 0.8f else 1f,
         animationSpec = animationSpecFast,
@@ -835,7 +836,6 @@ fun AvatarQrWidget(
             }
             Avatar(
                 modifier = avatarModifier
-                    .size(animatedSize)
                     .graphicsLayer(
                         alpha = avatarAlpha,
                         scaleX = avatarScale,
@@ -844,7 +844,7 @@ fun AvatarQrWidget(
                 ,
                 size = animatedSize,
                 maxSizeLoad = LocalDimensions.current.iconXXLargeAvatar,
-                data = avatarUIData
+                data = avatarUIData,
             )
 
             // QR with scale and alpha

app/src/main/java/org/thoughtcrime/securesms/ui/components/Avatar.kt

@@ -104,20 +104,11 @@ fun BaseAvatar(
 
         // Badge content, if any.
         if (badge != null) {
-            var badgeSize = size * 0.4f
-            var offset = 0.dp
-
-            if(badgeSize < MIN_BADGE_SIZE){
-                // apply an opinionated minimum size for the badge
-                badgeSize = MIN_BADGE_SIZE
-                offset = 1.dp // the forced min size looks better with a slight offset
-            }
-
             Box(
                 modifier = Modifier
                     .align(Alignment.BottomEnd)
-                    .offset(x = offset, y = offset)
-                    .size(badgeSize)
+                    .offset(x = 1.dp, y = 1.dp)
+                    .size(max(size * 0.4f, MIN_BADGE_SIZE))
             ) {
                 badge()
             }
@@ -398,40 +389,6 @@ fun PreviewAvatarSinglePhoto(){
     }
 }
 
-@Preview
-@Composable
-fun PreviewAvatarBadge(){
-    PreviewTheme {
-        Avatar(
-            size = LocalDimensions.current.iconLarge,
-            badge = AvatarBadge.Admin,
-            data = AvatarUIData(
-                listOf(AvatarUIElement(
-                    name = "AT",
-                    color = primaryGreen,
-                    remoteFile = null
-                )))
-        )
-    }
-}
-
-@Preview
-@Composable
-fun PreviewAvatarBadgeSmall(){
-    PreviewTheme {
-        Avatar(
-            size = LocalDimensions.current.iconMediumAvatar,
-            badge = AvatarBadge.Admin,
-            data = AvatarUIData(
-                listOf(AvatarUIElement(
-                    name = "AT",
-                    color = primaryGreen,
-                    remoteFile = null
-                )))
-        )
-    }
-}
-
 @Preview
 @Composable
 fun PreviewAvatarElementUnclipped(){