Merge pull request #1689 from nextcloud/fix/1660/squished-dialogs

fix: Squished dialogs when opening keyboard programmatically
nextcloud · Mar 2, 2023 · 83c91cc · 83c91cc
2 parents 42d7331 + d6e4980
commit 83c91cc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryDialogFragment.java
@@ -25,6 +25,7 @@
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.DialogChangeCategoryBinding;
 import it.niedermann.owncloud.notes.main.navigation.NavigationItem;
+import it.niedermann.owncloud.notes.shared.util.KeyboardUtils;
 
 /**
  * This {@link DialogFragment} allows for the selection of a category.
@@ -170,12 +171,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (editCategory.getText() == null || editCategory.getText().length() == 0) {
-            editCategory.requestFocus();
-            if (getDialog() != null && getDialog().getWindow() != null) {
-                getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-            } else {
-                Log.w(TAG, "can not set SOFT_INPUT_STATE_ALWAYAS_VISIBLE because getWindow() == null");
-            }
+            KeyboardUtils.showKeyboardForEditText(editCategory);
         }
     }
 

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/title/EditTitleDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/title/EditTitleDialogFragment.java
@@ -18,6 +18,7 @@
 import it.niedermann.owncloud.notes.branding.BrandedDialogFragment;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.DialogEditTitleBinding;
+import it.niedermann.owncloud.notes.shared.util.KeyboardUtils;
 
 public class EditTitleDialogFragment extends BrandedDialogFragment {
 
@@ -68,13 +69,7 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        binding.title.requestFocus();
-        final var window = requireDialog().getWindow();
-        if (window != null) {
-            window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        } else {
-            Log.w(TAG, "can not enable soft keyboard because " + Window.class.getSimpleName() + " is null.");
-        }
+        KeyboardUtils.showKeyboardForEditText(binding.title);
     }
 
     public static DialogFragment newInstance(String title) {

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/KeyboardUtils.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/KeyboardUtils.kt
@@ -0,0 +1,23 @@
+package it.niedermann.owncloud.notes.shared.util
+
+import android.content.Context
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+
+object KeyboardUtils {
+    private const val SHOW_INPUT_DELAY_MILLIS = 100L
+
+    @JvmStatic
+    fun showKeyboardForEditText(editText: EditText) {
+        editText.requestFocus()
+        // needs 100ms delay to account for focus animations
+        editText.postDelayed({
+            val context = editText.context
+            if (context != null) {
+                val inputMethodManager =
+                    context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+                inputMethodManager.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT)
+            }
+        }, SHOW_INPUT_DELAY_MILLIS)
+    }
+}