diff --git a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt b/core/src/androidMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt index 06e89bdd..cebee1c4 100644 --- a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt +++ b/core/src/androidMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt @@ -21,4 +21,4 @@ actual class PreferenceStoreFactory @Inject constructor(private val context: Con ) ) } -} \ No newline at end of file +} diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/io/FileSystems.kt b/core/src/commonMain/kotlin/ca/gosyer/core/io/FileSystems.kt index 34e086d3..6eb2d856 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/io/FileSystems.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/core/io/FileSystems.kt @@ -8,4 +8,4 @@ package ca.gosyer.core.io import okio.FileSystem -expect val FileSystem.Companion.SYSTEM: FileSystem \ No newline at end of file +expect val FileSystem.Companion.SYSTEM: FileSystem diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/lang/Dispatchers.kt b/core/src/commonMain/kotlin/ca/gosyer/core/lang/Dispatchers.kt index c708202f..48856f93 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/lang/Dispatchers.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/core/lang/Dispatchers.kt @@ -9,4 +9,4 @@ package ca.gosyer.core.lang import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers -expect val Dispatchers.IO: CoroutineDispatcher \ No newline at end of file +expect val Dispatchers.IO: CoroutineDispatcher diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/lang/Locale.kt b/core/src/commonMain/kotlin/ca/gosyer/core/lang/Locale.kt index 5042daa1..5c3763c1 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/lang/Locale.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/core/lang/Locale.kt @@ -8,4 +8,4 @@ package ca.gosyer.core.lang import io.fluidsonic.locale.Locale -expect fun Locale.Companion.getDefault(): Locale \ No newline at end of file +expect fun Locale.Companion.getDefault(): Locale diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/lang/String.kt b/core/src/commonMain/kotlin/ca/gosyer/core/lang/String.kt index 942a55a4..6057b5ae 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/lang/String.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/core/lang/String.kt @@ -16,4 +16,4 @@ fun String.chop(count: Int, replacement: String = "…"): String { } else { this } -} \ No newline at end of file +} diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt b/core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt index ed91a31f..9fefaf41 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt @@ -8,4 +8,4 @@ package ca.gosyer.core.prefs expect class PreferenceStoreFactory { fun create(vararg names: String): PreferenceStore -} \ No newline at end of file +} diff --git a/core/src/jvmMain/kotlin/ca/gosyer/core/io/JvmFileSystems.kt b/core/src/jvmMain/kotlin/ca/gosyer/core/io/JvmFileSystems.kt index f1d7fa9e..7bafba65 100644 --- a/core/src/jvmMain/kotlin/ca/gosyer/core/io/JvmFileSystems.kt +++ b/core/src/jvmMain/kotlin/ca/gosyer/core/io/JvmFileSystems.kt @@ -10,4 +10,4 @@ import okio.FileSystem @Suppress("EXTENSION_SHADOWED_BY_MEMBER") actual val FileSystem.Companion.SYSTEM: FileSystem - get() = SYSTEM \ No newline at end of file + get() = SYSTEM diff --git a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmDispatchers.kt b/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmDispatchers.kt index fe3dcc0e..03965f21 100644 --- a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmDispatchers.kt +++ b/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmDispatchers.kt @@ -11,4 +11,4 @@ import kotlinx.coroutines.Dispatchers @Suppress("EXTENSION_SHADOWED_BY_MEMBER") actual val Dispatchers.IO: CoroutineDispatcher - get() = IO \ No newline at end of file + get() = IO diff --git a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmLocale.kt b/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmLocale.kt index 6bda0414..8768b5d2 100644 --- a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmLocale.kt +++ b/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmLocale.kt @@ -10,4 +10,4 @@ import io.fluidsonic.locale.Locale import io.fluidsonic.locale.toCommon import java.util.Locale as PlatformLocale -actual fun Locale.Companion.getDefault(): Locale = PlatformLocale.getDefault().toCommon() \ No newline at end of file +actual fun Locale.Companion.getDefault(): Locale = PlatformLocale.getDefault().toCommon() diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/Sort.kt b/data/src/commonMain/kotlin/ca/gosyer/data/library/model/Sort.kt index 1ac3ba96..7fdabf88 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/Sort.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/data/library/model/Sort.kt @@ -11,11 +11,13 @@ import kotlinx.serialization.Serializable @Serializable enum class Sort { ALPHABETICAL, + // LAST_READ, // LAST_CHECKED, UNREAD, + // TOTAL_CHAPTERS, // LATEST_CHAPTER, // DATE_FETCHED, DATE_ADDED; -} \ No newline at end of file +} diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/Source.kt b/data/src/commonMain/kotlin/ca/gosyer/data/models/Source.kt index 66a475cc..a0d270dc 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/Source.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/data/models/Source.kt @@ -20,11 +20,11 @@ data class Source( val displayName: String ) { val displayLang: String - get() = if (id == LOCAL_SOURCE_ID) { - "other" - } else { - lang - } + get() = if (id == LOCAL_SOURCE_ID) { + "other" + } else { + lang + } companion object { const val LOCAL_SOURCE_LANG = "localsourcelang" diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/downloads/AndroidDownloadService.kt b/presentation/src/androidMain/kotlin/ca/gosyer/ui/downloads/AndroidDownloadService.kt index 7e895351..572e0475 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/downloads/AndroidDownloadService.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/ui/downloads/AndroidDownloadService.kt @@ -25,4 +25,4 @@ internal actual fun startDownloadService( action = actions.name } ContextCompat.startForegroundService(context, intent) -} \ No newline at end of file +} diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/downloads/DesktopDownloadService.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/ui/downloads/DesktopDownloadService.kt index 8b98ebf5..2b3524a8 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/downloads/DesktopDownloadService.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/ui/downloads/DesktopDownloadService.kt @@ -16,4 +16,4 @@ internal actual fun startDownloadService( actions: WebsocketService.Actions ) { downloadService.init() -} \ No newline at end of file +} diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/components/LocaleToString.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/components/LocaleToString.kt index b82e175b..98c241c4 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/components/LocaleToString.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/components/LocaleToString.kt @@ -11,4 +11,4 @@ import java.util.Locale fun localeToString(locale: String) = Locale.forLanguageTag(locale) ?.getDisplayLanguage(Locale.getDefault()) ?.ifBlank { null } - ?: locale.uppercase() \ No newline at end of file + ?: locale.uppercase() diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/image/KamelConfigProvider.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/image/KamelConfigProvider.kt index ff3e7ddd..a6dcbc10 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/image/KamelConfigProvider.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/image/KamelConfigProvider.kt @@ -109,6 +109,5 @@ class KamelConfigProvider @Inject constructor( val bytes = response.receive() send(Resource.Success(bytes)) } - } } diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/DownloadService.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/DownloadService.kt index 4ed40da1..ad037b4e 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/DownloadService.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/DownloadService.kt @@ -14,4 +14,4 @@ internal expect fun startDownloadService( contextWrapper: ContextWrapper, downloadService: DownloadService, actions: WebsocketService.Actions -) \ No newline at end of file +) diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/Routes.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/Routes.kt index ec81dcac..bdddbc2b 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/Routes.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/Routes.kt @@ -24,4 +24,4 @@ fun StartScreen.toScreenClazz() = when (this) { StartScreen.Updates -> UpdatesScreen::class StartScreen.Sources -> SourcesScreen::class StartScreen.Extensions -> ExtensionsScreen::class -} \ No newline at end of file +} diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaMenu.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaMenu.kt index 18bc6800..2c804827 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaMenu.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaMenu.kt @@ -42,9 +42,9 @@ import androidx.compose.ui.util.fastForEach import ca.gosyer.data.models.Category import ca.gosyer.data.models.Manga import ca.gosyer.i18n.MR +import ca.gosyer.ui.base.dialog.getMaterialDialogProperties import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.ui.base.dialog.getMaterialDialogProperties import ca.gosyer.uicore.image.KamelImage import ca.gosyer.uicore.resources.stringResource import com.google.accompanist.flowlayout.FlowRow diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceScreenContent.kt index 71ae2aa1..eb7ddda3 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceScreenContent.kt @@ -421,7 +421,6 @@ fun SourceToolbar( }, openDisplayModeSelect = { displayModeSelectOpen = true } ) - } ) } @@ -447,7 +446,6 @@ fun DisplayModeSelect( Text(stringResource(it.res)) } } - } } diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/components/SourcesMenu.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/components/SourcesMenu.kt index 81abc1a7..294c3545 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/components/SourcesMenu.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/components/SourcesMenu.kt @@ -36,9 +36,9 @@ import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR import ca.gosyer.ui.base.components.CursorPoint import ca.gosyer.ui.base.components.TooltipArea +import ca.gosyer.ui.sources.home.SourceHomeScreen import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.ui.sources.home.SourceHomeScreen import ca.gosyer.uicore.image.KamelImage import ca.gosyer.uicore.resources.stringResource import io.kamel.image.lazyPainterResource diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchScreen.kt index e1928ae9..dd80dfa0 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchScreen.kt @@ -50,4 +50,4 @@ class GlobalSearchScreen(private val initialQuery: String) : Screen { } ) } -} \ No newline at end of file +} diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt index 1db86068..81d124de 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt @@ -182,4 +182,4 @@ fun GlobalSearchItem( } } } -} \ No newline at end of file +} diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidDropDownMenu.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidDropDownMenu.kt index 7e9ba3db..ad6adb8d 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidDropDownMenu.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidDropDownMenu.kt @@ -33,6 +33,7 @@ internal actual fun RealDropdownMenu( offset = offset, content = content ) + @Composable internal actual fun RealDropdownMenuItem( onClick: () -> Unit, @@ -66,4 +67,4 @@ fun SecureFlagPolicy.toAndroidSecureFlagPolicy() = when (this) { SecureFlagPolicy.Inherit -> AndroidSecureFlagPolicy.Inherit SecureFlagPolicy.SecureOn -> AndroidSecureFlagPolicy.SecureOn SecureFlagPolicy.SecureOff -> AndroidSecureFlagPolicy.SecureOff -} \ No newline at end of file +} diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidFileResource.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidFileResource.kt index e77d8a9e..55cc3d1b 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidFileResource.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidFileResource.kt @@ -15,4 +15,4 @@ import dev.icerock.moko.resources.FileResource actual fun FileResource.rememberReadText(): String { val context = LocalContext.current return remember(context) { readText(context) } -} \ No newline at end of file +} diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/AroundLayout.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/AroundLayout.kt index ddd82e84..31bb21d3 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/AroundLayout.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/AroundLayout.kt @@ -63,4 +63,4 @@ fun AroundLayout( } } -private enum class AroundLayoutContent { Start, MainContent, End } \ No newline at end of file +private enum class AroundLayoutContent { Start, MainContent, End } diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropDownMenu.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropDownMenu.kt index ae6d42e2..8375375d 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropDownMenu.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropDownMenu.kt @@ -34,6 +34,7 @@ enum class SecureFlagPolicy { * policy. */ SecureOn, + /** * No [WindowManager.LayoutParams.FLAG_SECURE] will be set on the window that is using this * policy. @@ -92,4 +93,4 @@ fun DropdownMenuItem( contentPadding: PaddingValues = MenuDefaults.DropdownMenuItemContentPadding, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, content: @Composable RowScope.() -> Unit -) = RealDropdownMenuItem(onClick, modifier, enabled, contentPadding, interactionSource, content) \ No newline at end of file +) = RealDropdownMenuItem(onClick, modifier, enabled, contentPadding, interactionSource, content) diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/FileResource.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/FileResource.kt index 03ab9fec..6b3553a7 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/FileResource.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/FileResource.kt @@ -10,4 +10,4 @@ import androidx.compose.runtime.Composable import dev.icerock.moko.resources.FileResource @Composable -expect fun FileResource.rememberReadText(): String \ No newline at end of file +expect fun FileResource.rememberReadText(): String diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt index 8d6899ae..7beb706b 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt @@ -16,4 +16,4 @@ expect class ContextWrapper { enum class Length { SHORT, LONG -} \ No newline at end of file +} diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopDropDownMenu.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopDropDownMenu.kt index 7d58de91..46222132 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopDropDownMenu.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopDropDownMenu.kt @@ -30,6 +30,7 @@ internal actual fun RealDropdownMenu( offset = offset, content = content ) + @Composable internal actual fun RealDropdownMenuItem( onClick: () -> Unit, @@ -45,4 +46,4 @@ internal actual fun RealDropdownMenuItem( contentPadding = contentPadding, interactionSource = interactionSource, content = content -) \ No newline at end of file +) diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopFileResource.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopFileResource.kt index f7fe7bc7..2c753e33 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopFileResource.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopFileResource.kt @@ -11,4 +11,4 @@ import androidx.compose.runtime.remember import dev.icerock.moko.resources.FileResource @Composable -actual fun FileResource.rememberReadText(): String = remember { readText() } \ No newline at end of file +actual fun FileResource.rememberReadText(): String = remember { readText() }