mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-10 14:52:03 +01:00
Code Issues Projects Releases Wiki Activity

Move Scrollbar to ui-core

Browse Source
This commit is contained in:
Syer10
2022-03-16 21:33:40 -04:00
parent 2ef525cbf9
commit 2ff962c6f2
40 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
presentation/src/androidMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt
View File

@@ -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

2
presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/prefs/PreferencesUiBuilder.kt
View File

@@ -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

2
presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt
View File

@@ -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

2
presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/categories/components/CategoriesScreenContent.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/downloads/components/DownloadsScreenContent.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/extensions/components/ExtensionsScreenContent.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaList.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaComfortableGrid.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCompactGrid.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/library/components/MangaCoverOnlyGrid.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaMenu.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/manga/components/MangaScreenContent.kt
View File

@@ -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

6
presentation/src/jvmMain/kotlin/ca/gosyer/ui/reader/viewer/Continuous.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAdvancedScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBackupScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsBrowseScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsDownloadsScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsLibraryScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsParentalControlsScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsReaderScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsSecurityScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsServerScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/settings/SettingsTrackingScreen.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaComfortableGrid.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaCompactGrid.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaList.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersMenu.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/components/SourcesMenu.kt
View File

@@ -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

6
presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/home/components/SourceHomeScreenContent.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/sources/settings/components/SourceSettingsScreenContent.kt
View File

@@ -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

4
presentation/src/jvmMain/kotlin/ca/gosyer/ui/updates/components/UpdatesScreenContent.kt
View File

@@ -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

6
presentation/src/androidMain/kotlin/ca/gosyer/ui/base/components/AndroidScrollbar.kt → ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidScrollbar.kt
View File

@@ -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<ScrollbarStyle> = 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,

16
presentation/src/jvmMain/kotlin/ca/gosyer/ui/base/components/Scrollbar.kt → ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Scrollbar.kt
View File

@@ -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<ScrollbarStyle>
@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(

6
presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/components/DesktopScrollbar.kt → ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopScrollbar.kt
View File

@@ -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<ScrollbarStyle>
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,