Merge pull request #500 from PhilKes/fix/next-action-edittext

Fix next action on ListItem EditText

app/src/main/java/com/philkes/notallyx/presentation/view/misc/EditTextWithWatcher.kt

@@ -33,17 +33,15 @@ open class EditTextWithWatcher(context: Context, attrs: AttributeSet) :
     }
 
     fun setCanEdit(value: Boolean) {
-        post {
+        if (!value) {
-            if (!value) {
+            clearFocus()
-                clearFocus()
-            }
-            keyListener?.let { keyListenerInstance = it }
-            keyListener = if (value) keyListenerInstance else null // Disables text editing
-            isCursorVisible = true
-            isFocusable = value
-            isFocusableInTouchMode = value
-            setTextIsSelectable(true)
         }
+        keyListener?.let { keyListenerInstance = it }
+        keyListener = if (value) keyListenerInstance else null // Disables text editing
+        isCursorVisible = true
+        isFocusable = value
+        isFocusableInTouchMode = value
+        setTextIsSelectable(true)
     }
 
     @Deprecated(

app/src/main/java/com/philkes/notallyx/presentation/view/note/listitem/adapter/ListItemVH.kt

@@ -50,11 +50,6 @@ class ListItemVH(
         binding.EditText.apply {
             setTextSize(TypedValue.COMPLEX_UNIT_SP, body)
 
-            setOnNextAction {
-                val position = bindingAdapterPosition + 1
-                listManager.add(position)
-            }
-
             textWatcher =
                 createListTextWatcherWithHistory(
                     listManager,
@@ -157,24 +152,6 @@ class ListItemVH(
                     paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
                 }
             alpha = if (item.checked) 0.5f else 1.0f
-            setOnKeyListener { _, keyCode, event ->
-                if (
-                    event.action == KeyEvent.ACTION_DOWN &&
-                        keyCode == KeyEvent.KEYCODE_DEL &&
-                        item.body.isEmpty()
-                ) {
-                    // TODO: when there are multiple checked items above it does not jump to the
-                    // last
-                    // unchecked item but always re-adds a new item
-                    listManager.delete(
-                        absoluteAdapterPosition,
-                        inCheckedList = inCheckedList,
-                        force = false,
-                    )
-                } else {
-                    false
-                }
-            }
             contentDescription = "EditText$position"
             if (viewMode == NoteViewMode.EDIT) {
                 setOnFocusChangeListener { _, hasFocus ->
@@ -207,6 +184,25 @@ class ListItemVH(
                     }
                 }
             }
+            setOnNextAction { listManager.add(bindingAdapterPosition + 1) }
+            setOnKeyListener { _, keyCode, event ->
+                if (
+                    event.action == KeyEvent.ACTION_DOWN &&
+                        keyCode == KeyEvent.KEYCODE_DEL &&
+                        item.body.isEmpty()
+                ) {
+                    // TODO: when there are multiple checked items above it does not jump to the
+                    // last
+                    // unchecked item but always re-adds a new item
+                    listManager.delete(
+                        absoluteAdapterPosition,
+                        inCheckedList = inCheckedList,
+                        force = false,
+                    )
+                } else {
+                    false
+                }
+            }
         }
     }