feat: Replace UserAvatar module with Avatar and remove it altogether (#461)

Author: LouisCAD

Coil/build.gradle.kts

@@ -43,7 +43,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":Core:Auth"))
+    api(project(":Core:Auth"))
     implementation(project(":Core:Avatar"))
     implementation(project(":Core:Network"))
 

CrossAppLoginUI/build.gradle.kts

@@ -43,11 +43,12 @@ android {
 dependencies {
 
     implementation(project(":Core"))
+    implementation(project(":Core:Avatar"))
+    implementation(project(":Core:Coil"))
     implementation(project(":Core:Compose:Basics"))
     implementation(project(":Core:Compose:Margin"))
     implementation(project(":Core:Compose:MaterialThemeFromXml"))
     implementation(project(":Core:CrossAppLogin"))
-    implementation(project(":Core:UserAvatar"))
 
     implementation(core.androidx.core.ktx)
     implementation(core.material)

CrossAppLoginUI/src/main/kotlin/com/infomaniak/core/crossloginui/components/Avatar.kt renamed to CrossAppLoginUI/src/main/kotlin/com/infomaniak/core/crossloginui/components/CrossLoginAvatar.kt

@@ -18,35 +18,61 @@
 package com.infomaniak.core.crossloginui.components
 
 import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import com.infomaniak.core.avatar.components.Avatar
+import com.infomaniak.core.avatar.getBackgroundColorResBasedOnId
+import com.infomaniak.core.avatar.models.AvatarColors
+import com.infomaniak.core.avatar.models.AvatarType
+import com.infomaniak.core.avatar.models.AvatarUrlData
+import com.infomaniak.core.coil.ImageLoaderProvider
 import com.infomaniak.core.crossloginui.data.CrossLoginDefaults
 import com.infomaniak.core.crossloginui.previews.AccountsPreviewParameter
 import com.infomaniak.core.login.crossapp.ExternalAccount
-import com.infomaniak.core.useravatar.AvatarData
-import com.infomaniak.core.useravatar.exposed.UserAvatar
 
 @Composable
-internal fun Avatar(modifier: Modifier = Modifier, account: ExternalAccount, strokeColor: Color? = null) {
-    UserAvatar(
+internal fun CrossLoginAvatar(modifier: Modifier = Modifier, account: ExternalAccount, strokeColor: Color? = null) {
+    val context = LocalContext.current
+    val unauthenticatedImageLoader = remember(context) { ImageLoaderProvider.newImageLoader(context) }
+
+    Avatar(
+        avatarType = AvatarType.getUrlOrInitials(
+            account.avatarUrl?.let { AvatarUrlData(it, unauthenticatedImageLoader) },
+            initials = account.initials,
+            colors = AvatarColors(
+                // TODO: Adapt colors correctly for each app
+                containerColor = Color(context.getBackgroundColorResBasedOnId(account.id.toInt())),
+                // TODO: Adapt colors correctly for each app
+                contentColor = getDefaultIconColor(),
+            ),
+        ),
         modifier = modifier,
-        avatarData = AvatarData(id = account.id.toString(), uri = account.avatarUrl, userInitials = account.initials),
         border = strokeColor?.let { BorderStroke(width = 1.dp, color = it) },
     )
 }
 
+// Copied from old UserAvatar module to keep old behavior
+// TODO: Remove this when using CoreUi
+private const val iconColorDark = 0xFF333333
+
+@Composable
+private fun getDefaultIconColor() = if (isSystemInDarkTheme()) Color(iconColorDark) else Color.White
+
 @Preview
 @Composable
 private fun Preview(@PreviewParameter(AccountsPreviewParameter::class) accounts: List<ExternalAccount>) {
     MaterialTheme {
         Surface {
-            Avatar(
+            CrossLoginAvatar(
                 account = accounts.first(),
                 strokeColor = CrossLoginDefaults.colors().avatarStrokeColor,
             )

CrossAppLoginUI/src/main/kotlin/com/infomaniak/core/crossloginui/components/SingleAccount.kt

@@ -52,7 +52,7 @@ internal fun SingleAccount(
         modifier = modifier,
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        Avatar(
+        CrossLoginAvatar(
             modifier = Modifier
                 .size(Dimens.bigAvatarSize)
                 .clip(CircleShape),

CrossAppLoginUI/src/main/kotlin/com/infomaniak/core/crossloginui/components/ThreeAccountsView.kt

@@ -44,7 +44,7 @@ internal fun ThreeAccountsView(
 
         Row {
             // Left
-            Avatar(
+            CrossLoginAvatar(
                 modifier = Modifier.size(Dimens.iconSize),
                 account = accounts[1],
                 strokeColor = avatarStrokeColor,
@@ -53,15 +53,15 @@ internal fun ThreeAccountsView(
             Spacer(Modifier.width(width = Dimens.avatarsBoxWidth - (Dimens.iconSize + Dimens.iconSize)))
 
             // Right
-            Avatar(
+            CrossLoginAvatar(
                 modifier = Modifier.size(Dimens.iconSize),
                 account = accounts[2],
                 strokeColor = avatarStrokeColor,
             )
         }
 
         // Center
-        Avatar(
+        CrossLoginAvatar(
             modifier = Modifier.size(Dimens.avatarsBoxHeight),
             account = accounts[0],
             strokeColor = avatarStrokeColor,

CrossAppLoginUI/src/main/kotlin/com/infomaniak/core/crossloginui/components/TwoAccountsView.kt

@@ -45,7 +45,7 @@ internal fun TwoAccountsView(
     ) {
 
         // Right
-        Avatar(
+        CrossLoginAvatar(
             modifier = Modifier
                 .size(Dimens.avatarsBoxHeight)
                 .align(Alignment.CenterEnd),
@@ -54,7 +54,7 @@ internal fun TwoAccountsView(
         )
 
         // Left
-        Avatar(
+        CrossLoginAvatar(
             modifier = Modifier
                 .size(Dimens.avatarsBoxHeight)
                 .align(Alignment.CenterStart),

MyKSuite/build.gradle.kts

@@ -50,6 +50,7 @@ dependencies {
 
     implementation(project(":Core"))
     implementation(project(":Core:Avatar"))
+    implementation(project(":Core:Coil"))
     implementation(project(":Core:Compose:Basics"))
     implementation(project(":Core:Compose:Margin"))
     implementation(project(":Core:Compose:MaterialThemeFromXml"))

MyKSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/AvatarData.kt

@@ -20,12 +20,13 @@ package com.infomaniak.core.myksuite.ui.data
 import android.os.Parcelable
 import androidx.annotation.ColorInt
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
-import coil3.SingletonImageLoader
-import coil3.compose.LocalPlatformContext
+import androidx.compose.ui.platform.LocalContext
 import com.infomaniak.core.avatar.models.AvatarColors
 import com.infomaniak.core.avatar.models.AvatarType
 import com.infomaniak.core.avatar.models.AvatarUrlData
+import com.infomaniak.core.coil.ImageLoaderProvider
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -38,8 +39,11 @@ data class AvatarData(
 ) : Parcelable {
     @Composable
     fun toAvatarType(): AvatarType {
+        val context = LocalContext.current
+        val unauthenticatedImageLoader = remember(context) { ImageLoaderProvider.newImageLoader(context) }
+
         return AvatarType.getUrlOrInitials(
-            avatarUrlData = uri?.let { AvatarUrlData(it, SingletonImageLoader.get(LocalPlatformContext.current)) },
+            avatarUrlData = uri?.let { AvatarUrlData(it, unauthenticatedImageLoader) },
             initials = userInitials,
             colors = AvatarColors(
                 containerColor = Color(backgroundColor),