Преглед на файлове

Removed book cover search from main screen

Vadik Sirekanyan преди 7 години
родител
ревизия
a65ff1eac1

+ 1 - 1
app/src/main/java/me/vadik/knigopis/common/extensions/image_view.kt

@@ -29,7 +29,7 @@ fun ImageView.setSquareImage(url: String?) {
         .load(url)
         .apply(
             RequestOptions.centerCropTransform()
-                .placeholder(R.drawable.oval_placeholder_background)
+                .placeholder(R.drawable.rectangle_placeholder_background)
                 .theme(context.theme)
         )
         .transition(DrawableTransitionOptions.withCrossFade())

+ 0 - 3
app/src/main/java/me/vadik/knigopis/feature/MainActivity.kt

@@ -39,7 +39,6 @@ import me.vadik.knigopis.feature.profile.createProfileIntent
 import me.vadik.knigopis.feature.user.createUserIntent
 import me.vadik.knigopis.feature.users.UsersAdapter
 import me.vadik.knigopis.repository.*
-import me.vadik.knigopis.repository.api.BookCoverSearch
 import me.vadik.knigopis.repository.api.Endpoint
 import me.vadik.knigopis.repository.model.*
 import me.vadik.knigopis.repository.model.CurrentTab.*
@@ -57,7 +56,6 @@ private const val CURRENT_TAB_KEY = "me.vadik.knigopis.current_tab"
 class MainActivity : AppCompatActivity(), Router {
 
     private val api by inject<Endpoint>()
-    private val bookCoverSearch by inject<BookCoverSearch>()
     private val config by inject<Configuration>()
     private val auth by inject<KAuth>()
     private val dialogs by inject<DialogFactory> { mapOf("activity" to this) }
@@ -71,7 +69,6 @@ class MainActivity : AppCompatActivity(), Router {
     private val allNotes = mutableListOf<Note>()
     private val booksAdapter by lazy {
         BooksAdapter(
-            bookCoverSearch,
             api,
             auth,
             this,

+ 2 - 22
app/src/main/java/me/vadik/knigopis/feature/books/BooksAdapter.kt

@@ -5,13 +5,11 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
-import com.bumptech.glide.request.RequestOptions
 import me.vadik.knigopis.R
 import me.vadik.knigopis.Router
 import me.vadik.knigopis.common.Adapter
 import me.vadik.knigopis.common.extensions.hideNow
+import me.vadik.knigopis.common.extensions.setSquareImage
 import me.vadik.knigopis.common.extensions.showNow
 import me.vadik.knigopis.common.extensions.toast
 import me.vadik.knigopis.common.io2main
@@ -20,7 +18,6 @@ import me.vadik.knigopis.common.setProgressSmoothly
 import me.vadik.knigopis.common.view.dialog.DialogFactory
 import me.vadik.knigopis.common.view.dialog.createDialogItem
 import me.vadik.knigopis.repository.KAuth
-import me.vadik.knigopis.repository.api.BookCoverSearch
 import me.vadik.knigopis.repository.api.Endpoint
 import me.vadik.knigopis.repository.model.Book
 import me.vadik.knigopis.repository.model.BookHeader
@@ -28,7 +25,6 @@ import me.vadik.knigopis.repository.model.FinishedBook
 import me.vadik.knigopis.repository.model.PlannedBook
 
 class BooksAdapter(
-    private val coverSearch: BookCoverSearch,
     private val api: Endpoint,
     private val auth: KAuth,
     private val router: Router,
@@ -107,23 +103,7 @@ class BooksAdapter(
             }
         }
         .bind<ImageView>(R.id.book_image) {
-            coverSearch.search(books[it])
-                .subscribe({ coverUrl ->
-                    Glide.with(context)
-                        .load(coverUrl)
-                        .apply(
-                            RequestOptions.centerCropTransform()
-                                .placeholder(R.drawable.rectangle_placeholder_background)
-                        )
-                        .transition(DrawableTransitionOptions.withCrossFade())
-                        .into(this)
-                }, {
-                    logError("cannot load thumbnail", it)
-                    Glide.with(context)
-                        .load(R.drawable.rectangle_placeholder_background)
-                        .transition(DrawableTransitionOptions.withCrossFade())
-                        .into(this)
-                })
+            setSquareImage(books[it].bookImageUrl)
         }
         .bind<TextView>(R.id.book_title) {
             text = books[it].titleOrDefault