Add refocusing after reloading

CrazyBoyFeng · Aug 19, 2021 · eb8ddff · eb8ddff
1 parent 35947f0
commit eb8ddff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/app/src/main/kotlin/com/github/crazyboyfeng/justTvLauncher/browse/BrowseFragment.kt b/app/src/main/kotlin/com/github/crazyboyfeng/justTvLauncher/browse/BrowseFragment.kt
@@ -9,6 +9,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import androidx.leanback.app.BrowseSupportFragment
+import androidx.leanback.widget.ListRowPresenter
 import androidx.lifecycle.ViewModelProvider
 import com.github.crazyboyfeng.justTvLauncher.model.Shortcut
 import java.text.DateFormat
@@ -39,6 +40,7 @@ class BrowseFragment : BrowseSupportFragment() {
                 is Shortcut -> {
                     launch(item.id)
                     viewModel.incrementOpenCount(item)
+                    select(item)
                 }
             }
         }
@@ -56,6 +58,14 @@ class BrowseFragment : BrowseSupportFragment() {
         startActivity(intent)
     }
 
+
+    private fun select(shortcut: Shortcut) = handler.post {
+        val position = viewModel.findPosition(shortcut)
+        val task = ListRowPresenter.SelectItemViewHolderTask(position.second)
+        task.isSmoothScroll = false
+        rowsSupportFragment.setSelectedPosition(position.first, false, task)
+    }
+
     override fun onResume() {
         super.onResume()
         startTick()

diff --git a/app/src/main/kotlin/com/github/crazyboyfeng/justTvLauncher/browse/BrowseViewModel.kt b/app/src/main/kotlin/com/github/crazyboyfeng/justTvLauncher/browse/BrowseViewModel.kt
@@ -46,6 +46,14 @@ class BrowseViewModel(application: Application) : AndroidViewModel(application)
         loadShortcutGroupList()
     }
 
+    fun findPosition(shortcut: Shortcut): Pair<Int, Int> {
+        val shortcutGroupList = browseContent.value!!
+        val x = shortcutGroupList.indexOfFirst { it.category == shortcut.category }
+        val y = shortcutGroupList[x].shortcutList.indexOf(shortcut)
+        Log.v(TAG, "${shortcut.id}: ($x, $y)")
+        return Pair(x, y)
+    }
+
     fun removePackage(packageName: String) {
         shortcutRepository.deleteById(packageName)
         loadShortcutGroupList()