fixed tabs focus issues

truefedex · Jan 22, 2022 · 86d2250 · 86d2250
1 parent fb15940
commit 86d2250
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/app/src/main/java/com/phlox/tvwebbrowser/activity/main/view/tabs/TabsAdapter.kt b/app/src/main/java/com/phlox/tvwebbrowser/activity/main/view/tabs/TabsAdapter.kt
@@ -7,21 +7,22 @@ import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.phlox.tvwebbrowser.R
 import com.phlox.tvwebbrowser.activity.main.TabsModel
 import com.phlox.tvwebbrowser.activity.main.view.tabs.TabsAdapter.TabViewHolder
 import com.phlox.tvwebbrowser.databinding.ViewHorizontalWebtabItemBinding
 import com.phlox.tvwebbrowser.model.WebTabState
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.DiffUtil.DiffResult
+import com.phlox.tvwebbrowser.widgets.CheckableContainer
 
 
 class TabsAdapter(private val tabsModel: TabsModel, private val tabsView: TabsView) : RecyclerView.Adapter<TabViewHolder>() {
   private val tabsCopy = ArrayList<WebTabState>().apply { addAll(tabsModel.tabsStates) }
   var current: Int = 0
   var listener: Listener? = null
   val uiHandler = Handler(Looper.getMainLooper())
+  var checkedView: CheckableContainer? = null
 
   interface Listener {
     fun onTitleChanged(index: Int)
@@ -71,20 +72,22 @@ class TabsAdapter(private val tabsModel: TabsModel, private val tabsView: TabsVi
       } else
         vb.ivFavicon.setImageResource(R.drawable.ic_launcher)
 
-      vb.root.isChecked = position == current
+      if (current == tabState.position) {
+        checkedView?.isChecked = false
+        vb.root.isChecked = true
+        checkedView = vb.root
+      }
 
       vb.root.tag = tabState
 
       vb.root.setOnFocusChangeListener { v, hasFocus ->
         if (hasFocus) {
           if (current != tabState.position) {
-            val oldCurrent = current
             current = tabState.position
             listener?.onTitleChanged(position)
-            uiHandler.post {
-              notifyItemChanged(oldCurrent)
-              notifyItemChanged(current)
-            }
+            checkedView?.isChecked = false
+            vb.root.isChecked = true
+            checkedView = vb.root
           }
         }
       }

diff --git a/app/src/main/res/color/webtab_horizontal_text_selector.xml b/app/src/main/res/color/webtab_horizontal_text_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:color="@color/web_tab_selected_text_color" />
+    <item android:state_checked="true" android:color="@color/web_tab_selected_text_color" />
     <item android:color="@color/web_tab_text_color" />
 </selector>