!!!

Author: david-allison

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialog.kt

@@ -18,6 +18,7 @@ package com.ichi2.anki.dialogs
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import anki.collection.OpChanges
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.utils.InitStatus
@@ -26,10 +27,12 @@ import com.ichi2.anki.utils.ext.require
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.CardTemplates
 import com.ichi2.libanki.NoteId
+import com.ichi2.libanki.NoteTypeId
 import com.ichi2.libanki.NotetypeJson
 import com.ichi2.libanki.Notetypes
 import com.ichi2.libanki.undoableOp
 import com.ichi2.utils.HashUtil
+import com.ichi2.utils.NamedJSONComparator
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -67,12 +70,15 @@ class ChangeNoteTypeViewModel(
     ViewModelDelayedInitializer {
     /** IDs of notes to be modified */
     val noteIds: List<NoteId>
-        get() = stateHandle.require(ARG_NOTE_IDS)
+        get() = stateHandle.require<LongArray>(ARG_NOTE_IDS).toList()
 
     // unchanged after init { }
     /** The note type of the selected notes */
     // This should be lateinit
-    private var sourceNoteType: NotetypeJson = NotetypeJson("{}")
+    var sourceNoteType: NotetypeJson = NotetypeJson("{}")
+        private set
+
+    var availableNoteTypes: List<NotetypeJson> = listOf()
 
     // UI variables
     /** @see Tab */
@@ -82,17 +88,17 @@ class ChangeNoteTypeViewModel(
     private var noteTypeChangeFieldMap: MutableMap<FieldIndex, FieldIndex?>? = mutableMapOf()
     private var noteTypeChangeCardMap: MutableMap<CardTemplateIndex, CardTemplateIndex?>? = mutableMapOf()
 
-    override val viewModelScope: CoroutineScope
-        get() = this@ChangeNoteTypeViewModel.viewModelScope
+    override val scope: CoroutineScope
+        get() = viewModelScope
 
     // Flows
     /** Flow to track initialization status */
     override val initStatus: MutableStateFlow<InitStatus> = MutableStateFlow(InitStatus.PENDING)
 
     /** The note type selected by the user for conversion */
-    var destinationNoteType = MutableStateFlow<NotetypeJson>(sourceNoteType)
+    var selectedDestinationNoteType = MutableStateFlow<NotetypeJson>(sourceNoteType)
     val conversionType =
-        destinationNoteType
+        selectedDestinationNoteType
             .map { newNoteType ->
                 ConversionType.fromNoteTypes(current = sourceNoteType, new = newNoteType)
             }
@@ -107,17 +113,18 @@ class ChangeNoteTypeViewModel(
     init {
         delayedInit {
             sourceNoteType = withCol { getNote(noteIds.first()) }.notetype
-
-            destinationNoteType.emit(sourceNoteType)
+            availableNoteTypes = withCol { notetypes.all().sortedWith(NamedJSONComparator.INSTANCE) }
+            selectedDestinationNoteType.value = sourceNoteType
+            Timber.d("set selectedDestinationNoteType to ${selectedDestinationNoteType.value.name}")
             initializeMapsInternal(sourceNoteType, sourceNoteType)
         }
     }
 
     @NeedsTest("test changing note type")
     fun changeNoteTypeAsync() =
-        viewModelScope.async {
+        scope.async {
             val oldNotetype = sourceNoteType
-            val newNotetype = destinationNoteType.value
+            val newNotetype = selectedDestinationNoteType.value
 
             Timber.d("Changing note type from %s to %s", oldNotetype.name, newNotetype.name)
             Timber.d("Field map: %s", noteTypeChangeFieldMap)
@@ -172,7 +179,7 @@ class ChangeNoteTypeViewModel(
 
     suspend fun initializeMaps() {
         val oldNotetype = sourceNoteType
-        val newNotetype = destinationNoteType.value
+        val newNotetype = selectedDestinationNoteType.value
 
         val oldFieldMap = Notetypes.fieldMap(oldNotetype)
         val newFieldMap = Notetypes.fieldMap(newNotetype)
@@ -308,7 +315,7 @@ class ChangeNoteTypeViewModel(
             Timber.w("Attempted to update field mapping before initialization")
         }
         // Increment the counter to notify observers that field mapping has changed
-        viewModelScope.launch {
+        scope.launch {
             fieldMappingChanges.emit(Unit)
         }
     }
@@ -321,7 +328,7 @@ class ChangeNoteTypeViewModel(
             Timber.w("Attempted to update card mapping before initialization")
         }
         // Increment the counter to notify observers that card mapping has changed
-        viewModelScope.launch {
+        scope.launch {
             cardMappingChanges.emit(Unit)
         }
     }
@@ -382,12 +389,21 @@ class ChangeNoteTypeViewModel(
      */
     fun updateSelectedNoteType(noteType: NotetypeJson) {
         viewModelScope.launch {
-            destinationNoteType.emit(noteType)
+            Timber.i("updating selected note type to ${noteType.id}")
+            selectedDestinationNoteType.emit(noteType)
             // Initialize maps immediately after note type selection
             initializeMaps()
         }
     }
 
+    /**
+     * @throws IllegalStateException if [id] is not found
+     */
+    fun selectNoteTypeAtPosition(id: NoteTypeId) {
+        val notetype = availableNoteTypes.find { it.id == id } ?: error("$id not found")
+        updateSelectedNoteType(notetype)
+    }
+
     enum class Tab(
         val position: Int,
     ) {

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ChangeNoteTypeViewModel.kt

@@ -32,11 +32,11 @@ interface ViewModelDelayedInitializer {
     /** Flow to track initialization status */
     val initStatus: MutableStateFlow<InitStatus>
 
-    val viewModelScope: CoroutineScope
+    val scope: CoroutineScope
 
     // TODO: Docs
     fun delayedInit(block: suspend () -> Unit) {
-        viewModelScope.launch {
+        scope.launch {
             initStatus.value = InitStatus.IN_PROGRESS
             try {
                 block()

AnkiDroid/src/main/java/com/ichi2/anki/ui/ChangeNoteTypeSpinnerUtils.kt

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
+    android:id="@+id/change_note_type_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:visibility="gone"
     android:fadeScrollbars="false">
     <LinearLayout
         android:layout_width="match_parent"

AnkiDroid/src/main/java/com/ichi2/anki/ui/FieldSpinnerUtils.kt

@@ -270,8 +270,8 @@ also changes the interval of the card"
     <string name="tts_error_dialog_supported_voices_button_text">Voice options</string>
 
     <!--Change Note Type Dialog Fragment-->
-    <string name="regular_to_cloze">Card numbers remain unchanged</string>
-    <string name="cloze_to_regular">Extra cloze deletions will be removed</string>
+    <string name="card_numbers_unchanged">Card numbers remain unchanged</string>
+    <string name="extra_cloze_deletions_removed">Extra cloze deletions will be removed</string>
     <string name="different_note_types_selected">Please select notes from only one notetype.</string>
     <string name="change_note_type_complete">Note type changed for: %1$d notes</string>
 </resources>