refactor: move JSON array and JSON object to common module

Author: criticalAY

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

@@ -36,6 +36,7 @@ import com.ichi2.anki.AnkiDroidJsAPIConstants.ANKI_JS_ERROR_CODE_SUSPEND_NOTE
 import com.ichi2.anki.AnkiDroidJsAPIConstants.flagCommands
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.cardviewer.ViewerCommand
+import com.ichi2.anki.common.utils.ext.stringIterable
 import com.ichi2.anki.model.CardsOrNotes
 import com.ichi2.anki.servicelayer.rescheduleCards
 import com.ichi2.anki.servicelayer.resetCards
@@ -48,7 +49,6 @@ import com.ichi2.libanki.Decks
 import com.ichi2.libanki.Note
 import com.ichi2.libanki.SortOrder
 import com.ichi2.utils.NetworkUtils
-import com.ichi2.utils.stringIterable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

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

@@ -28,13 +28,13 @@ import android.preference.Preference
 import android.preference.PreferenceCategory
 import androidx.core.content.edit
 import com.ichi2.anki.analytics.UsageAnalytics
+import com.ichi2.anki.common.utils.ext.stringIterable
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.Collection
 import com.ichi2.preferences.StepsPreference.Companion.convertFromJSON
 import com.ichi2.preferences.StepsPreference.Companion.convertToJSON
 import com.ichi2.themes.Themes
 import com.ichi2.ui.AppCompatPreferenceActivity
-import com.ichi2.utils.stringIterable
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject

AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/NoteType.kt

@@ -17,9 +17,9 @@
 package com.ichi2.anki.utils.ext
 
 import anki.notetypes.StockNotetype.OriginalStockKind.ORIGINAL_STOCK_KIND_IMAGE_OCCLUSION_VALUE
+import com.ichi2.anki.common.utils.ext.jsonObjectIterable
 import com.ichi2.anki.utils.CardTemplateJson
 import com.ichi2.libanki.NotetypeJson
-import com.ichi2.utils.jsonObjectIterable
 import org.json.JSONException
 
 /**

AnkiDroid/src/main/java/com/ichi2/libanki/CardTemplate.kt

@@ -16,6 +16,7 @@
 
 package com.ichi2.libanki
 
+import com.ichi2.anki.common.utils.ext.deepClone
 import com.ichi2.utils.JSONObjectHolder
 import com.ichi2.utils.deepClone
 import net.ankiweb.rsdroid.RustCleanup

AnkiDroid/src/main/java/com/ichi2/libanki/Decks.kt

@@ -36,14 +36,14 @@ import anki.decks.DeckTreeNode
 import anki.decks.FilteredDeckForUpdate
 import anki.decks.SetDeckCollapsedRequest
 import anki.decks.copy
+import com.ichi2.anki.common.utils.ext.jsonObjectIterable
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.backend.BackendUtils
 import com.ichi2.libanki.backend.BackendUtils.toJsonBytes
 import com.ichi2.libanki.utils.LibAnkiAlias
 import com.ichi2.libanki.utils.NotInLibAnki
 import com.ichi2.libanki.utils.append
 import com.ichi2.libanki.utils.len
-import com.ichi2.utils.jsonObjectIterable
 import net.ankiweb.rsdroid.RustCleanup
 import net.ankiweb.rsdroid.exceptions.BackendDeckIsFilteredException
 import net.ankiweb.rsdroid.exceptions.BackendNotFoundException

AnkiDroid/src/main/java/com/ichi2/libanki/NotetypeJson.kt

@@ -17,8 +17,8 @@
 package com.ichi2.libanki
 
 import androidx.annotation.CheckResult
+import com.ichi2.anki.common.utils.ext.toStringList
 import com.ichi2.utils.deepClonedInto
-import com.ichi2.utils.toStringList
 import org.intellij.lang.annotations.Language
 import org.json.JSONArray
 import org.json.JSONObject

AnkiDroid/src/main/java/com/ichi2/libanki/utils/PythonExtensions.kt

@@ -16,7 +16,7 @@
 
 package com.ichi2.libanki.utils
 
-import com.ichi2.utils.jsonObjectIterable
+import com.ichi2.anki.common.utils.ext.jsonObjectIterable
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.Optional

AnkiDroid/src/main/java/com/ichi2/preferences/StepsPreference.kt

@@ -22,8 +22,8 @@ import android.util.AttributeSet
 import android.view.View
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.ext.stringIterable
 import com.ichi2.anki.showThemedToast
-import com.ichi2.utils.stringIterable
 import org.json.JSONArray
 import org.json.JSONException
 import timber.log.Timber

AnkiDroid/src/main/java/com/ichi2/utils/JSONContainer.kt

@@ -17,6 +17,7 @@
 package com.ichi2.utils
 
 import androidx.annotation.VisibleForTesting
+import com.ichi2.anki.common.utils.ext.jsonObjectIterator
 import com.ichi2.libanki.utils.NotInLibAnki
 import com.ichi2.libanki.utils.append
 import com.ichi2.libanki.utils.index

AnkiDroid/src/test/java/com/ichi2/libanki/PythonExtensionsTest.kt

@@ -17,8 +17,8 @@
 package com.ichi2.libanki
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.utils.ext.jsonObjectIterable
 import com.ichi2.libanki.utils.insert
-import com.ichi2.utils.jsonObjectIterable
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.collection.IsIterableContainingInOrder.contains