From 8b4bdff7ae0fa33f28f35d4be84c741ddfb5bb12 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Wed, 9 Mar 2022 20:32:30 -0500 Subject: [PATCH] Minor fixes and improvements --- .../ca/gosyer/ui/library/components/DesktopLibraryGrid.kt | 2 +- .../ca/gosyer/ui/manga/components/DesktopChapterItem.kt | 2 +- .../kotlin/ca/gosyer/ui/main/components/DownloadsExtraInfo.kt | 2 +- .../kotlin/ca/gosyer/ui/main/more/components/MoreContent.kt | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/library/components/DesktopLibraryGrid.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/ui/library/components/DesktopLibraryGrid.kt index 362620f0..a2da5c71 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/library/components/DesktopLibraryGrid.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/ui/library/components/DesktopLibraryGrid.kt @@ -17,7 +17,7 @@ import ca.gosyer.uicore.resources.stringResource actual fun Modifier.libraryMangaModifier( onClickManga: () -> Unit, onClickRemoveManga: () -> Unit -): Modifier = Modifier.contextMenuClickable( +): Modifier = contextMenuClickable( { getContextItems(onClickRemoveManga) }, diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/manga/components/DesktopChapterItem.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/ui/manga/components/DesktopChapterItem.kt index b800b3c6..eca44162 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/manga/components/DesktopChapterItem.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/ui/manga/components/DesktopChapterItem.kt @@ -19,7 +19,7 @@ actual fun Modifier.chapterItemModifier( toggleRead: () -> Unit, toggleBookmarked: () -> Unit, markPreviousAsRead: () -> Unit -): Modifier = Modifier.contextMenuClickable( +): Modifier = contextMenuClickable( { getContextItems( toggleRead, diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/components/DownloadsExtraInfo.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/components/DownloadsExtraInfo.kt index 33e8bb3f..cd504cfa 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/components/DownloadsExtraInfo.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/components/DownloadsExtraInfo.kt @@ -46,7 +46,7 @@ fun DownloadsExtraInfo() { } WebsocketService.Status.STOPPED -> null } - if (text != null) { + if (!text.isNullOrBlank()) { Text( text, style = MaterialTheme.typography.body2, diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/more/components/MoreContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/more/components/MoreContent.kt index e67fd0d2..d9bd4f19 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/more/components/MoreContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/more/components/MoreContent.kt @@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material.Divider import androidx.compose.material.Icon import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold @@ -51,6 +52,9 @@ fun MoreContent() { ) } } + item { + Divider() + } MoreMenus.values().asList().fastForEach { item { val navigator = LocalNavigator.current