Skip to content

fix: search view focus #15948

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: search view focus #15948

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
21 changes: 15 additions & 6 deletions app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import android.view.MenuItem
import android.view.View
import android.view.ViewTreeObserver.OnGlobalLayoutListener
import android.view.WindowManager.BadTokenException
import android.view.inputmethod.InputMethodManager
import androidx.activity.OnBackPressedCallback
import androidx.annotation.VisibleForTesting
import androidx.appcompat.widget.SearchView
Expand Down Expand Up @@ -888,9 +889,12 @@ class FileDisplayActivity :
val searchMenuItem = menu.findItem(R.id.action_search)
searchView = MenuItemCompat.getActionView(searchMenuItem) as SearchView?
searchMenuItem.isVisible = false
mSearchText.setOnClickListener { v: View? ->
mSearchText.setOnClickListener {
showSearchView()
searchView?.isIconified = false
searchView?.postDelayed({
searchView?.isIconified = false
searchView?.requestFocusFromTouch()
}, 100)
}

searchView?.let { viewThemeUtils.androidx.themeToolbarSearchView(it) }
Expand Down Expand Up @@ -961,7 +965,11 @@ class FileDisplayActivity :
) {
openDrawer()
} else {
onBackPressedDispatcher.onBackPressed()
if (isSearchOpen()) {
resetSearchAction()
} else {
onBackPressedDispatcher.onBackPressed()
}
}
} else if (itemId == R.id.action_select_all) {
val fragment = this.listOfFilesFragment
Expand Down Expand Up @@ -1239,17 +1247,18 @@ class FileDisplayActivity :
return
}

searchView?.setQuery("", true)
searchView?.onActionViewCollapsed()
searchView?.clearFocus()
val imm = getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager
imm?.hideSoftInputFromWindow(searchView?.windowToken, 0)
searchView?.setQuery("", false)
searchView?.onActionViewCollapsed()

if (isRoot(getCurrentDir()) && leftFragment is OCFileListFragment) {
// Remove the list to the original state
leftFragment.adapter?.let { adapter ->
val listOfHiddenFiles = adapter.listOfHiddenFiles
leftFragment.performSearch("", listOfHiddenFiles, true)
}

hideSearchView(getCurrentDir())
setDrawerIndicatorEnabled(isDrawerIndicatorAvailable)
}
Expand Down
Loading