Skip to content

Commit 2370f78

Browse files
criticalAYlukstbit
criticalAY
authored and
lukstbit
committed
refactor: move KotlinCleanup to common module
1 parent 39f6b07 commit 2370f78

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+43
-40
lines changed

‎AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import anki.notetypes.StockNotetype
2727
import com.ichi2.anki.CollectionManager
2828
import com.ichi2.anki.Ease
2929
import com.ichi2.anki.FlashCardsContract
30+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
3031
import com.ichi2.anki.provider.pureAnswer
3132
import com.ichi2.anki.testutil.DatabaseUtils.cursorFillWindow
3233
import com.ichi2.anki.testutil.GrantStoragePermission.storagePermission
@@ -48,7 +49,6 @@ import com.ichi2.libanki.getStockNotetypeLegacy
4849
import com.ichi2.libanki.sched.Scheduler
4950
import com.ichi2.libanki.utils.set
5051
import com.ichi2.testutils.common.assertThrows
51-
import com.ichi2.utils.KotlinCleanup
5252
import com.ichi2.utils.emptyStringArray
5353
import net.ankiweb.rsdroid.exceptions.BackendNotFoundException
5454
import org.hamcrest.MatcherAssert.assertThat

‎AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/NotificationChannelTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
2323
import androidx.test.filters.SdkSuppress
2424
import com.ichi2.anki.AnkiDroidApp
2525
import com.ichi2.anki.Channel
26+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
2627
import com.ichi2.anki.testutil.GrantStoragePermission
2728
import com.ichi2.compat.CompatHelper.Companion.sdkVersion
28-
import com.ichi2.utils.KotlinCleanup
2929
import org.hamcrest.MatcherAssert.assertThat
3030
import org.hamcrest.Matchers.greaterThanOrEqualTo
3131
import org.junit.Before

‎AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/Shared.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package com.ichi2.anki.tests
1818
import android.annotation.SuppressLint
1919
import android.content.Context
2020
import androidx.test.espresso.matcher.ViewMatchers.assertThat
21+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
2122
import com.ichi2.compat.CompatHelper
2223
import com.ichi2.libanki.Collection
2324
import com.ichi2.libanki.Storage
24-
import com.ichi2.utils.KotlinCleanup
2525
import org.hamcrest.CoreMatchers.containsString
2626
import org.hamcrest.CoreMatchers.not
2727
import org.junit.Assert.assertTrue

‎AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import com.ichi2.anki.android.input.ShortcutGroup
5656
import com.ichi2.anki.android.input.ShortcutGroupProvider
5757
import com.ichi2.anki.android.input.shortcut
5858
import com.ichi2.anki.common.utils.android.isRobolectric
59+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
5960
import com.ichi2.anki.dialogs.AsyncDialogFragment
6061
import com.ichi2.anki.dialogs.DatabaseErrorDialog
6162
import com.ichi2.anki.dialogs.DatabaseErrorDialog.CustomExceptionData
@@ -77,7 +78,6 @@ import com.ichi2.libanki.Collection
7778
import com.ichi2.themes.Themes
7879
import com.ichi2.utils.AdaptionUtil
7980
import com.ichi2.utils.HandlerUtils
80-
import com.ichi2.utils.KotlinCleanup
8181
import kotlinx.coroutines.flow.Flow
8282
import kotlinx.coroutines.launch
8383
import kotlinx.coroutines.runBlocking

‎AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import anki.collection.OpChanges
3838
import com.ichi2.anki.CrashReportService.sendExceptionReport
3939
import com.ichi2.anki.analytics.UsageAnalytics
4040
import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
41+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
4142
import com.ichi2.anki.common.utils.isRunningAsUnitTest
4243
import com.ichi2.anki.contextmenu.AnkiCardContextMenu
4344
import com.ichi2.anki.contextmenu.CardBrowserContextMenu
@@ -58,7 +59,6 @@ import com.ichi2.compat.CompatHelper
5859
import com.ichi2.libanki.ChangeManager
5960
import com.ichi2.utils.AdaptionUtil
6061
import com.ichi2.utils.ExceptionUtil
61-
import com.ichi2.utils.KotlinCleanup
6262
import com.ichi2.utils.LanguageUtil
6363
import com.ichi2.utils.Permissions
6464
import com.ichi2.widget.cardanalysis.CardAnalysisWidget

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import com.ichi2.anki.browser.SaveSearchResult
7777
import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
7878
import com.ichi2.anki.browser.registerFindReplaceHandler
7979
import com.ichi2.anki.browser.toCardBrowserLaunchOptions
80+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
8081
import com.ichi2.anki.dialogs.BrowserOptionsDialog
8182
import com.ichi2.anki.dialogs.CardBrowserMySearchesDialog
8283
import com.ichi2.anki.dialogs.CardBrowserMySearchesDialog.Companion.newInstance
@@ -123,7 +124,6 @@ import com.ichi2.libanki.NoteId
123124
import com.ichi2.libanki.SortOrder
124125
import com.ichi2.libanki.undoableOp
125126
import com.ichi2.ui.CardBrowserSearchView
126-
import com.ichi2.utils.KotlinCleanup
127127
import com.ichi2.utils.LanguageUtil
128128
import com.ichi2.utils.TagsUtil.getUpdatedTags
129129
import com.ichi2.utils.dp

‎AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ import com.ichi2.anki.CollectionManager.TR
6464
import com.ichi2.anki.CollectionManager.withCol
6565
import com.ichi2.anki.android.input.ShortcutGroup
6666
import com.ichi2.anki.android.input.shortcut
67+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
6768
import com.ichi2.anki.dialogs.ConfirmationDialog
6869
import com.ichi2.anki.dialogs.DeckSelectionDialog
6970
import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckSelectionListener
@@ -99,7 +100,6 @@ import com.ichi2.libanki.undoableOp
99100
import com.ichi2.themes.Themes
100101
import com.ichi2.ui.FixedEditText
101102
import com.ichi2.ui.FixedTextView
102-
import com.ichi2.utils.KotlinCleanup
103103
import com.ichi2.utils.copyToClipboard
104104
import com.ichi2.utils.listItems
105105
import com.ichi2.utils.show

‎AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import android.os.Bundle
2222
import android.os.Parcel
2323
import android.os.Parcelable
2424
import androidx.core.os.bundleOf
25+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
2526
import com.ichi2.async.saveModel
2627
import com.ichi2.compat.CompatHelper.Companion.compat
2728
import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
2829
import com.ichi2.libanki.CardTemplate
2930
import com.ichi2.libanki.Collection
3031
import com.ichi2.libanki.NoteTypeId
3132
import com.ichi2.libanki.NotetypeJson
32-
import com.ichi2.utils.KotlinCleanup
3333
import timber.log.Timber
3434
import java.io.ByteArrayInputStream
3535
import java.io.ByteArrayOutputStream

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ import com.ichi2.anki.analytics.UsageAnalytics
108108
import com.ichi2.anki.android.back.exitViaDoubleTapBackCallback
109109
import com.ichi2.anki.android.input.ShortcutGroup
110110
import com.ichi2.anki.android.input.shortcut
111+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
111112
import com.ichi2.anki.deckpicker.BITMAP_BYTES_PER_PIXEL
112113
import com.ichi2.anki.deckpicker.BackgroundImage
113114
import com.ichi2.anki.deckpicker.DeckDeletionResult
@@ -180,7 +181,6 @@ import com.ichi2.utils.AdaptionUtil
180181
import com.ichi2.utils.ClipboardUtil.IMPORT_MIME_TYPES
181182
import com.ichi2.utils.ImportUtils
182183
import com.ichi2.utils.ImportUtils.ImportResult
183-
import com.ichi2.utils.KotlinCleanup
184184
import com.ichi2.utils.NetworkUtils
185185
import com.ichi2.utils.NetworkUtils.isActiveNetworkMetered
186186
import com.ichi2.utils.SyncStatus

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.annotation.MainThread
2626
import androidx.appcompat.app.ActionBar
2727
import androidx.appcompat.app.AppCompatActivity
2828
import com.ichi2.anki.CollectionManager.withCol
29+
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
2930
import com.ichi2.anki.dialogs.DeckSelectionDialog
3031
import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckCreationListener
3132
import com.ichi2.anki.dialogs.DeckSelectionDialog.SelectableDeck
@@ -36,7 +37,6 @@ import com.ichi2.libanki.Collection
3637
import com.ichi2.libanki.DeckId
3738
import com.ichi2.libanki.DeckNameId
3839
import com.ichi2.utils.FragmentManagerSupplier
39-
import com.ichi2.utils.KotlinCleanup
4040
import com.ichi2.utils.asFragmentManagerSupplier
4141
import timber.log.Timber
4242

0 commit comments

Comments
 (0)