diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt index 527d8000..9cfbf486 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt @@ -36,4 +36,4 @@ class BatchChapterDownload @Inject constructor(private val downloadRepository: D companion object { private val log = logging() } -} \ No newline at end of file +} diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt index a82e1b9e..32b7542f 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt @@ -48,7 +48,7 @@ import kotlinx.coroutines.flow.asStateFlow @Stable data class ChapterDownloadItem( val manga: Manga?, - val chapter: Chapter, + val chapter: Chapter ) { private val _isSelected = MutableStateFlow(false) val isSelected = _isSelected.asStateFlow() diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionMenu.kt index 733415c6..fdee7882 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionMenu.kt @@ -120,7 +120,7 @@ fun ActionMenu( DropdownMenu( expanded = menuVisible.value, onDismissRequest = { menuVisible.value = false }, - offset = DpOffset(8.dp, (-56).dp), + offset = DpOffset(8.dp, (-56).dp) ) { overflowActions.fastForEach { item -> key(item.hashCode()) { @@ -144,7 +144,7 @@ fun ActionMenu( DropdownMenu( openGroup != null, onDismissRequest = { openGroup = null }, - offset = DpOffset(8.dp, (-56).dp), + offset = DpOffset(8.dp, (-56).dp) ) { openGroup?.actions?.fastForEach { item -> key(item.hashCode()) { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/Toolbar.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/Toolbar.kt index bf9222b8..c3091d06 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/Toolbar.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/Toolbar.kt @@ -192,7 +192,7 @@ private fun WideToolbar( TextActionIcon( onClick = onClose, text = stringResource(MR.strings.action_close), - icon = if (closeIcon === ToolbarDefault) Icons.Rounded.Close else closeIcon, + icon = if (closeIcon === ToolbarDefault) Icons.Rounded.Close else closeIcon ) } } diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt index 32cc5a97..4cde2732 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt @@ -130,8 +130,6 @@ class MangaScreenViewModel @Inject constructor( refreshMangaAsync(params.mangaId).await() to refreshChaptersAsync(params.mangaId).await() _isLoading.value = false } - - } fun loadManga() { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/ChapterItem.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/ChapterItem.kt index 66b4db8c..792fe3d0 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/ChapterItem.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/ChapterItem.kt @@ -96,7 +96,7 @@ fun ChapterItem( } Row( - horizontalArrangement = Arrangement.SpaceBetween, + horizontalArrangement = Arrangement.SpaceBetween ) { Column( Modifier.padding(4.dp).width(this@BoxWithConstraints.maxWidth - 60.dp) @@ -109,7 +109,7 @@ fun ChapterItem( contentDescription = stringResource(MR.strings.action_filter_bookmarked), modifier = Modifier .sizeIn(maxHeight = with(LocalDensity.current) { textHeight.toDp() - 2.dp }), - tint = MaterialTheme.colors.primary, + tint = MaterialTheme.colors.primary ) Spacer(modifier = Modifier.width(2.dp)) } diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaScreenContent.kt index 5ce9dfd8..2bf9fbd3 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaScreenContent.kt @@ -378,27 +378,27 @@ private fun getBottomActionItems( BottomActionItem( name = stringResource(MR.strings.action_bookmark), icon = Icons.Rounded.BookmarkAdd, - onClick = { bookmarkChapter(selectedItems.first().chapter.index) }, + onClick = { bookmarkChapter(selectedItems.first().chapter.index) } ).takeIf { selectedItems.fastAny { !it.chapter.bookmarked } && selectedItems.size == 1 }, BottomActionItem( name = stringResource(MR.strings.action_remove_bookmark), icon = Icons.Rounded.BookmarkRemove, - onClick = { unBookmarkChapter(selectedItems.first().chapter.index) }, + onClick = { unBookmarkChapter(selectedItems.first().chapter.index) } ).takeIf { selectedItems.fastAny { it.chapter.bookmarked } && selectedItems.size == 1 }, BottomActionItem( name = stringResource(MR.strings.action_mark_as_read), icon = Icons.Rounded.DoneAll, - onClick = { markRead(selectedItems.first().chapter.index) }, + onClick = { markRead(selectedItems.first().chapter.index) } ).takeIf { selectedItems.fastAny { !it.chapter.read } && selectedItems.size == 1 }, BottomActionItem( name = stringResource(MR.strings.action_mark_as_unread), icon = Icons.Rounded.RemoveDone, - onClick = { markUnread(selectedItems.first().chapter.index) }, + onClick = { markUnread(selectedItems.first().chapter.index) } ).takeIf { selectedItems.fastAny { !it.chapter.read } && selectedItems.size == 1 }, BottomActionItem( name = stringResource(MR.strings.action_mark_previous_read), icon = JuiAssets.DonePrev, - onClick = { markPreviousAsRead(selectedItems.first().chapter.index) }, + onClick = { markPreviousAsRead(selectedItems.first().chapter.index) } ).takeIf { selectedItems.size == 1 }, BottomActionItem( name = stringResource(MR.strings.action_download), diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/manga/components/DesktopChapterItem.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/manga/components/DesktopChapterItem.kt index 74457474..4c30aabd 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/manga/components/DesktopChapterItem.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/manga/components/DesktopChapterItem.kt @@ -60,6 +60,6 @@ private fun getContextItems( if (unBookmarkChapter != null) ContextMenuItem(stringResource(MR.strings.action_remove_bookmark), unBookmarkChapter) else null, if (markRead != null) ContextMenuItem(stringResource(MR.strings.action_mark_as_read), markRead) else null, if (markUnread != null) ContextMenuItem(stringResource(MR.strings.action_mark_as_unread), markUnread) else null, - ContextMenuItem(stringResource(MR.strings.action_mark_previous_read), markPreviousAsRead), + ContextMenuItem(stringResource(MR.strings.action_mark_previous_read), markPreviousAsRead) ) } diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidBottomActionMenu.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidBottomActionMenu.kt index 6fb4f48b..a49a90fa 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidBottomActionMenu.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidBottomActionMenu.kt @@ -15,12 +15,12 @@ import androidx.compose.ui.composed actual fun Modifier.buttonModifier( onClick: () -> Unit, - onHintClick: () -> Unit, + onHintClick: () -> Unit ): Modifier = composed { combinedClickable( interactionSource = remember { MutableInteractionSource() }, indication = rememberRipple(bounded = false), onLongClick = onHintClick, - onClick = onClick, + onClick = onClick ) -} \ No newline at end of file +} diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/BottomActionMenu.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/BottomActionMenu.kt index 17de10e2..3a4a7fa1 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/BottomActionMenu.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/BottomActionMenu.kt @@ -60,18 +60,18 @@ data class BottomActionItem( fun BottomActionMenu( visible: Boolean, modifier: Modifier = Modifier, - items: ImmutableList, + items: ImmutableList ) { AnimatedVisibility( visible = visible, enter = expandVertically(expandFrom = Alignment.Bottom), - exit = shrinkVertically(shrinkTowards = Alignment.Bottom), + exit = shrinkVertically(shrinkTowards = Alignment.Bottom) ) { val scope = rememberCoroutineScope() Surface( modifier = modifier, shape = MaterialTheme.shapes.large.copy(bottomEnd = ZeroCornerSize, bottomStart = ZeroCornerSize), - elevation = 3.dp, + elevation = 3.dp ) { val haptic = LocalHapticFeedback.current var confirm by remember { mutableStateOf(null) } @@ -88,7 +88,7 @@ fun BottomActionMenu( Row( modifier = Modifier .padding(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).asPaddingValues()) - .padding(horizontal = 8.dp, vertical = 12.dp), + .padding(horizontal = 8.dp, vertical = 12.dp) ) { items.forEachIndexed { index, item -> Button( @@ -96,7 +96,7 @@ fun BottomActionMenu( icon = item.icon, toConfirm = confirm == index, onLongClick = { onLongClickItem(index) }, - onClick = item.onClick, + onClick = item.onClick ) } } @@ -106,7 +106,7 @@ fun BottomActionMenu( expect fun Modifier.buttonModifier( onClick: () -> Unit, - onHintClick: () -> Unit, + onHintClick: () -> Unit ): Modifier @Composable @@ -116,7 +116,7 @@ private fun RowScope.Button( toConfirm: Boolean, onLongClick: () -> Unit, onClick: () -> Unit, - content: (@Composable () -> Unit)? = null, + content: (@Composable () -> Unit)? = null ) { val animatedWeight by animateFloatAsState(if (toConfirm) 2f else 1f) Column( @@ -125,27 +125,27 @@ private fun RowScope.Button( .weight(animatedWeight) .buttonModifier( onHintClick = onLongClick, - onClick = onClick, + onClick = onClick ), verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally, + horizontalAlignment = Alignment.CenterHorizontally ) { Icon( imageVector = icon, - contentDescription = title, + contentDescription = title ) AnimatedVisibility( visible = toConfirm, enter = expandVertically(expandFrom = Alignment.Top) + fadeIn(), - exit = shrinkVertically(shrinkTowards = Alignment.Top) + fadeOut(), + exit = shrinkVertically(shrinkTowards = Alignment.Top) + fadeOut() ) { Text( text = title, overflow = TextOverflow.Visible, maxLines = 1, - style = MaterialTheme.typography.overline, + style = MaterialTheme.typography.overline ) } content?.invoke() } -} \ No newline at end of file +} diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/SelectedBackground.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/SelectedBackground.kt index 744e3af0..a0409f3c 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/SelectedBackground.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/SelectedBackground.kt @@ -19,4 +19,4 @@ fun Modifier.selectedBackground(isSelected: Boolean): Modifier = composed { } else { this } -} \ No newline at end of file +} diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/__JuiAssets.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/__JuiAssets.kt index 862c04c6..515faa20 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/__JuiAssets.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/__JuiAssets.kt @@ -11,10 +11,10 @@ public object JuiAssets private var __AllAssets: ____KtList? = null public val JuiAssets.AllAssets: ____KtList - get() { - if (__AllAssets != null) { - return __AllAssets!! + get() { + if (__AllAssets != null) { + return __AllAssets!! + } + __AllAssets = Ca.AllAssets + listOf(DonePrev) + return __AllAssets!! } - __AllAssets= Ca.AllAssets + listOf(DonePrev) - return __AllAssets!! - } diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/DonePrev.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/DonePrev.kt index 509e1ec5..f8eff2b3 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/DonePrev.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/DonePrev.kt @@ -1,12 +1,9 @@ package ca.gosyer.jui.uicore.icons.juiassets import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType import androidx.compose.ui.graphics.PathFillType.Companion.NonZero import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector.Builder @@ -19,11 +16,22 @@ public val JuiAssets.DonePrev: ImageVector if (_donePrev != null) { return _donePrev!! } - _donePrev = Builder(name = "DonePrev", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp, - viewportWidth = 24.0f, viewportHeight = 24.0f).apply { - path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { + _donePrev = Builder( + name = "DonePrev", + defaultWidth = 24.0.dp, + defaultHeight = 24.0.dp, + viewportWidth = 24.0f, + viewportHeight = 24.0f + ).apply { + path( + fill = SolidColor(Color(0xFF000000)), + stroke = null, + strokeLineWidth = 0.0f, + strokeLineCap = Butt, + strokeLineJoin = Miter, + strokeLineMiter = 4.0f, + pathFillType = NonZero + ) { moveTo(9.0f, 16.2f) lineTo(4.8f, 12.0f) lineToRelative(-1.4f, 1.4f) @@ -33,9 +41,15 @@ public val JuiAssets.DonePrev: ImageVector lineTo(9.0f, 16.2f) close() } - path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { + path( + fill = SolidColor(Color(0xFF000000)), + stroke = null, + strokeLineWidth = 0.0f, + strokeLineCap = Butt, + strokeLineJoin = Miter, + strokeLineMiter = 4.0f, + pathFillType = NonZero + ) { moveTo(22.0f, 18.0f) lineToRelative(-3.0f, 0.0f) lineToRelative(0.0f, -4.0f) @@ -46,7 +60,7 @@ public val JuiAssets.DonePrev: ImageVector close() } } - .build() + .build() return _donePrev!! } diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/__Ca.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/__Ca.kt index 1463f490..15efbd84 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/__Ca.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/__Ca.kt @@ -9,15 +9,15 @@ import kotlin.collections.List as ____KtList public object CaGroup public val JuiAssets.Ca: CaGroup - get() = CaGroup + get() = CaGroup private var __AllAssets: ____KtList? = null public val CaGroup.AllAssets: ____KtList - get() { - if (__AllAssets != null) { - return __AllAssets!! + get() { + if (__AllAssets != null) { + return __AllAssets!! + } + __AllAssets = Gosyer.AllAssets + listOf() + return __AllAssets!! } - __AllAssets= Gosyer.AllAssets + listOf() - return __AllAssets!! - } diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/__Gosyer.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/__Gosyer.kt index e90470e4..180ec9d1 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/__Gosyer.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/__Gosyer.kt @@ -9,15 +9,15 @@ import kotlin.collections.List as ____KtList public object GosyerGroup public val CaGroup.Gosyer: GosyerGroup - get() = GosyerGroup + get() = GosyerGroup private var __AllAssets: ____KtList? = null public val GosyerGroup.AllAssets: ____KtList - get() { - if (__AllAssets != null) { - return __AllAssets!! + get() { + if (__AllAssets != null) { + return __AllAssets!! + } + __AllAssets = Jui.AllAssets + listOf() + return __AllAssets!! } - __AllAssets= Jui.AllAssets + listOf() - return __AllAssets!! - } diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/__Jui.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/__Jui.kt index 192e86a5..58c91aaa 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/__Jui.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/__Jui.kt @@ -9,15 +9,15 @@ import kotlin.collections.List as ____KtList public object JuiGroup public val GosyerGroup.Jui: JuiGroup - get() = JuiGroup + get() = JuiGroup private var __AllAssets: ____KtList? = null public val JuiGroup.AllAssets: ____KtList - get() { - if (__AllAssets != null) { - return __AllAssets!! + get() { + if (__AllAssets != null) { + return __AllAssets!! + } + __AllAssets = Uicore.AllAssets + listOf() + return __AllAssets!! } - __AllAssets= Uicore.AllAssets + listOf() - return __AllAssets!! - } diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/__Uicore.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/__Uicore.kt index 5c54dd3b..18caab32 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/__Uicore.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/__Uicore.kt @@ -9,15 +9,15 @@ import kotlin.collections.List as ____KtList public object UicoreGroup public val JuiGroup.Uicore: UicoreGroup - get() = UicoreGroup + get() = UicoreGroup private var __AllAssets: ____KtList? = null public val UicoreGroup.AllAssets: ____KtList - get() { - if (__AllAssets != null) { - return __AllAssets!! + get() { + if (__AllAssets != null) { + return __AllAssets!! + } + __AllAssets = Icons.AllAssets + listOf() + return __AllAssets!! } - __AllAssets= Icons.AllAssets + listOf() - return __AllAssets!! - } diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/uicore/__Icons.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/uicore/__Icons.kt index 2db26823..080f7faa 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/uicore/__Icons.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/uicore/__Icons.kt @@ -9,15 +9,15 @@ import kotlin.collections.List as ____KtList public object IconsGroup public val UicoreGroup.Icons: IconsGroup - get() = IconsGroup + get() = IconsGroup private var __AllAssets: ____KtList? = null public val IconsGroup.AllAssets: ____KtList - get() { - if (__AllAssets != null) { - return __AllAssets!! + get() { + if (__AllAssets != null) { + return __AllAssets!! + } + __AllAssets = Juiassets.AllAssets + listOf() + return __AllAssets!! } - __AllAssets= Juiassets.AllAssets + listOf() - return __AllAssets!! - } diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/uicore/icons/__Juiassets.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/uicore/icons/__Juiassets.kt index 208ff262..93f5834e 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/uicore/icons/__Juiassets.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/icons/juiassets/ca/gosyer/jui/uicore/icons/__Juiassets.kt @@ -7,15 +7,15 @@ import kotlin.collections.List as ____KtList public object JuiassetsGroup public val IconsGroup.Juiassets: JuiassetsGroup - get() = JuiassetsGroup + get() = JuiassetsGroup private var __AllAssets: ____KtList? = null public val JuiassetsGroup.AllAssets: ____KtList - get() { - if (__AllAssets != null) { - return __AllAssets!! + get() { + if (__AllAssets != null) { + return __AllAssets!! + } + __AllAssets = listOf() + return __AllAssets!! } - __AllAssets= listOf() - return __AllAssets!! - } diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopBottomActionMenu.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopBottomActionMenu.kt index e69feafa..b05515a1 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopBottomActionMenu.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopBottomActionMenu.kt @@ -22,7 +22,7 @@ import kotlin.time.Duration.Companion.seconds actual fun Modifier.buttonModifier( onClick: () -> Unit, - onHintClick: () -> Unit, + onHintClick: () -> Unit ): Modifier = composed { val interactionSource = remember { MutableInteractionSource() } LaunchedEffect(interactionSource) { @@ -39,4 +39,4 @@ actual fun Modifier.buttonModifier( interactionSource.interactions onClick(onClick = onClick) .hoverable(interactionSource) -} \ No newline at end of file +} diff --git a/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosBottomActionMenu.kt b/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosBottomActionMenu.kt index 6fb4f48b..a49a90fa 100644 --- a/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosBottomActionMenu.kt +++ b/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosBottomActionMenu.kt @@ -15,12 +15,12 @@ import androidx.compose.ui.composed actual fun Modifier.buttonModifier( onClick: () -> Unit, - onHintClick: () -> Unit, + onHintClick: () -> Unit ): Modifier = composed { combinedClickable( interactionSource = remember { MutableInteractionSource() }, indication = rememberRipple(bounded = false), onLongClick = onHintClick, - onClick = onClick, + onClick = onClick ) -} \ No newline at end of file +}