Skip to content

Fix TV D-pad navigation in multi-select action mode toolbar #1550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ihx-rainbow wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −2
Open

Fix TV D-pad navigation in multi-select action mode toolbar #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
val activity = requireActivity() as AppCompatActivity
activity.setTitle(R.string.file_list_title)
activity.setSupportActionBar(binding.toolbar)
overlayActionMode = OverlayToolbarActionMode(binding.overlayToolbar)
overlayActionMode = OverlayToolbarActionMode(binding.overlayToolbar, binding.toolbar)
bottomActionMode = PersistentBarLayoutToolbarActionMode(
binding.persistentBarLayout, binding.bottomBarLayout, binding.bottomToolbar
)
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/java/me/zhanghai/android/files/ui/OverlayToolbarActionMode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@ import androidx.core.view.isVisible
import me.zhanghai.android.files.util.fadeInUnsafe
import me.zhanghai.android.files.util.fadeOutUnsafe

class OverlayToolbarActionMode(bar: ViewGroup, toolbar: Toolbar) : ToolbarActionMode(bar, toolbar) {
class OverlayToolbarActionMode(
bar: ViewGroup,
toolbar: Toolbar,
private val siblingView: ViewGroup? = null
) : ToolbarActionMode(bar, toolbar) {
constructor(toolbar: Toolbar) : this(toolbar, toolbar)

constructor(toolbar: Toolbar, siblingView: ViewGroup) : this(toolbar, toolbar, siblingView)

init {
bar.isVisible = false
}

override fun show(bar: ViewGroup, animate: Boolean) {
siblingView?.descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
if (animate) {
bar.fadeInUnsafe()
} else {
Expand All @@ -27,6 +34,7 @@ class OverlayToolbarActionMode(bar: ViewGroup, toolbar: Toolbar) : ToolbarAction
}

override fun hide(bar: ViewGroup, animate: Boolean) {
siblingView?.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS
if (animate) {
bar.fadeOutUnsafe()
} else {
Expand Down