Glide v4

2025-11-03 23:58:55 +01:00 · 2017-10-14 18:16:11 +02:00
parent f45efe2aa8
commit 1470e9d5ca
20 changed files with 351 additions and 292 deletions
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueGridHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueGridHolder.kt
@@ -1,10 +1,10 @@
 package eu.kanade.tachiyomi.ui.catalogue

 import android.view.View
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.widget.StateImageViewTarget
 import kotlinx.android.synthetic.main.catalogue_grid_item.view.*

@@ -36,16 +36,15 @@ class CatalogueGridHolder(private val view: View, private val adapter: FlexibleA
    }

    override fun setImage(manga: Manga) {
-        Glide.clear(view.thumbnail)
+        GlideApp.with(view.context).clear(view.thumbnail)
        if (!manga.thumbnail_url.isNullOrEmpty()) {
-            Glide.with(view.context)
+            GlideApp.with(view.context)
                    .load(manga)
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                    .diskCacheStrategy(DiskCacheStrategy.DATA)
                    .centerCrop()
                    .skipMemoryCache(true)
                    .placeholder(android.R.color.transparent)
                    .into(StateImageViewTarget(view.thumbnail, view.progress))
-
        }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueListHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueListHolder.kt
@@ -1,12 +1,11 @@
 package eu.kanade.tachiyomi.ui.catalogue

 import android.view.View
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.util.getResourceColor
-import jp.wasabeef.glide.transformations.CropCircleTransformation
 import kotlinx.android.synthetic.main.catalogue_list_item.view.*

 /**
@@ -37,13 +36,13 @@ class CatalogueListHolder(private val view: View, adapter: FlexibleAdapter<*>) :
    }

    override fun setImage(manga: Manga) {
-        Glide.clear(view.thumbnail)
+        GlideApp.with(view.context).clear(view.thumbnail)
        if (!manga.thumbnail_url.isNullOrEmpty()) {
-            Glide.with(view.context)
+            GlideApp.with(view.context)
                    .load(manga)
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                    .diskCacheStrategy(DiskCacheStrategy.DATA)
                    .centerCrop()
-                    .bitmapTransform(CropCircleTransformation(view.context))
+                    .circleCrop()
                    .dontAnimate()
                    .skipMemoryCache(true)
                    .placeholder(android.R.color.transparent)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardHolder.kt
@@ -1,10 +1,10 @@
 package eu.kanade.tachiyomi.ui.catalogue.global_search

 import android.view.View
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.widget.StateImageViewTarget
 import kotlinx.android.synthetic.main.catalogue_global_search_controller_card_item.view.*

@@ -28,11 +28,11 @@ class CatalogueSearchCardHolder(view: View, adapter: CatalogueSearchCardAdapter)
    }

    fun setImage(manga: Manga) {
-        Glide.clear(itemView.itemImage)
+        GlideApp.with(itemView.context).clear(itemView.itemImage)
        if (!manga.thumbnail_url.isNullOrEmpty()) {
-            Glide.with(itemView.context)
+            GlideApp.with(itemView.context)
                    .load(manga)
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                    .diskCacheStrategy(DiskCacheStrategy.DATA)
                    .centerCrop()
                    .skipMemoryCache(true)
                    .placeholder(android.R.color.transparent)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt
@@ -1,10 +1,10 @@
 package eu.kanade.tachiyomi.ui.library

 import android.view.View
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import kotlinx.android.synthetic.main.catalogue_grid_item.view.*

 /**
@@ -38,10 +38,10 @@ class LibraryGridHolder(
        }

        // Update the cover.
-        Glide.clear(view.thumbnail)
-        Glide.with(view.context)
+        GlideApp.with(view.context).clear(view.thumbnail)
+        GlideApp.with(view.context)
                .load(manga)
-                .diskCacheStrategy(DiskCacheStrategy.RESULT)
+                .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                .centerCrop()
                .into(view.thumbnail)
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
@@ -1,11 +1,10 @@
 package eu.kanade.tachiyomi.ui.library

 import android.view.View
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.models.Manga
-import jp.wasabeef.glide.transformations.CropCircleTransformation
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import kotlinx.android.synthetic.main.catalogue_list_item.view.*

 /**
@@ -46,12 +45,12 @@ class LibraryListHolder(
        }

        // Update the cover.
-        Glide.clear(itemView.thumbnail)
-        Glide.with(itemView.context)
+        GlideApp.with(itemView.context).clear(itemView.thumbnail)
+        GlideApp.with(itemView.context)
                .load(manga)
-                .diskCacheStrategy(DiskCacheStrategy.RESULT)
+                .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                .centerCrop()
-                .bitmapTransform(CropCircleTransformation(itemView.context))
+                .circleCrop()
                .dontAnimate()
                .into(itemView.thumbnail)
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
@@ -1,8 +1,10 @@
 package eu.kanade.tachiyomi.ui.manga.info

+import android.app.Dialog
 import android.app.PendingIntent
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -12,20 +14,22 @@ import android.support.v4.content.pm.ShortcutManagerCompat
 import android.support.v4.graphics.drawable.IconCompat
 import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
-import com.bumptech.glide.BitmapRequestBuilder
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.resource.bitmap.CenterCrop
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.transition.Transition
 import com.jakewharton.rxbinding.support.v4.widget.refreshes
 import com.jakewharton.rxbinding.view.clicks
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Category
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
 import eu.kanade.tachiyomi.ui.main.MainActivity
@@ -33,15 +37,9 @@ import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.getResourceColor
 import eu.kanade.tachiyomi.util.snack
 import eu.kanade.tachiyomi.util.toast
-import jp.wasabeef.glide.transformations.CropCircleTransformation
 import jp.wasabeef.glide.transformations.CropSquareTransformation
 import jp.wasabeef.glide.transformations.MaskTransformation
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.manga_info_controller.view.*
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
-import rx.subscriptions.Subscriptions
 import uy.kohesive.injekt.injectLazy
 import java.text.DecimalFormat

@@ -157,16 +155,16 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),

            // Set cover if it wasn't already.
            if (manga_cover.drawable == null && !manga.thumbnail_url.isNullOrEmpty()) {
-                Glide.with(context)
+                GlideApp.with(context)
                        .load(manga)
-                        .diskCacheStrategy(DiskCacheStrategy.RESULT)
+                        .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                        .centerCrop()
                        .into(manga_cover)

                if (backdrop != null) {
-                    Glide.with(context)
+                    GlideApp.with(context)
                            .load(manga)
-                            .diskCacheStrategy(DiskCacheStrategy.RESULT)
+                            .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                            .centerCrop()
                            .into(backdrop)
                }
@@ -316,51 +314,78 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
    }

    /**
-     * Choose the shape of the icon
-     * Only use for pre Oreo devices.
+     * Add a shortcut of the manga to the home screen
     */
-    private fun chooseIconDialog() {
-        val activity = activity ?: return
-
-        val modes = intArrayOf(R.string.circular_icon,
-                R.string.rounded_icon,
-                R.string.square_icon,
-                R.string.star_icon)
-
-        val request = Glide.with(activity).load(presenter.manga).asBitmap()
-
-        fun getIcon(i: Int): Bitmap? = when (i) {
-            0 -> request.transform(CropCircleTransformation(activity)).toIcon()
-            1 -> request.transform(RoundedCornersTransformation(activity, 5, 0)).toIcon()
-            2 -> request.transform(CropSquareTransformation(activity)).toIcon()
-            3 -> request.transform(CenterCrop(activity),
-                    MaskTransformation(activity, R.drawable.mask_star)).toIcon()
-            else -> null
+    private fun addToHomeScreen() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // TODO are transformations really unsupported or is it just the Pixel Launcher?
+            createShortcutForShape()
+        } else {
+            ChooseShapeDialog(this).showDialog(router)
        }
-
-        val dialog = MaterialDialog.Builder(activity)
-                .title(R.string.icon_shape)
-                .negativeText(android.R.string.cancel)
-                .items(modes.map { activity.getString(it) })
-                .itemsCallback { _, _, i, _ ->
-                    Observable.fromCallable { getIcon(i) }
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe({ icon ->
-                                if (icon != null) createShortcut(icon)
-                            }, {
-                                activity.toast(R.string.icon_creation_fail)
-                            })
-                }
-                .show()
-
-        untilDestroySubscriptions.add(Subscriptions.create { dialog.dismiss() })
    }

-    private fun BitmapRequestBuilder<out Any, Bitmap>.toIcon() = this.into(96,96).get()
+    /**
+     * Dialog to choose a shape for the icon.
+     */
+    private class ChooseShapeDialog(bundle: Bundle? = null) : DialogController(bundle) {
+
+        constructor(target: MangaInfoController) : this() {
+            targetController = target
+        }
+
+        override fun onCreateDialog(savedViewState: Bundle?): Dialog {
+            val modes = intArrayOf(R.string.circular_icon,
+                    R.string.rounded_icon,
+                    R.string.square_icon,
+                    R.string.star_icon)
+
+            return MaterialDialog.Builder(activity!!)
+                    .title(R.string.icon_shape)
+                    .negativeText(android.R.string.cancel)
+                    .items(modes.map { activity?.getString(it) })
+                    .itemsCallback { _, _, i, _ ->
+                        (targetController as? MangaInfoController)?.createShortcutForShape(i)
+                    }
+                    .build()
+        }
+    }
+
+    /**
+     * Retrieves the bitmap of the shortcut with the requested shape and calls [createShortcut] when
+     * the resource is available.
+     *
+     * @param i The shape index to apply. No transformation is performed if the parameter is not
+     *          provided.
+     */
+    private fun createShortcutForShape(i: Int = 0) {
+        GlideApp.with(activity)
+                .asBitmap()
+                .load(presenter.manga)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .apply {
+                    when (i) {
+                        0 -> circleCrop()
+                        1 -> transform(RoundedCorners(5))
+                        2 -> transform(CropSquareTransformation())
+                        3 -> centerCrop().transform(MaskTransformation(R.drawable.mask_star))
+                    }
+                }
+                .into(object : SimpleTarget<Bitmap>(96, 96) {
+                    override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                        createShortcut(resource)
+                    }
+
+                    override fun onLoadFailed(errorDrawable: Drawable?) {
+                        activity?.toast(R.string.icon_creation_fail)
+                    }
+                })
+    }

    /**
     * Create shortcut using ShortcutManager.
+     *
+     * @param icon The image of the shortcut.
     */
    private fun createShortcut(icon: Bitmap) {
        val activity = activity ?: return
@@ -375,49 +400,29 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),

        // Check if shortcut placement is supported
        if (ShortcutManagerCompat.isRequestPinShortcutSupported(activity)) {
+            val shortcutId = "manga-shortcut-${presenter.manga.title}-${presenter.source.name}"

            // Create shortcut info
-            val pinShortcutInfo = ShortcutInfoCompat.Builder(activity, "manga-shortcut-${presenter.manga.title}-${presenter.source.name}")
+            val shortcutInfo = ShortcutInfoCompat.Builder(activity, shortcutId)
                    .setShortLabel(presenter.manga.title)
                    .setIcon(IconCompat.createWithBitmap(icon))
-                    .setIntent(shortcutIntent).build()
+                    .setIntent(shortcutIntent)
+                    .build()

-            val successCallback: PendingIntent
-
-            successCallback = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val successCallback = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                // Create the CallbackIntent.
-                val pinnedShortcutCallbackIntent = ShortcutManagerCompat.createShortcutResultIntent(activity, pinShortcutInfo)
+                val intent = ShortcutManagerCompat.createShortcutResultIntent(activity, shortcutInfo)

                // Configure the intent so that the broadcast receiver gets the callback successfully.
-                PendingIntent.getBroadcast(activity, 0, pinnedShortcutCallbackIntent, 0)
-            } else{
+                PendingIntent.getBroadcast(activity, 0, intent, 0)
+            } else {
                NotificationReceiver.shortcutCreatedBroadcast(activity)
            }

            // Request shortcut.
-            ShortcutManagerCompat.requestPinShortcut(activity, pinShortcutInfo,
+            ShortcutManagerCompat.requestPinShortcut(activity, shortcutInfo,
                    successCallback.intentSender)
        }
    }

-    /**
-     * Add a shortcut of the manga to the home screen
-     */
-    private fun addToHomeScreen() {
-        // Get bitmap icon
-        val bitmap = Glide.with(activity).load(presenter.manga).asBitmap()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
-            Observable.fromCallable {
-                bitmap.toIcon()
-            }
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe({icon ->
-                        createShortcut(icon)
-                    })
-        }else{
-            chooseIconDialog()
-        }
-    }
-}
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
@@ -3,9 +3,9 @@ package eu.kanade.tachiyomi.ui.reader
 import android.content.Context
 import android.graphics.Bitmap
 import android.support.v4.app.NotificationCompat
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.notification.NotificationHandler
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.notification.Notifications
@@ -34,12 +34,12 @@ class SaveImageNotifier(private val context: Context) {
     * @param file image file containing downloaded page image.
     */
    fun onComplete(file: File) {
-        val bitmap = Glide.with(context)
-                .load(file)
+        val bitmap = GlideApp.with(context)
                .asBitmap()
+                .load(file)
                .diskCacheStrategy(DiskCacheStrategy.NONE)
                .skipMemoryCache(true)
-                .into(720, 1280)
+                .submit(720, 1280)
                .get()

        if (bitmap != null) {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChapterHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChapterHolder.kt
@@ -2,14 +2,13 @@ package eu.kanade.tachiyomi.ui.recent_updates

 import android.view.View
 import android.widget.PopupMenu
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.model.Download
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.util.getResourceColor
 import eu.kanade.tachiyomi.util.setVectorCompat
-import jp.wasabeef.glide.transformations.CropCircleTransformation
 import kotlinx.android.synthetic.main.recent_chapters_item.view.*

 /**
@@ -68,12 +67,12 @@ class RecentChapterHolder(private val view: View, private val adapter: RecentCha
        view.chapter_menu_icon.setVectorCompat(R.drawable.ic_more_horiz_black_24dp, view.context.getResourceColor(R.attr.icon_color))

        // Set cover
-        Glide.clear(itemView.manga_cover)
+        GlideApp.with(itemView.context).clear(itemView.manga_cover)
        if (!item.manga.thumbnail_url.isNullOrEmpty()) {
-            Glide.with(itemView.context)
+            GlideApp.with(itemView.context)
                    .load(item.manga)
-                    .diskCacheStrategy(DiskCacheStrategy.RESULT)
-                    .bitmapTransform(CropCircleTransformation(view.context))
+                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                    .circleCrop()
                    .into(itemView.manga_cover)
        }

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadHolder.kt
@@ -1,11 +1,11 @@
 package eu.kanade.tachiyomi.ui.recently_read

 import android.view.View
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.MangaChapterHistory
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import kotlinx.android.synthetic.main.recently_read_item.view.*
 import java.util.*

@@ -58,15 +58,15 @@ class RecentlyReadHolder(
        itemView.last_read.text = adapter.dateFormat.format(Date(history.last_read))

        // Set cover
-        Glide.clear(itemView.cover)
+        GlideApp.with(itemView.context).clear(itemView.cover)
        if (!manga.thumbnail_url.isNullOrEmpty()) {
-            Glide.with(itemView.context)
+            GlideApp.with(itemView.context)
                    .load(manga)
-                    .diskCacheStrategy(DiskCacheStrategy.RESULT)
+                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                    .centerCrop()
                    .into(itemView.cover)
        }
-
    }

+
 }