Vadik Sirekanyan 7 жил өмнө
parent
commit
1f6ded4a82

+ 0 - 11
app/src/main/java/com/sirekanyan/knigopis/repository/model/Book.kt

@@ -1,18 +1,7 @@
 package com.sirekanyan.knigopis.repository.model
 
-import com.sirekanyan.knigopis.common.orDefault
-import com.sirekanyan.knigopis.repository.api.createBookImageUrl
-
 interface Book {
     val id: String
     val title: String
     val author: String
-    val bookImageUrl get() = createBookImageUrl(title)
-    val titleOrDefault get() = title.orDefault("(без названия)")
-    val authorOrDefault get() = author.orDefault("(автор не указан)")
-    val fullTitle
-        get() = when {
-            author.isEmpty() -> titleOrDefault
-            else -> "$titleOrDefault — $authorOrDefault"
-        }
 }

+ 0 - 8
app/src/main/java/com/sirekanyan/knigopis/repository/model/BookHeader.kt

@@ -1,8 +0,0 @@
-package com.sirekanyan.knigopis.repository.model
-
-class BookHeader(
-    override val title: String,
-    val count: Int,
-    override val id: String = "",
-    override val author: String = ""
-) : Book

+ 2 - 7
app/src/main/java/com/sirekanyan/knigopis/repository/model/User.kt

@@ -1,8 +1,5 @@
 package com.sirekanyan.knigopis.repository.model
 
-import android.net.Uri
-import com.sirekanyan.knigopis.common.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",
@@ -25,10 +22,8 @@ class User(
 
     val name get() = nickname ?: id
 
-    val avatar: String? get() = photo.takeUnless { it in defaultAvatars }
+    val avatar get() = photo.takeUnless { it in defaultAvatars }
 
-    val profiles: List<Uri>
-        get() = listOfNotNull(profile, identity)
-            .mapNotNull(String::toUriOrNull)
+    val profiles get() = listOfNotNull(profile, identity)
 
 }