diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt b/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt index 16a7ea3d..3965b436 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt @@ -7,7 +7,7 @@ package ca.gosyer.ui.base.theme import androidx.compose.runtime.Composable -import ca.gosyer.ui.base.components.ScrollbarStyle +import ca.gosyer.uicore.components.ScrollbarStyle actual object ThemeScrollbarStyle { @Composable diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt index b7b265d4..c2464fde 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt @@ -9,7 +9,7 @@ package ca.gosyer.ui.base.theme import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp -import ca.gosyer.ui.base.components.ScrollbarStyle +import ca.gosyer.uicore.components.ScrollbarStyle actual object ThemeScrollbarStyle { @Composable diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/prefs/PreferencesUiBuilder.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/prefs/PreferencesUiBuilder.kt index 22568843..4fc0f275 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/prefs/PreferencesUiBuilder.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/prefs/PreferencesUiBuilder.kt @@ -75,10 +75,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.keyboardHandler +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow import ca.gosyer.uicore.resources.stringResource import com.vanpra.composematerialdialogs.MaterialDialog diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt index afae9e6f..0c5cb79a 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt @@ -22,8 +22,8 @@ import androidx.compose.ui.graphics.luminance import androidx.compose.ui.graphics.takeOrElse import ca.gosyer.data.ui.UiPreferences import ca.gosyer.data.ui.model.ThemeMode -import ca.gosyer.ui.base.components.LocalScrollbarStyle import ca.gosyer.ui.base.theme.ThemeScrollbarStyle.getScrollbarStyle +import ca.gosyer.uicore.components.LocalScrollbarStyle import ca.gosyer.uicore.theme.Theme import ca.gosyer.uicore.theme.themes import ca.gosyer.uicore.vm.ContextWrapper diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt index 092cf34c..79bb3d4a 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt @@ -7,7 +7,7 @@ package ca.gosyer.ui.base.theme import androidx.compose.runtime.Composable -import ca.gosyer.ui.base.components.ScrollbarStyle +import ca.gosyer.uicore.components.ScrollbarStyle expect object ThemeScrollbarStyle { @Composable diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/categories/components/CategoriesScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/categories/components/CategoriesScreenContent.kt index 15091687..f79bd4d4 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/categories/components/CategoriesScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/categories/components/CategoriesScreenContent.kt @@ -42,10 +42,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.categories.CategoriesScreenViewModel.MenuCategory +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import com.vanpra.composematerialdialogs.rememberMaterialDialogState import kotlinx.coroutines.CoroutineExceptionHandler diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/components/DownloadsScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/components/DownloadsScreenContent.kt index cddfc757..cf29c89a 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/components/DownloadsScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/components/DownloadsScreenContent.kt @@ -45,8 +45,6 @@ import ca.gosyer.data.download.model.DownloadChapter import ca.gosyer.data.download.model.DownloaderStatus import ca.gosyer.data.models.Chapter import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.ActionItem import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.uicore.components.DropdownIconButton @@ -55,7 +53,9 @@ import ca.gosyer.uicore.components.MangaListItemColumn import ca.gosyer.uicore.components.MangaListItemImage import ca.gosyer.uicore.components.MangaListItemSubtitle import ca.gosyer.uicore.components.MangaListItemTitle +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.mangaAspectRatio +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import io.kamel.image.lazyPainterResource diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/extensions/components/ExtensionsScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/extensions/components/ExtensionsScreenContent.kt index ea97bad2..7460784a 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/extensions/components/ExtensionsScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/extensions/components/ExtensionsScreenContent.kt @@ -49,12 +49,12 @@ import androidx.compose.ui.unit.sp import ca.gosyer.data.models.Extension import ca.gosyer.i18n.MR import ca.gosyer.presentation.build.BuildKonfig -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.dialog.getMaterialDialogProperties import ca.gosyer.ui.base.navigation.ActionItem import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.uicore.components.LoadingScreen +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.image.KamelImage import ca.gosyer.uicore.resources.stringResource import com.vanpra.composematerialdialogs.MaterialDialog diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaList.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaList.kt index 7aba07d9..e54f9d43 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaList.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaList.kt @@ -23,11 +23,11 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.FilterQuality import androidx.compose.ui.unit.dp import ca.gosyer.data.models.Manga -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.uicore.components.MangaListItem import ca.gosyer.uicore.components.MangaListItemImage import ca.gosyer.uicore.components.MangaListItemTitle +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaComfortableGrid.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaComfortableGrid.kt index b1bcda1e..bf132522 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaComfortableGrid.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaComfortableGrid.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ca.gosyer.data.models.Manga -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.mangaAspectRatio +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.image.KamelImage import io.kamel.image.lazyPainterResource diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCompactGrid.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCompactGrid.kt index 88c21b33..00c4aba0 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCompactGrid.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCompactGrid.kt @@ -34,9 +34,9 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ca.gosyer.data.models.Manga -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.mangaAspectRatio +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.image.KamelImage import io.kamel.image.lazyPainterResource diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCoverOnlyGrid.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCoverOnlyGrid.kt index d5183703..0d1d2c21 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCoverOnlyGrid.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCoverOnlyGrid.kt @@ -25,9 +25,9 @@ import androidx.compose.ui.graphics.FilterQuality import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.dp import ca.gosyer.data.models.Manga -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.mangaAspectRatio +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.image.KamelImage import io.kamel.image.lazyPainterResource 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 ce7a4c3b..18bc6800 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,8 +42,8 @@ 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.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter +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 diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaScreenContent.kt index 8ed22517..2a6c0816 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaScreenContent.kt @@ -30,13 +30,13 @@ import ca.gosyer.data.models.Category import ca.gosyer.data.models.Manga import ca.gosyer.i18n.MR import ca.gosyer.ui.base.chapter.ChapterDownloadItem -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.ActionItem import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.reader.rememberReaderLauncher import ca.gosyer.uicore.components.ErrorScreen import ca.gosyer.uicore.components.LoadingScreen +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import com.vanpra.composematerialdialogs.rememberMaterialDialogState import kotlinx.coroutines.flow.SharedFlow diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/reader/viewer/Continuous.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/reader/viewer/Continuous.kt index f12657e6..39e163f3 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/reader/viewer/Continuous.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/reader/viewer/Continuous.kt @@ -30,15 +30,15 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.dp import ca.gosyer.data.reader.model.Direction -import ca.gosyer.ui.base.components.HorizontalScrollbar -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.reader.ChapterSeparator import ca.gosyer.ui.reader.ReaderImage import ca.gosyer.ui.reader.model.MoveTo import ca.gosyer.ui.reader.model.PageMove import ca.gosyer.ui.reader.model.ReaderChapter import ca.gosyer.ui.reader.model.ReaderPage +import ca.gosyer.uicore.components.HorizontalScrollbar +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapLatest diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAdvancedScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAdvancedScreen.kt index 143b9ab9..0c89c6a9 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAdvancedScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAdvancedScreen.kt @@ -19,10 +19,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ca.gosyer.data.update.UpdatePreferences import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.SwitchPreference +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow import ca.gosyer.uicore.resources.stringResource import ca.gosyer.uicore.vm.ContextWrapper diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt index c5a4ec90..14ab8f9f 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt @@ -36,8 +36,6 @@ import androidx.compose.ui.unit.sp import ca.gosyer.data.ui.UiPreferences import ca.gosyer.data.ui.model.ThemeMode import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.ChoicePreference import ca.gosyer.ui.base.prefs.ColorPreference @@ -46,6 +44,8 @@ import ca.gosyer.ui.base.theme.AppColorsPreferenceState import ca.gosyer.ui.base.theme.asStateFlow import ca.gosyer.ui.base.theme.getDarkColors import ca.gosyer.ui.base.theme.getLightColors +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow import ca.gosyer.uicore.resources.stringResource import ca.gosyer.uicore.theme.Theme diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBackupScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBackupScreen.kt index c897a6f2..57bd7d0d 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBackupScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBackupScreen.kt @@ -39,13 +39,13 @@ import ca.gosyer.core.lang.throwIfCancellation import ca.gosyer.core.logging.CKLogger import ca.gosyer.data.server.interactions.BackupInteractionHandler import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.dialog.getMaterialDialogProperties import ca.gosyer.ui.base.file.rememberFileChooser import ca.gosyer.ui.base.file.rememberFileSaver import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.PreferenceRow +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import ca.gosyer.uicore.vm.ContextWrapper import ca.gosyer.uicore.vm.ViewModel diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBrowseScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBrowseScreen.kt index dd52da75..04760199 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBrowseScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBrowseScreen.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsDownloadsScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsDownloadsScreen.kt index 3b916269..5478f9c2 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsDownloadsScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsDownloadsScreen.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt index 3dd12ea3..02bd9805 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt @@ -23,11 +23,11 @@ import androidx.compose.ui.unit.dp import ca.gosyer.data.ui.UiPreferences import ca.gosyer.data.ui.model.StartScreen import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.ChoicePreference import ca.gosyer.ui.base.prefs.SwitchPreference +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow import ca.gosyer.uicore.resources.rememberReadText import ca.gosyer.uicore.resources.stringResource diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsLibraryScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsLibraryScreen.kt index 06814d2c..9b42c73a 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsLibraryScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsLibraryScreen.kt @@ -38,13 +38,13 @@ import ca.gosyer.data.library.LibraryPreferences import ca.gosyer.data.library.model.DisplayMode import ca.gosyer.data.server.interactions.CategoryInteractionHandler import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.dialog.getMaterialDialogProperties import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.ChoicePreference import ca.gosyer.ui.base.prefs.PreferenceRow import ca.gosyer.ui.categories.rememberCategoriesLauncher +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow import ca.gosyer.uicore.resources.stringResource import ca.gosyer.uicore.vm.ContextWrapper diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsParentalControlsScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsParentalControlsScreen.kt index fb475a8d..a8226c2e 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsParentalControlsScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsParentalControlsScreen.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsReaderScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsReaderScreen.kt index fd3b0e43..b7f01182 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsReaderScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsReaderScreen.kt @@ -27,12 +27,12 @@ import ca.gosyer.data.reader.model.Direction import ca.gosyer.data.reader.model.ImageScale import ca.gosyer.data.reader.model.NavigationMode import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.ChoicePreference import ca.gosyer.ui.base.prefs.ExpandablePreference import ca.gosyer.ui.base.prefs.SwitchPreference +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow import ca.gosyer.uicore.prefs.asStateIn import ca.gosyer.uicore.resources.stringResource diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsScreen.kt index b7a9d905..ef6bf124 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsScreen.kt @@ -26,10 +26,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.PreferenceRow +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsSecurityScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsSecurityScreen.kt index 8d80fa29..26869b1d 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsSecurityScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsSecurityScreen.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsServerScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsServerScreen.kt index 855586bf..d294aef6 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsServerScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsServerScreen.kt @@ -27,12 +27,12 @@ import ca.gosyer.data.server.ServerPreferences import ca.gosyer.data.server.model.Auth import ca.gosyer.data.server.model.Proxy import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.ChoicePreference import ca.gosyer.ui.base.prefs.EditTextPreference import ca.gosyer.ui.base.prefs.PreferenceRow +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow import ca.gosyer.uicore.prefs.asStateIn import ca.gosyer.uicore.prefs.asStringStateIn diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsTrackingScreen.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsTrackingScreen.kt index 13dd39b1..78c879c6 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsTrackingScreen.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsTrackingScreen.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaComfortableGrid.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaComfortableGrid.kt index 7ac5f20a..1e2530ea 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaComfortableGrid.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaComfortableGrid.kt @@ -33,9 +33,9 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ca.gosyer.data.models.Manga -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.mangaAspectRatio +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.image.KamelImage import io.kamel.image.lazyPainterResource diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaCompactGrid.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaCompactGrid.kt index 443d4ece..07dbe45a 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaCompactGrid.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaCompactGrid.kt @@ -36,9 +36,9 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ca.gosyer.data.models.Manga -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.mangaAspectRatio +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.image.KamelImage import io.kamel.image.lazyPainterResource diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaList.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaList.kt index 4206dd6c..4722c0a7 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaList.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaList.kt @@ -25,11 +25,11 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.FilterQuality import androidx.compose.ui.unit.dp import ca.gosyer.data.models.Manga -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.uicore.components.MangaListItem import ca.gosyer.uicore.components.MangaListItemImage import ca.gosyer.uicore.components.MangaListItemTitle +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersMenu.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersMenu.kt index 5815c618..8eafdbf7 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersMenu.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersMenu.kt @@ -58,11 +58,11 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEach import ca.gosyer.data.models.sourcefilters.SortFilter import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.prefs.ExpandablePreference import ca.gosyer.ui.sources.browse.filter.model.SourceFiltersView import ca.gosyer.uicore.components.Spinner +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import kotlinx.coroutines.flow.filterIsInstance 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 7a072814..81abc1a7 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,8 +36,8 @@ 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.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter +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 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 b5805390..1db86068 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 @@ -37,13 +37,13 @@ import ca.gosyer.data.library.model.DisplayMode import ca.gosyer.data.models.Manga import ca.gosyer.data.models.Source import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.components.HorizontalScrollbar -import ca.gosyer.ui.base.components.VerticalScrollbar import ca.gosyer.ui.base.components.localeToString -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.sources.globalsearch.GlobalSearchViewModel.Search import ca.gosyer.uicore.components.ErrorScreen +import ca.gosyer.uicore.components.HorizontalScrollbar +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource @Composable diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/home/components/SourceHomeScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/home/components/SourceHomeScreenContent.kt index 1a600a6a..eec05c6e 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/home/components/SourceHomeScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/home/components/SourceHomeScreenContent.kt @@ -45,13 +45,13 @@ import androidx.compose.ui.unit.sp import ca.gosyer.data.models.Source import ca.gosyer.i18n.MR import ca.gosyer.ui.base.components.TooltipArea -import ca.gosyer.ui.base.components.VerticalScrollbar import ca.gosyer.ui.base.components.localeToString -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.ActionItem import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.extensions.components.LanguageDialog import ca.gosyer.uicore.components.LoadingScreen +import ca.gosyer.uicore.components.VerticalScrollbar +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.image.KamelImage import ca.gosyer.uicore.resources.stringResource import com.vanpra.composematerialdialogs.rememberMaterialDialogState diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/settings/components/SourceSettingsScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/settings/components/SourceSettingsScreenContent.kt index 1f68ca79..0d2012e3 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/settings/components/SourceSettingsScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/settings/components/SourceSettingsScreenContent.kt @@ -29,8 +29,6 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.unit.dp import ca.gosyer.i18n.MR import ca.gosyer.presentation.build.BuildKonfig -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.dialog.getMaterialDialogProperties import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.ui.base.prefs.ChoiceDialog @@ -43,7 +41,9 @@ import ca.gosyer.ui.sources.settings.model.SourceSettingsView.List import ca.gosyer.ui.sources.settings.model.SourceSettingsView.MultiSelect import ca.gosyer.ui.sources.settings.model.SourceSettingsView.Switch import ca.gosyer.ui.sources.settings.model.SourceSettingsView.TwoState +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.keyboardHandler +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import com.vanpra.composematerialdialogs.MaterialDialog import com.vanpra.composematerialdialogs.message diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/updates/components/UpdatesScreenContent.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/updates/components/UpdatesScreenContent.kt index a5ef2440..02c552b3 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/updates/components/UpdatesScreenContent.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/ui/updates/components/UpdatesScreenContent.kt @@ -32,8 +32,6 @@ import ca.gosyer.data.models.Chapter import ca.gosyer.i18n.MR import ca.gosyer.ui.base.chapter.ChapterDownloadIcon import ca.gosyer.ui.base.chapter.ChapterDownloadItem -import ca.gosyer.ui.base.components.VerticalScrollbar -import ca.gosyer.ui.base.components.rememberScrollbarAdapter import ca.gosyer.ui.base.navigation.Toolbar import ca.gosyer.uicore.components.LoadingScreen import ca.gosyer.uicore.components.MangaListItem @@ -41,7 +39,9 @@ import ca.gosyer.uicore.components.MangaListItemColumn import ca.gosyer.uicore.components.MangaListItemImage import ca.gosyer.uicore.components.MangaListItemSubtitle import ca.gosyer.uicore.components.MangaListItemTitle +import ca.gosyer.uicore.components.VerticalScrollbar import ca.gosyer.uicore.components.mangaAspectRatio +import ca.gosyer.uicore.components.rememberScrollbarAdapter import ca.gosyer.uicore.resources.stringResource import io.kamel.image.lazyPainterResource diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/components/AndroidScrollbar.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidScrollbar.kt similarity index 92% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/components/AndroidScrollbar.kt rename to ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidScrollbar.kt index 12950a1d..5481d167 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/components/AndroidScrollbar.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidScrollbar.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.components +package ca.gosyer.uicore.components import androidx.compose.foundation.ScrollState import androidx.compose.foundation.interaction.MutableInteractionSource @@ -24,7 +24,7 @@ actual class ScrollbarStyle actual val LocalScrollbarStyle: ProvidableCompositionLocal = staticCompositionLocalOf { ScrollbarStyle() } @Composable -actual fun VerticalScrollbar( +internal actual fun RealVerticalScrollbar( adapter: ScrollbarAdapter, modifier: Modifier, reverseLayout: Boolean, @@ -33,7 +33,7 @@ actual fun VerticalScrollbar( ) {} @Composable -actual fun HorizontalScrollbar( +internal actual fun RealHorizontalScrollbar( adapter: ScrollbarAdapter, modifier: Modifier, reverseLayout: Boolean, diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/components/Scrollbar.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Scrollbar.kt similarity index 82% rename from presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/components/Scrollbar.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Scrollbar.kt index 9deb1598..72e843e0 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/components/Scrollbar.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Scrollbar.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.components +package ca.gosyer.uicore.components import androidx.compose.foundation.ScrollState import androidx.compose.foundation.interaction.MutableInteractionSource @@ -21,7 +21,7 @@ expect class ScrollbarStyle expect val LocalScrollbarStyle: ProvidableCompositionLocal @Composable -expect fun VerticalScrollbar( +internal expect fun RealVerticalScrollbar( adapter: ScrollbarAdapter, modifier: Modifier, reverseLayout: Boolean, @@ -30,7 +30,7 @@ expect fun VerticalScrollbar( ) @Composable -expect fun HorizontalScrollbar( +internal expect fun RealHorizontalScrollbar( adapter: ScrollbarAdapter, modifier: Modifier, reverseLayout: Boolean, @@ -44,9 +44,8 @@ fun VerticalScrollbar( modifier: Modifier = Modifier, reverseLayout: Boolean = false, style: ScrollbarStyle = LocalScrollbarStyle.current, - interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, - real: Boolean = false -) = VerticalScrollbar(adapter, modifier, reverseLayout, style, interactionSource) + interactionSource: MutableInteractionSource = remember { MutableInteractionSource() } +) = RealVerticalScrollbar(adapter, modifier, reverseLayout, style, interactionSource) @Composable fun HorizontalScrollbar( @@ -54,9 +53,8 @@ fun HorizontalScrollbar( modifier: Modifier = Modifier, reverseLayout: Boolean = false, style: ScrollbarStyle = LocalScrollbarStyle.current, - interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, - real: Boolean = false -) = HorizontalScrollbar(adapter, modifier, reverseLayout, style, interactionSource) + interactionSource: MutableInteractionSource = remember { MutableInteractionSource() } +) = RealHorizontalScrollbar(adapter, modifier, reverseLayout, style, interactionSource) @Composable expect fun rememberScrollbarAdapter( diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/components/DesktopScrollbar.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopScrollbar.kt similarity index 93% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/components/DesktopScrollbar.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopScrollbar.kt index 99968c9e..36845bac 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/components/DesktopScrollbar.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopScrollbar.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.components +package ca.gosyer.uicore.components import androidx.compose.foundation.ScrollState import androidx.compose.foundation.interaction.MutableInteractionSource @@ -21,7 +21,7 @@ actual val LocalScrollbarStyle: ProvidableCompositionLocal get() = androidx.compose.foundation.LocalScrollbarStyle @Composable -actual fun VerticalScrollbar( +internal actual fun RealVerticalScrollbar( adapter: ScrollbarAdapter, modifier: Modifier, reverseLayout: Boolean, @@ -32,7 +32,7 @@ actual fun VerticalScrollbar( ) @Composable -actual fun HorizontalScrollbar( +internal actual fun RealHorizontalScrollbar( adapter: ScrollbarAdapter, modifier: Modifier, reverseLayout: Boolean,