Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Immersive: alerts are glass (delete, leave, uninstall, rename, install and URL prompts), the menus of the library pages use the glass sheet, and the playlist invitation bar floats on glass over the list
kota-zo1cafc51071cc
diff --git a/base/app/src/main/java/com/music/spotui/ui/components/AddCollectionToPlaylistSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/AddCollectionToPlaylistSheet.ktindex 56d6940c..1d353d9b 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/AddCollectionToPlaylistSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/AddCollectionToPlaylistSheet.kt@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.outlined.AddCircleOutline-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Textimport androidx.compose.material3.TextButton@@ -121,7 +120,7 @@ fun AddCollectionToPlaylistSheet(sourceUri: String, title: String, onDismiss: ()asking?.let { (target, plan) ->val some = plan.someDuplicate- AlertDialog(+ LookAlertDialog(// Outside the dialog: nothing is added (the Web Player's onOutside).onDismissRequest = { asking = null; onDismiss() },containerColor = tone(0xFF282828),diff --git a/base/app/src/main/java/com/music/spotui/ui/components/LookAlertDialog.kt b/base/app/src/main/java/com/music/spotui/ui/components/LookAlertDialog.ktnew file mode 100644index 00000000..e7e27537--- /dev/null+++ b/base/app/src/main/java/com/music/spotui/ui/components/LookAlertDialog.kt@@ -0,0 +1,33 @@+package com.music.spotui.ui.components++import androidx.compose.material3.AlertDialog+import androidx.compose.runtime.Composable+import androidx.compose.ui.graphics.Color+import com.music.spotui.ui.immersive.sheets.ImmersiveAlertDialog+import com.music.spotui.ui.navigation.isImmersive++/**+ * The alert of the screens shared by both looks: Material's [AlertDialog] on [containerColor] in+ * Classic (exactly as before), a glass dialog in Immersive (as [LookSheet] for the sheets).+ */+@Composable+fun LookAlertDialog(+ onDismissRequest: () -> Unit,+ confirmButton: @Composable () -> Unit,+ containerColor: Color,+ dismissButton: (@Composable () -> Unit)? = null,+ icon: (@Composable () -> Unit)? = null,+ title: (@Composable () -> Unit)? = null,+ text: (@Composable () -> Unit)? = null,+) {+ if (isImmersive()) ImmersiveAlertDialog(onDismissRequest, confirmButton, dismissButton, icon, title, text)+ else AlertDialog(+ onDismissRequest = onDismissRequest,+ confirmButton = confirmButton,+ dismissButton = dismissButton,+ icon = icon,+ title = title,+ text = text,+ containerColor = containerColor,+ )+}diff --git a/base/app/src/main/java/com/music/spotui/ui/components/PlaylistOptionsSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/PlaylistOptionsSheet.ktindex ebd139db..c28be8fe 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/PlaylistOptionsSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/PlaylistOptionsSheet.kt@@ -40,7 +40,6 @@ import androidx.compose.material.icons.outlined.PersonRemoveimport androidx.compose.material.icons.outlined.PersonAddimport androidx.compose.material.icons.outlined.QrCode2import androidx.compose.material.icons.automirrored.outlined.Logout-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Iconimport androidx.compose.material3.OutlinedTextField@@ -271,7 +270,7 @@ fun PlaylistOptionsSheet(onDone = { ok -> if (!ok) onChanged() })}- if (leavingBlend) AlertDialog(+ if (leavingBlend) LookAlertDialog(onDismissRequest = { leavingBlend = false },containerColor = tone(0xFF282828),title = { Text(stringResource(R.string.blend_leave), color = AppText) },@@ -292,7 +291,7 @@ fun PlaylistOptionsSheet(if (stoppingCollab) {// Public (listed on the profile): collaborators are removed; private: they become listeners.val public = published == true- AlertDialog(+ LookAlertDialog(onDismissRequest = { stoppingCollab = false },containerColor = tone(0xFF282828),title = { Text(stringResource(R.string.playlist_stop_collab), color = AppText) },@@ -310,7 +309,7 @@ fun PlaylistOptionsSheet()}- if (leavingPlaylist) AlertDialog(+ if (leavingPlaylist) LookAlertDialog(onDismissRequest = { leavingPlaylist = false },containerColor = tone(0xFF282828),title = { Text(stringResource(R.string.playlist_leave), color = AppText) },@@ -328,7 +327,7 @@ fun PlaylistOptionsSheet(dismissButton = { TextButton(onClick = { leavingPlaylist = false }) { Text(stringResource(R.string.cancel), color = AppText) } },)- if (deleting) AlertDialog(+ if (deleting) LookAlertDialog(onDismissRequest = { deleting = false },containerColor = tone(0xFF282828),text = { Text(stringResource(R.string.playlist_delete_confirm, page.name), color = AppText) },@@ -370,7 +369,7 @@ private fun EditDetailsDialog(page: ContextPageModel, onDismiss: () -> Unit, onSfocusedBorderColor = AppAccent, unfocusedBorderColor = Color(0xFF555555),focusedLabelColor = AppAccent, unfocusedLabelColor = AppMuted,)- AlertDialog(+ LookAlertDialog(onDismissRequest = onDismiss,containerColor = tone(0xFF282828),title = { Text(stringResource(R.string.playlist_edit_details), color = AppText) },diff --git a/base/app/src/main/java/com/music/spotui/ui/components/QualityPickers.kt b/base/app/src/main/java/com/music/spotui/ui/components/QualityPickers.ktindex 96c164de..b43fdb5f 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/QualityPickers.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/QualityPickers.kt@@ -164,7 +164,7 @@ fun DownloadAskHost() {Option(DownloadQuality.CD, R.string.quality_download_cd, R.string.quality_download_cd_detail),Option(DownloadQuality.HI_RES, R.string.quality_download_hires, R.string.quality_download_hires_detail),)- androidx.compose.material3.AlertDialog(+ LookAlertDialog(onDismissRequest = { DownloadAsk.pending = null },containerColor = tone(0xFF282828),title = { Text(stringResource(R.string.quality_download_title), color = AppText) },@@ -201,10 +201,9 @@ private fun NeedSourceDialog() {val close = { DownloadAsk.needSource = false }val ink = if (immersive) Immersive.Text else AppTextval accent = if (immersive) Immersive.Accent else AppAccent- androidx.compose.material3.AlertDialog(+ LookAlertDialog(onDismissRequest = close,- containerColor = if (immersive) Color(0xFF2C2C2E) else tone(0xFF282828),- shape = if (immersive) androidx.compose.foundation.shape.RoundedCornerShape(20.dp) else androidx.compose.material3.AlertDialogDefaults.shape,+ containerColor = tone(0xFF282828),title = { Text(stringResource(R.string.downloads_need_source_title), color = ink) },text = { Text(stringResource(R.string.downloads_need_source_detail), color = if (immersive) Immersive.TextSecondary else AppMuted, fontSize = 14.sp) },confirmButton = {diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionDetail.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionDetail.ktindex 75628d60..71f7d736 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionDetail.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionDetail.kt@@ -1,5 +1,6 @@package com.music.spotui.ui.immersive.pages+import com.music.spotui.ui.immersive.sheets.ImmersiveAlertDialogimport android.content.Intentimport android.net.Uriimport androidx.compose.foundation.background@@ -14,7 +15,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.text.BasicTextFieldimport androidx.compose.foundation.text.KeyboardOptions-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.Textimport androidx.compose.material3.TextButtonimport androidx.compose.runtime.Composable@@ -371,9 +371,8 @@ fun ImmersiveExtensionScreen(navController: NavController, id: String) {}}- if (uninstall && e != null) AlertDialog(+ if (uninstall && e != null) ImmersiveAlertDialog(onDismissRequest = { uninstall = false },- containerColor = Immersive.Raised,text = { Text(stringResource(R.string.extension_uninstall_confirm, e.name), style = Immersive.Body) },confirmButton = {TextButton(onClick = {diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionsScreen.ktindex 6ec304cb..a547d035 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionsScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionsScreen.kt@@ -1,5 +1,6 @@package com.music.spotui.ui.immersive.pages+import com.music.spotui.ui.immersive.sheets.ImmersiveAlertDialogimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column@@ -18,7 +19,6 @@ import androidx.compose.material.icons.rounded.KeyboardArrowDownimport androidx.compose.material.icons.rounded.KeyboardArrowUpimport androidx.compose.material.icons.rounded.Linkimport androidx.compose.material.icons.rounded.Refresh-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.Iconimport androidx.compose.material3.Text@@ -471,9 +471,8 @@ private fun InstalledRow(m?.let { ActionIcons(it.asks().filter { a -> a.key in e.granted }) }extra()}- if (askUninstall) AlertDialog(+ if (askUninstall) ImmersiveAlertDialog(onDismissRequest = { askUninstall = false },- containerColor = Immersive.Raised,text = { Text(stringResource(R.string.extension_uninstall_confirm, e.name), style = Immersive.Body) },confirmButton = {TextButton(onClick = {diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveLibraryPages.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveLibraryPages.ktindex e95beba7..84f38a60 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveLibraryPages.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveLibraryPages.kt@@ -1,5 +1,6 @@package com.music.spotui.ui.immersive.pages+import com.music.spotui.ui.immersive.sheets.ImmersiveAlertDialogimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.fillMaxSize@@ -10,7 +11,6 @@ import androidx.compose.material.icons.automirrored.rounded.PlaylistAddimport androidx.compose.material.icons.rounded.DeleteOutlineimport androidx.compose.material.icons.rounded.Editimport androidx.compose.material.icons.rounded.MoreHoriz-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Textimport androidx.compose.material3.TextButton@@ -91,9 +91,8 @@ fun ImmersiveFolderScreen(navController: NavController, uri: String, initialNameImmersiveSheetRow(Icons.Rounded.DeleteOutline, stringResource(R.string.folder_delete), destructive = true, onClick = { menu = false; deletingFolder = true })}itemMenu?.let { LibraryItemSheet(it, onDismiss = { itemMenu = null }, onChanged = { generation++ }) }- if (deletingFolder) AlertDialog(+ if (deletingFolder) ImmersiveAlertDialog(onDismissRequest = { deletingFolder = false },- containerColor = Immersive.Raised,text = { Text(stringResource(R.string.folder_delete_confirm, name), style = Immersive.Body) },confirmButton = {TextButton(onClick = {diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersivePagesParts.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersivePagesParts.ktindex bfe247d7..d95e07ee 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersivePagesParts.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersivePagesParts.kt@@ -5,6 +5,8 @@*/package com.music.spotui.ui.immersive.pages+import com.music.spotui.ui.immersive.sheets.ImmersiveAlertDialog+import com.music.spotui.ui.immersive.sheets.ImmersiveGlassSheetimport androidx.compose.animation.animateColorAsStateimport androidx.compose.animation.core.Animatableimport androidx.compose.animation.core.snap@@ -35,10 +37,8 @@ import androidx.compose.foundation.text.KeyboardActionsimport androidx.compose.foundation.text.KeyboardOptionsimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.rounded.DeleteOutline-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Textimport androidx.compose.material3.TextButtonimport androidx.compose.runtime.Composable@@ -213,9 +213,8 @@ internal fun ImmersiveNameDialog(var text by remember { mutableStateOf(initial) }val focus = remember { FocusRequester() }LaunchedEffect(Unit) { runCatching { focus.requestFocus() } }- AlertDialog(+ ImmersiveAlertDialog(onDismissRequest = onDismiss,- containerColor = Immersive.Raised,title = { Text(title, style = Immersive.Headline) },text = {Box(@@ -255,11 +254,11 @@ internal fun ImmersiveNameDialog()}-/** A bottom sheet on the [Immersive.Raised] fill, the frame of every menu of these pages. */+/** A bottom sheet on glass, the frame of every menu of these pages. */@OptIn(ExperimentalMaterial3Api::class)@Composableinternal fun ImmersiveSheet(onDismiss: () -> Unit, content: @Composable ColumnScope.() -> Unit) {- ModalBottomSheet(onDismissRequest = onDismiss, containerColor = Immersive.Raised) {+ ImmersiveGlassSheet(onDismiss) {Column(Modifier.navigationBarsPadding().padding(bottom = 12.dp), content = content)}}diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.ktindex b323f184..3d59930c 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt@@ -1,5 +1,6 @@package com.music.spotui.ui.immersive.pages+import com.music.spotui.ui.immersive.sheets.ImmersiveAlertDialogimport com.music.spotui.data.preferences.TransitionPref.Mode as TransitionModeimport androidx.activity.compose.BackHandlerimport androidx.compose.animation.AnimatedContent@@ -28,7 +29,6 @@ import androidx.compose.material.icons.rounded.PlayArrowimport androidx.compose.material.icons.rounded.SignalCellularAltimport androidx.compose.material.icons.rounded.Infoimport androidx.compose.material.icons.rounded.Refresh-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.Textimport androidx.compose.material3.TextButtonimport androidx.compose.runtime.Composable@@ -458,9 +458,8 @@ private fun DownloadsPage(navController: NavController, open: (SettingsPage) ->}}}- if (ask) AlertDialog(+ if (ask) ImmersiveAlertDialog(onDismissRequest = { ask = false },- containerColor = Immersive.Raised,title = { Text(stringResource(R.string.settings_storage_remove_downloads_dialog_title), style = Immersive.Headline) },text = { Text(stringResource(R.string.playlist_entity_remove_download_dialog_description), style = Immersive.Subhead) },confirmButton = {diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/people/ImmersiveProfileScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/people/ImmersiveProfileScreen.ktindex 2290a13f..4ae98861 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/people/ImmersiveProfileScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/people/ImmersiveProfileScreen.kt@@ -1,5 +1,6 @@package com.music.spotui.ui.immersive.people+import com.music.spotui.ui.immersive.sheets.ImmersiveAlertDialogimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -22,7 +23,6 @@ import androidx.compose.material.icons.rounded.Checkimport androidx.compose.material.icons.rounded.Personimport androidx.compose.material.icons.rounded.PersonAddimport androidx.compose.material3.Text-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.DropdownMenuimport androidx.compose.material3.DropdownMenuItemimport androidx.compose.material3.TextButton@@ -248,9 +248,8 @@ fun ImmersiveProfileScreen(navController: NavController, userId: String, userNam)}}- if (blockAsk) AlertDialog(+ if (blockAsk) ImmersiveAlertDialog(onDismissRequest = { blockAsk = false },- containerColor = Immersive.Raised,title = { Text(stringResource(R.string.profile_block_title, displayName.ifEmpty { userId }), style = Immersive.Headline) },text = { Text(stringResource(R.string.profile_block_confirm, displayName.ifEmpty { userId }), style = Immersive.Subhead) },confirmButton = {diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveContextScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveContextScreen.ktindex 078476e3..162c7c1f 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveContextScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveContextScreen.kt@@ -4,6 +4,8 @@*/package com.music.spotui.ui.immersive.screens+import com.music.spotui.ui.immersive.shell.immersiveGlassSurface+import com.music.spotui.ui.immersive.sheets.ImmersiveAlertDialogimport android.widget.Toastimport androidx.compose.animation.animateColorAsStateimport androidx.compose.animation.core.tween@@ -48,7 +50,6 @@ import androidx.compose.material.icons.rounded.Shuffleimport androidx.compose.material.icons.rounded.SwapVertimport androidx.compose.material.icons.rounded.ArrowDownwardimport androidx.compose.material.icons.rounded.ArrowUpward-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.DropdownMenuimport androidx.compose.material3.DropdownMenuItem@@ -277,9 +278,8 @@ private fun ImmersiveContextContent(navController: NavController, vm: ContextVie},onLeave = { showMembers = false; leaveAsk = true },) { showMembers = false }- if (leaveAsk) androidx.compose.material3.AlertDialog(+ if (leaveAsk) ImmersiveAlertDialog(onDismissRequest = { leaveAsk = false },- containerColor = Immersive.Raised,title = { Text(stringResource(R.string.playlist_leave), color = Immersive.Text) },text = { Text(stringResource(R.string.playlist_leave_confirm, p.name), color = Immersive.TextSecondary) },confirmButton = {@@ -337,9 +337,8 @@ private fun ImmersiveContextContent(navController: NavController, vm: ContextVieonDeleted = { navController.navigateUp() },onProfile = { navController.navigate(profileRoute(it, p.ownerName)) },)- if (askRemoveDownloads) AlertDialog(+ if (askRemoveDownloads) ImmersiveAlertDialog(onDismissRequest = { askRemoveDownloads = false },- containerColor = Immersive.Raised,title = { Text(stringResource(R.string.playlist_entity_remove_download_dialog_title), style = Immersive.Headline) },text = { Text(stringResource(R.string.playlist_entity_remove_download_dialog_description), style = Immersive.Subhead) },confirmButton = {@@ -1031,8 +1030,8 @@ private fun InviteJoinBar(vm: ContextViewModel, p: ContextPageModel, modifier: MverticalAlignment = Alignment.CenterVertically,modifier = modifier.fillMaxWidth()- .clip(RoundedCornerShape(16.dp))- .background(Immersive.Raised)+ // Floats over the list: glass, not an opaque card.+ .immersiveGlassSurface(RoundedCornerShape(16.dp)).padding(start = 16.dp, end = 8.dp, top = 8.dp, bottom = 8.dp),) {Text(stringResource(R.string.playlist_invite_banner), style = Immersive.Body, modifier = Modifier.weight(1f).padding(end = 12.dp))diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/sheets/ImmersiveAlertDialog.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/sheets/ImmersiveAlertDialog.ktnew file mode 100644index 00000000..801587d6--- /dev/null+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/sheets/ImmersiveAlertDialog.kt@@ -0,0 +1,43 @@+package com.music.spotui.ui.immersive.sheets++import androidx.compose.foundation.shape.RoundedCornerShape+import androidx.compose.material3.AlertDialog+import androidx.compose.runtime.Composable+import androidx.compose.ui.Modifier+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.unit.dp+import com.music.spotui.ui.immersive.Immersive+import com.music.spotui.ui.immersive.shell.immersiveGlassSurface++/** The corners of an Immersive dialog. */+val ImmersiveDialogShape = RoundedCornerShape(28.dp)++/**+ * A Material alert on glass, the dialog of the Immersive look: the same title, text and buttons+ * as [AlertDialog], the container drawn with the shared `immersiveGlassSurface` (as the sheets)+ * instead of an opaque fill.+ */+@Composable+fun ImmersiveAlertDialog(+ onDismissRequest: () -> Unit,+ confirmButton: @Composable () -> Unit,+ dismissButton: (@Composable () -> Unit)? = null,+ icon: (@Composable () -> Unit)? = null,+ title: (@Composable () -> Unit)? = null,+ text: (@Composable () -> Unit)? = null,+) {+ AlertDialog(+ onDismissRequest = onDismissRequest,+ confirmButton = confirmButton,+ modifier = Modifier.immersiveGlassSurface(ImmersiveDialogShape),+ dismissButton = dismissButton,+ icon = icon,+ title = title,+ text = text,+ shape = ImmersiveDialogShape,+ containerColor = Color.Transparent,+ titleContentColor = Immersive.Text,+ textContentColor = Immersive.TextSecondary,+ tonalElevation = 0.dp,+ )+}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionParts.kt b/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionParts.ktindex 5dda7e88..3f2c8bec 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionParts.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionParts.kt@@ -35,7 +35,6 @@ import androidx.compose.foundation.text.KeyboardOptionsimport androidx.compose.foundation.verticalScrollimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ArrowBack-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.Buttonimport androidx.compose.material3.ButtonDefaultsimport androidx.compose.material3.Checkbox@@ -198,7 +197,7 @@ internal fun InstallPrompt() {val askRisk = plan !is InstallPlan.NotNewer && (!silentUpdate || m.id !in registry.noticeAccepted)val dismiss = { pending.value = null }- AlertDialog(+ com.music.spotui.ui.components.LookAlertDialog(onDismissRequest = dismiss,containerColor = tone(0xFF282828),icon = { ExtIcon(m.id, m.name, null, p.pkg.icon, 48.dp) },@@ -301,7 +300,7 @@ internal fun ClashChoices(newName: String, clashes: List<Clash>, keepNew: Mutabl@Composableinternal fun ClashDialog(m: Manifest, clashes: List<Clash>, onDismiss: () -> Unit, onDone: (Map<Clash, Boolean>) -> Unit) {val keepNew = remember(clashes) { mutableStateMapOf<Clash, Boolean>().apply { clashes.forEach { put(it, true) } } }- AlertDialog(+ com.music.spotui.ui.components.LookAlertDialog(onDismissRequest = onDismiss,containerColor = tone(0xFF282828),title = { Text(m.name, color = AppText, maxLines = 2, overflow = TextOverflow.Ellipsis) },@@ -552,7 +551,7 @@ internal fun SwitchRow(label: String, detail: String, checked: Boolean, detailCointernal fun UrlDialog(title: Int, hint: Int, warning: Int? = null, onDismiss: () -> Unit, onOk: (String) -> Unit) {var text by remember { mutableStateOf("") }val ok = text.trim().startsWith("https://") && text.trim().length > 10- AlertDialog(+ com.music.spotui.ui.components.LookAlertDialog(onDismissRequest = onDismiss,containerColor = tone(0xFF282828),title = { Text(stringResource(title), color = AppText) },