فهرست منبع

Replace default images with empty ones

Vadik Sirekanyan 7 سال پیش
والد
کامیت
74d9397754

+ 1 - 1
app/src/main/java/me/vadik/knigopis/adapters/users/UsersAdapter.kt

@@ -24,7 +24,7 @@ class UsersAdapter(
     override fun onBindViewHolder(holder: UserViewHolder, position: Int) {
         val user = users[position]
         holder.nickname = user.subUser.nickname
-        holder.avatarUrl = user.subUser.photo
+        holder.avatarUrl = user.subUser.avatar
         holder.profile = "${user.subUser.booksCount} прочитано" + user.newBooksCount?.let {
             " (+$it новых)"
         }.orEmpty()

+ 15 - 1
app/src/main/java/me/vadik/knigopis/model/subscription/SubUser.kt

@@ -3,15 +3,29 @@ package me.vadik.knigopis.model.subscription
 import android.net.Uri
 import me.vadik.knigopis.toUriOrNull
 
+private val defaultAvatars = setOf(
+    "https://lh3.googleusercontent.com/-XdUIqdMkCWA/AAAAAAAAAAI/AAAAAAAAAAA/4252rscbv5M/photo.jpg?sz=100",
+    "https://lh6.googleusercontent.com/-cfU0I0DdeGE/AAAAAAAAAAI/AAAAAAAAANs/RoQmKyJjwLo/photo.jpg?sz=100",
+    "https://vk.com/images/camera_50.png",
+    "http://vk.com/images/camera_50.png",
+    "https://ulogin.ru/img/photo.png",
+    "http://avt-27.foto.mail.ru/mail/newmoon56/_avatar"
+)
+
 class SubUser(
     val id: String,
     val nickname: String,
-    val photo: String?,
+    private val photo: String?,
     private val profile: String?,
     private val identity: String?,
     val booksCount: Int
 ) {
+
     val profiles: List<Uri>
         get() = listOfNotNull(profile, identity)
             .mapNotNull(String::toUriOrNull)
+
+    val avatar: String?
+        get() = photo.takeUnless { it in defaultAvatars }
+
 }

+ 1 - 1
app/src/main/java/me/vadik/knigopis/user/UserActivity.kt

@@ -29,7 +29,7 @@ fun Context.createUserIntent(user: Subscription): Intent =
     Intent(this, UserActivity::class.java)
         .putExtra(EXTRA_USER_ID, user.subUser.id)
         .putExtra(EXTRA_USER_NAME, user.subUser.nickname)
-        .putExtra(EXTRA_USER_PHOTO, user.subUser.photo)
+        .putExtra(EXTRA_USER_PHOTO, user.subUser.avatar)
         .putExtra(EXTRA_USER_PROFILES, user.subUser.profiles.toTypedArray())
 
 fun Context.createUserIntent(user: Identity): Intent =