From 0a3d6bd8f5221fcdcb55bdf046a6a06d3cf68c56 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sat, 10 Apr 2021 19:10:42 -0400
Subject: [PATCH] adding compatToolTipText helper + using unused strings

---
 .../eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt   |  7 +++++++
 .../eu/kanade/tachiyomi/ui/setting/ThemePreference.kt |  5 +----
 .../eu/kanade/tachiyomi/ui/source/SourceHolder.kt     |  2 ++
 .../eu/kanade/tachiyomi/util/view/ViewExtensions.kt   | 11 +++++++++++
 app/src/main/res/layout/source_item.xml               |  3 ++-
 app/src/main/res/menu/migration_main.xml              |  2 +-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
index c72af4a578..9ec8a51cd3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
@@ -112,6 +112,13 @@ class EditMangaDialog : DialogController {
             infoController.changeCover()
         }
         binding.resetTags.setOnClickListener { resetTags() }
+        binding.resetTags.text = resources?.getString(
+            if (manga.genre.isNullOrBlank() || manga.source == LocalSource.ID) {
+                R.string.clear_tags
+            } else {
+                R.string.reset_tags
+            }
+        )
         binding.resetCover.visibleIf(!isLocal)
         binding.resetCover.setOnClickListener {
             binding.mangaCover.loadAny(
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt
index c5cadd7fdd..00c9761bd8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt
@@ -43,10 +43,6 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
         layoutResource = R.layout.themes_preference
         fastAdapter = FastAdapter.with(itemAdapter)
         fastAdapter.setHasStableIds(true)
-        val enumConstants = ThemeUtil.Themes::class.java.enumConstants
-        val currentLightTheme = preferences.lightTheme().get()
-        val currentDarkTheme = preferences.darkTheme().get()
-        val nightMode = preferences.nightMode().get()
         selectExtension = fastAdapter.getSelectExtension().apply {
             isSelectable = true
             multiSelect = true
@@ -78,6 +74,7 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
             }
         }
 
+        val enumConstants = ThemeUtil.Themes::class.java.enumConstants
         itemAdapter.set(enumConstants?.map(::ThemeItem).orEmpty())
         isSelectable = false
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt
index 7094834388..a15a555eed 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt
@@ -8,6 +8,7 @@ import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.icon
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import eu.kanade.tachiyomi.util.system.getResourceColor
+import eu.kanade.tachiyomi.util.view.compatToolTipText
 import eu.kanade.tachiyomi.util.view.gone
 import eu.kanade.tachiyomi.util.view.visible
 
@@ -40,6 +41,7 @@ class SourceHolder(view: View, val adapter: SourceAdapter) :
                     else android.R.attr.textColorSecondary
                 )
             )
+            compatToolTipText = context.getString(if (isPinned) R.string.unpin else R.string.pin)
             setImageResource(
                 if (isPinned) R.drawable.ic_pin_24dp
                 else R.drawable.ic_pin_outline_24dp
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
index 7f41f2fdfe..1d92e421b2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
@@ -20,6 +20,7 @@ import androidx.annotation.IdRes
 import androidx.annotation.Px
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
@@ -336,3 +337,13 @@ fun RecyclerView.smoothScrollToTop() {
         scrollToPosition(0)
     }
 }
+
+var View.compatToolTipText: CharSequence?
+    get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        tooltipText
+    } else {
+        ""
+    }
+    set(value) {
+        ViewCompat.setTooltipText(this, value)
+    }
diff --git a/app/src/main/res/layout/source_item.xml b/app/src/main/res/layout/source_item.xml
index 56b8a2b905..a8fa7d0b4a 100644
--- a/app/src/main/res/layout/source_item.xml
+++ b/app/src/main/res/layout/source_item.xml
@@ -102,7 +102,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:contentDescription="@string/pin" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
diff --git a/app/src/main/res/menu/migration_main.xml b/app/src/main/res/menu/migration_main.xml
index 106bb80330..fe23d7cc08 100644
--- a/app/src/main/res/menu/migration_main.xml
+++ b/app/src/main/res/menu/migration_main.xml
@@ -9,7 +9,7 @@
 
     <item
         android:id="@+id/action_migration_guide"
-        android:title="@string/help"
+        android:title="@string/source_migration_guide"
         android:icon="@drawable/ic_help_24dp"
         app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file