Rename NoteEditor to NoteEditorFragment

Author: Haz3-jolt

AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorIntentTest.kt

@@ -20,7 +20,7 @@ import androidx.core.os.bundleOf
 import androidx.lifecycle.Lifecycle
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.NoteEditor.Companion.intentLaunchedWithImage
+import com.ichi2.anki.NoteEditorFragment.Companion.intentLaunchedWithImage
 import com.ichi2.anki.noteeditor.NoteEditorLauncher
 import com.ichi2.anki.tests.InstrumentedTest
 import com.ichi2.anki.testutil.GrantStoragePermission

AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorTabOrderTest.kt

@@ -64,7 +64,7 @@ class NoteEditorTabOrderTest : NoteEditorTest() {
     }
 
     private fun sendKeyDownUp(
-        editor: NoteEditor,
+        editor: NoteEditorFragment,
         keyCode: Int,
     ) {
         val focusedView = editor.requireActivity().currentFocus ?: return

…va/com/ichi2/anki/testutil/NoteEditor.kt …chi2/anki/testutil/NoteEditorFragment.ktAnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/NoteEditor.kt renamed to AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/NoteEditorFragment.kt AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/NoteEditor.kt renamed to AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/NoteEditorFragment.kt

@@ -17,7 +17,7 @@
 package com.ichi2.anki.testutil
 
 import androidx.test.core.app.ActivityScenario
-import com.ichi2.anki.NoteEditor
+import com.ichi2.anki.NoteEditorFragment
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import java.util.concurrent.atomic.AtomicReference
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicReference
  * @throws Throwable if any exception is thrown during the execution of the block.
  */
 @Throws(Throwable::class)
-fun ActivityScenario<SingleFragmentActivity>.onNoteEditor(block: (NoteEditor) -> Unit) {
+fun ActivityScenario<SingleFragmentActivity>.onNoteEditor(block: (NoteEditorFragment) -> Unit) {
     val wrapped = AtomicReference<Throwable?>(null)
     this.onActivity { activity: SingleFragmentActivity ->
         try {
@@ -50,4 +50,5 @@ fun ActivityScenario<SingleFragmentActivity>.onNoteEditor(block: (NoteEditor) ->
 /**
  * Extension function for SingleFragmentActivity to find the NoteEditor fragment
  */
-fun SingleFragmentActivity.getEditor(): NoteEditor = supportFragmentManager.findFragmentById(R.id.fragment_container) as NoteEditor
+fun SingleFragmentActivity.getEditor(): NoteEditorFragment =
+    supportFragmentManager.findFragmentById(R.id.fragment_container) as NoteEditorFragment

AnkiDroid/src/main/AndroidManifest.xml

@@ -452,6 +452,12 @@
             android:exported="false"
             android:configChanges="orientation|screenSize"
             />
+        <activity
+            android:name="com.ichi2.anki.NoteEditor"
+            android:exported="false"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
+            />
         <activity
             android:name="com.ichi2.anki.previewer.CardViewerActivity"
             android:exported="false"

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

@@ -355,7 +355,7 @@ abstract class AbstractFlashcardViewer :
                The card could have been rescheduled, the deck could have changed, or a change of
                note type could have lead to the card being deleted */
             val reloadRequired =
-                result.data?.getBooleanExtra(NoteEditor.RELOAD_REQUIRED_EXTRA_KEY, false) == true
+                result.data?.getBooleanExtra(NoteEditorFragment.RELOAD_REQUIRED_EXTRA_KEY, false) == true
             if (reloadRequired) {
                 performReload()
             }

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

@@ -211,8 +211,8 @@ open class CardBrowser :
             // in use by reviewer?
             result.data?.let {
                 if (
-                    it.getBooleanExtra(NoteEditor.RELOAD_REQUIRED_EXTRA_KEY, false) ||
-                    it.getBooleanExtra(NoteEditor.NOTE_CHANGED_EXTRA_KEY, false)
+                    it.getBooleanExtra(NoteEditorFragment.RELOAD_REQUIRED_EXTRA_KEY, false) ||
+                    it.getBooleanExtra(NoteEditorFragment.NOTE_CHANGED_EXTRA_KEY, false)
                 ) {
                     if (reviewerCardId == currentCardId) {
                         reloadRequired = true
@@ -248,8 +248,8 @@ open class CardBrowser :
             val data = result.data
             if (data != null &&
                 (
-                    data.getBooleanExtra(NoteEditor.RELOAD_REQUIRED_EXTRA_KEY, false) ||
-                        data.getBooleanExtra(NoteEditor.NOTE_CHANGED_EXTRA_KEY, false)
+                    data.getBooleanExtra(NoteEditorFragment.RELOAD_REQUIRED_EXTRA_KEY, false) ||
+                        data.getBooleanExtra(NoteEditorFragment.NOTE_CHANGED_EXTRA_KEY, false)
                 )
             ) {
                 forceRefreshSearch()
@@ -370,7 +370,7 @@ open class CardBrowser :
             RESULT_OK,
             Intent().apply {
                 // Add reload flag to result intent so that schedule reset when returning to note editor
-                putExtra(NoteEditor.RELOAD_REQUIRED_EXTRA_KEY, reloadRequired)
+                putExtra(NoteEditorFragment.RELOAD_REQUIRED_EXTRA_KEY, reloadRequired)
             },
         )
 
@@ -493,9 +493,9 @@ open class CardBrowser :
     }
 
     private fun loadNoteEditorFragment(launcher: NoteEditorLauncher) {
-        val noteEditor = NoteEditor.newInstance(launcher)
+        val noteEditorFragment = NoteEditorFragment.newInstance(launcher)
         supportFragmentManager.commit {
-            replace(R.id.note_editor_frame, noteEditor)
+            replace(R.id.note_editor_frame, noteEditorFragment)
         }
         // Invalidate options menu so that note editor menu will show
         invalidateOptionsMenu()
@@ -504,8 +504,8 @@ open class CardBrowser :
     /**
      * Retrieves the `NoteEditor` fragment if it is present in the fragment container
      */
-    val fragment: NoteEditor?
-        get() = supportFragmentManager.findFragmentById(R.id.note_editor_frame) as? NoteEditor
+    val fragment: NoteEditorFragment?
+        get() = supportFragmentManager.findFragmentById(R.id.note_editor_frame) as? NoteEditorFragment
 
     /**
      * Loads the NoteEditor fragment in container if the view is x-large.

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

@@ -211,7 +211,7 @@ import kotlin.runCatching as runCatchingKotlin
  *
  * On a tablet, this is a fragmented view, with [StudyOptionsFragment] to the right: [loadStudyOptionsFragment]
  *
- * Often used as navigation to: [Reviewer], [NoteEditor] (adding notes), [StudyOptionsFragment] [SharedDecksDownloadFragment]
+ * Often used as navigation to: [Reviewer], [NoteEditorFragment] (adding notes), [StudyOptionsFragment] [SharedDecksDownloadFragment]
  *
  * Responsibilities:
  * * Setup/upgrades of the application: [handleStartup]

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

@@ -421,7 +421,7 @@ class DeckPickerFloatingActionMenu(
     }
 
     /**
-     * Closes the FAB menu and opens the [NoteEditor]
+     * Closes the FAB menu and opens the [NoteEditorFragment]
      * @see DeckPicker.addNote
      */
     private fun addNote() {

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

@@ -22,7 +22,7 @@ import android.net.Uri
 import com.ichi2.anki.noteeditor.NoteEditorLauncher
 
 /**
- * Builder class for creating intents related to image occlusion in the [NoteEditor].
+ * Builder class for creating intents related to image occlusion in the [NoteEditorFragment].
  */
 class ImageOcclusionIntentBuilder(
     private val context: Context,

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

@@ -17,7 +17,7 @@
 package com.ichi2.anki
 
 import android.os.Bundle
-import com.ichi2.anki.NoteEditor.Companion.NoteEditorCaller
+import com.ichi2.anki.NoteEditorFragment.Companion.NoteEditorCaller
 import com.ichi2.anki.noteeditor.NoteEditorLauncher
 import timber.log.Timber
 
@@ -32,9 +32,9 @@ class IntentHandler2 : AbstractIntentHandler() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Timber.v(intent.toString())
-        if (NoteEditor.intentLaunchedWithImage(intent)) {
+        if (NoteEditorFragment.intentLaunchedWithImage(intent)) {
             Timber.i("Intent contained an image")
-            intent.putExtra(NoteEditor.EXTRA_CALLER, NoteEditorCaller.ADD_IMAGE.value)
+            intent.putExtra(NoteEditorFragment.EXTRA_CALLER, NoteEditorCaller.ADD_IMAGE.value)
         }
         if (intent.extras == null) {
             Timber.w("Intent unexpectedly has no extras. Notifying user, defaulting to add note.")