Retain field content when changing note type

Author: Aryan171

AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt

@@ -1325,6 +1325,8 @@ class NoteEditorFragment :
 
         // treat add new note and edit existing note independently
         if (addNote) {
+            // truncate the fields to the actual size the notetype supports
+            editorNote!!.fields = editorNote!!.fields.take(editorNote!!.notetype.fields.length()).toMutableList()
             // load all of the fields into the note
             for (f in editFields!!) {
                 updateField(f)
@@ -2492,7 +2494,17 @@ class NoteEditorFragment :
             if (note == null || addNote) {
                 getColUnsafe.run {
                     val notetype = notetypes.current()
-                    Note.fromNotetypeId(this@run, notetype.id)
+                    val newNote = Note.fromNotetypeId(this@run, notetype.id)
+                    editorNote?.let {
+                        if (editorNote!!.fields.size > newNote.fields.size) {
+                            newNote.fields = editorNote!!.fields.toMutableList()
+                        } else {
+                            editorNote!!.fields.forEachIndexed { i, field ->
+                                newNote.fields[i] = field
+                            }
+                        }
+                    }
+                    newNote
                 }
             } else {
                 note
@@ -2891,7 +2903,9 @@ class NoteEditorFragment :
         if (!getColUnsafe.config.getBool(ConfigKey.Bool.ADDING_DEFAULTS_TO_CURRENT_DECK)) {
             deckId = getColUnsafe.defaultsForAdding().deckId
         }
-
+        for (f in editFields!!) {
+            updateField(f)
+        }
         refreshNoteData(FieldChangeType.changeFieldCount(shouldReplaceNewlines()))
         setDuplicateFieldStyles()
     }