From 0015bccc2110cb51603c0a223668d752d9dd12f5 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Thu, 25 Aug 2022 05:02:05 +0000 Subject: [PATCH] Automatic Lint --- .../ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt | 2 +- .../gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt | 5 ++--- .../ui/sources/home/components/SourceHomeScreenContent.kt | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt index fcd0e0214..daef4ecf9 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt @@ -150,7 +150,7 @@ class ExtensionsScreenViewModel @Inject constructor( .mapValues { it.value .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, Extension::name)) - .map (ExtensionUI::ExtensionItem) + .map(ExtensionUI::ExtensionItem) } .toList() .sortedWith( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt index 3223fc9b5..98d051b37 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt @@ -48,7 +48,6 @@ class SourceHomeScreenViewModel @Inject constructor( it.lang in languages || it.id == Source.LOCAL_SOURCE_ID } .groupBy(Source::displayLang) - .mapValues { it.value.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, Source::name)) .map(SourceUI::SourceItem) @@ -115,5 +114,5 @@ class SourceHomeScreenViewModel @Inject constructor( sealed class SourceUI { data class Header(val header: String) : SourceUI() - data class SourceItem(val source: Source): SourceUI() -} \ No newline at end of file + data class SourceItem(val source: Source) : SourceUI() +} diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/components/SourceHomeScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/components/SourceHomeScreenContent.kt index d554efa75..7e5f6fc8b 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/components/SourceHomeScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/components/SourceHomeScreenContent.kt @@ -163,7 +163,6 @@ fun WideSourcesMenu( onSourceClicked = onAddSource ) } - } } VerticalScrollbar( @@ -214,6 +213,7 @@ fun WideSourceItem( } } } + @Composable fun ThinSourcesMenu( sources: List, @@ -247,7 +247,6 @@ fun ThinSourcesMenu( onSourceClicked = onAddSource ) } - } } VerticalScrollbar(