refactor(destinations): replace 'bundleOf' with Bundle()

Deprecated in androidx:core 1.18.0

https://developer.android.com/jetpack/androidx/releases/core#core_and_core-ktx_version_118_2

Assisted-by: Claude Opus 4.8 - all

Author: david-allison

AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt

@@ -17,7 +17,7 @@ package com.ichi2.anki.pages
 
 import android.content.Context
 import android.content.Intent
-import androidx.core.os.bundleOf
+import android.os.Bundle
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.libanki.CardId
@@ -39,7 +39,11 @@ data class CardInfoDestination(
                 simplifiedTitle.toSentenceCase(context, R.string.sentence_card_stats_previous_card_study),
             )
         val cardInfoTitle = sentenceStrings.firstOrNull { it != simplifiedTitle } ?: title
-        val arguments = bundleOf(CardInfoFragment.KEY_TITLE to cardInfoTitle, CardInfoFragment.KEY_CARD_ID to cardId)
+        val arguments =
+            Bundle().apply {
+                putString(CardInfoFragment.KEY_TITLE, cardInfoTitle)
+                putLong(CardInfoFragment.KEY_CARD_ID, cardId)
+            }
         return SingleFragmentActivity.getIntent(
             context,
             fragmentClass = CardInfoFragment::class,

AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt

@@ -21,7 +21,6 @@ import android.os.Bundle
 import android.view.View
 import android.webkit.WebView
 import androidx.activity.OnBackPressedCallback
-import androidx.core.os.bundleOf
 import com.google.android.material.appbar.MaterialToolbar
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.R
@@ -112,7 +111,7 @@ class CsvImporter : PageFragment() {
             context: Context,
             filePath: String,
         ): Intent {
-            val arguments = bundleOf(KEY_FILE_PATH to filePath)
+            val arguments = Bundle().apply { putString(KEY_FILE_PATH, filePath) }
             return SingleFragmentActivity.getIntent(context, fragmentClass = CsvImporter::class, arguments)
         }
     }

AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt

@@ -23,7 +23,6 @@ import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import androidx.activity.OnBackPressedCallback
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import anki.collection.OpChanges
@@ -257,7 +256,11 @@ class DeckOptions : PageFragment() {
             context: Context,
             deckId: DeckId,
         ): Intent =
-            SingleFragmentActivity.getIntent(context, fragmentClass = DeckOptions::class, arguments = bundleOf(KEY_DECK_ID to deckId))
+            SingleFragmentActivity.getIntent(
+                context,
+                fragmentClass = DeckOptions::class,
+                arguments = Bundle().apply { putLong(KEY_DECK_ID, deckId) },
+            )
     }
 }
 

AnkiDroid/src/main/java/com/ichi2/anki/pages/ImageOcclusion.kt

@@ -24,7 +24,6 @@ import android.webkit.WebView
 import android.widget.TextView
 import androidx.activity.addCallback
 import androidx.core.os.BundleCompat
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import com.google.android.material.appbar.MaterialToolbar
@@ -152,7 +151,7 @@ class ImageOcclusion : PageFragment(R.layout.page_image_occlusion) {
             context: Context,
             args: ImageOcclusionArgs,
         ): Intent {
-            val arguments = bundleOf(IO_ARGS_KEY to args)
+            val arguments = Bundle().apply { putParcelable(IO_ARGS_KEY, args) }
             return SingleFragmentActivity.getIntent(context, ImageOcclusion::class, arguments)
         }
     }

AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt

@@ -25,7 +25,6 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.annotation.XmlRes
-import androidx.core.os.bundleOf
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentFactory
@@ -254,7 +253,7 @@ class PreferencesActivity :
             context: Context,
             initialFragment: KClass<out Fragment>? = null,
         ): Intent {
-            val arguments = bundleOf(INITIAL_FRAGMENT_EXTRA to initialFragment?.jvmName)
+            val arguments = Bundle().apply { putString(INITIAL_FRAGMENT_EXTRA, initialFragment?.jvmName) }
             return Intent(context, PreferencesActivity::class.java).apply {
                 putExtra(FRAGMENT_NAME_EXTRA, PreferencesFragment::class.jvmName)
                 putExtra(FRAGMENT_ARGS_EXTRA, arguments)

AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt

@@ -24,7 +24,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.widget.Toolbar
-import androidx.core.os.bundleOf
 import androidx.core.view.ViewCompat
 import androidx.core.view.doOnLayout
 import androidx.core.view.isVisible
@@ -295,10 +294,10 @@ class PreviewerFragment :
             currentIndex: Int,
         ): Intent {
             val arguments =
-                bundleOf(
-                    CURRENT_INDEX_ARG to currentIndex,
-                    CARD_IDS_FILE_ARG to idsFile,
-                )
+                Bundle().apply {
+                    putInt(CURRENT_INDEX_ARG, currentIndex)
+                    putParcelable(CARD_IDS_FILE_ARG, idsFile)
+                }
             return CardViewerActivity.getIntent(context, PreviewerFragment::class, arguments)
         }
     }

AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerFragment.kt

@@ -17,7 +17,6 @@ package com.ichi2.anki.previewer
 
 import android.os.Bundle
 import android.view.View
-import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.ichi2.anki.R
@@ -102,7 +101,7 @@ class TemplatePreviewerFragment :
 
         fun newInstance(arguments: TemplatePreviewerArguments): TemplatePreviewerFragment =
             TemplatePreviewerFragment().apply {
-                val args = bundleOf(ARGS_KEY to arguments)
+                val args = Bundle().apply { putParcelable(ARGS_KEY, arguments) }
                 this.arguments = args
             }
     }

AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt

@@ -20,7 +20,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.core.os.BundleCompat
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commitNow
 import androidx.lifecycle.lifecycleScope
@@ -88,7 +87,7 @@ class TemplatePreviewerPage : Fragment(R.layout.fragment_template_previewer_cont
             CardViewerActivity.getIntent(
                 context,
                 TemplatePreviewerPage::class,
-                bundleOf(ARGS_KEY to arguments),
+                Bundle().apply { putParcelable(ARGS_KEY, arguments) },
             )
     }
 }