From f3c8b379280132b2dea5e356375bea2bcb0898b5 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 23 May 2020 23:30:07 -0400
Subject: [PATCH] Last few fixes for J2K Auto Migration

---
 .../manga/process/MigrationProcessHolder.kt        | 14 ++++++--------
 app/src/main/res/layout/migration_process_item.xml |  2 ++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt
index 4716490d6..6e2132ce3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt
@@ -25,13 +25,12 @@ import eu.kanade.tachiyomi.util.view.setVectorCompat
 import eu.kanade.tachiyomi.util.view.visible
 import exh.MERGED_SOURCE_ID
 import java.text.DecimalFormat
-import kotlinx.android.synthetic.main.migration_manga_card.gradient
-import kotlinx.android.synthetic.main.migration_manga_card.loading_group
-import kotlinx.android.synthetic.main.migration_manga_card.manga_chapters
-import kotlinx.android.synthetic.main.migration_manga_card.manga_last_chapter_label
-import kotlinx.android.synthetic.main.migration_manga_card.manga_source_label
-import kotlinx.android.synthetic.main.migration_manga_card.thumbnail
+import kotlinx.android.synthetic.main.migration_manga_card.view.gradient
 import kotlinx.android.synthetic.main.migration_manga_card.view.loading_group
+import kotlinx.android.synthetic.main.migration_manga_card.view.manga_chapters
+import kotlinx.android.synthetic.main.migration_manga_card.view.manga_last_chapter_label
+import kotlinx.android.synthetic.main.migration_manga_card.view.manga_source_label
+import kotlinx.android.synthetic.main.migration_manga_card.view.thumbnail
 import kotlinx.android.synthetic.main.migration_manga_card.view.title
 import kotlinx.android.synthetic.main.migration_process_item.migration_manga_card_from
 import kotlinx.android.synthetic.main.migration_process_item.migration_manga_card_to
@@ -162,8 +161,7 @@ class MigrationProcessHolder(
 
     private fun View.attachManga(manga: Manga, source: Source) {
         loading_group.gone()
-        GlideApp.with(view.context).clear(thumbnail)
-        GlideApp.with(view.context)
+        GlideApp.with(view.context.applicationContext)
             .load(manga.toMangaThumbnail())
             .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
             .centerCrop()
diff --git a/app/src/main/res/layout/migration_process_item.xml b/app/src/main/res/layout/migration_process_item.xml
index ed5588374..47793a7f8 100644
--- a/app/src/main/res/layout/migration_process_item.xml
+++ b/app/src/main/res/layout/migration_process_item.xml
@@ -25,6 +25,7 @@
         android:contentDescription="@string/migrating_to"
         android:scaleType="center"
         android:layout_marginBottom="45dp"
+        android:tint="?attr/colorOnPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/migration_manga_card_to"
         app:layout_constraintHorizontal_bias="0.5"
@@ -64,6 +65,7 @@
         android:id="@+id/skip_manga"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
+        android:tint="?attr/colorOnPrimary"
         app:layout_constraintBottom_toBottomOf="@+id/migration_menu"
         app:layout_constraintEnd_toEndOf="@+id/migration_menu"
         app:layout_constraintStart_toStartOf="@+id/migration_menu"