Skip to content

Commit 331a7f7

Browse files
committed
refactor: extract 'showThemedToast' and 'getDensityAdjustedValue' to :common:android
UIUtils.kt held two unrelated helpers: Toast wrappers and a density scaler. Both are pure Android utilities with no project deps, so they belong in :common:android. Splits them into Toast.kt and Density.kt for clarity and deletes the AnkiDroid-side UIUtils.kt.
1 parent eac3505 commit 331a7f7

40 files changed

Lines changed: 54 additions & 31 deletions

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ import com.ichi2.anki.cardviewer.handledGamepadKeyDown
112112
import com.ichi2.anki.cardviewer.handledGamepadKeyUp
113113
import com.ichi2.anki.common.annotations.NeedsTest
114114
import com.ichi2.anki.common.utils.android.HandlerUtils.newHandler
115+
import com.ichi2.anki.common.utils.android.showThemedToast
115116
import com.ichi2.anki.compat.CompatHelper.Companion.resolveActivityCompat
116117
import com.ichi2.anki.compat.ResolveInfoFlagsCompat
117118
import com.ichi2.anki.dialogs.TtsPlaybackErrorDialog

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ import com.ichi2.anki.android.input.shortcut
6666
import com.ichi2.anki.common.annotations.LegacyNotifications
6767
import com.ichi2.anki.common.annotations.NeedsTest
6868
import com.ichi2.anki.common.crashreporting.CrashReportService
69+
import com.ichi2.anki.common.utils.android.showThemedToast
6970
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
7071
import com.ichi2.anki.compat.CompatHelper
7172
import com.ichi2.anki.compat.CompatHelper.Companion.registerReceiverCompat

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import com.ichi2.anki.common.annotations.NeedsTest
4141
import com.ichi2.anki.common.coroutines.applicationScope
4242
import com.ichi2.anki.common.crashreporting.CrashReportService.sendExceptionReport
4343
import com.ichi2.anki.common.utils.android.SdCard
44+
import com.ichi2.anki.common.utils.android.showThemedToast
4445
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
4546
import com.ichi2.anki.compat.CompatHelper
4647
import com.ichi2.anki.contextmenu.AnkiCardContextMenu

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import com.ichi2.anki.CollectionManager.withCol
3636
import com.ichi2.anki.browser.search.SearchString
3737
import com.ichi2.anki.cardviewer.ViewerCommand
3838
import com.ichi2.anki.common.annotations.NeedsTest
39+
import com.ichi2.anki.common.utils.android.showThemedToast
3940
import com.ichi2.anki.common.utils.ext.stringIterable
4041
import com.ichi2.anki.libanki.Card
4142
import com.ichi2.anki.libanki.Collection

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.annotation.CheckResult
2626
import androidx.appcompat.app.AlertDialog
2727
import androidx.core.widget.doAfterTextChanged
2828
import com.ichi2.anki.CollectionManager.TR
29+
import com.ichi2.anki.common.utils.android.showThemedToast
2930
import com.ichi2.anki.databinding.ActivityCardBrowserAppearanceBinding
3031
import com.ichi2.anki.dialogs.DiscardChangesDialog
3132
import com.ichi2.anki.libanki.CardTemplate

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ import com.ichi2.anki.android.input.ShortcutGroup
6464
import com.ichi2.anki.android.input.shortcut
6565
import com.ichi2.anki.cardviewer.SingleCardSide
6666
import com.ichi2.anki.common.annotations.NeedsTest
67+
import com.ichi2.anki.common.utils.android.showThemedToast
6768
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
6869
import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
6970
import com.ichi2.anki.databinding.ActivityCardTemplateEditorBinding

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ import com.ichi2.anki.common.annotations.NeedsTest
9797
import com.ichi2.anki.common.crashreporting.CrashReportService
9898
import com.ichi2.anki.common.destinations.navigate
9999
import com.ichi2.anki.common.time.TimeManager
100+
import com.ichi2.anki.common.utils.android.showThemedToast
100101
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
101102
import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
102103
import com.ichi2.anki.contextmenu.DeckPickerMenuContentProvider

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.annotation.DrawableRes
3131
import androidx.constraintlayout.widget.ConstraintSet
3232
import androidx.core.os.ParcelCompat
3333
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
34+
import com.ichi2.anki.common.utils.android.getDensityAdjustedValue
3435
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
3536
import com.ichi2.anki.compat.setTooltipTextCompat
3637
import com.ichi2.anki.databinding.ViewCardMultimediaEditlineBinding

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import androidx.core.content.IntentCompat
2929
import androidx.work.WorkManager
3030
import com.ichi2.anki.common.annotations.NeedsTest
3131
import com.ichi2.anki.common.coroutines.applicationScope
32+
import com.ichi2.anki.common.utils.android.showThemedToast
3233
import com.ichi2.anki.common.utils.trimToLength
3334
import com.ichi2.anki.dialogs.DialogHandler.Companion.storeMessage
3435
import com.ichi2.anki.dialogs.DialogHandlerMessage

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package com.ichi2.anki
1818

1919
import android.os.Bundle
2020
import com.ichi2.anki.NoteEditorFragment.Companion.NoteEditorCaller
21+
import com.ichi2.anki.common.utils.android.showThemedToast
2122
import com.ichi2.anki.noteeditor.NoteEditorLauncher
2223
import timber.log.Timber
2324

0 commit comments

Comments
 (0)