Skip to content

Commit fb58917

Browse files
criticalAYBrayanDSO
authored andcommitted
fix: instant note editor tap mode inconsistency
1 parent 7f20a0e commit fb58917

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ class InstantNoteEditorActivity :
8484

8585
private var dialogView: View? = null
8686

87-
private var editMode = EditMode.ADVANCED
87+
private val editMode: EditMode
88+
get() = viewModel.editorMode.value
8889

8990
private lateinit var editModeButton: MaterialButton
9091

@@ -217,6 +218,8 @@ class InstantNoteEditorActivity :
217218
editFieldsLayout?.addView(editField)
218219
}
219220

221+
setLayoutVisibility()
222+
220223
instantAlertDialog =
221224
AlertDialog.Builder(this).show {
222225
setView(dialogView)
@@ -304,10 +307,9 @@ class InstantNoteEditorActivity :
304307
editModeButton.setOnClickListener {
305308
viewModel.setClozeFieldText(textBox.text.toString())
306309
when (editMode) {
307-
EditMode.SINGLE_TAP -> {
310+
EditMode.ADVANCED -> {
308311
hideKeyboard()
309312
textBox.setText(clozeFieldText)
310-
editMode = EditMode.ADVANCED
311313
viewModel.setEditorMode(EditMode.SINGLE_TAP)
312314
editModeButton.setIconResource(R.drawable.ic_mode_edit_white)
313315

@@ -318,10 +320,9 @@ class InstantNoteEditorActivity :
318320
viewModel.setClozeFieldText(textBox.text.toString())
319321
}
320322

321-
EditMode.ADVANCED -> {
322-
viewModel.setEditorMode(EditMode.ADVANCED)
323+
EditMode.SINGLE_TAP -> {
323324
editModeButton.setIconResource(R.drawable.ic_touch)
324-
editMode = EditMode.SINGLE_TAP
325+
viewModel.setEditorMode(EditMode.ADVANCED)
325326

326327
singleTapLayout.visibility = View.GONE
327328
editFieldsLayout?.visibility = View.VISIBLE
@@ -330,6 +331,19 @@ class InstantNoteEditorActivity :
330331
}
331332
}
332333

334+
private fun setLayoutVisibility() {
335+
when (editMode) {
336+
EditMode.SINGLE_TAP -> {
337+
singleTapLayout.visibility = View.VISIBLE
338+
editFieldsLayout?.visibility = View.GONE
339+
}
340+
EditMode.ADVANCED -> {
341+
singleTapLayout.visibility = View.GONE
342+
editFieldsLayout?.visibility = View.VISIBLE
343+
}
344+
}
345+
}
346+
333347
private fun hideKeyboard() {
334348
val inputMethodManager =
335349
this.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager

0 commit comments

Comments
 (0)