fixed keyboard navigation and deletion for list entries

joric · joric · commit 5d6c85e7fd6b · 2026-04-09T01:08:29.000+05:00
diff --git a/app/src/main/java/com/teleteh/xplayer2/MainActivity.kt b/app/src/main/java/com/teleteh/xplayer2/MainActivity.kt
@@ -24,7 +24,6 @@ import android.view.KeyEvent
 import android.widget.Button
 import android.widget.EditText
 import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 
@@ -50,6 +49,16 @@ class MainActivity : AppCompatActivity() {
         return false
     }
 
+    private fun findRecyclerItemView(focused: View, recyclerView: RecyclerView): View? {
+        var current: View? = focused
+        while (current != null) {
+            val parent = current.parent
+            if (parent === recyclerView) return current
+            current = if (parent is View) parent else null
+        }
+        return null
+    }
+
     private fun shouldReturnToTabsOnUp(fragmentView: View): Boolean {
         val focused = currentFocus ?: return false
 
@@ -65,9 +74,11 @@ class MainActivity : AppCompatActivity() {
         val recyclerView: RecyclerView? = fragmentView.findViewById<RecyclerView?>(R.id.rvRecent)
             ?: fragmentView.findViewById<RecyclerView?>(R.id.rvNetwork)
         if (recyclerView != null && isDescendantOf(focused, recyclerView)) {
-            val lm = recyclerView.layoutManager as? LinearLayoutManager
-            val atTop = lm?.findFirstVisibleItemPosition()?.let { it <= 0 } == true
-            if (atTop) return true
+            val focusedItemView = findRecyclerItemView(focused, recyclerView)
+            if (focusedItemView == null) return true
+
+            val focusedPosition = recyclerView.getChildAdapterPosition(focusedItemView)
+            if (focusedPosition == 0) return true
         }
 
         return false
diff --git a/app/src/main/java/com/teleteh/xplayer2/ui/network/NetworkAdapter.kt b/app/src/main/java/com/teleteh/xplayer2/ui/network/NetworkAdapter.kt
@@ -1,6 +1,7 @@
 package com.teleteh.xplayer2.ui.network
 
 import android.net.Uri
+import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
@@ -15,7 +16,8 @@ import com.teleteh.xplayer2.R
 import com.teleteh.xplayer2.data.network.NetworkItem
 
 class NetworkAdapter(
-    private val onClick: (NetworkItem) -> Unit
+    private val onClick: (NetworkItem) -> Unit,
+    private val onDelete: (NetworkItem.SmbShare) -> Unit = {}
 ) : ListAdapter<NetworkItem, NetworkAdapter.VH>(DIFF) {
 
     companion object {
@@ -42,25 +44,32 @@ class NetworkAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
         val v = LayoutInflater.from(parent.context).inflate(R.layout.item_network, parent, false)
-        return VH(v, onClick)
+        return VH(v, onClick, onDelete)
     }
 
     override fun onBindViewHolder(holder: VH, position: Int) {
         holder.bind(getItem(position))
     }
 
-    class VH(itemView: View, private val onClick: (NetworkItem) -> Unit) :
+    class VH(
+        itemView: View,
+        private val onClick: (NetworkItem) -> Unit,
+        private val onDelete: (NetworkItem.SmbShare) -> Unit
+    ) :
         RecyclerView.ViewHolder(itemView) {
         private val title: TextView = itemView.findViewById(R.id.tvTitle)
         private val sub: TextView = itemView.findViewById(R.id.tvSubtitle)
         private val iconBg: ImageView = itemView.findViewById(R.id.ivIconBg)
         private val icon: ImageView = itemView.findViewById(R.id.ivIcon)
+        private val deleteButton: View = itemView.findViewById(R.id.btnDelete)
         private var current: NetworkItem? = null
 
         init {
+            itemView.isFocusable = true
+            itemView.isFocusableInTouchMode = true
             itemView.isLongClickable = false
             itemView.setOnClickListener { current?.let(onClick) }
-            
+
             // Single-tap activation without double-click requirement
             itemView.setOnTouchListener { v, event ->
                 if (event.action == MotionEvent.ACTION_UP) {
@@ -71,6 +80,40 @@ class NetworkAdapter(
                     false
                 }
             }
+
+            itemView.setOnKeyListener { _, keyCode, event ->
+                if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
+                    if (deleteButton.visibility == View.VISIBLE) {
+                        deleteButton.requestFocus()
+                        return@setOnKeyListener true
+                    }
+                }
+                false
+            }
+
+            deleteButton.isFocusable = true
+            deleteButton.isFocusableInTouchMode = true
+            deleteButton.setOnClickListener {
+                (current as? NetworkItem.SmbShare)?.let(onDelete)
+            }
+            deleteButton.setOnKeyListener { _, keyCode, event ->
+                if (event.action != KeyEvent.ACTION_DOWN) return@setOnKeyListener false
+                when (keyCode) {
+                    KeyEvent.KEYCODE_DPAD_LEFT -> {
+                        itemView.requestFocus()
+                        true
+                    }
+
+                    KeyEvent.KEYCODE_DPAD_CENTER,
+                    KeyEvent.KEYCODE_ENTER,
+                    KeyEvent.KEYCODE_NUMPAD_ENTER -> {
+                        deleteButton.performClick()
+                        true
+                    }
+
+                    else -> false
+                }
+            }
         }
 
         fun bind(item: NetworkItem) {
@@ -81,12 +124,14 @@ class NetworkAdapter(
                     sub.text = formatSmbSubtitle(item.uri)
                     iconBg.setImageResource(R.drawable.bg_circle_smb)
                     icon.setImageResource(R.drawable.ic_smb_24)
+                    deleteButton.visibility = View.VISIBLE
                 }
 
                 is NetworkItem.DlnaDevice -> {
                     title.text = item.friendlyName.ifBlank { "DLNA Device" }
                     sub.text = formatHttpSubtitle(item.location)
                     iconBg.setImageResource(R.drawable.bg_circle_dlna)
+                    deleteButton.visibility = View.GONE
                     val iurl = item.iconUrl
                     if (!iurl.isNullOrBlank()) {
                         icon.load(iurl) {
@@ -104,19 +149,22 @@ class NetworkAdapter(
                     sub.text = "Вверх"
                     iconBg.setImageResource(R.drawable.bg_circle_dlna)
                     icon.setImageResource(R.drawable.ic_folder_24)
+                    deleteButton.visibility = View.GONE
                 }
 
                 is NetworkItem.DlnaContainer -> {
                     title.text = item.title
                     sub.text = "Папка"
                     iconBg.setImageResource(R.drawable.bg_circle_dlna)
                     icon.setImageResource(R.drawable.ic_folder_24)
+                    deleteButton.visibility = View.GONE
                 }
 
                 is NetworkItem.DlnaMedia -> {
                     title.text = item.title
                     sub.text = item.mime ?: item.url
                     iconBg.setImageResource(R.drawable.bg_circle_dlna)
+                    deleteButton.visibility = View.GONE
                     val mime = item.mime ?: ""
                     icon.setImageResource(
                         if (mime.startsWith("audio")) R.drawable.ic_audio_24 else R.drawable.ic_video_24
diff --git a/app/src/main/java/com/teleteh/xplayer2/ui/network/NetworkFragment.kt b/app/src/main/java/com/teleteh/xplayer2/ui/network/NetworkFragment.kt
@@ -53,7 +53,13 @@ class NetworkFragment : Fragment(R.layout.fragment_network) {
         rv = view.findViewById(R.id.rvNetwork)
         val fab: FloatingActionButton = view.findViewById(R.id.fabAddShare)
 
-        adapter = NetworkAdapter(onClick = { item -> onItemClick(item) })
+        adapter = NetworkAdapter(
+            onClick = { item -> onItemClick(item) },
+            onDelete = { share ->
+                smbStorage.remove(share.name)
+                reloadShares()
+            }
+        )
         rv.layoutManager = LinearLayoutManager(requireContext())
         rv.adapter = adapter
 
diff --git a/app/src/main/res/layout/item_network.xml b/app/src/main/res/layout/item_network.xml
@@ -63,4 +63,18 @@
             android:text="Subtitle" />
     </LinearLayout>
 
+    <ImageButton
+        android:id="@+id/btnDelete"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="8dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/delete"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:clickable="true"
+        android:nextFocusLeft="@id/tvTitle"
+        android:src="@android:drawable/ic_menu_delete"
+        android:visibility="gone" />
+
 </LinearLayout>
