diff --git a/app/src/main/java/com/example/login_v3/data/api/api_class/FriendRequest.kt b/app/src/main/java/com/example/login_v3/data/api/api_class/FriendRequest.kt index 6adaf64..7230874 100644 --- a/app/src/main/java/com/example/login_v3/data/api/api_class/FriendRequest.kt +++ b/app/src/main/java/com/example/login_v3/data/api/api_class/FriendRequest.kt @@ -100,7 +100,7 @@ data class UserDetail( val displayName: String, @Json(name = "avatar_url") - val avatarUrl: String?, + val SearchAvatarUrl: String?, @Json(name = "banner_url") val bannerUrl: String?, @@ -110,4 +110,13 @@ data class UserDetail( @Json(name = "created_at") val createdAt: String -) \ No newline at end of file +) + +val UserDetail.fullSearchedAvatarUrl: Any + get() = if (SearchAvatarUrl.isNullOrBlank()) { + R.drawable.avatar_v1 + } else if (SearchAvatarUrl.startsWith("http")) { + SearchAvatarUrl + } else { + "http://192.168.0.217$SearchAvatarUrl" + } \ No newline at end of file diff --git a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_contact_list.kt b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_contact_list.kt index 1d1c694..6e7f857 100644 --- a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_contact_list.kt +++ b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_contact_list.kt @@ -70,6 +70,7 @@ import com.example.login_v3.data.api.api_class.fullPendingAvatarUrl import com.example.login_v3.home.Message.ViewModel.Detail.ContactListViewModel import com.example.login_v3.navigation.BottomBarViewModel import androidx.compose.ui.text.input.ImeAction +import com.example.login_v3.data.api.api_class.fullSearchedAvatarUrl @Composable @@ -421,7 +422,7 @@ fun SearchResultRow( ) { // 這裡放頭像 AsyncImage( - model = user.avatarUrl, + model = user.fullSearchedAvatarUrl, contentDescription = null, modifier = Modifier.size(40.dp).clip(CircleShape) )