Refactor deck selection code in NoteEditorFragment

Uses a simple TextView(and a dropdown drawable at its end) to display
the selected deck instead of the more verbose current Spinner/
DeckSpinnerSelection code.

Author: lukstbit

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

@@ -17,12 +17,7 @@ package com.ichi2.anki
 
 import android.view.MotionEvent
 import android.view.View
-import android.view.ViewGroup
-import android.widget.ArrayAdapter
 import android.widget.Spinner
-import android.widget.TextView
-import androidx.annotation.LayoutRes
-import androidx.annotation.MainThread
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.ichi2.anki.CollectionManager.withCol
@@ -73,40 +68,6 @@ class DeckSpinnerSelection(
     // but this class also handles initializeNoteEditorDeckSpinner, so this can't happen yet
     private var dropDownDecks: MutableList<DeckNameId>? = null
 
-    @MainThread // spinner.adapter
-    fun initializeNoteEditorDeckSpinner(
-        col: Collection,
-        @LayoutRes layoutResource: Int = R.layout.multiline_spinner_item,
-    ) {
-        computeDropDownDecks(col, includeFiltered = false).toMutableList().let {
-            dropDownDecks = it
-            val deckNames = it.map { it.name }
-            val noteDeckAdapter: ArrayAdapter<String?> =
-                object :
-                    ArrayAdapter<String?>(context, layoutResource, deckNames as List<String?>) {
-                    override fun getDropDownView(
-                        position: Int,
-                        convertView: View?,
-                        parent: ViewGroup,
-                    ): View {
-                        // Cast the drop down items (popup items) as text view
-                        val tv = super.getDropDownView(position, convertView, parent) as TextView
-
-                        // If this item is selected
-                        if (position == spinner.selectedItemPosition) {
-                            tv.setBackgroundColor(context.getColor(R.color.note_editor_selected_item_background))
-                            tv.setTextColor(context.getColor(R.color.note_editor_selected_item_text))
-                        }
-
-                        // Return the modified view
-                        return tv
-                    }
-                }
-            spinner.adapter = noteDeckAdapter
-            setSpinnerListener()
-        }
-    }
-
     /** @return All decks. */
     private fun computeDropDownDecks(
         col: Collection,

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

@@ -58,7 +58,6 @@ import androidx.annotation.CheckResult
 import androidx.annotation.DrawableRes
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatButton
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.FileProvider
@@ -239,7 +238,6 @@ class NoteEditorFragment :
 
     @VisibleForTesting
     internal var noteTypeSpinner: Spinner? = null
-    private var deckSpinnerSelection: DeckSpinnerSelection? = null
     private var imageOcclusionButtonsContainer: LinearLayout? = null
     private var selectImageForOcclusionButton: Button? = null
     private var editOcclusionsButton: Button? = null
@@ -433,11 +431,7 @@ class NoteEditorFragment :
         }
         require(deck is SelectableDeck.Deck)
         deckId = deck.deckId
-        // this is called because DeckSpinnerSelection.onDeckAdded doesn't update the list
-        deckSpinnerSelection!!.initializeNoteEditorDeckSpinner(getColUnsafe)
-        launchCatchingTask {
-            deckSpinnerSelection!!.selectDeckById(deckId, false)
-        }
+        view?.findViewById<TextView>(R.id.note_deck_name)?.text = deck.name
     }
 
     private enum class AddClozeType {
@@ -825,17 +819,14 @@ class NoteEditorFragment :
         if (!addNote && editorNote!!.notetype.templates.length() > 1) {
             deckTextView.setText(R.string.CardEditorCardDeck)
         }
-        deckSpinnerSelection =
-            DeckSpinnerSelection(
-                requireContext() as AppCompatActivity,
-                requireView().findViewById(R.id.note_deck_spinner),
-                showAllDecks = false,
-                alwaysShowDefault = true,
-                showFilteredDecks = false,
-                fragmentManagerSupplier = { childFragmentManager },
-            )
-        deckSpinnerSelection!!.initializeNoteEditorDeckSpinner(col)
+
         deckId = requireArguments().getLong(EXTRA_DID, deckId)
+        view?.findViewById<TextView>(R.id.note_deck_name)?.apply {
+            text = col.decks.name(deckId)
+            setOnClickListener {
+                startDeckSelection(all = false, filtered = false)
+            }
+        }
         val getTextFromSearchView = requireArguments().getString(EXTRA_TEXT_FROM_SEARCH_VIEW)
         setDid(editorNote)
         setNote(editorNote, FieldChangeType.onActivityCreation(shouldReplaceNewlines()))
@@ -1055,7 +1046,7 @@ class NoteEditorFragment :
                 }
             KeyEvent.KEYCODE_D -> // null check in case Spinner is moved into options menu in the future
                 if (event.isCtrlPressed) {
-                    launchCatchingTask { deckSpinnerSelection!!.displayDeckSelectionDialog() }
+                    launchCatchingTask { startDeckSelection(all = false, filtered = false) }
                     return true
                 }
             KeyEvent.KEYCODE_L ->
@@ -1847,7 +1838,7 @@ class NoteEditorFragment :
             )
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                 if (i == 0) {
-                    requireView().findViewById<View>(R.id.note_deck_spinner).nextFocusForwardId = newEditText.id
+                    requireView().findViewById<View>(R.id.note_deck_name).nextFocusForwardId = newEditText.id
                 }
                 if (previous != null) {
                     previous.lastViewInTabOrder.nextFocusForwardId = newEditText.id
@@ -2379,7 +2370,10 @@ class NoteEditorFragment :
         }
 
         deckId = calculateDeckId()
-        launchCatchingTask { deckSpinnerSelection!!.selectDeckById(deckId, false) }
+        launchCatchingTask {
+            val selectedDeckName = withCol { decks.name(deckId) }
+            view?.findViewById<TextView>(R.id.note_deck_name)?.text = selectedDeckName
+        }
     }
 
     /** Refreshes the UI using the currently selected note type as a template  */
@@ -2393,7 +2387,7 @@ class NoteEditorFragment :
         changeType: FieldChangeType,
     ) {
         requireView().findViewById<TextView>(R.id.CardEditorDeckText).isVisible = !currentNotetypeIsImageOcclusion()
-        requireView().findViewById<View>(R.id.note_deck_spinner).isVisible = !currentNotetypeIsImageOcclusion()
+        requireView().findViewById<View>(R.id.note_deck_name).isVisible = !currentNotetypeIsImageOcclusion()
         editorNote =
             if (note == null || addNote) {
                 getColUnsafe.run {
@@ -2784,7 +2778,6 @@ class NoteEditorFragment :
 
         refreshNoteData(FieldChangeType.changeFieldCount(shouldReplaceNewlines()))
         setDuplicateFieldStyles()
-        deckSpinnerSelection!!.updateDeckPosition(deckId)
     }
 
     // ----------------------------------------------------------------------------
@@ -2858,15 +2851,14 @@ class NoteEditorFragment :
                 updateTags()
                 requireView().findViewById<View>(R.id.CardEditorTagButton).isEnabled = false
                 // ((LinearLayout) findViewById(R.id.CardEditorCardsButton)).setEnabled(false);
-                deckSpinnerSelection!!.setEnabledActionBarSpinner(false)
-                deckSpinnerSelection!!.updateDeckPosition(currentEditedCard!!.did)
+                view?.findViewById<TextView>(R.id.note_deck_name)?.isEnabled = false
                 updateFieldsFromStickyText()
             } else {
                 populateEditFields(FieldChangeType.refresh(shouldReplaceNewlines()), false)
                 updateCards(currentEditedCard!!.noteType(getColUnsafe))
                 requireView().findViewById<View>(R.id.CardEditorTagButton).isEnabled = true
                 // ((LinearLayout) findViewById(R.id.CardEditorCardsButton)).setEnabled(false);
-                deckSpinnerSelection!!.setEnabledActionBarSpinner(true)
+                view?.findViewById<TextView>(R.id.note_deck_name)?.isEnabled = true
             }
         }
 

AnkiDroid/src/main/res/layout/note_editor_fragment.xml

@@ -61,11 +61,19 @@
                     android:gravity="start|center_vertical"
                     android:textStyle="bold"
                     android:text="@string/CardEditorNoteDeck" />
-                <Spinner
-                    android:id="@+id/note_deck_spinner"
+                <!-- different horizontal padding to match note_type_spinner drop down alignment -->
+                <com.ichi2.ui.FixedTextView
+                    android:id="@+id/note_deck_name"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:popupTheme="@style/ActionBar.Popup"/>
+                    android:paddingStart="8dp"
+                    android:paddingEnd="12dp"
+                    android:drawableEnd="@drawable/id_arrow_drop_down"
+                    android:background="?attr/selectableItemBackground"
+                    android:minHeight="?attr/listPreferredItemHeightSmall"
+                    android:gravity="center_vertical"
+                    tools:text="Deck name here"
+                    />
             </LinearLayout>
 
             <!-- Front/Back/Attach views added in NoteEditor.populateEditFields(..) -->