Introduce NoteEditorActivity to host the NoteEditorFragment

Author: Haz3-jolt

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

@@ -42,7 +42,7 @@ class NoteEditorIntentTest : InstrumentedTest() {
     var runtimePermissionRule: TestRule? = GrantStoragePermission.instance
 
     @get:Rule
-    var activityRuleIntent: ActivityScenarioRule<SingleFragmentActivity>? =
+    var activityRuleIntent: ActivityScenarioRule<NoteEditorActivity>? =
         ActivityScenarioRule(
             noteEditorTextIntent,
         )
@@ -57,7 +57,7 @@ class NoteEditorIntentTest : InstrumentedTest() {
         var currentFieldStrings: String? = null
         scenario.onActivity { activity ->
             val editor = activity.getEditor()
-            currentFieldStrings = editor.currentFieldStrings[0]
+            currentFieldStrings = editor!!.currentFieldStrings[0]
         }
         MatcherAssert.assertThat(currentFieldStrings!!, Matchers.equalTo("sample text"))
     }

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

@@ -45,8 +45,8 @@ abstract class NoteEditorTest protected constructor() {
             .takeUnless { isInvalid }
 
     @get:Rule
-    var activityRule: ActivityScenarioRule<SingleFragmentActivity>? =
-        ActivityScenarioRule<SingleFragmentActivity>(
+    var activityRule: ActivityScenarioRule<NoteEditorActivity>? =
+        ActivityScenarioRule<NoteEditorActivity>(
             noteEditorIntent,
         ).takeUnless { isInvalid }
 

AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/NoteEditorFragment.kt

@@ -17,9 +17,9 @@
 package com.ichi2.anki.testutil
 
 import androidx.test.core.app.ActivityScenario
+import com.ichi2.anki.NoteEditorActivity
 import com.ichi2.anki.NoteEditorFragment
 import com.ichi2.anki.R
-import com.ichi2.anki.SingleFragmentActivity
 import java.util.concurrent.atomic.AtomicReference
 
 /**
@@ -28,11 +28,11 @@ 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: (NoteEditorFragment) -> Unit) {
+fun ActivityScenario<NoteEditorActivity>.onNoteEditor(block: (NoteEditorFragment) -> Unit) {
     val wrapped = AtomicReference<Throwable?>(null)
-    this.onActivity { activity: SingleFragmentActivity ->
+    this.onActivity { activity: NoteEditorActivity ->
         try {
-            val editor = activity.getEditor()
+            val editor: NoteEditorFragment = activity.getEditor()!!
             activity.runOnUiThread {
                 try {
                     block(editor)
@@ -47,8 +47,5 @@ fun ActivityScenario<SingleFragmentActivity>.onNoteEditor(block: (NoteEditorFrag
     wrapped.get()?.let { throw it }
 }
 
-/**
- * Extension function for SingleFragmentActivity to find the NoteEditor fragment
- */
-fun SingleFragmentActivity.getEditor(): NoteEditorFragment =
-    supportFragmentManager.findFragmentById(R.id.fragment_container) as NoteEditorFragment
+fun NoteEditorActivity.getEditor(): NoteEditorFragment? =
+    supportFragmentManager.findFragmentById(R.id.note_editor_fragment_frame) as NoteEditorFragment

AnkiDroid/src/main/AndroidManifest.xml

@@ -452,6 +452,12 @@
             android:exported="false"
             android:configChanges="orientation|screenSize"
             />
+        <activity
+            android:name="com.ichi2.anki.NoteEditorActivity"
+            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/NoteEditorActivity.kt

@@ -0,0 +1,106 @@
+/*
+ *  Copyright (c) 2025 Hari Srinivasan <harisrini21@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki
+
+import android.os.Bundle
+import androidx.fragment.app.commit
+import com.ichi2.anki.android.input.ShortcutGroup
+import com.ichi2.anki.android.input.ShortcutGroupProvider
+import com.ichi2.anki.dialogs.DeckSelectionDialog
+import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckSelectionListener
+import com.ichi2.anki.dialogs.tags.TagsDialogListener
+import com.ichi2.anki.libanki.Collection
+import com.ichi2.anki.model.CardStateFilter
+import com.ichi2.anki.noteeditor.NoteEditorLauncher
+import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
+import com.ichi2.anki.snackbar.SnackbarBuilder
+import com.ichi2.anki.widgets.DeckDropDownAdapter.SubtitleListener
+import timber.log.Timber
+
+/**
+ * To find the actual note Editor, @see [NoteEditorFragment]
+ * This activity contains the NoteEditorFragment, and, on x-large screens, the previewer fragment.
+ * It also ensures that changes in the note are transmitted to the previewer
+ */
+class NoteEditorActivity :
+    AnkiActivity(),
+    DeckSelectionListener,
+    SubtitleListener,
+    TagsDialogListener,
+    BaseSnackbarBuilderProvider,
+    DispatchKeyEventListener,
+    ShortcutGroupProvider {
+    override val baseSnackbarBuilder: SnackbarBuilder = { }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        if (showedActivityFailedScreen(savedInstanceState)) {
+            return
+        }
+        super.onCreate(savedInstanceState)
+        if (!ensureStoragePermissions()) {
+            return
+        }
+
+        setContentView(R.layout.note_editor)
+
+        // Create and launch the NoteEditorFragment based on the launcher intent
+        val launcher =
+            intent.extras?.let { bundle ->
+                // Convert intent extras to NoteEditorLauncher
+                NoteEditorLauncher.PassArguments(bundle)
+            } ?: NoteEditorLauncher.AddNote()
+
+        supportFragmentManager.commit {
+            replace(R.id.note_editor_fragment_frame, NoteEditorFragment.newInstance(launcher))
+        }
+
+        startLoadingCollection()
+    }
+
+    /**
+     * Retrieves the [NoteEditorFragment]
+     */
+    val noteEditorFragment: NoteEditorFragment?
+        get() = supportFragmentManager.findFragmentById(R.id.note_editor_fragment_frame) as? NoteEditorFragment
+
+    override fun onCollectionLoaded(col: Collection) {
+        super.onCollectionLoaded(col)
+        Timber.d("onCollectionLoaded()")
+        registerReceiver()
+    }
+
+    override fun onDeckSelected(deck: DeckSelectionDialog.SelectableDeck?) {
+        noteEditorFragment?.onDeckSelected(deck)
+    }
+
+    override val subtitleText: String
+        get() = noteEditorFragment?.subtitleText ?: ""
+
+    override fun onSelectedTags(
+        selectedTags: List<String>,
+        indeterminateTags: List<String>,
+        stateFilter: CardStateFilter,
+    ) {
+        noteEditorFragment?.onSelectedTags(selectedTags, indeterminateTags, stateFilter)
+    }
+
+    override fun dispatchKeyEvent(event: android.view.KeyEvent): Boolean =
+        noteEditorFragment?.dispatchKeyEvent(event) ?: false || super.dispatchKeyEvent(event)
+
+    override val shortcuts: ShortcutGroup
+        get() = noteEditorFragment?.shortcuts ?: ShortcutGroup(emptyList(), 0)
+}

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

@@ -70,13 +70,15 @@ import androidx.core.os.BundleCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.util.component1
 import androidx.core.util.component2
+import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
 import androidx.core.view.OnReceiveContentListener
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.isVisible
 import androidx.draganddrop.DropHelper
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import anki.config.ConfigKey
 import anki.notes.NoteFieldsCheckResponse
@@ -226,8 +228,11 @@ class NoteEditorFragment :
     private val getColUnsafe: Collection
         get() = CollectionManager.getColUnsafe()
 
+    private val noteEditorActivity: NoteEditorActivity
+        get() = requireActivity() as NoteEditorActivity
+
     private val mainToolbar: androidx.appcompat.widget.Toolbar
-        get() = requireView().findViewById(R.id.toolbar)
+        get() = noteEditorActivity.findViewById(R.id.toolbar)
 
     /**
      * Flag which forces the calling activity to rebuild it's definition of current card from scratch
@@ -551,7 +556,7 @@ class NoteEditorFragment :
 
         // Hide mainToolbar since CardBrowser handles the toolbar in fragmented activities.
         if (inFragmentedActivity) {
-            mainToolbar.visibility = View.GONE
+            mainToolbar?.visibility = View.GONE
         }
 
         try {
@@ -578,7 +583,13 @@ class NoteEditorFragment :
             requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
+        // Register this fragment as a menu provider with the activity
         mainToolbar.addMenuProvider(this)
+        (requireActivity() as MenuHost).addMenuProvider(
+            this,
+            viewLifecycleOwner,
+            Lifecycle.State.RESUMED,
+        )
     }
 
     /**

AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorLauncher.kt

@@ -24,9 +24,9 @@ import android.os.Parcelable
 import androidx.core.os.bundleOf
 import com.ichi2.anim.ActivityTransitionAnimation
 import com.ichi2.anki.AnkiActivity
+import com.ichi2.anki.NoteEditorActivity
 import com.ichi2.anki.NoteEditorFragment
 import com.ichi2.anki.NoteEditorFragment.Companion.NoteEditorCaller
-import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.browser.CardBrowserViewModel
 import com.ichi2.anki.libanki.CardId
 import com.ichi2.anki.libanki.DeckId
@@ -39,16 +39,19 @@ sealed interface NoteEditorLauncher : Destination {
     override fun toIntent(context: Context): Intent = toIntent(context, action = null)
 
     /**
-     * Generates an intent to open the NoteEditor fragment with the configured parameters.
+     * Generates an intent to open the NoteEditor activity with the configured parameters
      *
      * @param context The context from which the intent is launched.
      * @param action Optional action string for the intent.
-     * @return Intent configured to launch the NoteEditor fragment.
+     * @return Intent configured to launch the appropriate activity.
      */
     fun toIntent(
         context: Context,
         action: String? = null,
-    ) = SingleFragmentActivity.getIntent(context, NoteEditorFragment::class, toBundle(), action)
+    ) = Intent(context, NoteEditorActivity::class.java).apply {
+        putExtras(toBundle())
+        action?.let { this.action = it }
+    }
 
     /**
      * Converts the configuration into a Bundle to pass arguments to the NoteEditor fragment.

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <include layout="@layout/toolbar" />
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/note_editor_fragment_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>