Skip to content

Commit c183726

Browse files
committed
Update UnifiedSearchFragment.kt.
Commit id: 4fb3fb3 from branch bug/NMC-1652.
1 parent 43f4b1a commit c183726

3 files changed

Lines changed: 28 additions & 0 deletions

File tree

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.nmc.android.utils;
2+
3+
import android.app.Activity;
4+
import android.content.Context;
5+
import android.view.View;
6+
import android.view.inputmethod.InputMethodManager;
7+
8+
public class KeyboardUtils {
9+
10+
public static void showSoftKeyboard(Context context, View view) {
11+
view.requestFocus();
12+
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
13+
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
14+
}
15+
16+
public static void hideKeyboardFrom(Context context, View view) {
17+
view.clearFocus();
18+
InputMethodManager imm = (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
19+
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
20+
}
21+
}

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
import com.owncloud.android.utils.MimeTypeUtil;
136136
import com.owncloud.android.utils.PermissionUtil;
137137
import com.owncloud.android.utils.PushUtils;
138+
import com.nmc.android.utils.KeyboardUtils;
138139
import com.owncloud.android.utils.StringUtils;
139140
import com.owncloud.android.utils.theme.CapabilityUtils;
140141

@@ -1037,6 +1038,8 @@ private void popBack() {
10371038
// pop back fragment
10381039
binding.fabMain.setImageResource(R.drawable.ic_plus);
10391040
resetScrolling(true);
1041+
// hide the keyboard on back press if showing
1042+
KeyboardUtils.hideKeyboardFrom(this, binding.getRoot());
10401043
popSortListGroupVisibility();
10411044
super.onBackPressed();
10421045
}

app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import com.nextcloud.client.account.CurrentAccountProvider
3939
import com.nextcloud.client.core.AsyncRunner
4040
import com.nextcloud.client.di.Injectable
4141
import com.nextcloud.client.di.ViewModelFactory
42+
import com.nmc.android.utils.KeyboardUtils
4243
import com.nextcloud.client.network.ClientFactory
4344
import com.owncloud.android.R
4445
import com.owncloud.android.databinding.ListFragmentBinding
@@ -221,6 +222,8 @@ class UnifiedSearchFragment :
221222
private fun showFile(file: OCFile, showFileActions: Boolean) {
222223
activity.let {
223224
if (activity is FileDisplayActivity) {
225+
// NMC: hide keyboard when user taps on any file to view
226+
KeyboardUtils.hideKeyboardFrom(requireContext(), binding.root)
224227
val fda = activity as FileDisplayActivity
225228
fda.file = file
226229

@@ -280,6 +283,7 @@ class UnifiedSearchFragment :
280283
}
281284

282285
override fun onQueryTextSubmit(query: String): Boolean {
286+
KeyboardUtils.hideKeyboardFrom(requireContext(), binding.root)
283287
vm.setQuery(query)
284288
vm.initialQuery()
285289
return true

0 commit comments

Comments
 (0)