From 156aea632c82e6b5dbcc65b41bacdfe88d1bb4a2 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 25 Jun 2026 13:22:04 +0000 Subject: [PATCH] fix: spotless import ordering and remove fully-qualified class name Move java.* imports after kotlinx.* imports in MainActivity and BouncingIntentNav per ktlint ordering rules. Replace fully-qualified Route reference in PreviewUrl with an import. --- .../main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt | 2 +- .../amethyst/ui/navigation/navs/BouncingIntentNav.kt | 2 +- .../amethyst/ui/note/creators/previews/PreviewUrl.kt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt index 8eb9fd5c23..edf9d17fbf 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt @@ -54,12 +54,12 @@ import com.vitorpamplona.quartz.nip52Calendar.appt.time.CalendarTimeSlotEvent import com.vitorpamplona.quartz.nip73ExternalIds.urls.UrlId import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.UriParser -import java.net.URLDecoder import kotlinx.coroutines.CancellationException import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch +import java.net.URLDecoder class MainActivity : AppCompatActivity() { companion object { diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/BouncingIntentNav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/BouncingIntentNav.kt index 1e943a0780..68ad628ab8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/BouncingIntentNav.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/BouncingIntentNav.kt @@ -34,10 +34,10 @@ import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent import com.vitorpamplona.quartz.nip19Bech32.entities.NPub import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent import com.vitorpamplona.quartz.utils.Log -import java.net.URLEncoder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking +import java.net.URLEncoder import kotlin.reflect.KClass private const val NOSTR_URI_PREFIX = "nostr:" diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/previews/PreviewUrl.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/previews/PreviewUrl.kt index d1b3da35d1..60eeab1d63 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/previews/PreviewUrl.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/previews/PreviewUrl.kt @@ -51,6 +51,7 @@ import com.vitorpamplona.amethyst.ui.components.UrlPreviewCard import com.vitorpamplona.amethyst.ui.components.UrlPreviewState import com.vitorpamplona.amethyst.ui.components.WaitAndDisplay import com.vitorpamplona.amethyst.ui.navigation.navs.INav +import com.vitorpamplona.amethyst.ui.navigation.routes.Route import com.vitorpamplona.amethyst.ui.note.NoteCompose import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel @@ -309,7 +310,7 @@ private fun MyLoadUrlPreviewDirectFillWidth( UrlPreviewCard( url, previewInfo = state.previewInfo, - onUrlComments = { nav.nav(com.vitorpamplona.amethyst.ui.navigation.routes.Route.Url(url)) }, + onUrlComments = { nav.nav(Route.Url(url)) }, ) } }