Merge pull request #935 from ILIYANGERMANOV/develop

Develop
Ivy-Apps · May 23, 2022 · 5660e6b · 5660e6b
2 parents 754935b + 40a7005
commit 5660e6b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/io/network/data/UserDTO.kt b/app/src/main/java/com/ivy/wallet/io/network/data/UserDTO.kt
@@ -1,5 +1,6 @@
 package com.ivy.wallet.io.network.data
 
+import com.google.gson.annotations.SerializedName
 import com.ivy.wallet.domain.data.AuthProviderType
 import com.ivy.wallet.io.persistence.data.UserEntity
 import java.util.*
@@ -9,6 +10,7 @@ data class UserDTO(
     val authProviderType: AuthProviderType,
     var firstName: String,
     val lastName: String?,
+    @SerializedName("profilePictureUrl")
     val profilePicture: String?,
     val color: Int,
 

diff --git a/app/src/main/java/com/ivy/wallet/io/network/request/auth/AuthResponse.kt b/app/src/main/java/com/ivy/wallet/io/network/request/auth/AuthResponse.kt
@@ -1,11 +1,11 @@
 package com.ivy.wallet.io.network.request.auth
 
 import com.google.gson.annotations.SerializedName
-import com.ivy.wallet.domain.data.core.User
+import com.ivy.wallet.io.network.data.UserDTO
 
 data class AuthResponse(
     @SerializedName("user")
-    val user: User,
+    val user: UserDTO,
     @SerializedName("sessionToken")
     val sessionToken: String
 )
diff --git a/app/src/main/java/com/ivy/wallet/ui/settings/SettingsScreen.kt b/app/src/main/java/com/ivy/wallet/ui/settings/SettingsScreen.kt
@@ -1,7 +1,10 @@
 package com.ivy.wallet.ui.settings
 
 import androidx.annotation.DrawableRes
-import androidx.compose.foundation.*
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.CircleShape
@@ -24,7 +27,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.accompanist.coil.rememberCoilPainter
+import coil.compose.AsyncImage
 import com.google.accompanist.insets.navigationBarsPadding
 import com.google.accompanist.insets.statusBarsPadding
 import com.ivy.design.l0_system.UI
@@ -722,11 +725,11 @@ private fun AccountCardUser(
         Spacer(Modifier.width(24.dp))
 
         if (user.profilePicture != null) {
-            Image(
+            AsyncImage(
                 modifier = Modifier
                     .clip(CircleShape)
                     .size(32.dp),
-                painter = rememberCoilPainter(request = user.profilePicture),
+                model = user.profilePicture,
                 contentScale = ContentScale.FillBounds,
                 contentDescription = "profile picture"
             )