From bee6af56caeb845de8fdd4884ebf51b2242d8af6 Mon Sep 17 00:00:00 2001
From: kitsunyan <kitsunyan@airmail.cc>
Date: Sat, 1 Aug 2020 05:53:41 +0300
Subject: [PATCH] Fix some bugs

---
 .../nya/kitsunyan/foxydroid/screen/ProductAdapter.kt       | 2 +-
 .../kotlin/nya/kitsunyan/foxydroid/screen/TabsFragment.kt  | 7 ++++---
 src/main/res/layout/preference_item.xml                    | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/nya/kitsunyan/foxydroid/screen/ProductAdapter.kt b/src/main/kotlin/nya/kitsunyan/foxydroid/screen/ProductAdapter.kt
index 7717ed8..42beb87 100644
--- a/src/main/kotlin/nya/kitsunyan/foxydroid/screen/ProductAdapter.kt
+++ b/src/main/kotlin/nya/kitsunyan/foxydroid/screen/ProductAdapter.kt
@@ -774,7 +774,7 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int)
     val releaseItems = compatibleReleasePairs.asSequence()
       .map { (release, repository) -> Item.ReleaseItem(repository, release,
         repository.id == productRepository?.second?.id,
-        signaturesForVersionCode.getValue(release.versionCode).size >= 2) }
+        signaturesForVersionCode[release.versionCode].orEmpty().size >= 2) }
       .sortedByDescending { it.release.versionCode }
       .toList()
     if (releaseItems.isNotEmpty()) {
diff --git a/src/main/kotlin/nya/kitsunyan/foxydroid/screen/TabsFragment.kt b/src/main/kotlin/nya/kitsunyan/foxydroid/screen/TabsFragment.kt
index 467d488..61a2b6a 100644
--- a/src/main/kotlin/nya/kitsunyan/foxydroid/screen/TabsFragment.kt
+++ b/src/main/kotlin/nya/kitsunyan/foxydroid/screen/TabsFragment.kt
@@ -42,8 +42,8 @@ import nya.kitsunyan.foxydroid.utility.Utils
 import nya.kitsunyan.foxydroid.utility.extension.android.*
 import nya.kitsunyan.foxydroid.utility.extension.resources.*
 import nya.kitsunyan.foxydroid.widget.DividerItemDecoration
-import nya.kitsunyan.foxydroid.widget.EnumRecyclerAdapter
 import nya.kitsunyan.foxydroid.widget.FocusSearchView
+import nya.kitsunyan.foxydroid.widget.StableRecyclerAdapter
 import kotlin.math.*
 
 class TabsFragment: ScreenFragment() {
@@ -323,7 +323,7 @@ class TabsFragment: ScreenFragment() {
   override fun onSaveInstanceState(outState: Bundle) {
     super.onSaveInstanceState(outState)
 
-    outState.putBoolean(STATE_SEARCH_FOCUSED, searchMenuItem?.actionView!!.hasFocus())
+    outState.putBoolean(STATE_SEARCH_FOCUSED, searchMenuItem?.actionView?.hasFocus() == true)
     outState.putString(STATE_SEARCH_QUERY, searchQuery)
     outState.putByte(STATE_SHOW_SECTIONS, if (showSections) 1 else 0)
     outState.putParcelableArrayList(STATE_SECTIONS, ArrayList(sections))
@@ -544,7 +544,7 @@ class TabsFragment: ScreenFragment() {
   }
 
   private class SectionsAdapter(private val sections: () -> List<ProductItem.Section>,
-    private val onClick: (ProductItem.Section) -> Unit): EnumRecyclerAdapter<SectionsAdapter.ViewType,
+    private val onClick: (ProductItem.Section) -> Unit): StableRecyclerAdapter<SectionsAdapter.ViewType,
     RecyclerView.ViewHolder>() {
     enum class ViewType { SECTION }
 
@@ -582,6 +582,7 @@ class TabsFragment: ScreenFragment() {
       get() = ViewType::class.java
 
     override fun getItemCount(): Int = sections().size
+    override fun getItemDescriptor(position: Int): String = sections()[position].toString()
     override fun getItemEnumViewType(position: Int): ViewType = ViewType.SECTION
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: ViewType): RecyclerView.ViewHolder {
diff --git a/src/main/res/layout/preference_item.xml b/src/main/res/layout/preference_item.xml
index d4d6cbb..09dfa75 100644
--- a/src/main/res/layout/preference_item.xml
+++ b/src/main/res/layout/preference_item.xml
@@ -37,6 +37,7 @@
     android:layout_marginStart="-16dp"
     android:paddingStart="12dp"
     android:paddingEnd="12dp"
+    android:clickable="false"
     android:visibility="gone" />
 
 </LinearLayout>