From 0852f08a84d56620de3ac1aaac6f519b0481cd47 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Sat, 19 Mar 2022 23:38:32 -0400 Subject: [PATCH] Put everything under a jui subpackage --- .../ca/gosyer/jui/android/App.kt | 8 +-- .../ca/gosyer/jui/android/AppComponent.kt | 10 ++-- .../ca/gosyer/jui/android/AppMigrations.kt | 4 +- .../ca/gosyer/jui/android/MainActivity.kt | 6 +- .../ca/gosyer/jui/android/ReaderActivity.kt | 6 +- .../data/download/AndroidDownloadService.kt | 24 ++++---- .../data/notification/Notifications.kt | 2 +- .../android/data/update/UpdateCheckWorker.kt | 4 +- .../ca/gosyer/jui/android/util/Context.kt | 0 .../android/util/NotificationExtensions.kt | 0 core/build.gradle.kts | 2 +- core/src/androidMain/AndroidManifest.xml | 2 +- .../{ => jui}/core/prefs/AndroidPreference.kt | 2 +- .../core/prefs/AndroidPreferenceAdapters.kt | 2 +- .../core/prefs/AndroidPreferenceStore.kt | 2 +- .../core/prefs/PreferenceStoreFactory.kt | 2 +- .../ca/gosyer/{ => jui}/core/di/AppScope.kt | 2 +- .../gosyer/{ => jui}/core/io/FileSystems.kt | 2 +- .../{ => jui}/core/io/OkioExtensions.kt | 4 +- .../core/lang/CoroutineExtensions.kt | 2 +- .../gosyer/{ => jui}/core/lang/Dispatchers.kt | 2 +- .../ca/gosyer/{ => jui}/core/lang/Locale.kt | 4 +- .../ca/gosyer/{ => jui}/core/lang/String.kt | 4 +- .../gosyer/{ => jui}/core/logging/Logging.kt | 2 +- .../core/prefs/LazyPreferenceStore.kt | 2 +- .../gosyer/{ => jui}/core/prefs/Preference.kt | 2 +- .../{ => jui}/core/prefs/PreferenceStore.kt | 2 +- .../core/prefs/PreferenceStoreFactory.kt | 2 +- .../core/util/CollectionExtensions.kt | 2 +- .../gosyer/{ => jui}/core/util/ImageUtil.kt | 2 +- .../ca/gosyer/{ => jui}/core/io/AppDirs.kt | 4 +- .../{ => jui}/core/prefs/JvmPreference.kt | 2 +- .../core/prefs/JvmPreferenceAdapters.kt | 2 +- .../core/prefs/JvmPreferenceStore.kt | 2 +- .../core/prefs/PreferenceStoreFactory.kt | 2 +- .../{ => jui}/core/io/JvmFileSystems.kt | 2 +- .../{ => jui}/core/lang/JvmDispatchers.kt | 2 +- .../gosyer/{ => jui}/core/lang/JvmLocale.kt | 4 +- .../gosyer/{ => jui}/core/lang/JvmString.kt | 5 +- data/build.gradle.kts | 2 +- data/src/androidMain/AndroidManifest.xml | 2 +- .../ca/gosyer/{ => jui}/data/DataComponent.kt | 34 +++++------ .../ca/gosyer/{ => jui}/data/DataComponent.kt | 2 +- .../{ => jui}/data/base/WebsocketService.kt | 12 ++-- .../data/catalog/CatalogPreferences.kt | 10 ++-- .../data/download/DownloadService.kt | 18 +++--- .../data/download/model/DownloadChapter.kt | 6 +- .../data/download/model/DownloadState.kt | 2 +- .../data/download/model/DownloadStatus.kt | 2 +- .../data/download/model/DownloaderStatus.kt | 2 +- .../data/extension/ExtensionPreferences.kt | 8 +-- .../data/library/LibraryPreferences.kt | 10 ++-- .../data/library/LibraryUpdateService.kt | 14 ++--- .../data/library/model/DisplayMode.kt | 4 +- .../{ => jui}/data/library/model/JobStatus.kt | 2 +- .../{ => jui}/data/library/model/Sort.kt | 2 +- .../data/library/model/UpdateStatus.kt | 2 +- .../data/migration/MigrationPreferences.kt | 6 +- .../{ => jui}/data/migration/Migrations.kt | 6 +- .../ca/gosyer/{ => jui}/data/models/About.kt | 2 +- .../data/models/BackupValidationResult.kt | 2 +- .../gosyer/{ => jui}/data/models/Category.kt | 2 +- .../gosyer/{ => jui}/data/models/Chapter.kt | 4 +- .../gosyer/{ => jui}/data/models/Extension.kt | 2 +- .../ca/gosyer/{ => jui}/data/models/Manga.kt | 6 +- .../{ => jui}/data/models/MangaAndChapter.kt | 2 +- .../gosyer/{ => jui}/data/models/MangaPage.kt | 2 +- .../ca/gosyer/{ => jui}/data/models/Page.kt | 2 +- .../ca/gosyer/{ => jui}/data/models/Source.kt | 2 +- .../gosyer/{ => jui}/data/models/Updates.kt | 2 +- .../models/sourcefilters/CheckBoxFilter.kt | 2 +- .../data/models/sourcefilters/GroupFilter.kt | 2 +- .../data/models/sourcefilters/HeaderFilter.kt | 2 +- .../data/models/sourcefilters/SelectFilter.kt | 2 +- .../models/sourcefilters/SeparatorFilter.kt | 2 +- .../data/models/sourcefilters/SortFilter.kt | 2 +- .../data/models/sourcefilters/SourceFilter.kt | 2 +- .../sourcefilters/SourceFilterChange.kt | 2 +- .../data/models/sourcefilters/TextFilter.kt | 2 +- .../models/sourcefilters/TriStateFilter.kt | 2 +- .../sourcepreference/CheckBoxPreference.kt | 2 +- .../sourcepreference/EditTextPreference.kt | 2 +- .../models/sourcepreference/ListPreference.kt | 2 +- .../MultiSelectListPreference.kt | 2 +- .../sourcepreference/SourcePreference.kt | 2 +- .../SourcePreferenceChange.kt | 2 +- .../sourcepreference/SwitchPreference.kt | 2 +- .../models/sourcepreference/TwoStateProps.kt | 2 +- .../data/reader/ReaderModePreferences.kt | 14 ++--- .../{ => jui}/data/reader/ReaderModeWatch.kt | 4 +- .../data/reader/ReaderPreferences.kt | 8 +-- .../data/reader/model/DefaultReaderMode.kt | 2 +- .../{ => jui}/data/reader/model/Direction.kt | 4 +- .../{ => jui}/data/reader/model/ImageScale.kt | 4 +- .../data/reader/model/NavigationMode.kt | 4 +- .../data/reader/model/TappingInvertMode.kt | 2 +- .../{ => jui}/data/server/HttpClient.kt | 8 +-- .../data/server/ServerPreferences.kt | 10 ++-- .../data/server/ServerUrlPreference.kt | 6 +- .../interactions/BackupInteractionHandler.kt | 18 +++--- .../interactions/BaseInteractionHandler.kt | 6 +- .../CategoryInteractionHandler.kt | 30 +++++----- .../interactions/ChapterInteractionHandler.kt | 28 ++++----- .../DownloadInteractionHandler.kt | 14 ++--- .../ExtensionInteractionHandler.kt | 20 +++---- .../interactions/LibraryInteractionHandler.kt | 14 ++--- .../interactions/MangaInteractionHandler.kt | 16 +++--- .../interactions/SourceInteractionHandler.kt | 40 ++++++------- .../interactions/UpdatesInteractionHandler.kt | 16 +++--- .../{ => jui}/data/server/model/Auth.kt | 2 +- .../{ => jui}/data/server/model/Proxy.kt | 2 +- .../{ => jui}/data/server/requests/Backup.kt | 2 +- .../data/server/requests/Category.kt | 2 +- .../data/server/requests/Chapters.kt | 2 +- .../data/server/requests/Downloads.kt | 2 +- .../data/server/requests/Extensions.kt | 2 +- .../{ => jui}/data/server/requests/Library.kt | 2 +- .../{ => jui}/data/server/requests/Manga.kt | 2 +- .../{ => jui}/data/server/requests/Meta.kt | 2 +- .../data/server/requests/RestRequests.kt | 2 +- .../{ => jui}/data/server/requests/Sources.kt | 2 +- .../{ => jui}/data/server/requests/Updates.kt | 2 +- .../gosyer/{ => jui}/data/ui/UiPreferences.kt | 12 ++-- .../{ => jui}/data/ui/model/StartScreen.kt | 2 +- .../{ => jui}/data/ui/model/ThemeMode.kt | 2 +- .../{ => jui}/data/ui/model/WindowSettings.kt | 2 +- .../{ => jui}/data/update/UpdateChecker.kt | 10 ++-- .../data/update/UpdatePreferences.kt | 6 +- .../data/update/model/GithubRelease.kt | 2 +- .../ca/gosyer/{ => jui}/data/DataComponent.kt | 38 ++++++------- .../data/server/ServerHostPreferences.kt | 8 +-- .../{ => jui}/data/server/ServerService.kt | 12 ++-- .../data/server/host/ServerHostPreference.kt | 8 +-- desktop/build.gradle.kts | 4 +- .../gosyer/{ => jui/desktop}/AppComponent.kt | 12 ++-- .../gosyer/{ => jui/desktop}/AppMigrations.kt | 8 +-- .../desktop}/logging/LoggingSetup.kt | 4 +- .../ca/gosyer/{ => jui/desktop}/main.kt | 36 ++++++------ i18n/build.gradle.kts | 2 +- i18n/src/androidMain/AndroidManifest.xml | 2 +- .../kotlin/ca.gosyer.i18n/StringList.kt | 9 --- presentation/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 2 +- .../gosyer/{ => jui}/ui/base/UiComponent.kt | 14 ++--- .../ui/base/components/AndroidTooltipArea.kt | 2 +- .../ui/base/file/AndroidFileChooser.kt | 2 +- .../ui/base/file/AndroidFileSaver.kt | 2 +- .../ui/base/navigation/ActionIcon.kt | 2 +- .../ui/base/navigation/AndroidBackHandler.kt | 2 +- .../ui/base/prefs/AndroidColorExtensions.kt | 2 +- .../ui/base/theme/ThemeScrollbarStyle.kt | 4 +- .../{ => jui}/ui/base/vm/ViewModelFactory.kt | 56 +++++++++--------- .../{ => jui}/ui/categories/OpenCategories.kt | 2 +- .../ui/downloads/AndroidDownloadService.kt | 8 +-- .../library/components/AndroidLibraryGrid.kt | 6 +- .../ui/manga/components/AndroidChapterItem.kt | 6 +- .../{ => jui}/ui/reader/AndroidReaderMenu.kt | 2 +- .../AndroidSettingsAppearenceScreen.kt | 2 +- .../settings/AndroidSettingsServerScreen.kt | 6 +- .../sources/components/AndroidSourcesMenu.kt | 2 +- .../gosyer/{ => jui}/ui/util/compose/Image.kt | 2 +- .../gosyer/{ => jui}/ui/base/UiComponent.kt | 10 ++-- .../ui/base/chapter/ChapterDownloadButtons.kt | 20 +++---- .../ui/base/components/LocaleToString.kt | 6 +- .../ui/base/components/TooltipArea.kt | 6 +- .../base/dialog/MaterialDialogProperties.kt | 8 +-- .../{ => jui}/ui/base/file/FileChooser.kt | 2 +- .../{ => jui}/ui/base/file/FileSaver.kt | 2 +- .../ui/base/image/KamelConfigProvider.kt | 12 ++-- .../ui/base/navigation/ActionIcon.kt | 2 +- .../ui/base/navigation/ActionMenu.kt | 10 ++-- .../ui/base/navigation/BackHandler.kt | 2 +- .../ui/base/navigation/DisplayController.kt | 2 +- .../{ => jui}/ui/base/navigation/Toolbar.kt | 8 +-- .../ui/base/prefs/ColorPickerDialog.kt | 10 ++-- .../ui/base/prefs/PreferencesUiBuilder.kt | 16 +++--- .../ui/base/theme/AppColorsPreference.kt | 12 ++-- .../{ => jui}/ui/base/theme/AppTheme.kt | 20 +++---- .../ui/base/theme/ThemeScrollbarStyle.kt | 4 +- .../{ => jui}/ui/base/vm/ViewModelFactory.kt | 4 +- .../ui/categories/CategoriesScreen.kt | 6 +- .../categories/CategoriesScreenViewModel.kt | 12 ++-- .../components/CategoriesDialogs.kt | 12 ++-- .../components/CategoriesScreenContent.kt | 14 ++--- .../{ => jui}/ui/downloads/DownloadService.kt | 8 +-- .../{ => jui}/ui/downloads/DownloadsScreen.kt | 8 +-- .../ui/downloads/DownloadsScreenViewModel.kt | 18 +++--- .../components/DownloadsScreenContent.kt | 36 ++++++------ .../ui/extensions/ExtensionsScreen.kt | 6 +- .../extensions/ExtensionsScreenViewModel.kt | 18 +++--- .../components/ExtensionsScreenContent.kt | 30 +++++----- .../{ => jui}/ui/library/LibraryScreen.kt | 8 +-- .../ui/library/LibraryScreenViewModel.kt | 32 +++++------ .../library/components/LibraryMangaBadges.kt | 2 +- .../ui/library/components/LibraryMangaList.kt | 14 ++--- .../ui/library/components/LibraryPager.kt | 8 +-- .../components/LibraryScreenContent.kt | 16 +++--- .../ui/library/components/LibraryTabs.kt | 4 +- .../components/MangaComfortableGrid.kt | 12 ++-- .../ui/library/components/MangaCompactGrid.kt | 12 ++-- .../library/components/MangaCoverOnlyGrid.kt | 12 ++-- .../ca/gosyer/{ => jui}/ui/main/MainMenu.kt | 14 ++--- .../gosyer/{ => jui}/ui/main/MainViewModel.kt | 12 ++-- .../ca/gosyer/{ => jui}/ui/main/Routes.kt | 12 ++-- .../gosyer/{ => jui}/ui/main/TopLevelMenus.kt | 20 +++---- .../{ => jui}/ui/main/components/BottomNav.kt | 6 +- .../ui/main/components/DebugOverlay.kt | 4 +- .../main/components/DebugOverlayViewModel.kt | 4 +- .../ui/main/components/DownloadsExtraInfo.kt | 14 ++--- .../{ => jui}/ui/main/components/SideMenu.kt | 10 ++-- .../ui/main/components/SideMenuItem.kt | 6 +- .../{ => jui}/ui/main/more/MoreScreen.kt | 4 +- .../ui/main/more/components/MoreContent.kt | 12 ++-- .../gosyer/{ => jui}/ui/manga/MangaScreen.kt | 12 ++-- .../ui/manga/MangaScreenViewModel.kt | 32 +++++------ .../ui/manga/components/ChapterItem.kt | 10 ++-- .../ui/manga/components/MangaMenu.kt | 18 +++--- .../ui/manga/components/MangaScreenContent.kt | 26 ++++----- .../{ => jui}/ui/reader/ChapterLoader.kt | 14 ++--- .../gosyer/{ => jui}/ui/reader/ReaderMenu.kt | 50 ++++++++-------- .../ui/reader/ReaderMenuViewModel.kt | 42 +++++++------- .../{ => jui}/ui/reader/ReaderSideMenu.kt | 21 ++++--- .../{ => jui}/ui/reader/loader/PageLoader.kt | 4 +- .../ui/reader/loader/TachideskPageLoader.kt | 20 +++---- .../{ => jui}/ui/reader/model/MoveTo.kt | 2 +- .../{ => jui}/ui/reader/model/Navigation.kt | 2 +- .../{ => jui}/ui/reader/model/PageMove.kt | 2 +- .../ui/reader/model/ReaderChapter.kt | 8 +-- .../{ => jui}/ui/reader/model/ReaderPage.kt | 2 +- .../ui/reader/model/ViewerChapters.kt | 2 +- .../ui/reader/navigation/EdgeNavigation.kt | 4 +- .../reader/navigation/KindlishNavigation.kt | 4 +- .../ui/reader/navigation/LNavigation.kt | 4 +- .../reader/navigation/NavigationClickable.kt | 6 +- .../navigation/RightAndLeftNavigation.kt | 4 +- .../ui/reader/navigation/ViewerNavigation.kt | 6 +- .../{ => jui}/ui/reader/viewer/Continuous.kt | 22 +++---- .../{ => jui}/ui/reader/viewer/Pager.kt | 16 +++--- .../ui/settings/SettingsAdvancedScreen.kt | 24 ++++---- .../ui/settings/SettingsAppearanceScreen.kt | 42 +++++++------- .../ui/settings/SettingsBackupScreen.kt | 40 ++++++------- .../ui/settings/SettingsBrowseScreen.kt | 12 ++-- .../ui/settings/SettingsDownloadsScreen.kt | 12 ++-- .../ui/settings/SettingsGeneralScreen.kt | 34 +++++------ .../ui/settings/SettingsLibraryScreen.kt | 36 ++++++------ .../SettingsParentalControlsScreen.kt | 12 ++-- .../ui/settings/SettingsReaderScreen.kt | 38 ++++++------- .../{ => jui}/ui/settings/SettingsScreen.kt | 14 ++--- .../ui/settings/SettingsSecurityScreen.kt | 12 ++-- .../ui/settings/SettingsServerScreen.kt | 38 ++++++------- .../ui/settings/SettingsTrackingScreen.kt | 12 ++-- .../{ => jui}/ui/sources/SourcesScreen.kt | 4 +- .../ui/sources/browse/SourceScreen.kt | 16 +++--- .../sources/browse/SourceScreenViewModel.kt | 22 +++---- .../browse/components/SourceMangaBadges.kt | 6 +- .../components/SourceMangaComfortableGrid.kt | 12 ++-- .../components/SourceMangaCompactGrid.kt | 12 ++-- .../browse/components/SourceMangaList.kt | 14 ++--- .../browse/components/SourceScreenContent.kt | 28 ++++----- .../browse/filter/SourceFiltersMenu.kt | 18 +++--- .../browse/filter/SourceFiltersViewModel.kt | 14 ++--- .../browse/filter/model/SourceFiltersView.kt | 20 +++---- .../ui/sources/components/SourcesMenu.kt | 18 +++--- .../ui/sources/components/SourcesNavigator.kt | 10 ++-- .../globalsearch/GlobalSearchScreen.kt | 14 ++--- .../globalsearch/GlobalSearchViewModel.kt | 20 +++---- .../GlobalSearchMangaComfortableGrid.kt | 10 ++-- .../GlobalSearchMangaCompactGrid.kt | 10 ++-- .../components/GlobalSearchScreenContent.kt | 26 ++++----- .../ui/sources/home/SourceHomeScreen.kt | 12 ++-- .../sources/home/SourceHomeScreenViewModel.kt | 14 ++--- .../components/SourceHomeScreenContent.kt | 26 ++++----- .../sources/settings/SourceSettingsScreen.kt | 6 +- .../settings/SourceSettingsScreenViewModel.kt | 14 ++--- .../components/SourceSettingsScreenContent.kt | 38 ++++++------- .../settings/model/SourceSettingsView.kt | 18 +++--- .../{ => jui}/ui/updates/UpdatesScreen.kt | 12 ++-- .../ui/updates/UpdatesScreenViewModel.kt | 18 +++--- .../components/UpdatesScreenContent.kt | 32 +++++------ .../gosyer/{ => jui}/ui/util/compose/Color.kt | 4 +- .../gosyer/{ => jui}/ui/util/compose/Image.kt | 2 +- .../{ => jui}/ui/util/compose/Offset.kt | 2 +- .../gosyer/{ => jui}/ui/util/lang/Collator.kt | 4 +- .../ca/gosyer/{ => jui}/ui/util/lang/Okio.kt | 4 +- .../{ => jui}/ui/util/lang/PriorityChannel.kt | 6 +- .../{ => jui}/ui/util/lang/StringFormat.kt | 4 +- .../gosyer/{ => jui}/ui/util/system/Flow.kt | 2 +- .../gosyer/{ => jui}/ui/base/UiComponent.kt | 14 ++--- .../ui/base/components/DesktopTooltipArea.kt | 2 +- .../ui/base/file/DesktopFileChooser.kt | 4 +- .../ui/base/file/DesktopFileSaver.kt | 4 +- .../ui/base/navigation/ActionIcon.kt | 4 +- .../ui/base/navigation/DesktopBackHandler.kt | 2 +- .../ui/base/prefs/DesktopColorExtensions.kt | 2 +- .../ui/base/theme/ThemeScrollbarStyle.kt | 4 +- .../{ => jui}/ui/base/vm/ViewModelFactory.kt | 57 +++++++++---------- .../ui/categories/CategoriesWindow.kt | 4 +- .../ui/downloads/DesktopDownloadService.kt | 8 +-- .../library/components/DesktopLibraryGrid.kt | 8 +-- .../{ => jui}/ui/main/components/Tray.kt | 8 +-- .../ui/main/components/TrayViewModel.kt | 12 ++-- .../ui/manga/components/DesktopChapterItem.kt | 8 +-- .../{ => jui}/ui/reader/DesktopReaderMenu.kt | 6 +- .../DesktopSettingsAppearenceScreen.kt | 2 +- .../settings/DesktopSettingsServerScreen.kt | 32 +++++------ .../sources/components/DesktopSourcesMenu.kt | 4 +- .../gosyer/{ => jui}/ui/util/compose/Image.kt | 4 +- .../gosyer/{ => jui}/ui/util/compose/Theme.kt | 4 +- .../{ => jui}/ui/util/compose/WindowGet.kt | 4 +- .../ui/util/lang/CoroutineExtensions.kt | 2 +- .../gosyer/{ => jui}/ui/util/system/File.kt | 4 +- .../main/components/DebugOverlayViewModel.kt | 6 +- .../{ => jui}/ui/util/compose/JvmColor.kt | 4 +- .../gosyer/{ => jui}/ui/util/lang/Collator.kt | 4 +- .../gosyer/{ => jui}/ui/util/lang/JvmOkio.kt | 4 +- .../ui/util/lang/JvmPriorityChannel.kt | 6 +- .../{ => jui}/ui/util/lang/StringFormat.kt | 4 +- ui-core/build.gradle.kts | 2 +- ui-core/src/androidMain/AndroidManifest.xml | 2 +- .../uicore/components/AndroidDropDownMenu.kt | 2 +- .../uicore/components/AndroidScrollbar.kt | 4 +- .../uicore/resources/AndroidFileResource.kt | 2 +- .../uicore/resources/AndroidImageResource.kt | 2 +- .../uicore/resources/AndroidStringResource.kt | 2 +- .../{ => jui}/uicore/vm/ContextWrapper.kt | 2 +- .../uicore/components/AroundLayout.kt | 2 +- .../uicore/components/DropDownMenu.kt | 2 +- .../uicore/components/DropdownIconButton.kt | 2 +- .../uicore/components/ErrorScreen.kt | 6 +- .../uicore/components/KeyboardHandler.kt | 2 +- .../uicore/components/LoadingScreen.kt | 6 +- .../{ => jui}/uicore/components/Manga.kt | 4 +- .../uicore/components/MangaListItem.kt | 4 +- .../{ => jui}/uicore/components/Scrollbar.kt | 2 +- .../{ => jui}/uicore/components/Spinner.kt | 2 +- .../{ => jui}/uicore/image/KamelImage.kt | 6 +- .../{ => jui}/uicore/prefs/ColorPreference.kt | 4 +- .../uicore/prefs/IntStringPreference.kt | 4 +- .../uicore/prefs/PreferenceMutableState.kt | 4 +- .../uicore/resources/FileResource.kt | 2 +- .../uicore/resources/ImageResource.kt | 2 +- .../uicore/resources/StringResource.kt | 2 +- .../{ => jui}/uicore/theme/RandomColors.kt | 2 +- .../gosyer/{ => jui}/uicore/theme/Themes.kt | 2 +- .../{ => jui}/uicore/vm/ComposeViewModel.kt | 2 +- .../{ => jui}/uicore/vm/ContextWrapper.kt | 2 +- .../gosyer/{ => jui}/uicore/vm/ViewModel.kt | 8 +-- .../{ => jui}/uicore/vm/ViewModelFactory.kt | 2 +- .../components/BoxWithTooltipSurface.kt | 2 +- .../uicore/components/DesktopDropDownMenu.kt | 2 +- .../uicore/components/DesktopScrollbar.kt | 2 +- .../uicore/components/MouseClickable.kt | 2 +- .../uicore/resources/DesktopFileResource.kt | 2 +- .../uicore/resources/DesktopImageResource.kt | 2 +- .../uicore/resources/DesktopStringResource.kt | 2 +- .../{ => jui}/uicore/vm/ContextWrapper.kt | 2 +- 356 files changed, 1493 insertions(+), 1503 deletions(-) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/App.kt (94%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/AppComponent.kt (85%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/AppMigrations.kt (90%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/MainActivity.kt (88%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/ReaderActivity.kt (94%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt (92%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/data/notification/Notifications.kt (98%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/data/update/UpdateCheckWorker.kt (97%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/util/Context.kt (100%) rename android/src/main/{java => kotlin}/ca/gosyer/jui/android/util/NotificationExtensions.kt (100%) rename core/src/androidMain/kotlin/ca/gosyer/{ => jui}/core/prefs/AndroidPreference.kt (98%) rename core/src/androidMain/kotlin/ca/gosyer/{ => jui}/core/prefs/AndroidPreferenceAdapters.kt (99%) rename core/src/androidMain/kotlin/ca/gosyer/{ => jui}/core/prefs/AndroidPreferenceStore.kt (98%) rename core/src/androidMain/kotlin/ca/gosyer/{ => jui}/core/prefs/PreferenceStoreFactory.kt (95%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/di/AppScope.kt (92%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/io/FileSystems.kt (91%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/io/OkioExtensions.kt (90%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/lang/CoroutineExtensions.kt (98%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/lang/Dispatchers.kt (92%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/lang/Locale.kt (86%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/lang/String.kt (90%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/logging/Logging.kt (92%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/prefs/LazyPreferenceStore.kt (98%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/prefs/Preference.kt (98%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/prefs/PreferenceStore.kt (98%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/prefs/PreferenceStoreFactory.kt (90%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/util/CollectionExtensions.kt (97%) rename core/src/commonMain/kotlin/ca/gosyer/{ => jui}/core/util/ImageUtil.kt (97%) rename core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/core/io/AppDirs.kt (90%) rename core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/core/prefs/JvmPreference.kt (98%) rename core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/core/prefs/JvmPreferenceAdapters.kt (99%) rename core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/core/prefs/JvmPreferenceStore.kt (98%) rename core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/core/prefs/PreferenceStoreFactory.kt (95%) rename core/src/jvmMain/kotlin/ca/gosyer/{ => jui}/core/io/JvmFileSystems.kt (92%) rename core/src/jvmMain/kotlin/ca/gosyer/{ => jui}/core/lang/JvmDispatchers.kt (92%) rename core/src/jvmMain/kotlin/ca/gosyer/{ => jui}/core/lang/JvmLocale.kt (88%) rename core/src/jvmMain/kotlin/ca/gosyer/{ => jui}/core/lang/JvmString.kt (93%) rename data/src/androidMain/kotlin/ca/gosyer/{ => jui}/data/DataComponent.kt (80%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/DataComponent.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/base/WebsocketService.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/catalog/CatalogPreferences.kt (74%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/download/DownloadService.kt (78%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/download/model/DownloadChapter.kt (80%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/download/model/DownloadState.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/download/model/DownloadStatus.kt (89%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/download/model/DownloaderStatus.kt (88%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/extension/ExtensionPreferences.kt (74%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/library/LibraryPreferences.kt (82%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/library/LibraryUpdateService.kt (76%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/library/model/DisplayMode.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/library/model/JobStatus.kt (89%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/library/model/Sort.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/library/model/UpdateStatus.kt (89%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/migration/MigrationPreferences.kt (79%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/migration/Migrations.kt (85%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/About.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/BackupValidationResult.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/Category.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/Chapter.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/Extension.kt (94%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/Manga.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/MangaAndChapter.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/MangaPage.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/Page.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/Source.kt (95%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/Updates.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/CheckBoxFilter.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/GroupFilter.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/HeaderFilter.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/SelectFilter.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/SeparatorFilter.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/SortFilter.kt (93%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/SourceFilter.kt (89%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/SourceFilterChange.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/TextFilter.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcefilters/TriStateFilter.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcepreference/CheckBoxPreference.kt (89%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcepreference/EditTextPreference.kt (94%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcepreference/ListPreference.kt (94%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcepreference/MultiSelectListPreference.kt (94%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcepreference/SourcePreference.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcepreference/SourcePreferenceChange.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcepreference/SwitchPreference.kt (89%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/models/sourcepreference/TwoStateProps.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/reader/ReaderModePreferences.kt (85%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/reader/ReaderModeWatch.kt (97%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/reader/ReaderPreferences.kt (85%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/reader/model/DefaultReaderMode.kt (95%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/reader/model/Direction.kt (88%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/reader/model/ImageScale.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/reader/model/NavigationMode.kt (89%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/reader/model/TappingInvertMode.kt (93%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/HttpClient.kt (95%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/ServerPreferences.kt (88%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/ServerUrlPreference.kt (94%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/BackupInteractionHandler.kt (85%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/BaseInteractionHandler.kt (76%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/CategoryInteractionHandler.kt (84%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/ChapterInteractionHandler.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/DownloadInteractionHandler.kt (76%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/ExtensionInteractionHandler.kt (78%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/LibraryInteractionHandler.kt (78%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/MangaInteractionHandler.kt (84%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/SourceInteractionHandler.kt (81%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/interactions/UpdatesInteractionHandler.kt (80%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/model/Auth.kt (88%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/model/Proxy.kt (89%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Backup.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Category.kt (96%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Chapters.kt (96%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Downloads.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Extensions.kt (93%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Library.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Manga.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Meta.kt (85%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/RestRequests.kt (88%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Sources.kt (96%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/server/requests/Updates.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/ui/UiPreferences.kt (88%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/ui/model/StartScreen.kt (91%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/ui/model/ThemeMode.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/ui/model/WindowSettings.kt (92%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/update/UpdateChecker.kt (90%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/update/UpdatePreferences.kt (75%) rename data/src/commonMain/kotlin/ca/gosyer/{ => jui}/data/update/model/GithubRelease.kt (92%) rename data/src/desktopMain/kotlin/ca/gosyer/{ => jui}/data/DataComponent.kt (80%) rename data/src/desktopMain/kotlin/ca/gosyer/{ => jui}/data/server/ServerHostPreferences.kt (94%) rename data/src/desktopMain/kotlin/ca/gosyer/{ => jui}/data/server/ServerService.kt (96%) rename data/src/desktopMain/kotlin/ca/gosyer/{ => jui}/data/server/host/ServerHostPreference.kt (96%) rename desktop/src/main/kotlin/ca/gosyer/{ => jui/desktop}/AppComponent.kt (81%) rename desktop/src/main/kotlin/ca/gosyer/{ => jui/desktop}/AppMigrations.kt (81%) rename desktop/src/main/kotlin/ca/gosyer/{core => jui/desktop}/logging/LoggingSetup.kt (98%) rename desktop/src/main/kotlin/ca/gosyer/{ => jui/desktop}/main.kt (89%) delete mode 100644 i18n/src/commonMain/kotlin/ca.gosyer.i18n/StringList.kt rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/UiComponent.kt (78%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/components/AndroidTooltipArea.kt (96%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/file/AndroidFileChooser.kt (97%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/file/AndroidFileSaver.kt (97%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/ActionIcon.kt (93%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/AndroidBackHandler.kt (91%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/prefs/AndroidColorExtensions.kt (95%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/theme/ThemeScrollbarStyle.kt (81%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/base/vm/ViewModelFactory.kt (69%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/categories/OpenCategories.kt (95%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/downloads/AndroidDownloadService.kt (80%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/AndroidLibraryGrid.kt (91%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/manga/components/AndroidChapterItem.kt (92%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/reader/AndroidReaderMenu.kt (97%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/settings/AndroidSettingsAppearenceScreen.kt (88%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/settings/AndroidSettingsServerScreen.kt (83%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/sources/components/AndroidSourcesMenu.kt (91%) rename presentation/src/androidMain/kotlin/ca/gosyer/{ => jui}/ui/util/compose/Image.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/UiComponent.kt (76%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/chapter/ChapterDownloadButtons.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/components/LocaleToString.kt (74%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/components/TooltipArea.kt (88%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/dialog/MaterialDialogProperties.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/file/FileChooser.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/file/FileSaver.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/image/KamelConfigProvider.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/ActionIcon.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/ActionMenu.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/BackHandler.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/DisplayController.kt (96%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/Toolbar.kt (98%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/prefs/ColorPickerDialog.kt (98%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/prefs/PreferencesUiBuilder.kt (97%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/theme/AppColorsPreference.kt (80%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/theme/AppTheme.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/theme/ThemeScrollbarStyle.kt (79%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/base/vm/ViewModelFactory.kt (79%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/categories/CategoriesScreen.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/categories/CategoriesScreenViewModel.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/categories/components/CategoriesDialogs.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/categories/components/CategoriesScreenContent.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/downloads/DownloadService.kt (67%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/downloads/DownloadsScreen.kt (87%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/downloads/DownloadsScreenViewModel.kt (85%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/downloads/components/DownloadsScreenContent.kt (87%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/extensions/ExtensionsScreen.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/extensions/ExtensionsScreenViewModel.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/extensions/components/ExtensionsScreenContent.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/LibraryScreen.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/LibraryScreenViewModel.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/LibraryMangaBadges.kt (97%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/LibraryMangaList.kt (88%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/LibraryPager.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/LibraryScreenContent.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/LibraryTabs.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/MangaComfortableGrid.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/MangaCompactGrid.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/MangaCoverOnlyGrid.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/MainMenu.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/MainViewModel.kt (78%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/Routes.kt (71%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/TopLevelMenus.kt (87%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/BottomNav.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/DebugOverlay.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/DebugOverlayViewModel.kt (82%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/DownloadsExtraInfo.kt (87%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/SideMenu.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/SideMenuItem.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/more/MoreScreen.kt (85%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/main/more/components/MoreContent.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/manga/MangaScreen.kt (84%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/manga/MangaScreenViewModel.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/manga/components/ChapterItem.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/manga/components/MangaMenu.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/manga/components/MangaScreenContent.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/ChapterLoader.kt (83%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/ReaderMenu.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/ReaderMenuViewModel.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/ReaderSideMenu.kt (96%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/loader/PageLoader.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/loader/TachideskPageLoader.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/model/MoveTo.kt (87%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/model/Navigation.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/model/PageMove.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/model/ReaderChapter.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/model/ReaderPage.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/model/ViewerChapters.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/navigation/EdgeNavigation.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/navigation/KindlishNavigation.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/navigation/LNavigation.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/navigation/NavigationClickable.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/navigation/RightAndLeftNavigation.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/navigation/ViewerNavigation.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/viewer/Continuous.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/reader/viewer/Pager.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsAdvancedScreen.kt (79%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsAppearanceScreen.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsBackupScreen.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsBrowseScreen.kt (85%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsDownloadsScreen.kt (85%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsGeneralScreen.kt (88%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsLibraryScreen.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsParentalControlsScreen.kt (85%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsReaderScreen.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsScreen.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsSecurityScreen.kt (85%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsServerScreen.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/settings/SettingsTrackingScreen.kt (85%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/SourcesScreen.kt (86%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/SourceScreen.kt (87%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/SourceScreenViewModel.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/components/SourceMangaBadges.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/components/SourceMangaComfortableGrid.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/components/SourceMangaCompactGrid.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/components/SourceMangaList.kt (88%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/components/SourceScreenContent.kt (96%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/filter/SourceFiltersMenu.kt (95%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/filter/SourceFiltersViewModel.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/browse/filter/model/SourceFiltersView.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/components/SourcesMenu.kt (93%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/components/SourcesNavigator.kt (96%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/globalsearch/GlobalSearchScreen.kt (80%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/globalsearch/GlobalSearchViewModel.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/globalsearch/components/GlobalSearchMangaComfortableGrid.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/globalsearch/components/GlobalSearchMangaCompactGrid.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/home/SourceHomeScreen.kt (83%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/home/SourceHomeScreenViewModel.kt (88%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/home/components/SourceHomeScreenContent.kt (92%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/settings/SourceSettingsScreen.kt (84%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/settings/SourceSettingsScreenViewModel.kt (86%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/settings/components/SourceSettingsScreenContent.kt (84%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/sources/settings/model/SourceSettingsView.kt (91%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/updates/UpdatesScreen.kt (80%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/updates/UpdatesScreenViewModel.kt (89%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/updates/components/UpdatesScreenContent.kt (85%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/util/compose/Color.kt (82%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/util/compose/Image.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/util/compose/Offset.kt (94%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/Collator.kt (90%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/Okio.kt (77%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/PriorityChannel.kt (81%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/StringFormat.kt (87%) rename presentation/src/commonMain/kotlin/ca/gosyer/{ => jui}/ui/util/system/Flow.kt (95%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/UiComponent.kt (78%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/components/DesktopTooltipArea.kt (96%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/file/DesktopFileChooser.kt (94%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/file/DesktopFileSaver.kt (95%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/ActionIcon.kt (89%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/navigation/DesktopBackHandler.kt (89%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/prefs/DesktopColorExtensions.kt (95%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/theme/ThemeScrollbarStyle.kt (90%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/base/vm/ViewModelFactory.kt (69%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/categories/CategoriesWindow.kt (93%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/downloads/DesktopDownloadService.kt (68%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/library/components/DesktopLibraryGrid.kt (82%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/Tray.kt (89%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/TrayViewModel.kt (81%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/manga/components/DesktopChapterItem.kt (87%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/reader/DesktopReaderMenu.kt (96%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/settings/DesktopSettingsAppearenceScreen.kt (88%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/settings/DesktopSettingsServerScreen.kt (92%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/sources/components/DesktopSourcesMenu.kt (82%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/util/compose/Image.kt (93%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/util/compose/Theme.kt (95%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/util/compose/WindowGet.kt (95%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/CoroutineExtensions.kt (94%) rename presentation/src/desktopMain/kotlin/ca/gosyer/{ => jui}/ui/util/system/File.kt (96%) rename presentation/src/jvmMain/kotlin/ca/gosyer/{ => jui}/ui/main/components/DebugOverlayViewModel.kt (91%) rename presentation/src/jvmMain/kotlin/ca/gosyer/{ => jui}/ui/util/compose/JvmColor.kt (88%) rename presentation/src/jvmMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/Collator.kt (94%) rename presentation/src/jvmMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/JvmOkio.kt (91%) rename presentation/src/jvmMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/JvmPriorityChannel.kt (74%) rename presentation/src/jvmMain/kotlin/ca/gosyer/{ => jui}/ui/util/lang/StringFormat.kt (91%) rename ui-core/src/androidMain/kotlin/ca/gosyer/{ => jui}/uicore/components/AndroidDropDownMenu.kt (98%) rename ui-core/src/androidMain/kotlin/ca/gosyer/{ => jui}/uicore/components/AndroidScrollbar.kt (92%) rename ui-core/src/androidMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/AndroidFileResource.kt (93%) rename ui-core/src/androidMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/AndroidImageResource.kt (92%) rename ui-core/src/androidMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/AndroidStringResource.kt (97%) rename ui-core/src/androidMain/kotlin/ca/gosyer/{ => jui}/uicore/vm/ContextWrapper.kt (97%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/AroundLayout.kt (98%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/DropDownMenu.kt (98%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/DropdownIconButton.kt (98%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/ErrorScreen.kt (93%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/KeyboardHandler.kt (96%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/LoadingScreen.kt (92%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/Manga.kt (97%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/MangaListItem.kt (96%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/Scrollbar.kt (98%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/components/Spinner.kt (98%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/image/KamelImage.kt (92%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/prefs/ColorPreference.kt (95%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/prefs/IntStringPreference.kt (94%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/prefs/PreferenceMutableState.kt (92%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/FileResource.kt (90%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/ImageResource.kt (91%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/StringResource.kt (94%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/theme/RandomColors.kt (96%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/theme/Themes.kt (97%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/vm/ComposeViewModel.kt (96%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/vm/ContextWrapper.kt (94%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/vm/ViewModel.kt (88%) rename ui-core/src/commonMain/kotlin/ca/gosyer/{ => jui}/uicore/vm/ViewModelFactory.kt (95%) rename ui-core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/uicore/components/BoxWithTooltipSurface.kt (96%) rename ui-core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/uicore/components/DesktopDropDownMenu.kt (97%) rename ui-core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/uicore/components/DesktopScrollbar.kt (97%) rename ui-core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/uicore/components/MouseClickable.kt (99%) rename ui-core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/DesktopFileResource.kt (91%) rename ui-core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/DesktopImageResource.kt (93%) rename ui-core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/uicore/resources/DesktopStringResource.kt (96%) rename ui-core/src/desktopMain/kotlin/ca/gosyer/{ => jui}/uicore/vm/ContextWrapper.kt (95%) diff --git a/android/src/main/java/ca/gosyer/jui/android/App.kt b/android/src/main/kotlin/ca/gosyer/jui/android/App.kt similarity index 94% rename from android/src/main/java/ca/gosyer/jui/android/App.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/App.kt index 76b59881..e0cb3ccf 100644 --- a/android/src/main/java/ca/gosyer/jui/android/App.kt +++ b/android/src/main/kotlin/ca/gosyer/jui/android/App.kt @@ -12,11 +12,11 @@ import androidx.core.os.LocaleListCompat import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.lifecycleScope -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.getAsFlow -import ca.gosyer.data.ui.model.ThemeMode import ca.gosyer.jui.android.data.notification.Notifications +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.getAsFlow +import ca.gosyer.jui.data.ui.model.ThemeMode import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import java.util.Locale diff --git a/android/src/main/java/ca/gosyer/jui/android/AppComponent.kt b/android/src/main/kotlin/ca/gosyer/jui/android/AppComponent.kt similarity index 85% rename from android/src/main/java/ca/gosyer/jui/android/AppComponent.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/AppComponent.kt index 3c544b25..8b95d0f2 100644 --- a/android/src/main/java/ca/gosyer/jui/android/AppComponent.kt +++ b/android/src/main/kotlin/ca/gosyer/jui/android/AppComponent.kt @@ -8,11 +8,11 @@ package ca.gosyer.jui.android import android.annotation.SuppressLint import android.content.Context -import ca.gosyer.core.di.AppScope -import ca.gosyer.data.DataComponent -import ca.gosyer.data.create -import ca.gosyer.ui.base.UiComponent -import ca.gosyer.ui.base.create +import ca.gosyer.jui.core.di.AppScope +import ca.gosyer.jui.data.DataComponent +import ca.gosyer.jui.data.create +import ca.gosyer.jui.ui.base.UiComponent +import ca.gosyer.jui.ui.base.create import me.tatarka.inject.annotations.Component import me.tatarka.inject.annotations.Provides diff --git a/android/src/main/java/ca/gosyer/jui/android/AppMigrations.kt b/android/src/main/kotlin/ca/gosyer/jui/android/AppMigrations.kt similarity index 90% rename from android/src/main/java/ca/gosyer/jui/android/AppMigrations.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/AppMigrations.kt index 1be0bc72..a80f71a7 100644 --- a/android/src/main/java/ca/gosyer/jui/android/AppMigrations.kt +++ b/android/src/main/kotlin/ca/gosyer/jui/android/AppMigrations.kt @@ -6,9 +6,9 @@ package ca.gosyer.jui.android -import ca.gosyer.data.migration.MigrationPreferences import ca.gosyer.jui.android.data.update.UpdateCheckWorker -import ca.gosyer.uicore.vm.ContextWrapper +import ca.gosyer.jui.data.migration.MigrationPreferences +import ca.gosyer.jui.uicore.vm.ContextWrapper import me.tatarka.inject.annotations.Inject class AppMigrations @Inject constructor( diff --git a/android/src/main/java/ca/gosyer/jui/android/MainActivity.kt b/android/src/main/kotlin/ca/gosyer/jui/android/MainActivity.kt similarity index 88% rename from android/src/main/java/ca/gosyer/jui/android/MainActivity.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/MainActivity.kt index 081de59d..81940be5 100644 --- a/android/src/main/java/ca/gosyer/jui/android/MainActivity.kt +++ b/android/src/main/kotlin/ca/gosyer/jui/android/MainActivity.kt @@ -4,10 +4,10 @@ import android.os.Bundle import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity import androidx.compose.runtime.CompositionLocalProvider -import ca.gosyer.data.base.WebsocketService.Actions import ca.gosyer.jui.android.data.download.AndroidDownloadService -import ca.gosyer.ui.base.theme.AppTheme -import ca.gosyer.ui.main.MainMenu +import ca.gosyer.jui.data.base.WebsocketService.Actions +import ca.gosyer.jui.ui.base.theme.AppTheme +import ca.gosyer.jui.ui.main.MainMenu class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/android/src/main/java/ca/gosyer/jui/android/ReaderActivity.kt b/android/src/main/kotlin/ca/gosyer/jui/android/ReaderActivity.kt similarity index 94% rename from android/src/main/java/ca/gosyer/jui/android/ReaderActivity.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/ReaderActivity.kt index 9b4bd1ad..0b74e6bc 100644 --- a/android/src/main/java/ca/gosyer/jui/android/ReaderActivity.kt +++ b/android/src/main/kotlin/ca/gosyer/jui/android/ReaderActivity.kt @@ -16,9 +16,9 @@ import androidx.compose.ui.input.key.KeyEvent import androidx.compose.ui.input.key.NativeKeyEvent import androidx.compose.ui.input.key.key import androidx.lifecycle.lifecycleScope -import ca.gosyer.ui.base.theme.AppTheme -import ca.gosyer.ui.reader.ReaderMenu -import ca.gosyer.ui.reader.supportedKeyList +import ca.gosyer.jui.ui.base.theme.AppTheme +import ca.gosyer.jui.ui.reader.ReaderMenu +import ca.gosyer.jui.ui.reader.supportedKeyList import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.launch diff --git a/android/src/main/java/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt b/android/src/main/kotlin/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt similarity index 92% rename from android/src/main/java/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt index f451827b..e0848054 100644 --- a/android/src/main/java/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt +++ b/android/src/main/kotlin/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt @@ -11,24 +11,24 @@ import android.content.Context import android.content.Intent import android.os.IBinder import androidx.core.content.ContextCompat -import ca.gosyer.core.lang.chop -import ca.gosyer.core.lang.throwIfCancellation -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.core.prefs.getAsFlow -import ca.gosyer.data.base.WebsocketService.Actions -import ca.gosyer.data.base.WebsocketService.Status -import ca.gosyer.data.download.DownloadService -import ca.gosyer.data.download.DownloadService.Companion.status -import ca.gosyer.data.download.model.DownloadState -import ca.gosyer.data.download.model.DownloadStatus -import ca.gosyer.data.server.requests.downloadsQuery -import ca.gosyer.i18n.MR import ca.gosyer.jui.android.AppComponent import ca.gosyer.jui.android.R import ca.gosyer.jui.android.data.notification.Notifications import ca.gosyer.jui.android.util.notification import ca.gosyer.jui.android.util.notificationBuilder import ca.gosyer.jui.android.util.notificationManager +import ca.gosyer.jui.core.lang.chop +import ca.gosyer.jui.core.lang.throwIfCancellation +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.core.prefs.getAsFlow +import ca.gosyer.jui.data.base.WebsocketService.Actions +import ca.gosyer.jui.data.base.WebsocketService.Status +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.data.download.DownloadService.Companion.status +import ca.gosyer.jui.data.download.model.DownloadState +import ca.gosyer.jui.data.download.model.DownloadStatus +import ca.gosyer.jui.data.server.requests.downloadsQuery +import ca.gosyer.jui.i18n.MR import dev.icerock.moko.resources.desc.desc import dev.icerock.moko.resources.format import io.ktor.client.features.websocket.ws diff --git a/android/src/main/java/ca/gosyer/jui/android/data/notification/Notifications.kt b/android/src/main/kotlin/ca/gosyer/jui/android/data/notification/Notifications.kt similarity index 98% rename from android/src/main/java/ca/gosyer/jui/android/data/notification/Notifications.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/data/notification/Notifications.kt index c9468cd5..a0753356 100644 --- a/android/src/main/java/ca/gosyer/jui/android/data/notification/Notifications.kt +++ b/android/src/main/kotlin/ca/gosyer/jui/android/data/notification/Notifications.kt @@ -8,9 +8,9 @@ package ca.gosyer.jui.android.data.notification import android.content.Context import androidx.core.app.NotificationManagerCompat -import ca.gosyer.i18n.MR import ca.gosyer.jui.android.util.buildNotificationChannel import ca.gosyer.jui.android.util.buildNotificationChannelGroup +import ca.gosyer.jui.i18n.MR import dev.icerock.moko.resources.desc.desc object Notifications { diff --git a/android/src/main/java/ca/gosyer/jui/android/data/update/UpdateCheckWorker.kt b/android/src/main/kotlin/ca/gosyer/jui/android/data/update/UpdateCheckWorker.kt similarity index 97% rename from android/src/main/java/ca/gosyer/jui/android/data/update/UpdateCheckWorker.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/data/update/UpdateCheckWorker.kt index da4f0ace..7d50321c 100644 --- a/android/src/main/java/ca/gosyer/jui/android/data/update/UpdateCheckWorker.kt +++ b/android/src/main/kotlin/ca/gosyer/jui/android/data/update/UpdateCheckWorker.kt @@ -14,12 +14,12 @@ import androidx.work.NetworkType import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkerParameters -import ca.gosyer.data.update.UpdateChecker.Update -import ca.gosyer.i18n.MR import ca.gosyer.jui.android.AppComponent import ca.gosyer.jui.android.data.notification.Notifications import ca.gosyer.jui.android.util.notificationBuilder import ca.gosyer.jui.android.util.notificationManager +import ca.gosyer.jui.data.update.UpdateChecker.Update +import ca.gosyer.jui.i18n.MR import dev.icerock.moko.resources.desc.desc import kotlinx.coroutines.flow.singleOrNull import java.util.concurrent.TimeUnit diff --git a/android/src/main/java/ca/gosyer/jui/android/util/Context.kt b/android/src/main/kotlin/ca/gosyer/jui/android/util/Context.kt similarity index 100% rename from android/src/main/java/ca/gosyer/jui/android/util/Context.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/util/Context.kt diff --git a/android/src/main/java/ca/gosyer/jui/android/util/NotificationExtensions.kt b/android/src/main/kotlin/ca/gosyer/jui/android/util/NotificationExtensions.kt similarity index 100% rename from android/src/main/java/ca/gosyer/jui/android/util/NotificationExtensions.kt rename to android/src/main/kotlin/ca/gosyer/jui/android/util/NotificationExtensions.kt diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b7713f26..862597c9 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -83,5 +83,5 @@ dependencies { } buildkonfig { - packageName = "ca.gosyer.core.build" + packageName = "ca.gosyer.jui.core.build" } diff --git a/core/src/androidMain/AndroidManifest.xml b/core/src/androidMain/AndroidManifest.xml index ad747f13..cd147468 100644 --- a/core/src/androidMain/AndroidManifest.xml +++ b/core/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreference.kt b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreference.kt similarity index 98% rename from core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreference.kt rename to core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreference.kt index 4f828264..b7c2637e 100644 --- a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreference.kt +++ b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import com.russhwolf.settings.ObservableSettings import kotlinx.coroutines.CoroutineScope diff --git a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreferenceAdapters.kt b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceAdapters.kt similarity index 99% rename from core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreferenceAdapters.kt rename to core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceAdapters.kt index 84979086..03b69a1e 100644 --- a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreferenceAdapters.kt +++ b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceAdapters.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import com.russhwolf.settings.ObservableSettings import com.russhwolf.settings.serialization.decodeValue diff --git a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreferenceStore.kt b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceStore.kt similarity index 98% rename from core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreferenceStore.kt rename to core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceStore.kt index fa620ca2..2fd0f80a 100644 --- a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/AndroidPreferenceStore.kt +++ b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceStore.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import com.russhwolf.settings.ObservableSettings import kotlinx.serialization.KSerializer diff --git a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt similarity index 95% rename from core/src/androidMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt rename to core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt index cebee1c4..70f7842f 100644 --- a/core/src/androidMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt +++ b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import android.content.Context import com.russhwolf.settings.AndroidSettings diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/di/AppScope.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/di/AppScope.kt similarity index 92% rename from core/src/commonMain/kotlin/ca/gosyer/core/di/AppScope.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/di/AppScope.kt index 58f5fa37..3343a442 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/di/AppScope.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/di/AppScope.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.di +package ca.gosyer.jui.core.di import me.tatarka.inject.annotations.Scope diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/io/FileSystems.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/io/FileSystems.kt similarity index 91% rename from core/src/commonMain/kotlin/ca/gosyer/core/io/FileSystems.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/io/FileSystems.kt index fb844d57..719e3e43 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/io/FileSystems.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/io/FileSystems.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.io +package ca.gosyer.jui.core.io import okio.FileSystem diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/io/OkioExtensions.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/io/OkioExtensions.kt similarity index 90% rename from core/src/commonMain/kotlin/ca/gosyer/core/io/OkioExtensions.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/io/OkioExtensions.kt index fa06a559..db62bae1 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/io/OkioExtensions.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/io/OkioExtensions.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.io +package ca.gosyer.jui.core.io -import ca.gosyer.core.lang.withIOContext +import ca.gosyer.jui.core.lang.withIOContext import okio.BufferedSink import okio.FileSystem import okio.Path diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/lang/CoroutineExtensions.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/CoroutineExtensions.kt similarity index 98% rename from core/src/commonMain/kotlin/ca/gosyer/core/lang/CoroutineExtensions.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/CoroutineExtensions.kt index 0a940071..7ac0dece 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/lang/CoroutineExtensions.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/CoroutineExtensions.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.lang +package ca.gosyer.jui.core.lang import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/lang/Dispatchers.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/Dispatchers.kt similarity index 92% rename from core/src/commonMain/kotlin/ca/gosyer/core/lang/Dispatchers.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/Dispatchers.kt index c9324a3b..c6aba9d9 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/lang/Dispatchers.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/Dispatchers.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.lang +package ca.gosyer.jui.core.lang import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/lang/Locale.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/Locale.kt similarity index 86% rename from core/src/commonMain/kotlin/ca/gosyer/core/lang/Locale.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/Locale.kt index 53604d35..51619206 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/lang/Locale.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/Locale.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.lang +package ca.gosyer.jui.core.lang import io.fluidsonic.locale.Locale @@ -14,4 +14,4 @@ expect fun Locale.getDisplayLanguage(displayLocale: Locale): String expect fun Locale.getDisplayName(displayLocale: Locale): String -expect val Locale.displayName: String \ No newline at end of file +expect val Locale.displayName: String diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/lang/String.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/String.kt similarity index 90% rename from core/src/commonMain/kotlin/ca/gosyer/core/lang/String.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/String.kt index cdab4810..e202d801 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/lang/String.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/String.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.lang +package ca.gosyer.jui.core.lang import io.fluidsonic.locale.Locale @@ -24,4 +24,4 @@ expect fun String.uppercase(locale: Locale): String expect fun String.lowercase(locale: Locale): String -expect fun Char.titlecase(locale: Locale): String \ No newline at end of file +expect fun Char.titlecase(locale: Locale): String diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/logging/Logging.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/logging/Logging.kt similarity index 92% rename from core/src/commonMain/kotlin/ca/gosyer/core/logging/Logging.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/logging/Logging.kt index 63377d42..288d6b3b 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/logging/Logging.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/logging/Logging.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.logging +package ca.gosyer.jui.core.logging import mu.KLogger import mu.KotlinLogging diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/LazyPreferenceStore.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/LazyPreferenceStore.kt similarity index 98% rename from core/src/commonMain/kotlin/ca/gosyer/core/prefs/LazyPreferenceStore.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/LazyPreferenceStore.kt index 2ca7926e..f1f38344 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/LazyPreferenceStore.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/LazyPreferenceStore.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import kotlinx.serialization.KSerializer import kotlinx.serialization.modules.SerializersModule diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/Preference.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/Preference.kt similarity index 98% rename from core/src/commonMain/kotlin/ca/gosyer/core/prefs/Preference.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/Preference.kt index dda504af..2619023b 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/Preference.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/Preference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStore.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt similarity index 98% rename from core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStore.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt index 97fba8a1..39a36c57 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStore.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import kotlinx.serialization.KSerializer import kotlinx.serialization.modules.EmptySerializersModule diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt similarity index 90% rename from core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt index 9fefaf41..dfa3b73b 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs expect class PreferenceStoreFactory { fun create(vararg names: String): PreferenceStore diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/util/CollectionExtensions.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/util/CollectionExtensions.kt similarity index 97% rename from core/src/commonMain/kotlin/ca/gosyer/core/util/CollectionExtensions.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/util/CollectionExtensions.kt index 18f60356..92c942ec 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/util/CollectionExtensions.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/util/CollectionExtensions.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.util +package ca.gosyer.jui.core.util /** * Returns a new list that replaces the item at the given [position] with [newItem]. diff --git a/core/src/commonMain/kotlin/ca/gosyer/core/util/ImageUtil.kt b/core/src/commonMain/kotlin/ca/gosyer/jui/core/util/ImageUtil.kt similarity index 97% rename from core/src/commonMain/kotlin/ca/gosyer/core/util/ImageUtil.kt rename to core/src/commonMain/kotlin/ca/gosyer/jui/core/util/ImageUtil.kt index a77832cd..ea4f4c36 100644 --- a/core/src/commonMain/kotlin/ca/gosyer/core/util/ImageUtil.kt +++ b/core/src/commonMain/kotlin/ca/gosyer/jui/core/util/ImageUtil.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.util +package ca.gosyer.jui.core.util import io.ktor.utils.io.core.toByteArray diff --git a/core/src/desktopMain/kotlin/ca/gosyer/core/io/AppDirs.kt b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/io/AppDirs.kt similarity index 90% rename from core/src/desktopMain/kotlin/ca/gosyer/core/io/AppDirs.kt rename to core/src/desktopMain/kotlin/ca/gosyer/jui/core/io/AppDirs.kt index 65e65cee..4e750b87 100644 --- a/core/src/desktopMain/kotlin/ca/gosyer/core/io/AppDirs.kt +++ b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/io/AppDirs.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.io +package ca.gosyer.jui.core.io -import ca.gosyer.core.build.BuildKonfig +import ca.gosyer.jui.core.build.BuildKonfig import mu.KotlinLogging import net.harawata.appdirs.AppDirsFactory import okio.FileSystem diff --git a/core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreference.kt b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreference.kt similarity index 98% rename from core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreference.kt rename to core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreference.kt index 2a56d64d..139539ec 100644 --- a/core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreference.kt +++ b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import com.russhwolf.settings.ObservableSettings import kotlinx.coroutines.CoroutineScope diff --git a/core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreferenceAdapters.kt b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreferenceAdapters.kt similarity index 99% rename from core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreferenceAdapters.kt rename to core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreferenceAdapters.kt index ac9d6ef7..204abed5 100644 --- a/core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreferenceAdapters.kt +++ b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreferenceAdapters.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import com.russhwolf.settings.ObservableSettings import com.russhwolf.settings.serialization.decodeValue diff --git a/core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreferenceStore.kt b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreferenceStore.kt similarity index 98% rename from core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreferenceStore.kt rename to core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreferenceStore.kt index 2a407431..3b3eacac 100644 --- a/core/src/desktopMain/kotlin/ca/gosyer/core/prefs/JvmPreferenceStore.kt +++ b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreferenceStore.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import com.russhwolf.settings.ObservableSettings import kotlinx.serialization.KSerializer diff --git a/core/src/desktopMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt similarity index 95% rename from core/src/desktopMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt rename to core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt index 43283b14..fbc93d13 100644 --- a/core/src/desktopMain/kotlin/ca/gosyer/core/prefs/PreferenceStoreFactory.kt +++ b/core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.prefs +package ca.gosyer.jui.core.prefs import com.russhwolf.settings.JvmPreferencesSettings import me.tatarka.inject.annotations.Inject diff --git a/core/src/jvmMain/kotlin/ca/gosyer/core/io/JvmFileSystems.kt b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/io/JvmFileSystems.kt similarity index 92% rename from core/src/jvmMain/kotlin/ca/gosyer/core/io/JvmFileSystems.kt rename to core/src/jvmMain/kotlin/ca/gosyer/jui/core/io/JvmFileSystems.kt index 7bafba65..c43b8201 100644 --- a/core/src/jvmMain/kotlin/ca/gosyer/core/io/JvmFileSystems.kt +++ b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/io/JvmFileSystems.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.io +package ca.gosyer.jui.core.io import okio.FileSystem diff --git a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmDispatchers.kt b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmDispatchers.kt similarity index 92% rename from core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmDispatchers.kt rename to core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmDispatchers.kt index 03965f21..95c071a4 100644 --- a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmDispatchers.kt +++ b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmDispatchers.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.lang +package ca.gosyer.jui.core.lang import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmLocale.kt b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt similarity index 88% rename from core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmLocale.kt rename to core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt index 94da8695..097499ac 100644 --- a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmLocale.kt +++ b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.lang +package ca.gosyer.jui.core.lang import io.fluidsonic.locale.Locale import io.fluidsonic.locale.toCommon @@ -19,4 +19,4 @@ actual fun Locale.getDisplayLanguage(displayLocale: Locale): String = toPlatform actual fun Locale.getDisplayName(displayLocale: Locale): String = toPlatform() .getDisplayName(displayLocale.toPlatform()) -actual val Locale.displayName get() = toPlatform().displayName \ No newline at end of file +actual val Locale.displayName get() = toPlatform().displayName diff --git a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmString.kt b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmString.kt similarity index 93% rename from core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmString.kt rename to core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmString.kt index 8fc318de..2bc4686c 100644 --- a/core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmString.kt +++ b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmString.kt @@ -5,7 +5,7 @@ */ @file:JvmName("JvmStringsKt") -package ca.gosyer.core.lang +package ca.gosyer.jui.core.lang import io.fluidsonic.locale.Locale import io.fluidsonic.locale.toPlatform @@ -13,9 +13,8 @@ import io.fluidsonic.locale.toPlatform fun String.capitalize(locale: Locale = Locale.getDefault()) = replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() } - actual fun String.uppercase(locale: Locale): String = uppercase(locale.toPlatform()) actual fun String.lowercase(locale: Locale): String = lowercase(locale.toPlatform()) -actual fun Char.titlecase(locale: Locale): String = titlecase(locale.toPlatform()) \ No newline at end of file +actual fun Char.titlecase(locale: Locale): String = titlecase(locale.toPlatform()) diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 2f2f6c25..4158b562 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -80,5 +80,5 @@ dependencies { } buildkonfig { - packageName = "ca.gosyer.data.build" + packageName = "ca.gosyer.jui.data.build" } diff --git a/data/src/androidMain/AndroidManifest.xml b/data/src/androidMain/AndroidManifest.xml index f0ad8144..09caee8e 100644 --- a/data/src/androidMain/AndroidManifest.xml +++ b/data/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/src/androidMain/kotlin/ca/gosyer/data/DataComponent.kt b/data/src/androidMain/kotlin/ca/gosyer/jui/data/DataComponent.kt similarity index 80% rename from data/src/androidMain/kotlin/ca/gosyer/data/DataComponent.kt rename to data/src/androidMain/kotlin/ca/gosyer/jui/data/DataComponent.kt index aff84c97..1398d091 100644 --- a/data/src/androidMain/kotlin/ca/gosyer/data/DataComponent.kt +++ b/data/src/androidMain/kotlin/ca/gosyer/jui/data/DataComponent.kt @@ -4,25 +4,25 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data +package ca.gosyer.jui.data import android.content.Context -import ca.gosyer.core.di.AppScope -import ca.gosyer.core.prefs.PreferenceStoreFactory -import ca.gosyer.data.catalog.CatalogPreferences -import ca.gosyer.data.download.DownloadService -import ca.gosyer.data.extension.ExtensionPreferences -import ca.gosyer.data.library.LibraryPreferences -import ca.gosyer.data.library.LibraryUpdateService -import ca.gosyer.data.migration.MigrationPreferences -import ca.gosyer.data.migration.Migrations -import ca.gosyer.data.reader.ReaderPreferences -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.HttpProvider -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.ui.UiPreferences -import ca.gosyer.data.update.UpdateChecker -import ca.gosyer.data.update.UpdatePreferences +import ca.gosyer.jui.core.di.AppScope +import ca.gosyer.jui.core.prefs.PreferenceStoreFactory +import ca.gosyer.jui.data.catalog.CatalogPreferences +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.data.extension.ExtensionPreferences +import ca.gosyer.jui.data.library.LibraryPreferences +import ca.gosyer.jui.data.library.LibraryUpdateService +import ca.gosyer.jui.data.migration.MigrationPreferences +import ca.gosyer.jui.data.migration.Migrations +import ca.gosyer.jui.data.reader.ReaderPreferences +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.HttpProvider +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.ui.UiPreferences +import ca.gosyer.jui.data.update.UpdateChecker +import ca.gosyer.jui.data.update.UpdatePreferences import me.tatarka.inject.annotations.Component import me.tatarka.inject.annotations.Provides diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/DataComponent.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/DataComponent.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt index 2c60eb50..6d642ad9 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/DataComponent.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt @@ -4,6 +4,6 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data +package ca.gosyer.jui.data expect abstract class DataComponent diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/base/WebsocketService.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/base/WebsocketService.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/base/WebsocketService.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/base/WebsocketService.kt index fbe16072..84e4c604 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/base/WebsocketService.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/base/WebsocketService.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.base +package ca.gosyer.jui.data.base -import ca.gosyer.core.lang.throwIfCancellation -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.build.BuildKonfig -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences +import ca.gosyer.jui.core.lang.throwIfCancellation +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.build.BuildKonfig +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences import io.ktor.client.features.websocket.ws import io.ktor.http.cio.websocket.Frame import kotlinx.coroutines.CancellationException diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/catalog/CatalogPreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/catalog/CatalogPreferences.kt similarity index 74% rename from data/src/commonMain/kotlin/ca/gosyer/data/catalog/CatalogPreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/catalog/CatalogPreferences.kt index daaa0a91..9a72eb10 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/catalog/CatalogPreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/catalog/CatalogPreferences.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.catalog +package ca.gosyer.jui.data.catalog -import ca.gosyer.core.lang.getDefault -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore -import ca.gosyer.data.library.model.DisplayMode +import ca.gosyer.jui.core.lang.getDefault +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore +import ca.gosyer.jui.data.library.model.DisplayMode import io.fluidsonic.locale.Locale class CatalogPreferences(private val preferenceStore: PreferenceStore) { diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/download/DownloadService.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/DownloadService.kt similarity index 78% rename from data/src/commonMain/kotlin/ca/gosyer/data/download/DownloadService.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/download/DownloadService.kt index fd0ec72b..0d69c622 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/download/DownloadService.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/DownloadService.kt @@ -4,16 +4,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.download +package ca.gosyer.jui.data.download -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.base.WebsocketService -import ca.gosyer.data.download.model.DownloadChapter -import ca.gosyer.data.download.model.DownloadStatus -import ca.gosyer.data.download.model.DownloaderStatus -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.downloadsQuery +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.base.WebsocketService +import ca.gosyer.jui.data.download.model.DownloadChapter +import ca.gosyer.jui.data.download.model.DownloadStatus +import ca.gosyer.jui.data.download.model.DownloaderStatus +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.downloadsQuery import io.ktor.http.cio.websocket.Frame import io.ktor.http.cio.websocket.readText import kotlinx.coroutines.DelicateCoroutinesApi diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadChapter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadChapter.kt similarity index 80% rename from data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadChapter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadChapter.kt index 555559db..6cebfc10 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadChapter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadChapter.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.download.model +package ca.gosyer.jui.data.download.model -import ca.gosyer.data.models.Chapter -import ca.gosyer.data.models.Manga +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.data.models.Manga import kotlinx.serialization.Serializable @Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadState.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadState.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadState.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadState.kt index 11a2cea0..357f2c71 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadState.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadState.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.download.model +package ca.gosyer.jui.data.download.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadStatus.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadStatus.kt similarity index 89% rename from data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadStatus.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadStatus.kt index c3f0c77d..0ed3f72f 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloadStatus.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadStatus.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.download.model +package ca.gosyer.jui.data.download.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloaderStatus.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloaderStatus.kt similarity index 88% rename from data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloaderStatus.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloaderStatus.kt index 27bf6c0e..0745440d 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/download/model/DownloaderStatus.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloaderStatus.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.download.model +package ca.gosyer.jui.data.download.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/extension/ExtensionPreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/extension/ExtensionPreferences.kt similarity index 74% rename from data/src/commonMain/kotlin/ca/gosyer/data/extension/ExtensionPreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/extension/ExtensionPreferences.kt index 3bfa0eaf..a1bef399 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/extension/ExtensionPreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/extension/ExtensionPreferences.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.extension +package ca.gosyer.jui.data.extension -import ca.gosyer.core.lang.getDefault -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore +import ca.gosyer.jui.core.lang.getDefault +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore import io.fluidsonic.locale.Locale class ExtensionPreferences(private val preferenceStore: PreferenceStore) { diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/library/LibraryPreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/LibraryPreferences.kt similarity index 82% rename from data/src/commonMain/kotlin/ca/gosyer/data/library/LibraryPreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/library/LibraryPreferences.kt index d3eb885d..efc8972e 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/library/LibraryPreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/LibraryPreferences.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.library +package ca.gosyer.jui.data.library -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore -import ca.gosyer.data.library.model.DisplayMode -import ca.gosyer.data.library.model.Sort +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore +import ca.gosyer.jui.data.library.model.DisplayMode +import ca.gosyer.jui.data.library.model.Sort class LibraryPreferences(private val preferenceStore: PreferenceStore) { diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/library/LibraryUpdateService.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/LibraryUpdateService.kt similarity index 76% rename from data/src/commonMain/kotlin/ca/gosyer/data/library/LibraryUpdateService.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/library/LibraryUpdateService.kt index 84a6c7c2..cff7e7ce 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/library/LibraryUpdateService.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/LibraryUpdateService.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.library +package ca.gosyer.jui.data.library -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.base.WebsocketService -import ca.gosyer.data.library.model.UpdateStatus -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.updatesQuery +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.base.WebsocketService +import ca.gosyer.jui.data.library.model.UpdateStatus +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.updatesQuery import io.ktor.http.cio.websocket.Frame import io.ktor.http.cio.websocket.readText import kotlinx.coroutines.DelicateCoroutinesApi diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/DisplayMode.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/DisplayMode.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/library/model/DisplayMode.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/DisplayMode.kt index 113848dd..64cd7aa3 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/DisplayMode.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/DisplayMode.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.library.model +package ca.gosyer.jui.data.library.model -import ca.gosyer.i18n.MR +import ca.gosyer.jui.i18n.MR import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/JobStatus.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/JobStatus.kt similarity index 89% rename from data/src/commonMain/kotlin/ca/gosyer/data/library/model/JobStatus.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/JobStatus.kt index 0610c00d..29cc77ee 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/JobStatus.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/JobStatus.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.library.model +package ca.gosyer.jui.data.library.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/Sort.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/Sort.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/library/model/Sort.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/Sort.kt index 7fdabf88..fcf6e73b 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/Sort.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/Sort.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.library.model +package ca.gosyer.jui.data.library.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/UpdateStatus.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/UpdateStatus.kt similarity index 89% rename from data/src/commonMain/kotlin/ca/gosyer/data/library/model/UpdateStatus.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/UpdateStatus.kt index 461e77ed..db2b27f5 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/library/model/UpdateStatus.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/UpdateStatus.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.library.model +package ca.gosyer.jui.data.library.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/migration/MigrationPreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/migration/MigrationPreferences.kt similarity index 79% rename from data/src/commonMain/kotlin/ca/gosyer/data/migration/MigrationPreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/migration/MigrationPreferences.kt index 7b3c31c2..97ccd6ba 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/migration/MigrationPreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/migration/MigrationPreferences.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.migration +package ca.gosyer.jui.data.migration -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore class MigrationPreferences(private val preferenceStore: PreferenceStore) { fun version(): Preference { diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/migration/Migrations.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/migration/Migrations.kt similarity index 85% rename from data/src/commonMain/kotlin/ca/gosyer/data/migration/Migrations.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/migration/Migrations.kt index 8aae3a64..3247df92 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/migration/Migrations.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/migration/Migrations.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.migration +package ca.gosyer.jui.data.migration -import ca.gosyer.data.build.BuildKonfig -import ca.gosyer.data.reader.ReaderPreferences +import ca.gosyer.jui.data.build.BuildKonfig +import ca.gosyer.jui.data.reader.ReaderPreferences import me.tatarka.inject.annotations.Inject class Migrations @Inject constructor( diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/About.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/About.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/About.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/About.kt index 1a370c64..ada90c27 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/About.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/About.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/BackupValidationResult.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/BackupValidationResult.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/BackupValidationResult.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/BackupValidationResult.kt index 632bbbc9..d2981f19 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/BackupValidationResult.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/BackupValidationResult.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/Category.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Category.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/Category.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Category.kt index 842c7d8c..4383f191 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/Category.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Category.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/Chapter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Chapter.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/Chapter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Chapter.kt index 700483ed..17c232aa 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/Chapter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Chapter.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models -import ca.gosyer.data.server.interactions.ChapterInteractionHandler +import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/Extension.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Extension.kt similarity index 94% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/Extension.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Extension.kt index aec046a4..db684494 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/Extension.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Extension.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/Manga.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Manga.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/Manga.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Manga.kt index 263d6719..5f6370a8 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/Manga.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Manga.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models -import ca.gosyer.data.server.interactions.MangaInteractionHandler -import ca.gosyer.i18n.MR +import ca.gosyer.jui.data.server.interactions.MangaInteractionHandler +import ca.gosyer.jui.i18n.MR import dev.icerock.moko.resources.StringResource import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/MangaAndChapter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/MangaAndChapter.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/MangaAndChapter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/MangaAndChapter.kt index 16f7acb6..46e4010b 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/MangaAndChapter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/MangaAndChapter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/MangaPage.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/MangaPage.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/MangaPage.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/MangaPage.kt index 1c9804a7..7efe4f1b 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/MangaPage.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/MangaPage.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/Page.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Page.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/Page.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Page.kt index a492db72..25942f9c 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/Page.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Page.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/Source.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Source.kt similarity index 95% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/Source.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Source.kt index a0d270dc..396a55f7 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/Source.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Source.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/Updates.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Updates.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/Updates.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Updates.kt index caaed15f..b3424d49 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/Updates.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Updates.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models +package ca.gosyer.jui.data.models import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/CheckBoxFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/CheckBoxFilter.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/CheckBoxFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/CheckBoxFilter.kt index 269eaedc..04776d97 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/CheckBoxFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/CheckBoxFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/GroupFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/GroupFilter.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/GroupFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/GroupFilter.kt index 8719f35d..859b9f7f 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/GroupFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/GroupFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/HeaderFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/HeaderFilter.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/HeaderFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/HeaderFilter.kt index 0b7b6560..670588de 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/HeaderFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/HeaderFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SelectFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SelectFilter.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SelectFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SelectFilter.kt index fb76cff2..2f6cac23 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SelectFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SelectFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SeparatorFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SeparatorFilter.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SeparatorFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SeparatorFilter.kt index 37b10db2..dbdd859a 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SeparatorFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SeparatorFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SortFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SortFilter.kt similarity index 93% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SortFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SortFilter.kt index 713cf1c0..982c71e7 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SortFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SortFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SourceFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SourceFilter.kt similarity index 89% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SourceFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SourceFilter.kt index 6d9f7675..933ffff4 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SourceFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SourceFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SourceFilterChange.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SourceFilterChange.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SourceFilterChange.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SourceFilterChange.kt index 26b1d09b..fd7c1265 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/SourceFilterChange.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SourceFilterChange.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/TextFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/TextFilter.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/TextFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/TextFilter.kt index e8f8fc8f..52093452 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/TextFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/TextFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/TriStateFilter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/TriStateFilter.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/TriStateFilter.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/TriStateFilter.kt index 162a0e8e..f88e55a2 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcefilters/TriStateFilter.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/TriStateFilter.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcefilters +package ca.gosyer.jui.data.models.sourcefilters import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/CheckBoxPreference.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/CheckBoxPreference.kt similarity index 89% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/CheckBoxPreference.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/CheckBoxPreference.kt index 0bdf383e..e22bbad8 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/CheckBoxPreference.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/CheckBoxPreference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcepreference +package ca.gosyer.jui.data.models.sourcepreference import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/EditTextPreference.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/EditTextPreference.kt similarity index 94% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/EditTextPreference.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/EditTextPreference.kt index 76840196..ffa7ae7b 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/EditTextPreference.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/EditTextPreference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcepreference +package ca.gosyer.jui.data.models.sourcepreference import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/ListPreference.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/ListPreference.kt similarity index 94% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/ListPreference.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/ListPreference.kt index c921567a..7b9b5326 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/ListPreference.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/ListPreference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcepreference +package ca.gosyer.jui.data.models.sourcepreference import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/MultiSelectListPreference.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/MultiSelectListPreference.kt similarity index 94% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/MultiSelectListPreference.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/MultiSelectListPreference.kt index cee9a177..389f223a 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/MultiSelectListPreference.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/MultiSelectListPreference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcepreference +package ca.gosyer.jui.data.models.sourcepreference import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SourcePreference.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SourcePreference.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SourcePreference.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SourcePreference.kt index 37526088..ac09814c 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SourcePreference.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SourcePreference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcepreference +package ca.gosyer.jui.data.models.sourcepreference import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SourcePreferenceChange.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SourcePreferenceChange.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SourcePreferenceChange.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SourcePreferenceChange.kt index 4e0026e3..afb029a2 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SourcePreferenceChange.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SourcePreferenceChange.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcepreference +package ca.gosyer.jui.data.models.sourcepreference import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SwitchPreference.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SwitchPreference.kt similarity index 89% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SwitchPreference.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SwitchPreference.kt index dffb2ce1..ba887f0c 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/SwitchPreference.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SwitchPreference.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcepreference +package ca.gosyer.jui.data.models.sourcepreference import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/TwoStateProps.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/TwoStateProps.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/TwoStateProps.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/TwoStateProps.kt index 091d7dd6..a4a4cff6 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/models/sourcepreference/TwoStateProps.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/TwoStateProps.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.models.sourcepreference +package ca.gosyer.jui.data.models.sourcepreference import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderModePreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderModePreferences.kt similarity index 85% rename from data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderModePreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderModePreferences.kt index a2dd59fe..1f4fe4f2 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderModePreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderModePreferences.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.reader +package ca.gosyer.jui.data.reader -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore -import ca.gosyer.data.reader.model.DefaultReaderMode -import ca.gosyer.data.reader.model.Direction -import ca.gosyer.data.reader.model.ImageScale -import ca.gosyer.data.reader.model.NavigationMode +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore +import ca.gosyer.jui.data.reader.model.DefaultReaderMode +import ca.gosyer.jui.data.reader.model.Direction +import ca.gosyer.jui.data.reader.model.ImageScale +import ca.gosyer.jui.data.reader.model.NavigationMode class ReaderModePreferences(private val mode: String, private val preferenceStore: PreferenceStore) { constructor(mode: String, factory: (String) -> PreferenceStore) : diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderModeWatch.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderModeWatch.kt similarity index 97% rename from data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderModeWatch.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderModeWatch.kt index 31b8adf0..a87942e2 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderModeWatch.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderModeWatch.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.reader +package ca.gosyer.jui.data.reader -import ca.gosyer.core.prefs.getAsFlow +import ca.gosyer.jui.core.prefs.getAsFlow import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableStateFlow diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderPreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderPreferences.kt similarity index 85% rename from data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderPreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderPreferences.kt index 9ec2d414..d029482b 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/reader/ReaderPreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderPreferences.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.reader +package ca.gosyer.jui.data.reader -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore -import ca.gosyer.data.reader.model.DefaultReaderMode +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore +import ca.gosyer.jui.data.reader.model.DefaultReaderMode import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.builtins.serializer diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/DefaultReaderMode.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/DefaultReaderMode.kt similarity index 95% rename from data/src/commonMain/kotlin/ca/gosyer/data/reader/model/DefaultReaderMode.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/DefaultReaderMode.kt index df8b4d46..5689af7a 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/DefaultReaderMode.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/DefaultReaderMode.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.reader.model +package ca.gosyer.jui.data.reader.model enum class DefaultReaderMode( val res: String, diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/Direction.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/Direction.kt similarity index 88% rename from data/src/commonMain/kotlin/ca/gosyer/data/reader/model/Direction.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/Direction.kt index 10a7b5bd..76eff29d 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/Direction.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/Direction.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.reader.model +package ca.gosyer.jui.data.reader.model -import ca.gosyer.i18n.MR +import ca.gosyer.jui.i18n.MR import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/ImageScale.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/ImageScale.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/reader/model/ImageScale.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/ImageScale.kt index 5e2c24af..f2aec8a7 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/ImageScale.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/ImageScale.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.reader.model +package ca.gosyer.jui.data.reader.model -import ca.gosyer.i18n.MR +import ca.gosyer.jui.i18n.MR import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/NavigationMode.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/NavigationMode.kt similarity index 89% rename from data/src/commonMain/kotlin/ca/gosyer/data/reader/model/NavigationMode.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/NavigationMode.kt index 526e073b..9d8941ab 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/NavigationMode.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/NavigationMode.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.reader.model +package ca.gosyer.jui.data.reader.model -import ca.gosyer.i18n.MR +import ca.gosyer.jui.i18n.MR import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/TappingInvertMode.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/TappingInvertMode.kt similarity index 93% rename from data/src/commonMain/kotlin/ca/gosyer/data/reader/model/TappingInvertMode.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/TappingInvertMode.kt index 4831a9aa..2937e99d 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/reader/model/TappingInvertMode.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/TappingInvertMode.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.reader.model +package ca.gosyer.jui.data.reader.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/HttpClient.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/HttpClient.kt similarity index 95% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/HttpClient.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/HttpClient.kt index c29eb70d..86ee1f41 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/HttpClient.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/HttpClient.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server +package ca.gosyer.jui.data.server -import ca.gosyer.data.build.BuildKonfig -import ca.gosyer.data.server.model.Auth -import ca.gosyer.data.server.model.Proxy +import ca.gosyer.jui.data.build.BuildKonfig +import ca.gosyer.jui.data.server.model.Auth +import ca.gosyer.jui.data.server.model.Proxy import io.ktor.client.HttpClient import io.ktor.client.engine.ProxyBuilder import io.ktor.client.features.auth.providers.BasicAuthCredentials diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/ServerPreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/ServerPreferences.kt similarity index 88% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/ServerPreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/ServerPreferences.kt index de5bd2f7..8efbe085 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/ServerPreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/ServerPreferences.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server +package ca.gosyer.jui.data.server -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore -import ca.gosyer.data.server.model.Auth -import ca.gosyer.data.server.model.Proxy +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore +import ca.gosyer.jui.data.server.model.Auth +import ca.gosyer.jui.data.server.model.Proxy import io.ktor.http.Url class ServerPreferences(private val preferenceStore: PreferenceStore) { diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/ServerUrlPreference.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/ServerUrlPreference.kt similarity index 94% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/ServerUrlPreference.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/ServerUrlPreference.kt index 457bfb13..3ccb6dbb 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/ServerUrlPreference.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/ServerUrlPreference.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server +package ca.gosyer.jui.data.server -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.getAsFlow +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.getAsFlow import io.ktor.http.URLBuilder import io.ktor.http.Url import kotlinx.coroutines.CoroutineScope diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/BackupInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/BackupInteractionHandler.kt similarity index 85% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/BackupInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/BackupInteractionHandler.kt index d447c700..8559380c 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/BackupInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/BackupInteractionHandler.kt @@ -4,16 +4,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.io.SYSTEM -import ca.gosyer.core.lang.IO -import ca.gosyer.data.models.BackupValidationResult -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.backupFileExportRequest -import ca.gosyer.data.server.requests.backupFileImportRequest -import ca.gosyer.data.server.requests.validateBackupFileRequest +import ca.gosyer.jui.core.io.SYSTEM +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.models.BackupValidationResult +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.backupFileExportRequest +import ca.gosyer.jui.data.server.requests.backupFileImportRequest +import ca.gosyer.jui.data.server.requests.validateBackupFileRequest import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.forms.formData import io.ktor.client.request.forms.submitFormWithBinaryData diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/BaseInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/BaseInteractionHandler.kt similarity index 76% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/BaseInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/BaseInteractionHandler.kt index b8ea2629..ec08015a 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/BaseInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/BaseInteractionHandler.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences open class BaseInteractionHandler( protected val client: Http, diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/CategoryInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/CategoryInteractionHandler.kt similarity index 84% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/CategoryInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/CategoryInteractionHandler.kt index 9f6c8c8e..13485df1 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/CategoryInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/CategoryInteractionHandler.kt @@ -4,22 +4,22 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.lang.IO -import ca.gosyer.data.models.Category -import ca.gosyer.data.models.Manga -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.addMangaToCategoryQuery -import ca.gosyer.data.server.requests.categoryDeleteRequest -import ca.gosyer.data.server.requests.categoryModifyRequest -import ca.gosyer.data.server.requests.categoryReorderRequest -import ca.gosyer.data.server.requests.createCategoryRequest -import ca.gosyer.data.server.requests.getCategoriesQuery -import ca.gosyer.data.server.requests.getMangaCategoriesQuery -import ca.gosyer.data.server.requests.getMangaInCategoryQuery -import ca.gosyer.data.server.requests.removeMangaFromCategoryRequest +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.addMangaToCategoryQuery +import ca.gosyer.jui.data.server.requests.categoryDeleteRequest +import ca.gosyer.jui.data.server.requests.categoryModifyRequest +import ca.gosyer.jui.data.server.requests.categoryReorderRequest +import ca.gosyer.jui.data.server.requests.createCategoryRequest +import ca.gosyer.jui.data.server.requests.getCategoriesQuery +import ca.gosyer.jui.data.server.requests.getMangaCategoriesQuery +import ca.gosyer.jui.data.server.requests.getMangaInCategoryQuery +import ca.gosyer.jui.data.server.requests.removeMangaFromCategoryRequest import io.ktor.client.request.delete import io.ktor.client.request.forms.submitForm import io.ktor.client.request.get diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/ChapterInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/ChapterInteractionHandler.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/ChapterInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/ChapterInteractionHandler.kt index cb023cfc..efb0d114 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/ChapterInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/ChapterInteractionHandler.kt @@ -4,21 +4,21 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.lang.IO -import ca.gosyer.data.models.Chapter -import ca.gosyer.data.models.Manga -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.deleteDownloadedChapterRequest -import ca.gosyer.data.server.requests.getChapterQuery -import ca.gosyer.data.server.requests.getMangaChaptersQuery -import ca.gosyer.data.server.requests.getPageQuery -import ca.gosyer.data.server.requests.queueDownloadChapterRequest -import ca.gosyer.data.server.requests.stopDownloadingChapterRequest -import ca.gosyer.data.server.requests.updateChapterMetaRequest -import ca.gosyer.data.server.requests.updateChapterRequest +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.deleteDownloadedChapterRequest +import ca.gosyer.jui.data.server.requests.getChapterQuery +import ca.gosyer.jui.data.server.requests.getMangaChaptersQuery +import ca.gosyer.jui.data.server.requests.getPageQuery +import ca.gosyer.jui.data.server.requests.queueDownloadChapterRequest +import ca.gosyer.jui.data.server.requests.stopDownloadingChapterRequest +import ca.gosyer.jui.data.server.requests.updateChapterMetaRequest +import ca.gosyer.jui.data.server.requests.updateChapterRequest import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.delete import io.ktor.client.request.forms.submitForm diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/DownloadInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/DownloadInteractionHandler.kt similarity index 76% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/DownloadInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/DownloadInteractionHandler.kt index 2a6179e2..2ede55a8 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/DownloadInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/DownloadInteractionHandler.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.lang.IO -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.downloadsClearRequest -import ca.gosyer.data.server.requests.downloadsStartRequest -import ca.gosyer.data.server.requests.downloadsStopRequest +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.downloadsClearRequest +import ca.gosyer.jui.data.server.requests.downloadsStartRequest +import ca.gosyer.jui.data.server.requests.downloadsStopRequest import io.ktor.client.request.get import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.Dispatchers diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/ExtensionInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/ExtensionInteractionHandler.kt similarity index 78% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/ExtensionInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/ExtensionInteractionHandler.kt index ad108124..d34d79fa 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/ExtensionInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/ExtensionInteractionHandler.kt @@ -4,17 +4,17 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.lang.IO -import ca.gosyer.data.models.Extension -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.apkIconQuery -import ca.gosyer.data.server.requests.apkInstallQuery -import ca.gosyer.data.server.requests.apkUninstallQuery -import ca.gosyer.data.server.requests.apkUpdateQuery -import ca.gosyer.data.server.requests.extensionListQuery +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.models.Extension +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.apkIconQuery +import ca.gosyer.jui.data.server.requests.apkInstallQuery +import ca.gosyer.jui.data.server.requests.apkUninstallQuery +import ca.gosyer.jui.data.server.requests.apkUpdateQuery +import ca.gosyer.jui.data.server.requests.extensionListQuery import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.get import io.ktor.client.statement.HttpResponse diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/LibraryInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/LibraryInteractionHandler.kt similarity index 78% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/LibraryInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/LibraryInteractionHandler.kt index c6ed4db9..43c8b315 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/LibraryInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/LibraryInteractionHandler.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.lang.IO -import ca.gosyer.data.models.Manga -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.addMangaToLibraryQuery -import ca.gosyer.data.server.requests.removeMangaFromLibraryRequest +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.addMangaToLibraryQuery +import ca.gosyer.jui.data.server.requests.removeMangaFromLibraryRequest import io.ktor.client.request.delete import io.ktor.client.request.get import io.ktor.client.statement.HttpResponse diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/MangaInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/MangaInteractionHandler.kt similarity index 84% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/MangaInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/MangaInteractionHandler.kt index fdd87a34..04f9579c 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/MangaInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/MangaInteractionHandler.kt @@ -4,15 +4,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.lang.IO -import ca.gosyer.data.models.Manga -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.mangaQuery -import ca.gosyer.data.server.requests.mangaThumbnailQuery -import ca.gosyer.data.server.requests.updateMangaMetaRequest +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.mangaQuery +import ca.gosyer.jui.data.server.requests.mangaThumbnailQuery +import ca.gosyer.jui.data.server.requests.updateMangaMetaRequest import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.forms.submitForm import io.ktor.client.request.get diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/SourceInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/SourceInteractionHandler.kt similarity index 81% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/SourceInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/SourceInteractionHandler.kt index 49741bfa..e0c0b974 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/SourceInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/SourceInteractionHandler.kt @@ -4,27 +4,27 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.lang.IO -import ca.gosyer.data.models.MangaPage -import ca.gosyer.data.models.Source -import ca.gosyer.data.models.sourcefilters.SourceFilter -import ca.gosyer.data.models.sourcefilters.SourceFilterChange -import ca.gosyer.data.models.sourcepreference.SourcePreference -import ca.gosyer.data.models.sourcepreference.SourcePreferenceChange -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.getFilterListQuery -import ca.gosyer.data.server.requests.getSourceSettingsQuery -import ca.gosyer.data.server.requests.globalSearchQuery -import ca.gosyer.data.server.requests.setFilterRequest -import ca.gosyer.data.server.requests.sourceInfoQuery -import ca.gosyer.data.server.requests.sourceLatestQuery -import ca.gosyer.data.server.requests.sourceListQuery -import ca.gosyer.data.server.requests.sourcePopularQuery -import ca.gosyer.data.server.requests.sourceSearchQuery -import ca.gosyer.data.server.requests.updateSourceSettingQuery +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.models.MangaPage +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.data.models.sourcefilters.SourceFilter +import ca.gosyer.jui.data.models.sourcefilters.SourceFilterChange +import ca.gosyer.jui.data.models.sourcepreference.SourcePreference +import ca.gosyer.jui.data.models.sourcepreference.SourcePreferenceChange +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.getFilterListQuery +import ca.gosyer.jui.data.server.requests.getSourceSettingsQuery +import ca.gosyer.jui.data.server.requests.globalSearchQuery +import ca.gosyer.jui.data.server.requests.setFilterRequest +import ca.gosyer.jui.data.server.requests.sourceInfoQuery +import ca.gosyer.jui.data.server.requests.sourceLatestQuery +import ca.gosyer.jui.data.server.requests.sourceListQuery +import ca.gosyer.jui.data.server.requests.sourcePopularQuery +import ca.gosyer.jui.data.server.requests.sourceSearchQuery +import ca.gosyer.jui.data.server.requests.updateSourceSettingQuery import io.ktor.client.request.get import io.ktor.client.request.parameter import io.ktor.client.request.post diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/UpdatesInteractionHandler.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/UpdatesInteractionHandler.kt similarity index 80% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/UpdatesInteractionHandler.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/UpdatesInteractionHandler.kt index cc28978e..434a671d 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/UpdatesInteractionHandler.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/UpdatesInteractionHandler.kt @@ -4,15 +4,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.interactions +package ca.gosyer.jui.data.server.interactions -import ca.gosyer.core.lang.IO -import ca.gosyer.data.models.Category -import ca.gosyer.data.models.Updates -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.requests.fetchUpdatesRequest -import ca.gosyer.data.server.requests.recentUpdatesQuery +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.models.Updates +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.requests.fetchUpdatesRequest +import ca.gosyer.jui.data.server.requests.recentUpdatesQuery import io.ktor.client.request.forms.submitForm import io.ktor.client.request.get import io.ktor.client.request.post diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/model/Auth.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/model/Auth.kt similarity index 88% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/model/Auth.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/model/Auth.kt index c64b1efc..ef4546e4 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/model/Auth.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/model/Auth.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.model +package ca.gosyer.jui.data.server.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/model/Proxy.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/model/Proxy.kt similarity index 89% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/model/Proxy.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/model/Proxy.kt index e7effd76..4cf80064 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/model/Proxy.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/model/Proxy.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.model +package ca.gosyer.jui.data.server.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Backup.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Backup.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Backup.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Backup.kt index 43dd6a9c..bed60203 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Backup.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Backup.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Post fun backupImportRequest() = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Category.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Category.kt similarity index 96% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Category.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Category.kt index 37a4c2b8..7b5aea01 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Category.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Category.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Get fun getMangaCategoriesQuery(mangaId: Long) = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Chapters.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Chapters.kt similarity index 96% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Chapters.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Chapters.kt index efde4954..a4761107 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Chapters.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Chapters.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Get fun getMangaChaptersQuery(mangaId: Long) = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Downloads.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Downloads.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Downloads.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Downloads.kt index dfa5ba9c..e59195ec 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Downloads.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Downloads.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @WS fun downloadsQuery() = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Extensions.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Extensions.kt similarity index 93% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Extensions.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Extensions.kt index 9ba5086a..b9606659 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Extensions.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Extensions.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Get fun extensionListQuery() = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Library.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Library.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Library.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Library.kt index 6c1102bf..e37b25a0 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Library.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Library.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Get fun addMangaToLibraryQuery(mangaId: Long) = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Manga.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Manga.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Manga.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Manga.kt index 997443b8..54651721 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Manga.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Manga.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Get fun mangaQuery(mangaId: Long) = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Meta.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Meta.kt similarity index 85% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Meta.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Meta.kt index 7e83f521..31ddbba6 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Meta.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Meta.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Get fun aboutQuery() = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/RestRequests.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/RestRequests.kt similarity index 88% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/RestRequests.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/RestRequests.kt index 11f709d3..a76ecd2d 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/RestRequests.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/RestRequests.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests annotation class Get diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Sources.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Sources.kt similarity index 96% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Sources.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Sources.kt index 85e743ab..ce847623 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Sources.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Sources.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Get fun sourceListQuery() = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Updates.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Updates.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Updates.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Updates.kt index 2ced5756..bcafd026 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/server/requests/Updates.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/server/requests/Updates.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.requests +package ca.gosyer.jui.data.server.requests @Get fun recentUpdatesQuery(pageNum: Int) = diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/ui/UiPreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/UiPreferences.kt similarity index 88% rename from data/src/commonMain/kotlin/ca/gosyer/data/ui/UiPreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/UiPreferences.kt index 95b0f98e..c895d39c 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/ui/UiPreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/UiPreferences.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.ui +package ca.gosyer.jui.data.ui -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore -import ca.gosyer.data.ui.model.StartScreen -import ca.gosyer.data.ui.model.ThemeMode -import ca.gosyer.data.ui.model.WindowSettings +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore +import ca.gosyer.jui.data.ui.model.StartScreen +import ca.gosyer.jui.data.ui.model.ThemeMode +import ca.gosyer.jui.data.ui.model.WindowSettings class UiPreferences(private val preferenceStore: PreferenceStore) { diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/ui/model/StartScreen.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/StartScreen.kt similarity index 91% rename from data/src/commonMain/kotlin/ca/gosyer/data/ui/model/StartScreen.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/StartScreen.kt index 19f95f01..853c37a8 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/ui/model/StartScreen.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/StartScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.ui.model +package ca.gosyer.jui.data.ui.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/ui/model/ThemeMode.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/ThemeMode.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/ui/model/ThemeMode.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/ThemeMode.kt index f1a7c6fc..f74867f2 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/ui/model/ThemeMode.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/ThemeMode.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.ui.model +package ca.gosyer.jui.data.ui.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/ui/model/WindowSettings.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/WindowSettings.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/ui/model/WindowSettings.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/WindowSettings.kt index de7388c5..ba88253b 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/ui/model/WindowSettings.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/ui/model/WindowSettings.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.ui.model +package ca.gosyer.jui.data.ui.model import kotlinx.serialization.Serializable diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/update/UpdateChecker.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/update/UpdateChecker.kt similarity index 90% rename from data/src/commonMain/kotlin/ca/gosyer/data/update/UpdateChecker.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/update/UpdateChecker.kt index 6b1a4866..eafa187d 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/update/UpdateChecker.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/update/UpdateChecker.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.update +package ca.gosyer.jui.data.update -import ca.gosyer.core.lang.IO -import ca.gosyer.data.build.BuildKonfig -import ca.gosyer.data.server.Http -import ca.gosyer.data.update.model.GithubRelease +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.data.build.BuildKonfig +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.update.model.GithubRelease import io.ktor.client.request.get import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.flow diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/update/UpdatePreferences.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/update/UpdatePreferences.kt similarity index 75% rename from data/src/commonMain/kotlin/ca/gosyer/data/update/UpdatePreferences.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/update/UpdatePreferences.kt index a1dfd408..f39374d7 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/update/UpdatePreferences.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/update/UpdatePreferences.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.update +package ca.gosyer.jui.data.update -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore class UpdatePreferences(private val preferenceStore: PreferenceStore) { fun enabled(): Preference { diff --git a/data/src/commonMain/kotlin/ca/gosyer/data/update/model/GithubRelease.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/update/model/GithubRelease.kt similarity index 92% rename from data/src/commonMain/kotlin/ca/gosyer/data/update/model/GithubRelease.kt rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/update/model/GithubRelease.kt index d37389dc..1d4ab2a9 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/data/update/model/GithubRelease.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/update/model/GithubRelease.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.update.model +package ca.gosyer.jui.data.update.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/desktopMain/kotlin/ca/gosyer/data/DataComponent.kt b/data/src/desktopMain/kotlin/ca/gosyer/jui/data/DataComponent.kt similarity index 80% rename from data/src/desktopMain/kotlin/ca/gosyer/data/DataComponent.kt rename to data/src/desktopMain/kotlin/ca/gosyer/jui/data/DataComponent.kt index 44733bee..d90f23b0 100644 --- a/data/src/desktopMain/kotlin/ca/gosyer/data/DataComponent.kt +++ b/data/src/desktopMain/kotlin/ca/gosyer/jui/data/DataComponent.kt @@ -4,26 +4,26 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data +package ca.gosyer.jui.data -import ca.gosyer.core.di.AppScope -import ca.gosyer.core.prefs.PreferenceStoreFactory -import ca.gosyer.data.catalog.CatalogPreferences -import ca.gosyer.data.download.DownloadService -import ca.gosyer.data.extension.ExtensionPreferences -import ca.gosyer.data.library.LibraryPreferences -import ca.gosyer.data.library.LibraryUpdateService -import ca.gosyer.data.migration.MigrationPreferences -import ca.gosyer.data.migration.Migrations -import ca.gosyer.data.reader.ReaderPreferences -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.HttpProvider -import ca.gosyer.data.server.ServerHostPreferences -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.ServerService -import ca.gosyer.data.ui.UiPreferences -import ca.gosyer.data.update.UpdateChecker -import ca.gosyer.data.update.UpdatePreferences +import ca.gosyer.jui.core.di.AppScope +import ca.gosyer.jui.core.prefs.PreferenceStoreFactory +import ca.gosyer.jui.data.catalog.CatalogPreferences +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.data.extension.ExtensionPreferences +import ca.gosyer.jui.data.library.LibraryPreferences +import ca.gosyer.jui.data.library.LibraryUpdateService +import ca.gosyer.jui.data.migration.MigrationPreferences +import ca.gosyer.jui.data.migration.Migrations +import ca.gosyer.jui.data.reader.ReaderPreferences +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.HttpProvider +import ca.gosyer.jui.data.server.ServerHostPreferences +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.ServerService +import ca.gosyer.jui.data.ui.UiPreferences +import ca.gosyer.jui.data.update.UpdateChecker +import ca.gosyer.jui.data.update.UpdatePreferences import me.tatarka.inject.annotations.Component import me.tatarka.inject.annotations.Provides diff --git a/data/src/desktopMain/kotlin/ca/gosyer/data/server/ServerHostPreferences.kt b/data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/ServerHostPreferences.kt similarity index 94% rename from data/src/desktopMain/kotlin/ca/gosyer/data/server/ServerHostPreferences.kt rename to data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/ServerHostPreferences.kt index c3837045..aaac914f 100644 --- a/data/src/desktopMain/kotlin/ca/gosyer/data/server/ServerHostPreferences.kt +++ b/data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/ServerHostPreferences.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server +package ca.gosyer.jui.data.server -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore -import ca.gosyer.data.server.host.ServerHostPreference +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore +import ca.gosyer.jui.data.server.host.ServerHostPreference class ServerHostPreferences(private val preferenceStore: PreferenceStore) { diff --git a/data/src/desktopMain/kotlin/ca/gosyer/data/server/ServerService.kt b/data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/ServerService.kt similarity index 96% rename from data/src/desktopMain/kotlin/ca/gosyer/data/server/ServerService.kt rename to data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/ServerService.kt index 7b4fa79d..4fdbfa66 100644 --- a/data/src/desktopMain/kotlin/ca/gosyer/data/server/ServerService.kt +++ b/data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/ServerService.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server +package ca.gosyer.jui.data.server -import ca.gosyer.core.io.copyTo -import ca.gosyer.core.io.userDataDir -import ca.gosyer.core.lang.withIOContext -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.build.BuildKonfig +import ca.gosyer.jui.core.io.copyTo +import ca.gosyer.jui.core.io.userDataDir +import ca.gosyer.jui.core.lang.withIOContext +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.build.BuildKonfig import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope diff --git a/data/src/desktopMain/kotlin/ca/gosyer/data/server/host/ServerHostPreference.kt b/data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/host/ServerHostPreference.kt similarity index 96% rename from data/src/desktopMain/kotlin/ca/gosyer/data/server/host/ServerHostPreference.kt rename to data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/host/ServerHostPreference.kt index 7ee6f68c..d59e5497 100644 --- a/data/src/desktopMain/kotlin/ca/gosyer/data/server/host/ServerHostPreference.kt +++ b/data/src/desktopMain/kotlin/ca/gosyer/jui/data/server/host/ServerHostPreference.kt @@ -4,15 +4,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.data.server.host +package ca.gosyer.jui.data.server.host -import ca.gosyer.core.prefs.Preference -import ca.gosyer.core.prefs.PreferenceStore +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.core.prefs.PreferenceStore sealed class ServerHostPreference { protected abstract val propertyName: String private val propertyPrefix - get() = "${argPrefix}$propertyName=" + get() = "$argPrefix$propertyName=" protected abstract val defaultValue: T protected abstract val serverValue: T diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index d0bd6f9c..2121e30e 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -148,7 +148,7 @@ kotlin { compose.desktop { application { - mainClass = "ca.gosyer.MainKt" + mainClass = "ca.gosyer.jui.desktop.MainKt" nativeDistributions { targetFormats( // Windows @@ -200,7 +200,7 @@ compose.desktop { fun String.wrap() = """"$this"""" buildConfig { className("BuildConfig") - packageName(project.group.toString() + ".desktop.build") + packageName(project.group.toString() + ".jui.desktop.build") useKotlinOutput { internalVisibility = true } buildConfigField("String", "NAME", rootProject.name.wrap()) diff --git a/desktop/src/main/kotlin/ca/gosyer/AppComponent.kt b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppComponent.kt similarity index 81% rename from desktop/src/main/kotlin/ca/gosyer/AppComponent.kt rename to desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppComponent.kt index 3d8b5472..07c45b91 100644 --- a/desktop/src/main/kotlin/ca/gosyer/AppComponent.kt +++ b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppComponent.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer +package ca.gosyer.jui.desktop -import ca.gosyer.core.di.AppScope -import ca.gosyer.data.DataComponent -import ca.gosyer.data.create -import ca.gosyer.ui.base.UiComponent -import ca.gosyer.ui.base.create +import ca.gosyer.jui.core.di.AppScope +import ca.gosyer.jui.data.DataComponent +import ca.gosyer.jui.data.create +import ca.gosyer.jui.ui.base.UiComponent +import ca.gosyer.jui.ui.base.create import me.tatarka.inject.annotations.Component import me.tatarka.inject.annotations.Provides diff --git a/desktop/src/main/kotlin/ca/gosyer/AppMigrations.kt b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppMigrations.kt similarity index 81% rename from desktop/src/main/kotlin/ca/gosyer/AppMigrations.kt rename to desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppMigrations.kt index 8ee2c5a9..2620c99f 100644 --- a/desktop/src/main/kotlin/ca/gosyer/AppMigrations.kt +++ b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppMigrations.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer +package ca.gosyer.jui.desktop -import ca.gosyer.data.migration.MigrationPreferences -import ca.gosyer.desktop.build.BuildConfig -import ca.gosyer.uicore.vm.ContextWrapper +import ca.gosyer.jui.data.migration.MigrationPreferences +import ca.gosyer.jui.desktop.build.BuildConfig +import ca.gosyer.jui.uicore.vm.ContextWrapper import me.tatarka.inject.annotations.Inject class AppMigrations @Inject constructor( diff --git a/desktop/src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/logging/LoggingSetup.kt similarity index 98% rename from desktop/src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt rename to desktop/src/main/kotlin/ca/gosyer/jui/desktop/logging/LoggingSetup.kt index bb3f46ac..f08fa312 100644 --- a/desktop/src/main/kotlin/ca/gosyer/core/logging/LoggingSetup.kt +++ b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/logging/LoggingSetup.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.core.logging +package ca.gosyer.jui.desktop.logging -import ca.gosyer.desktop.build.BuildConfig +import ca.gosyer.jui.desktop.build.BuildConfig import com.github.weisj.darklaf.LafManager import mu.KotlinLogging import okio.Path diff --git a/desktop/src/main/kotlin/ca/gosyer/main.kt b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/main.kt similarity index 89% rename from desktop/src/main/kotlin/ca/gosyer/main.kt rename to desktop/src/main/kotlin/ca/gosyer/jui/desktop/main.kt index 899f72a9..ecf8f8b7 100644 --- a/desktop/src/main/kotlin/ca/gosyer/main.kt +++ b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/main.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer +package ca.gosyer.jui.desktop import androidx.compose.animation.Crossfade import androidx.compose.foundation.layout.Box @@ -24,23 +24,23 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Window import androidx.compose.ui.window.awaitApplication import androidx.compose.ui.window.rememberWindowState -import ca.gosyer.core.io.userDataDir -import ca.gosyer.core.lang.withUIContext -import ca.gosyer.core.logging.initializeLogger -import ca.gosyer.core.prefs.getAsFlow -import ca.gosyer.data.server.ServerService.ServerResult -import ca.gosyer.data.ui.model.ThemeMode -import ca.gosyer.desktop.build.BuildConfig -import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.dialog.getMaterialDialogProperties -import ca.gosyer.ui.base.theme.AppTheme -import ca.gosyer.ui.main.MainMenu -import ca.gosyer.ui.main.components.DebugOverlay -import ca.gosyer.ui.main.components.Tray -import ca.gosyer.ui.util.compose.WindowGet -import ca.gosyer.uicore.components.LoadingScreen -import ca.gosyer.uicore.prefs.asStateIn -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.core.io.userDataDir +import ca.gosyer.jui.core.lang.withUIContext +import ca.gosyer.jui.core.prefs.getAsFlow +import ca.gosyer.jui.data.server.ServerService.ServerResult +import ca.gosyer.jui.data.ui.model.ThemeMode +import ca.gosyer.jui.desktop.build.BuildConfig +import ca.gosyer.jui.desktop.logging.initializeLogger +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.ui.base.theme.AppTheme +import ca.gosyer.jui.ui.main.MainMenu +import ca.gosyer.jui.ui.main.components.DebugOverlay +import ca.gosyer.jui.ui.main.components.Tray +import ca.gosyer.jui.ui.util.compose.WindowGet +import ca.gosyer.jui.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.prefs.asStateIn +import ca.gosyer.jui.uicore.resources.stringResource import com.github.weisj.darklaf.LafManager import com.github.weisj.darklaf.theme.DarculaTheme import com.github.weisj.darklaf.theme.IntelliJTheme diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts index 80796b0a..40b56a13 100644 --- a/i18n/build.gradle.kts +++ b/i18n/build.gradle.kts @@ -46,7 +46,7 @@ tasks { } multiplatformResources { - multiplatformResourcesPackage = "ca.gosyer.i18n" + multiplatformResourcesPackage = "ca.gosyer.jui.i18n" } android { diff --git a/i18n/src/androidMain/AndroidManifest.xml b/i18n/src/androidMain/AndroidManifest.xml index 05c55cdf..a010bf2e 100644 --- a/i18n/src/androidMain/AndroidManifest.xml +++ b/i18n/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/i18n/src/commonMain/kotlin/ca.gosyer.i18n/StringList.kt b/i18n/src/commonMain/kotlin/ca.gosyer.i18n/StringList.kt deleted file mode 100644 index ba9d5209..00000000 --- a/i18n/src/commonMain/kotlin/ca.gosyer.i18n/StringList.kt +++ /dev/null @@ -1,9 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package ca.gosyer.i18n - -typealias StringList = List \ No newline at end of file diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 0bbebb34..77e50237 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -96,5 +96,5 @@ dependencies { } buildkonfig { - packageName = "ca.gosyer.presentation.build" + packageName = "ca.gosyer.jui.presentation.build" } diff --git a/presentation/src/androidMain/AndroidManifest.xml b/presentation/src/androidMain/AndroidManifest.xml index 3a7fe863..88eb4a96 100644 --- a/presentation/src/androidMain/AndroidManifest.xml +++ b/presentation/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/UiComponent.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt similarity index 78% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/UiComponent.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt index b83fa8c2..9535fd5d 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/UiComponent.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base +package ca.gosyer.jui.ui.base -import ca.gosyer.core.di.AppScope -import ca.gosyer.data.DataComponent -import ca.gosyer.ui.base.image.KamelConfigProvider -import ca.gosyer.ui.base.vm.ViewModelFactoryImpl -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.LocalViewModelFactory +import ca.gosyer.jui.core.di.AppScope +import ca.gosyer.jui.data.DataComponent +import ca.gosyer.jui.ui.base.image.KamelConfigProvider +import ca.gosyer.jui.ui.base.vm.ViewModelFactoryImpl +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.LocalViewModelFactory import io.kamel.core.config.KamelConfig import io.kamel.image.config.LocalKamelConfig import io.kamel.image.config.resourcesFetcher diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/components/AndroidTooltipArea.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/components/AndroidTooltipArea.kt similarity index 96% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/components/AndroidTooltipArea.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/components/AndroidTooltipArea.kt index 8fe3c598..aa1eb321 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/components/AndroidTooltipArea.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/components/AndroidTooltipArea.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.jui.ui.base.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Box diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/file/AndroidFileChooser.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/file/AndroidFileChooser.kt similarity index 97% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/file/AndroidFileChooser.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/file/AndroidFileChooser.kt index bfce5137..f22f7e00 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/file/AndroidFileChooser.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/file/AndroidFileChooser.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.file +package ca.gosyer.jui.ui.base.file import android.net.Uri import android.webkit.MimeTypeMap diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/file/AndroidFileSaver.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/file/AndroidFileSaver.kt similarity index 97% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/file/AndroidFileSaver.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/file/AndroidFileSaver.kt index 484829d6..1e2a11ef 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/file/AndroidFileSaver.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/file/AndroidFileSaver.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.file +package ca.gosyer.jui.ui.base.file import android.net.Uri import androidx.activity.compose.ManagedActivityResultLauncher diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt similarity index 93% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt index 55078f08..1d87a0dc 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.material.Icon import androidx.compose.material.IconButton diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/navigation/AndroidBackHandler.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/navigation/AndroidBackHandler.kt similarity index 91% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/navigation/AndroidBackHandler.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/navigation/AndroidBackHandler.kt index f96f17ac..fc768d03 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/navigation/AndroidBackHandler.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/navigation/AndroidBackHandler.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.runtime.Composable import androidx.activity.compose.BackHandler as AndroidBackHandler diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/prefs/AndroidColorExtensions.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/prefs/AndroidColorExtensions.kt similarity index 95% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/prefs/AndroidColorExtensions.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/prefs/AndroidColorExtensions.kt index 2438bde7..9d10cfae 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/prefs/AndroidColorExtensions.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/prefs/AndroidColorExtensions.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.prefs +package ca.gosyer.jui.ui.base.prefs import androidx.compose.ui.graphics.Color diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt similarity index 81% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt index 3965b436..3ea19c6d 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.theme +package ca.gosyer.jui.ui.base.theme import androidx.compose.runtime.Composable -import ca.gosyer.uicore.components.ScrollbarStyle +import ca.gosyer.jui.uicore.components.ScrollbarStyle actual object ThemeScrollbarStyle { @Composable diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt similarity index 69% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt index 074c5dc2..c960db7a 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt @@ -4,33 +4,33 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.vm +package ca.gosyer.jui.ui.base.vm -import ca.gosyer.ui.base.theme.AppThemeViewModel -import ca.gosyer.ui.categories.CategoriesScreenViewModel -import ca.gosyer.ui.downloads.DownloadsScreenViewModel -import ca.gosyer.ui.extensions.ExtensionsScreenViewModel -import ca.gosyer.ui.library.LibraryScreenViewModel -import ca.gosyer.ui.main.MainViewModel -import ca.gosyer.ui.main.components.DebugOverlayViewModel -import ca.gosyer.ui.manga.MangaScreenViewModel -import ca.gosyer.ui.reader.ReaderMenuViewModel -import ca.gosyer.ui.settings.SettingsAdvancedViewModel -import ca.gosyer.ui.settings.SettingsBackupViewModel -import ca.gosyer.ui.settings.SettingsGeneralViewModel -import ca.gosyer.ui.settings.SettingsLibraryViewModel -import ca.gosyer.ui.settings.SettingsReaderViewModel -import ca.gosyer.ui.settings.SettingsServerHostViewModel -import ca.gosyer.ui.settings.SettingsServerViewModel -import ca.gosyer.ui.settings.ThemesViewModel -import ca.gosyer.ui.sources.browse.SourceScreenViewModel -import ca.gosyer.ui.sources.browse.filter.SourceFiltersViewModel -import ca.gosyer.ui.sources.globalsearch.GlobalSearchViewModel -import ca.gosyer.ui.sources.home.SourceHomeScreenViewModel -import ca.gosyer.ui.sources.settings.SourceSettingsScreenViewModel -import ca.gosyer.ui.updates.UpdatesScreenViewModel -import ca.gosyer.uicore.vm.ViewModel -import ca.gosyer.uicore.vm.ViewModelFactory +import ca.gosyer.jui.ui.base.theme.AppThemeViewModel +import ca.gosyer.jui.ui.categories.CategoriesScreenViewModel +import ca.gosyer.jui.ui.downloads.DownloadsScreenViewModel +import ca.gosyer.jui.ui.extensions.ExtensionsScreenViewModel +import ca.gosyer.jui.ui.library.LibraryScreenViewModel +import ca.gosyer.jui.ui.main.MainViewModel +import ca.gosyer.jui.ui.main.components.DebugOverlayViewModel +import ca.gosyer.jui.ui.manga.MangaScreenViewModel +import ca.gosyer.jui.ui.reader.ReaderMenuViewModel +import ca.gosyer.jui.ui.settings.SettingsAdvancedViewModel +import ca.gosyer.jui.ui.settings.SettingsBackupViewModel +import ca.gosyer.jui.ui.settings.SettingsGeneralViewModel +import ca.gosyer.jui.ui.settings.SettingsLibraryViewModel +import ca.gosyer.jui.ui.settings.SettingsReaderViewModel +import ca.gosyer.jui.ui.settings.SettingsServerHostViewModel +import ca.gosyer.jui.ui.settings.SettingsServerViewModel +import ca.gosyer.jui.ui.settings.ThemesViewModel +import ca.gosyer.jui.ui.sources.browse.SourceScreenViewModel +import ca.gosyer.jui.ui.sources.browse.filter.SourceFiltersViewModel +import ca.gosyer.jui.ui.sources.globalsearch.GlobalSearchViewModel +import ca.gosyer.jui.ui.sources.home.SourceHomeScreenViewModel +import ca.gosyer.jui.ui.sources.settings.SourceSettingsScreenViewModel +import ca.gosyer.jui.ui.updates.UpdatesScreenViewModel +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.ViewModelFactory import me.tatarka.inject.annotations.Inject import kotlin.reflect.KClass @@ -43,7 +43,7 @@ actual class ViewModelFactoryImpl( private val libraryFactory: () -> LibraryScreenViewModel, private val debugOverlayFactory: () -> DebugOverlayViewModel, private val mainFactory: () -> MainViewModel, - private val mangaFactory: (params: MangaScreenViewModel.Params) -> MangaScreenViewModel, + private val mangaFactory: (params: ca.gosyer.jui.ui.manga.MangaScreenViewModel.Params) -> ca.gosyer.jui.ui.manga.MangaScreenViewModel, private val readerFactory: (params: ReaderMenuViewModel.Params) -> ReaderMenuViewModel, private val settingsAdvancedFactory: () -> SettingsAdvancedViewModel, private val themesFactory: () -> ThemesViewModel, @@ -71,7 +71,7 @@ actual class ViewModelFactoryImpl( LibraryScreenViewModel::class -> libraryFactory() DebugOverlayViewModel::class -> debugOverlayFactory() MainViewModel::class -> mainFactory() - MangaScreenViewModel::class -> mangaFactory(arg1 as MangaScreenViewModel.Params) + ca.gosyer.jui.ui.manga.MangaScreenViewModel::class -> mangaFactory(arg1 as ca.gosyer.jui.ui.manga.MangaScreenViewModel.Params) ReaderMenuViewModel::class -> readerFactory(arg1 as ReaderMenuViewModel.Params) SettingsAdvancedViewModel::class -> settingsAdvancedFactory() ThemesViewModel::class -> themesFactory() diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/categories/OpenCategories.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/categories/OpenCategories.kt similarity index 95% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/categories/OpenCategories.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/categories/OpenCategories.kt index a969592b..c0a3cebc 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/categories/OpenCategories.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/categories/OpenCategories.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.categories +package ca.gosyer.jui.ui.categories import androidx.compose.runtime.Composable import androidx.compose.runtime.remember diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/downloads/AndroidDownloadService.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/downloads/AndroidDownloadService.kt similarity index 80% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/downloads/AndroidDownloadService.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/downloads/AndroidDownloadService.kt index 572e0475..c4296c9f 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/downloads/AndroidDownloadService.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/downloads/AndroidDownloadService.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.downloads +package ca.gosyer.jui.ui.downloads import android.content.Intent import androidx.core.content.ContextCompat -import ca.gosyer.data.base.WebsocketService -import ca.gosyer.data.download.DownloadService -import ca.gosyer.uicore.vm.ContextWrapper +import ca.gosyer.jui.data.base.WebsocketService +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.uicore.vm.ContextWrapper internal actual fun startDownloadService( contextWrapper: ContextWrapper, diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/library/components/AndroidLibraryGrid.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/library/components/AndroidLibraryGrid.kt similarity index 91% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/library/components/AndroidLibraryGrid.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/library/components/AndroidLibraryGrid.kt index 66eb1b38..cb682a20 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/library/components/AndroidLibraryGrid.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/library/components/AndroidLibraryGrid.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.combinedClickable import androidx.compose.material.DropdownMenu @@ -16,8 +16,8 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.composed -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.resources.stringResource actual fun Modifier.libraryMangaModifier( onClickManga: () -> Unit, diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/manga/components/AndroidChapterItem.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/manga/components/AndroidChapterItem.kt similarity index 92% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/manga/components/AndroidChapterItem.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/manga/components/AndroidChapterItem.kt index a0ef330a..6c8748ca 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/manga/components/AndroidChapterItem.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/manga/components/AndroidChapterItem.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.manga.components +package ca.gosyer.jui.ui.manga.components import androidx.compose.foundation.combinedClickable import androidx.compose.material.DropdownMenu @@ -16,8 +16,8 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.composed -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.resources.stringResource actual fun Modifier.chapterItemModifier( onClick: () -> Unit, diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/reader/AndroidReaderMenu.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/reader/AndroidReaderMenu.kt similarity index 97% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/reader/AndroidReaderMenu.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/reader/AndroidReaderMenu.kt index edf8ab3f..1c3d0f4c 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/reader/AndroidReaderMenu.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/reader/AndroidReaderMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader +package ca.gosyer.jui.ui.reader import android.content.Context import android.content.Intent diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/settings/AndroidSettingsAppearenceScreen.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/settings/AndroidSettingsAppearenceScreen.kt similarity index 88% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/settings/AndroidSettingsAppearenceScreen.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/settings/AndroidSettingsAppearenceScreen.kt index 70be9dbe..b470cd7d 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/settings/AndroidSettingsAppearenceScreen.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/settings/AndroidSettingsAppearenceScreen.kt @@ -4,6 +4,6 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings actual val showWindowDecorationsOption: Boolean = false diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/settings/AndroidSettingsServerScreen.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/settings/AndroidSettingsServerScreen.kt similarity index 83% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/settings/AndroidSettingsServerScreen.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/settings/AndroidSettingsServerScreen.kt index 2e39714f..47bfbdb4 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/settings/AndroidSettingsServerScreen.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/settings/AndroidSettingsServerScreen.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.runtime.Composable -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import me.tatarka.inject.annotations.Inject @Composable diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/sources/components/AndroidSourcesMenu.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/sources/components/AndroidSourcesMenu.kt similarity index 91% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/sources/components/AndroidSourcesMenu.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/sources/components/AndroidSourcesMenu.kt index 8b63634c..3ed2cc2e 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/sources/components/AndroidSourcesMenu.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/sources/components/AndroidSourcesMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.components +package ca.gosyer.jui.ui.sources.components import androidx.compose.foundation.clickable import androidx.compose.ui.Modifier diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/ui/util/compose/Image.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt similarity index 93% rename from presentation/src/androidMain/kotlin/ca/gosyer/ui/util/compose/Image.kt rename to presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt index 656db9f3..6f5b5729 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/ui/util/compose/Image.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.compose +package ca.gosyer.jui.ui.util.compose import android.graphics.BitmapFactory import androidx.compose.ui.graphics.ImageBitmap diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/UiComponent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt similarity index 76% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/UiComponent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt index 8ecdcc2f..1314d041 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/UiComponent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base +package ca.gosyer.jui.ui.base import androidx.compose.runtime.ProvidedValue -import ca.gosyer.data.DataComponent -import ca.gosyer.ui.base.image.KamelConfigProvider -import ca.gosyer.ui.base.vm.ViewModelFactoryImpl -import ca.gosyer.uicore.vm.ContextWrapper +import ca.gosyer.jui.data.DataComponent +import ca.gosyer.jui.ui.base.image.KamelConfigProvider +import ca.gosyer.jui.ui.base.vm.ViewModelFactoryImpl +import ca.gosyer.jui.uicore.vm.ContextWrapper import io.kamel.core.config.KamelConfig expect abstract class UiComponent { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/chapter/ChapterDownloadButtons.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/chapter/ChapterDownloadButtons.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt index 48bd6b84..5e43fb91 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/chapter/ChapterDownloadButtons.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.chapter +package ca.gosyer.jui.ui.base.chapter import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.BorderStroke @@ -31,15 +31,15 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import ca.gosyer.data.download.model.DownloadChapter -import ca.gosyer.data.download.model.DownloadState -import ca.gosyer.data.models.Chapter -import ca.gosyer.data.models.Manga -import ca.gosyer.data.server.interactions.ChapterInteractionHandler -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.components.DropdownIconButton -import ca.gosyer.uicore.components.DropdownMenuItem -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.data.download.model.DownloadChapter +import ca.gosyer.jui.data.download.model.DownloadState +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.components.DropdownIconButton +import ca.gosyer.jui.uicore.components.DropdownMenuItem +import ca.gosyer.jui.uicore.resources.stringResource import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/components/LocaleToString.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/LocaleToString.kt similarity index 74% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/components/LocaleToString.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/LocaleToString.kt index f47e1834..e3d65656 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/components/LocaleToString.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/LocaleToString.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.components +package ca.gosyer.jui.ui.base.components -import ca.gosyer.core.lang.getDefault -import ca.gosyer.core.lang.getDisplayLanguage +import ca.gosyer.jui.core.lang.getDefault +import ca.gosyer.jui.core.lang.getDisplayLanguage import io.fluidsonic.locale.Locale fun localeToString(locale: String) = Locale.forLanguageTag(locale) diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/components/TooltipArea.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/TooltipArea.kt similarity index 88% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/components/TooltipArea.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/TooltipArea.kt index 0878421d..d369276b 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/components/TooltipArea.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/TooltipArea.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.jui.ui.base.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.runtime.Composable @@ -21,7 +21,7 @@ fun TooltipPlacement.CursorPoint( offset: DpOffset = DpOffset.Zero, alignment: Alignment = Alignment.BottomEnd, windowMargin: Dp = 4.dp -) = ca.gosyer.ui.base.components.CursorPoint(offset, alignment, windowMargin) +) = ca.gosyer.jui.ui.base.components.CursorPoint(offset, alignment, windowMargin) @ExperimentalFoundationApi expect class CursorPoint( @@ -34,7 +34,7 @@ fun TooltipPlacement.ComponentRect( anchor: Alignment = Alignment.BottomCenter, alignment: Alignment = Alignment.BottomCenter, offset: DpOffset = DpOffset.Zero -) = ca.gosyer.ui.base.components.ComponentRect(anchor, alignment, offset) +) = ca.gosyer.jui.ui.base.components.ComponentRect(anchor, alignment, offset) @ExperimentalFoundationApi expect class ComponentRect( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/dialog/MaterialDialogProperties.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/dialog/MaterialDialogProperties.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/dialog/MaterialDialogProperties.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/dialog/MaterialDialogProperties.kt index c3ae6ecf..e4449fbb 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/dialog/MaterialDialogProperties.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/dialog/MaterialDialogProperties.kt @@ -4,16 +4,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.dialog +package ca.gosyer.jui.ui.base.dialog import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp -import ca.gosyer.i18n.MR -import ca.gosyer.presentation.build.BuildKonfig -import ca.gosyer.uicore.resources.toPainter +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.presentation.build.BuildKonfig +import ca.gosyer.jui.uicore.resources.toPainter import com.vanpra.composematerialdialogs.DesktopWindowPosition import com.vanpra.composematerialdialogs.MaterialDialogProperties import com.vanpra.composematerialdialogs.SecurePolicy diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/file/FileChooser.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/file/FileChooser.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/file/FileChooser.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/file/FileChooser.kt index fc4a9328..75e9b16f 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/file/FileChooser.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/file/FileChooser.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.file +package ca.gosyer.jui.ui.base.file import androidx.compose.runtime.Composable import okio.Source diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/file/FileSaver.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/file/FileSaver.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/file/FileSaver.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/file/FileSaver.kt index c029bfd0..7b8acedb 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/file/FileSaver.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/file/FileSaver.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.file +package ca.gosyer.jui.ui.base.file import androidx.compose.runtime.Composable import okio.Sink diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/image/KamelConfigProvider.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/image/KamelConfigProvider.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/image/KamelConfigProvider.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/image/KamelConfigProvider.kt index a6dcbc10..e3008042 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/image/KamelConfigProvider.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/image/KamelConfigProvider.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.image +package ca.gosyer.jui.ui.base.image -import ca.gosyer.data.models.Extension -import ca.gosyer.data.models.Manga -import ca.gosyer.data.models.Source -import ca.gosyer.data.server.Http -import ca.gosyer.data.server.ServerPreferences +import ca.gosyer.jui.data.models.Extension +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.data.server.Http +import ca.gosyer.jui.data.server.ServerPreferences import io.kamel.core.DataSource import io.kamel.core.Resource import io.kamel.core.config.DefaultCacheSize diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt index 586c8118..4a5fa580 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/ActionMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionMenu.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/ActionMenu.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionMenu.kt index dc87f760..88fe2737 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/ActionMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.material.LocalContentAlpha import androidx.compose.material.MaterialTheme @@ -21,10 +21,10 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.util.fastForEach -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.components.DropdownMenu -import ca.gosyer.uicore.components.DropdownMenuItem -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.components.DropdownMenu +import ca.gosyer.jui.uicore.components.DropdownMenuItem +import ca.gosyer.jui.uicore.resources.stringResource // Originally from https://gist.github.com/MachFour/369ebb56a66e2f583ebfb988dda2decf diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/BackHandler.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/BackHandler.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/BackHandler.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/BackHandler.kt index 8a35a6c6..8c0c3f09 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/BackHandler.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/BackHandler.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.runtime.Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/DisplayController.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/DisplayController.kt similarity index 96% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/DisplayController.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/DisplayController.kt index cb3abf31..bf115c60 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/DisplayController.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/DisplayController.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/Toolbar.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/Toolbar.kt similarity index 98% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/Toolbar.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/Toolbar.kt index 56923888..3eab31fc 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/navigation/Toolbar.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/navigation/Toolbar.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.Crossfade @@ -69,9 +69,9 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.components.keyboardHandler -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.components.keyboardHandler +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/prefs/ColorPickerDialog.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/prefs/ColorPickerDialog.kt similarity index 98% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/prefs/ColorPickerDialog.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/prefs/ColorPickerDialog.kt index 15e0bc3b..62e5cb8a 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/prefs/ColorPickerDialog.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/prefs/ColorPickerDialog.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.prefs +package ca.gosyer.jui.ui.base.prefs import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.ExperimentalFoundationApi @@ -63,10 +63,10 @@ import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEachIndexed -import ca.gosyer.ui.base.dialog.getMaterialDialogProperties -import ca.gosyer.ui.util.compose.toHexString -import ca.gosyer.ui.util.compose.toLong -import ca.gosyer.uicore.components.keyboardHandler +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.ui.util.compose.toHexString +import ca.gosyer.jui.ui.util.compose.toLong +import ca.gosyer.jui.uicore.components.keyboardHandler import com.vanpra.composematerialdialogs.MaterialDialog import com.vanpra.composematerialdialogs.MaterialDialogState import com.vanpra.composematerialdialogs.title diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/prefs/PreferencesUiBuilder.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/prefs/PreferencesUiBuilder.kt similarity index 97% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/prefs/PreferencesUiBuilder.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/prefs/PreferencesUiBuilder.kt index 4fc0f275..03512387 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/prefs/PreferencesUiBuilder.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/prefs/PreferencesUiBuilder.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.prefs +package ca.gosyer.jui.ui.base.prefs import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.FastOutLinearInEasing @@ -74,13 +74,13 @@ import androidx.compose.ui.text.input.VisualTransformation 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.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 ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.keyboardHandler +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.resources.stringResource import com.vanpra.composematerialdialogs.MaterialDialog import com.vanpra.composematerialdialogs.MaterialDialogButtons import com.vanpra.composematerialdialogs.MaterialDialogState diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/AppColorsPreference.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/AppColorsPreference.kt similarity index 80% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/AppColorsPreference.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/AppColorsPreference.kt index 19c269e1..71516629 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/AppColorsPreference.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/AppColorsPreference.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.theme +package ca.gosyer.jui.ui.base.theme import androidx.compose.ui.graphics.Color -import ca.gosyer.core.prefs.Preference -import ca.gosyer.data.ui.UiPreferences -import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow -import ca.gosyer.uicore.prefs.asColor -import ca.gosyer.uicore.prefs.asStateIn +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.data.ui.UiPreferences +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.prefs.asColor +import ca.gosyer.jui.uicore.prefs.asStateIn import kotlinx.coroutines.CoroutineScope data class AppColorsPreference( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/AppTheme.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/AppTheme.kt index 938e9f2f..69c553b7 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/AppTheme.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.theme +package ca.gosyer.jui.ui.base.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material.Colors @@ -18,15 +18,15 @@ import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color 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.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 -import ca.gosyer.uicore.vm.LocalViewModelFactory -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.data.ui.UiPreferences +import ca.gosyer.jui.data.ui.model.ThemeMode +import ca.gosyer.jui.ui.base.theme.ThemeScrollbarStyle.getScrollbarStyle +import ca.gosyer.jui.uicore.components.LocalScrollbarStyle +import ca.gosyer.jui.uicore.theme.Theme +import ca.gosyer.jui.uicore.theme.themes +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.LocalViewModelFactory +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.MainScope import kotlinx.coroutines.SupervisorJob diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt similarity index 79% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt index 79bb3d4a..335874f1 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.theme +package ca.gosyer.jui.ui.base.theme import androidx.compose.runtime.Composable -import ca.gosyer.uicore.components.ScrollbarStyle +import ca.gosyer.jui.uicore.components.ScrollbarStyle expect object ThemeScrollbarStyle { @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt similarity index 79% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt index d61094ba..f033970b 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.vm +package ca.gosyer.jui.ui.base.vm -import ca.gosyer.uicore.vm.ViewModelFactory +import ca.gosyer.jui.uicore.vm.ViewModelFactory import me.tatarka.inject.annotations.Inject @Inject diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/CategoriesScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreen.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/CategoriesScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreen.kt index f768d494..e55e2efd 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/CategoriesScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreen.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.categories +package ca.gosyer.jui.ui.categories import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.categories.components.CategoriesScreenContent -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.categories.components.CategoriesScreenContent +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/CategoriesScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreenViewModel.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/CategoriesScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreenViewModel.kt index 7f7fe717..e9d5206b 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/CategoriesScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreenViewModel.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.categories +package ca.gosyer.jui.ui.categories -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.models.Category -import ca.gosyer.data.server.interactions.CategoryInteractionHandler -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.server.interactions.CategoryInteractionHandler +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.catch diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/components/CategoriesDialogs.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesDialogs.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/components/CategoriesDialogs.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesDialogs.kt index 3a589057..d905bca0 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/components/CategoriesDialogs.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesDialogs.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.categories.components +package ca.gosyer.jui.ui.categories.components import androidx.compose.material.TextField import androidx.compose.runtime.Composable @@ -14,11 +14,11 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.TextFieldValue -import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.dialog.getMaterialDialogProperties -import ca.gosyer.ui.categories.CategoriesScreenViewModel -import ca.gosyer.uicore.components.keyboardHandler -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.ui.categories.CategoriesScreenViewModel +import ca.gosyer.jui.uicore.components.keyboardHandler +import ca.gosyer.jui.uicore.resources.stringResource import com.vanpra.composematerialdialogs.MaterialDialog import com.vanpra.composematerialdialogs.MaterialDialogState import com.vanpra.composematerialdialogs.message diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/components/CategoriesScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesScreenContent.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/components/CategoriesScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesScreenContent.kt index f79bd4d4..ed4783cd 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/categories/components/CategoriesScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.categories.components +package ca.gosyer.jui.ui.categories.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -41,12 +41,12 @@ import androidx.compose.runtime.DisposableEffect 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.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 ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.categories.CategoriesScreenViewModel.MenuCategory +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import com.vanpra.composematerialdialogs.rememberMaterialDialogState import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.DelicateCoroutinesApi diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadService.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadService.kt similarity index 67% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadService.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadService.kt index ad037b4e..87ec60ce 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadService.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadService.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.downloads +package ca.gosyer.jui.ui.downloads -import ca.gosyer.data.base.WebsocketService -import ca.gosyer.data.download.DownloadService -import ca.gosyer.uicore.vm.ContextWrapper +import ca.gosyer.jui.data.base.WebsocketService +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.uicore.vm.ContextWrapper internal expect fun startDownloadService( contextWrapper: ContextWrapper, diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadsScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreen.kt similarity index 87% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadsScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreen.kt index 8e19f011..d80ba65c 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadsScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreen.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.downloads +package ca.gosyer.jui.ui.downloads import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.downloads.components.DownloadsScreenContent -import ca.gosyer.ui.manga.MangaScreen -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.downloads.components.DownloadsScreenContent +import ca.gosyer.jui.ui.manga.MangaScreen +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadsScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt similarity index 85% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadsScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt index 6f9ace62..3d7785cb 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/DownloadsScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt @@ -4,16 +4,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.downloads +package ca.gosyer.jui.ui.downloads -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.base.WebsocketService.Actions -import ca.gosyer.data.download.DownloadService -import ca.gosyer.data.models.Chapter -import ca.gosyer.data.server.interactions.ChapterInteractionHandler -import ca.gosyer.data.server.interactions.DownloadInteractionHandler -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.base.WebsocketService.Actions +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler +import ca.gosyer.jui.data.server.interactions.DownloadInteractionHandler +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/components/DownloadsScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/components/DownloadsScreenContent.kt similarity index 87% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/components/DownloadsScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/components/DownloadsScreenContent.kt index e9e59748..c524e53d 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/downloads/components/DownloadsScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/components/DownloadsScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.downloads.components +package ca.gosyer.jui.ui.downloads.components import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.clickable @@ -40,23 +40,23 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.FilterQuality import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -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.navigation.ActionItem -import ca.gosyer.ui.base.navigation.Toolbar -import ca.gosyer.uicore.components.DropdownIconButton -import ca.gosyer.uicore.components.DropdownMenuItem -import ca.gosyer.uicore.components.MangaListItem -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 ca.gosyer.jui.data.download.model.DownloadChapter +import ca.gosyer.jui.data.download.model.DownloaderStatus +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.ActionItem +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.DropdownIconButton +import ca.gosyer.jui.uicore.components.DropdownMenuItem +import ca.gosyer.jui.uicore.components.MangaListItem +import ca.gosyer.jui.uicore.components.MangaListItemColumn +import ca.gosyer.jui.uicore.components.MangaListItemImage +import ca.gosyer.jui.uicore.components.MangaListItemSubtitle +import ca.gosyer.jui.uicore.components.MangaListItemTitle +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/ExtensionsScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreen.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/ExtensionsScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreen.kt index 522f799e..687fed73 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/ExtensionsScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreen.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.extensions +package ca.gosyer.jui.ui.extensions import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.extensions.components.ExtensionsScreenContent -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.extensions.components.ExtensionsScreenContent +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/ExtensionsScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/ExtensionsScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt index d75b143a..810a097f 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/ExtensionsScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt @@ -4,16 +4,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.extensions +package ca.gosyer.jui.ui.extensions -import ca.gosyer.core.lang.displayName -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.extension.ExtensionPreferences -import ca.gosyer.data.models.Extension -import ca.gosyer.data.server.interactions.ExtensionInteractionHandler -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.lang.displayName +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.extension.ExtensionPreferences +import ca.gosyer.jui.data.models.Extension +import ca.gosyer.jui.data.server.interactions.ExtensionInteractionHandler +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import io.fluidsonic.locale.Locale import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/components/ExtensionsScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/components/ExtensionsScreenContent.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/components/ExtensionsScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/components/ExtensionsScreenContent.kt index 52f6bd3c..c4b3db87 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/extensions/components/ExtensionsScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/components/ExtensionsScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.extensions.components +package ca.gosyer.jui.ui.extensions.components import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -46,20 +46,20 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ca.gosyer.core.lang.getDefault -import ca.gosyer.core.lang.getDisplayName -import ca.gosyer.core.lang.uppercase -import ca.gosyer.data.models.Extension -import ca.gosyer.i18n.MR -import ca.gosyer.presentation.build.BuildKonfig -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 ca.gosyer.jui.core.lang.getDefault +import ca.gosyer.jui.core.lang.getDisplayName +import ca.gosyer.jui.core.lang.uppercase +import ca.gosyer.jui.data.models.Extension +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.presentation.build.BuildKonfig +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.ui.base.navigation.ActionItem +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage +import ca.gosyer.jui.uicore.resources.stringResource import com.vanpra.composematerialdialogs.MaterialDialog import com.vanpra.composematerialdialogs.MaterialDialogState import com.vanpra.composematerialdialogs.rememberMaterialDialogState diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/LibraryScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreen.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/LibraryScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreen.kt index ba39b814..930e064f 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/LibraryScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreen.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library +package ca.gosyer.jui.ui.library import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.library.components.LibraryScreenContent -import ca.gosyer.ui.manga.MangaScreen -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.library.components.LibraryScreenContent +import ca.gosyer.jui.ui.manga.MangaScreen +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/LibraryScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreenViewModel.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/LibraryScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreenViewModel.kt index 725acb4c..1dc763a8 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/LibraryScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreenViewModel.kt @@ -4,23 +4,23 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library +package ca.gosyer.jui.ui.library -import ca.gosyer.core.lang.getDefault -import ca.gosyer.core.lang.lowercase -import ca.gosyer.core.lang.withDefaultContext -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.library.LibraryPreferences -import ca.gosyer.data.library.model.Sort -import ca.gosyer.data.models.Category -import ca.gosyer.data.models.Manga -import ca.gosyer.data.server.interactions.CategoryInteractionHandler -import ca.gosyer.data.server.interactions.LibraryInteractionHandler -import ca.gosyer.data.server.interactions.UpdatesInteractionHandler -import ca.gosyer.i18n.MR -import ca.gosyer.ui.util.lang.Collator -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.lang.getDefault +import ca.gosyer.jui.core.lang.lowercase +import ca.gosyer.jui.core.lang.withDefaultContext +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.library.LibraryPreferences +import ca.gosyer.jui.data.library.model.Sort +import ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.server.interactions.CategoryInteractionHandler +import ca.gosyer.jui.data.server.interactions.LibraryInteractionHandler +import ca.gosyer.jui.data.server.interactions.UpdatesInteractionHandler +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.util.lang.Collator +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import io.fluidsonic.locale.Locale import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaBadges.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryMangaBadges.kt similarity index 97% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaBadges.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryMangaBadges.kt index 35538cb6..2a35587e 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaBadges.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryMangaBadges.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Row diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaList.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryMangaList.kt similarity index 88% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaList.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryMangaList.kt index e54f9d43..8cac48dc 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryMangaList.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryMangaList.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -22,12 +22,12 @@ import androidx.compose.ui.Modifier 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.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 ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.uicore.components.MangaListItem +import ca.gosyer.jui.uicore.components.MangaListItemImage +import ca.gosyer.jui.uicore.components.MangaListItemTitle +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryPager.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryPager.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryPager.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryPager.kt index ef1e67a5..b70f1743 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryPager.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryPager.kt @@ -4,15 +4,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.getValue -import ca.gosyer.data.library.model.DisplayMode -import ca.gosyer.data.models.Category -import ca.gosyer.data.models.Manga +import ca.gosyer.jui.data.library.model.DisplayMode +import ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.models.Manga import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.PagerState diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryScreenContent.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryScreenContent.kt index ec05a58a..95ffc0c7 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxWithConstraints @@ -18,13 +18,13 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.State import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ca.gosyer.data.library.model.DisplayMode -import ca.gosyer.data.models.Category -import ca.gosyer.data.models.Manga -import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.navigation.Toolbar -import ca.gosyer.uicore.components.LoadingScreen -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.data.library.model.DisplayMode +import ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.resources.stringResource import com.google.accompanist.pager.PagerState import com.google.accompanist.pager.rememberPagerState diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryTabs.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryTabs.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryTabs.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryTabs.kt index 807211d5..2a6dd6c9 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/LibraryTabs.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/LibraryTabs.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -18,7 +18,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEachIndexed -import ca.gosyer.data.models.Category +import ca.gosyer.jui.data.models.Category import com.google.accompanist.pager.PagerState import com.google.accompanist.pager.pagerTabIndicatorOffset diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaComfortableGrid.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaComfortableGrid.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaComfortableGrid.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaComfortableGrid.kt index bf132522..9bc9d2b9 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaComfortableGrid.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaComfortableGrid.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -30,11 +30,11 @@ import androidx.compose.ui.text.TextStyle 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.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.mangaAspectRatio -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaCompactGrid.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaCompactGrid.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaCompactGrid.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaCompactGrid.kt index 00c4aba0..97e24f85 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaCompactGrid.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaCompactGrid.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio @@ -33,11 +33,11 @@ import androidx.compose.ui.text.TextStyle 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.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.mangaAspectRatio -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.image.lazyPainterResource expect fun Modifier.libraryMangaModifier( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaCoverOnlyGrid.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaCoverOnlyGrid.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaCoverOnlyGrid.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaCoverOnlyGrid.kt index 0d1d2c21..72f59b66 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/library/components/MangaCoverOnlyGrid.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/components/MangaCoverOnlyGrid.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio @@ -24,11 +24,11 @@ import androidx.compose.ui.draw.clip 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.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.mangaAspectRatio -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/MainMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/MainMenu.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/MainMenu.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/MainMenu.kt index 06492fbd..356ce854 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/MainMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/MainMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main +package ca.gosyer.jui.ui.main import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateDpAsState @@ -28,12 +28,12 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ca.gosyer.ui.base.navigation.BackHandler -import ca.gosyer.ui.base.navigation.DisplayController -import ca.gosyer.ui.base.navigation.withDisplayController -import ca.gosyer.ui.main.components.BottomNav -import ca.gosyer.ui.main.components.SideMenu -import ca.gosyer.uicore.vm.LocalViewModelFactory +import ca.gosyer.jui.ui.base.navigation.BackHandler +import ca.gosyer.jui.ui.base.navigation.DisplayController +import ca.gosyer.jui.ui.base.navigation.withDisplayController +import ca.gosyer.jui.ui.main.components.BottomNav +import ca.gosyer.jui.ui.main.components.SideMenu +import ca.gosyer.jui.uicore.vm.LocalViewModelFactory import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.transitions.FadeTransition import kotlinx.coroutines.delay diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/MainViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/MainViewModel.kt similarity index 78% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/MainViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/MainViewModel.kt index cdb40cfb..8378b06d 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/MainViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/MainViewModel.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main +package ca.gosyer.jui.ui.main -import ca.gosyer.data.ui.UiPreferences -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.Length -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.data.ui.UiPreferences +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.Length +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel import me.tatarka.inject.annotations.Inject diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/Routes.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/Routes.kt similarity index 71% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/Routes.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/Routes.kt index bdddbc2b..a1bfee59 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/Routes.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/Routes.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main +package ca.gosyer.jui.ui.main -import ca.gosyer.data.ui.model.StartScreen -import ca.gosyer.ui.extensions.ExtensionsScreen -import ca.gosyer.ui.library.LibraryScreen -import ca.gosyer.ui.sources.SourcesScreen -import ca.gosyer.ui.updates.UpdatesScreen +import ca.gosyer.jui.data.ui.model.StartScreen +import ca.gosyer.jui.ui.extensions.ExtensionsScreen +import ca.gosyer.jui.ui.library.LibraryScreen +import ca.gosyer.jui.ui.sources.SourcesScreen +import ca.gosyer.jui.ui.updates.UpdatesScreen fun StartScreen.toScreen() = when (this) { StartScreen.Library -> LibraryScreen() diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/TopLevelMenus.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/TopLevelMenus.kt similarity index 87% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/TopLevelMenus.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/TopLevelMenus.kt index 7f1ff242..eb8375c6 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/TopLevelMenus.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/TopLevelMenus.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main +package ca.gosyer.jui.ui.main import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Book @@ -23,15 +23,15 @@ import androidx.compose.material.icons.rounded.Settings import androidx.compose.material.icons.rounded.Store import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector -import ca.gosyer.i18n.MR -import ca.gosyer.ui.downloads.DownloadsScreen -import ca.gosyer.ui.extensions.ExtensionsScreen -import ca.gosyer.ui.library.LibraryScreen -import ca.gosyer.ui.main.components.DownloadsExtraInfo -import ca.gosyer.ui.main.more.MoreScreen -import ca.gosyer.ui.settings.SettingsScreen -import ca.gosyer.ui.sources.SourcesScreen -import ca.gosyer.ui.updates.UpdatesScreen +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.downloads.DownloadsScreen +import ca.gosyer.jui.ui.extensions.ExtensionsScreen +import ca.gosyer.jui.ui.library.LibraryScreen +import ca.gosyer.jui.ui.main.components.DownloadsExtraInfo +import ca.gosyer.jui.ui.main.more.MoreScreen +import ca.gosyer.jui.ui.settings.SettingsScreen +import ca.gosyer.jui.ui.sources.SourcesScreen +import ca.gosyer.jui.ui.updates.UpdatesScreen import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.Navigator import dev.icerock.moko.resources.StringResource diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/BottomNav.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/BottomNav.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/BottomNav.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/BottomNav.kt index c9b358e9..baafb45a 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/BottomNav.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/BottomNav.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components import androidx.compose.material.BottomNavigation import androidx.compose.material.BottomNavigationItem @@ -14,8 +14,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.util.fastForEach -import ca.gosyer.ui.main.TopLevelMenus -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.ui.main.TopLevelMenus +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.navigator.Navigator @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DebugOverlay.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlay.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DebugOverlay.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlay.kt index 97d4c2eb..8b717e99 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DebugOverlay.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlay.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components import androidx.compose.foundation.layout.Column import androidx.compose.material.Text @@ -14,7 +14,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color -import ca.gosyer.uicore.vm.LocalViewModelFactory +import ca.gosyer.jui.uicore.vm.LocalViewModelFactory @Composable fun DebugOverlay() { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DebugOverlayViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlayViewModel.kt similarity index 82% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DebugOverlayViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlayViewModel.kt index 8d4fe400..8ee5a6be 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DebugOverlayViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlayViewModel.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.flow.MutableStateFlow expect class DebugOverlayViewModel : ViewModel { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DownloadsExtraInfo.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DownloadsExtraInfo.kt similarity index 87% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DownloadsExtraInfo.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DownloadsExtraInfo.kt index 2b81badc..00e15532 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/DownloadsExtraInfo.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/DownloadsExtraInfo.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.ContentAlpha @@ -19,12 +19,12 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import ca.gosyer.data.base.WebsocketService -import ca.gosyer.data.download.model.DownloaderStatus -import ca.gosyer.i18n.MR -import ca.gosyer.ui.downloads.DownloadsScreenViewModel -import ca.gosyer.uicore.resources.stringResource -import ca.gosyer.uicore.vm.LocalViewModelFactory +import ca.gosyer.jui.data.base.WebsocketService +import ca.gosyer.jui.data.download.model.DownloaderStatus +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.downloads.DownloadsScreenViewModel +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.LocalViewModelFactory @Composable fun DownloadsExtraInfo() { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/SideMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/SideMenu.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/SideMenu.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/SideMenu.kt index e6569cad..4695567e 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/SideMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/SideMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -29,10 +29,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.util.fastForEach -import ca.gosyer.presentation.build.BuildKonfig -import ca.gosyer.ui.base.navigation.DisplayController -import ca.gosyer.ui.main.MoreMenus -import ca.gosyer.ui.main.TopLevelMenus +import ca.gosyer.jui.presentation.build.BuildKonfig +import ca.gosyer.jui.ui.base.navigation.DisplayController +import ca.gosyer.jui.ui.main.MoreMenus +import ca.gosyer.jui.ui.main.TopLevelMenus import cafe.adriel.voyager.navigator.Navigator @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/SideMenuItem.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/SideMenuItem.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/SideMenuItem.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/SideMenuItem.kt index bc1f6f6a..055493eb 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/components/SideMenuItem.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/SideMenuItem.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -25,8 +25,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import ca.gosyer.ui.main.Menu -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.ui.main.Menu +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/more/MoreScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/more/MoreScreen.kt similarity index 85% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/more/MoreScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/more/MoreScreen.kt index 7498574c..e6d6dea3 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/more/MoreScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/more/MoreScreen.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.more +package ca.gosyer.jui.ui.main.more import androidx.compose.runtime.Composable -import ca.gosyer.ui.main.more.components.MoreContent +import ca.gosyer.jui.ui.main.more.components.MoreContent import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/more/components/MoreContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/more/components/MoreContent.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/main/more/components/MoreContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/more/components/MoreContent.kt index d9bd4f19..23504b27 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/main/more/components/MoreContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/more/components/MoreContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.more.components +package ca.gosyer.jui.ui.main.more.components import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -28,11 +28,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEach -import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.navigation.Toolbar -import ca.gosyer.ui.main.MoreMenus -import ca.gosyer.uicore.resources.stringResource -import ca.gosyer.uicore.resources.toPainter +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.main.MoreMenus +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.resources.toPainter import cafe.adriel.voyager.navigator.LocalNavigator @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/MangaScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreen.kt similarity index 84% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/MangaScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreen.kt index 87855bb8..2bb1ad0f 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/MangaScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreen.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.manga +package ca.gosyer.jui.ui.manga import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.manga.components.MangaScreenContent -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.manga.components.MangaScreenContent +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey @@ -21,7 +21,11 @@ class MangaScreen(private val mangaId: Long) : Screen { @Composable override fun Content() { val vm = viewModel { - instantiate(MangaScreenViewModel.Params(mangaId)) + instantiate( + ca.gosyer.jui.ui.manga.MangaScreenViewModel.Params( + mangaId + ) + ) } MangaScreenContent( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/MangaScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/MangaScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt index 2d2130c4..4efce2e6 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/MangaScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt @@ -4,22 +4,22 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.manga +package ca.gosyer.jui.ui.manga -import ca.gosyer.core.lang.withIOContext -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.download.DownloadService -import ca.gosyer.data.models.Category -import ca.gosyer.data.models.Chapter -import ca.gosyer.data.models.Manga -import ca.gosyer.data.server.interactions.CategoryInteractionHandler -import ca.gosyer.data.server.interactions.ChapterInteractionHandler -import ca.gosyer.data.server.interactions.LibraryInteractionHandler -import ca.gosyer.data.server.interactions.MangaInteractionHandler -import ca.gosyer.data.ui.UiPreferences -import ca.gosyer.ui.base.chapter.ChapterDownloadItem -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.lang.withIOContext +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.server.interactions.CategoryInteractionHandler +import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler +import ca.gosyer.jui.data.server.interactions.LibraryInteractionHandler +import ca.gosyer.jui.data.server.interactions.MangaInteractionHandler +import ca.gosyer.jui.data.ui.UiPreferences +import ca.gosyer.jui.ui.base.chapter.ChapterDownloadItem +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import com.soywiz.klock.DateFormat import com.soywiz.klock.KlockLocale import com.soywiz.klock.PatternDateFormat @@ -46,7 +46,7 @@ class MangaScreenViewModel @Inject constructor( private val libraryHandler: LibraryInteractionHandler, uiPreferences: UiPreferences, contextWrapper: ContextWrapper, - private val params: Params, + private val params: ca.gosyer.jui.ui.manga.MangaScreenViewModel.Params, ) : ViewModel(contextWrapper) { private val _manga = MutableStateFlow(null) val manga = _manga.asStateFlow() diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/ChapterItem.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/ChapterItem.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/ChapterItem.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/ChapterItem.kt index 19a6461c..2da07470 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/ChapterItem.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/ChapterItem.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.manga.components +package ca.gosyer.jui.ui.manga.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.BoxWithConstraints @@ -28,10 +28,10 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.chapter.ChapterDownloadIcon -import ca.gosyer.ui.base.chapter.ChapterDownloadItem -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.chapter.ChapterDownloadIcon +import ca.gosyer.jui.ui.base.chapter.ChapterDownloadItem +import ca.gosyer.jui.uicore.resources.stringResource import com.soywiz.klock.DateTime expect fun Modifier.chapterItemModifier( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/MangaMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaMenu.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/MangaMenu.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaMenu.kt index 2c804827..8c813f95 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/MangaMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.manga.components +package ca.gosyer.jui.ui.manga.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -39,14 +39,14 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp 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.uicore.image.KamelImage -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage +import ca.gosyer.jui.uicore.resources.stringResource import com.google.accompanist.flowlayout.FlowRow import com.vanpra.composematerialdialogs.MaterialDialog import com.vanpra.composematerialdialogs.MaterialDialogState diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/MangaScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaScreenContent.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/MangaScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaScreenContent.kt index 8a83e0b1..770d4cb5 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/manga/components/MangaScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/components/MangaScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.manga.components +package ca.gosyer.jui.ui.manga.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -26,18 +26,18 @@ import androidx.compose.runtime.Stable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -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.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 ca.gosyer.jui.data.models.Category +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.chapter.ChapterDownloadItem +import ca.gosyer.jui.ui.base.navigation.ActionItem +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.reader.rememberReaderLauncher +import ca.gosyer.jui.uicore.components.ErrorScreen +import ca.gosyer.jui.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import com.soywiz.klock.DateFormat import com.soywiz.klock.format import com.vanpra.composematerialdialogs.rememberMaterialDialogState diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ChapterLoader.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ChapterLoader.kt similarity index 83% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ChapterLoader.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ChapterLoader.kt index 72b53364..49681526 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ChapterLoader.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ChapterLoader.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader +package ca.gosyer.jui.ui.reader -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.reader.ReaderPreferences -import ca.gosyer.data.server.interactions.ChapterInteractionHandler -import ca.gosyer.ui.reader.loader.TachideskPageLoader -import ca.gosyer.ui.reader.model.ReaderChapter -import ca.gosyer.ui.reader.model.ReaderPage +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.reader.ReaderPreferences +import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler +import ca.gosyer.jui.ui.reader.loader.TachideskPageLoader +import ca.gosyer.jui.ui.reader.model.ReaderChapter +import ca.gosyer.jui.ui.reader.model.ReaderPage import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.launchIn diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenu.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenu.kt index 76b225a5..b252c562 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader +package ca.gosyer.jui.ui.reader import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.Crossfade @@ -51,29 +51,29 @@ import androidx.compose.ui.input.key.KeyEvent import androidx.compose.ui.input.key.key import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.dp -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.navigation.ActionItem -import ca.gosyer.ui.base.navigation.Toolbar -import ca.gosyer.ui.reader.model.Navigation -import ca.gosyer.ui.reader.model.PageMove -import ca.gosyer.ui.reader.model.ReaderChapter -import ca.gosyer.ui.reader.model.ReaderPage -import ca.gosyer.ui.reader.navigation.EdgeNavigation -import ca.gosyer.ui.reader.navigation.KindlishNavigation -import ca.gosyer.ui.reader.navigation.LNavigation -import ca.gosyer.ui.reader.navigation.RightAndLeftNavigation -import ca.gosyer.ui.reader.navigation.ViewerNavigation -import ca.gosyer.ui.reader.navigation.navigationClickable -import ca.gosyer.ui.reader.viewer.ContinuousReader -import ca.gosyer.ui.reader.viewer.PagerReader -import ca.gosyer.uicore.components.ErrorScreen -import ca.gosyer.uicore.components.LoadingScreen -import ca.gosyer.uicore.components.mangaAspectRatio -import ca.gosyer.uicore.resources.stringResource -import ca.gosyer.uicore.vm.LocalViewModelFactory +import ca.gosyer.jui.data.reader.model.Direction +import ca.gosyer.jui.data.reader.model.ImageScale +import ca.gosyer.jui.data.reader.model.NavigationMode +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.ActionItem +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.reader.model.Navigation +import ca.gosyer.jui.ui.reader.model.PageMove +import ca.gosyer.jui.ui.reader.model.ReaderChapter +import ca.gosyer.jui.ui.reader.model.ReaderPage +import ca.gosyer.jui.ui.reader.navigation.EdgeNavigation +import ca.gosyer.jui.ui.reader.navigation.KindlishNavigation +import ca.gosyer.jui.ui.reader.navigation.LNavigation +import ca.gosyer.jui.ui.reader.navigation.RightAndLeftNavigation +import ca.gosyer.jui.ui.reader.navigation.ViewerNavigation +import ca.gosyer.jui.ui.reader.navigation.navigationClickable +import ca.gosyer.jui.ui.reader.viewer.ContinuousReader +import ca.gosyer.jui.ui.reader.viewer.PagerReader +import ca.gosyer.jui.uicore.components.ErrorScreen +import ca.gosyer.jui.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.LocalViewModelFactory import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch @@ -147,7 +147,6 @@ fun ReaderMenu( } } - Surface { Crossfade(state to chapter) { (state, chapter) -> if (state is ReaderChapter.State.Loaded && chapter != null) { @@ -213,7 +212,6 @@ fun ReaderMenu( ) } } - } else { ErrorScreen(stringResource(MR.strings.no_pages_found)) } diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderMenuViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenuViewModel.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderMenuViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenuViewModel.kt index c08c3afb..e0c4b3e5 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderMenuViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenuViewModel.kt @@ -4,28 +4,28 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader +package ca.gosyer.jui.ui.reader -import ca.gosyer.core.lang.launchDefault -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.core.prefs.getAsFlow -import ca.gosyer.data.models.Chapter -import ca.gosyer.data.models.Manga -import ca.gosyer.data.models.MangaMeta -import ca.gosyer.data.reader.ReaderModeWatch -import ca.gosyer.data.reader.ReaderPreferences -import ca.gosyer.data.reader.model.Direction -import ca.gosyer.data.server.interactions.ChapterInteractionHandler -import ca.gosyer.data.server.interactions.MangaInteractionHandler -import ca.gosyer.ui.reader.model.MoveTo -import ca.gosyer.ui.reader.model.Navigation -import ca.gosyer.ui.reader.model.PageMove -import ca.gosyer.ui.reader.model.ReaderChapter -import ca.gosyer.ui.reader.model.ReaderPage -import ca.gosyer.ui.reader.model.ViewerChapters -import ca.gosyer.uicore.prefs.asStateIn -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.lang.launchDefault +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.core.prefs.getAsFlow +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.models.MangaMeta +import ca.gosyer.jui.data.reader.ReaderModeWatch +import ca.gosyer.jui.data.reader.ReaderPreferences +import ca.gosyer.jui.data.reader.model.Direction +import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler +import ca.gosyer.jui.data.server.interactions.MangaInteractionHandler +import ca.gosyer.jui.ui.reader.model.MoveTo +import ca.gosyer.jui.ui.reader.model.Navigation +import ca.gosyer.jui.ui.reader.model.PageMove +import ca.gosyer.jui.ui.reader.model.ReaderChapter +import ca.gosyer.jui.ui.reader.model.ReaderPage +import ca.gosyer.jui.ui.reader.model.ViewerChapters +import ca.gosyer.jui.uicore.prefs.asStateIn +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.MainScope diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderSideMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderSideMenu.kt similarity index 96% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderSideMenu.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderSideMenu.kt index 56011b27..2e3f5f91 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/ReaderSideMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderSideMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader +package ca.gosyer.jui.ui.reader import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateFloatAsState @@ -50,15 +50,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ca.gosyer.core.logging.kLogger -import ca.gosyer.core.util.replace -import ca.gosyer.data.models.MangaMeta -import ca.gosyer.data.reader.model.Direction -import ca.gosyer.i18n.MR -import ca.gosyer.ui.reader.model.ReaderChapter -import ca.gosyer.uicore.components.AroundLayout -import ca.gosyer.uicore.components.Spinner -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.core.logging.kLogger +import ca.gosyer.jui.core.util.replace +import ca.gosyer.jui.data.models.MangaMeta +import ca.gosyer.jui.data.reader.model.Direction +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.reader.model.ReaderChapter +import ca.gosyer.jui.uicore.components.AroundLayout +import ca.gosyer.jui.uicore.components.Spinner +import ca.gosyer.jui.uicore.resources.stringResource import kotlin.math.roundToInt private val logger = kLogger {} @@ -208,7 +208,6 @@ fun ReaderSheet( Column(Modifier.fillMaxWidth()) { ReaderModeSetting(readerModes, selectedMode, onSetReaderMode) } - } @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/loader/PageLoader.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/PageLoader.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/loader/PageLoader.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/PageLoader.kt index b6c06fb8..318d8def 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/loader/PageLoader.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/PageLoader.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.loader +package ca.gosyer.jui.ui.reader.loader -import ca.gosyer.ui.reader.model.ReaderPage +import ca.gosyer.jui.ui.reader.model.ReaderPage import kotlinx.coroutines.flow.StateFlow /** diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/loader/TachideskPageLoader.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/loader/TachideskPageLoader.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt index 305ea6d6..7d385747 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/loader/TachideskPageLoader.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt @@ -4,17 +4,17 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.loader +package ca.gosyer.jui.ui.reader.loader -import ca.gosyer.core.lang.IO -import ca.gosyer.core.lang.throwIfCancellation -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.reader.ReaderPreferences -import ca.gosyer.data.server.interactions.ChapterInteractionHandler -import ca.gosyer.ui.reader.model.ReaderChapter -import ca.gosyer.ui.reader.model.ReaderPage -import ca.gosyer.ui.util.compose.toImageBitmap -import ca.gosyer.ui.util.lang.priorityChannel +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.core.lang.throwIfCancellation +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.reader.ReaderPreferences +import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler +import ca.gosyer.jui.ui.reader.model.ReaderChapter +import ca.gosyer.jui.ui.reader.model.ReaderPage +import ca.gosyer.jui.ui.util.compose.toImageBitmap +import ca.gosyer.jui.ui.util.lang.priorityChannel import cafe.adriel.voyager.core.concurrent.AtomicInt32 import io.ktor.client.features.onDownload import kotlinx.coroutines.CoroutineScope diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/MoveTo.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/MoveTo.kt similarity index 87% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/MoveTo.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/MoveTo.kt index 41e8f505..e7715986 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/MoveTo.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/MoveTo.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.model +package ca.gosyer.jui.ui.reader.model enum class MoveTo { Previous, diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/Navigation.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/Navigation.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/Navigation.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/Navigation.kt index 33d37160..f55af788 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/Navigation.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/Navigation.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.model +package ca.gosyer.jui.ui.reader.model sealed class Navigation(val name: String) { object MENU : Navigation("Menu") diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/PageMove.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/PageMove.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/PageMove.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/PageMove.kt index d818eae5..666e6f84 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/PageMove.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/PageMove.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.model +package ca.gosyer.jui.ui.reader.model sealed class PageMove { data class Direction(val moveTo: MoveTo, val currentPage: Int) : PageMove() diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ReaderChapter.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderChapter.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ReaderChapter.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderChapter.kt index 3ba883fa..6d9f3513 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ReaderChapter.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderChapter.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.model +package ca.gosyer.jui.ui.reader.model -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.models.Chapter -import ca.gosyer.ui.reader.loader.PageLoader +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.ui.reader.loader.PageLoader import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ReaderPage.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderPage.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ReaderPage.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderPage.kt index 53e96f6e..70a4f1e4 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ReaderPage.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderPage.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.model +package ca.gosyer.jui.ui.reader.model import androidx.compose.ui.graphics.ImageBitmap import kotlinx.coroutines.flow.MutableStateFlow diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ViewerChapters.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ViewerChapters.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ViewerChapters.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ViewerChapters.kt index c334af7b..d98ff517 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/model/ViewerChapters.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ViewerChapters.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.model +package ca.gosyer.jui.ui.reader.model import kotlinx.coroutines.flow.MutableStateFlow diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/EdgeNavigation.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/EdgeNavigation.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/EdgeNavigation.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/EdgeNavigation.kt index bae8b73a..255d1f68 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/EdgeNavigation.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/EdgeNavigation.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.navigation +package ca.gosyer.jui.ui.reader.navigation -import ca.gosyer.ui.reader.model.Navigation +import ca.gosyer.jui.ui.reader.model.Navigation /** * Visualization of default state without any inversion diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/KindlishNavigation.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/KindlishNavigation.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/KindlishNavigation.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/KindlishNavigation.kt index 2a842f07..1ad76fe6 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/KindlishNavigation.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/KindlishNavigation.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.navigation +package ca.gosyer.jui.ui.reader.navigation -import ca.gosyer.ui.reader.model.Navigation +import ca.gosyer.jui.ui.reader.model.Navigation /** * Visualization of default state without any inversion diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/LNavigation.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/LNavigation.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/LNavigation.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/LNavigation.kt index cd7c5048..35734837 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/LNavigation.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/LNavigation.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.navigation +package ca.gosyer.jui.ui.reader.navigation -import ca.gosyer.ui.reader.model.Navigation +import ca.gosyer.jui.ui.reader.model.Navigation /** * Visualization of default state without any inversion diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/NavigationClickable.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/NavigationClickable.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/NavigationClickable.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/NavigationClickable.kt index c262c2ab..5ccfb331 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/NavigationClickable.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/NavigationClickable.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.navigation +package ca.gosyer.jui.ui.reader.navigation import androidx.compose.foundation.clickable import androidx.compose.foundation.gestures.awaitFirstDown @@ -23,8 +23,8 @@ import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.debugInspectorInfo import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.toSize -import ca.gosyer.ui.reader.model.Navigation -import ca.gosyer.ui.util.compose.contains +import ca.gosyer.jui.ui.reader.model.Navigation +import ca.gosyer.jui.ui.util.compose.contains fun Modifier.navigationClickable( navigation: ViewerNavigation, diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/RightAndLeftNavigation.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/RightAndLeftNavigation.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/RightAndLeftNavigation.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/RightAndLeftNavigation.kt index 265c2d65..3c41ac4d 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/RightAndLeftNavigation.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/RightAndLeftNavigation.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.navigation +package ca.gosyer.jui.ui.reader.navigation -import ca.gosyer.ui.reader.model.Navigation +import ca.gosyer.jui.ui.reader.model.Navigation /** * Visualization of default state without any inversion diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/ViewerNavigation.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/ViewerNavigation.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/ViewerNavigation.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/ViewerNavigation.kt index f42febba..d563f3a0 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/navigation/ViewerNavigation.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/navigation/ViewerNavigation.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.navigation +package ca.gosyer.jui.ui.reader.navigation import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size import androidx.compose.ui.unit.IntOffset -import ca.gosyer.data.reader.model.TappingInvertMode -import ca.gosyer.ui.reader.model.Navigation +import ca.gosyer.jui.data.reader.model.TappingInvertMode +import ca.gosyer.jui.ui.reader.model.Navigation abstract class ViewerNavigation { data class Rect(val xRange: IntRange, val yRange: IntRange) { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/viewer/Continuous.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/viewer/Continuous.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/viewer/Continuous.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/viewer/Continuous.kt index 39e163f3..82d7441d 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/viewer/Continuous.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/viewer/Continuous.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.viewer +package ca.gosyer.jui.ui.reader.viewer import androidx.compose.foundation.gestures.animateScrollBy import androidx.compose.foundation.layout.Box @@ -29,16 +29,16 @@ import androidx.compose.ui.Alignment 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.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 ca.gosyer.jui.data.reader.model.Direction +import ca.gosyer.jui.ui.reader.ChapterSeparator +import ca.gosyer.jui.ui.reader.ReaderImage +import ca.gosyer.jui.ui.reader.model.MoveTo +import ca.gosyer.jui.ui.reader.model.PageMove +import ca.gosyer.jui.ui.reader.model.ReaderChapter +import ca.gosyer.jui.ui.reader.model.ReaderPage +import ca.gosyer.jui.uicore.components.HorizontalScrollbar +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapLatest diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/viewer/Pager.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/viewer/Pager.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/viewer/Pager.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/viewer/Pager.kt index 413cba0e..2836e19c 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/reader/viewer/Pager.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/viewer/Pager.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader.viewer +package ca.gosyer.jui.ui.reader.viewer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable @@ -12,13 +12,13 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale -import ca.gosyer.data.reader.model.Direction -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.jui.data.reader.model.Direction +import ca.gosyer.jui.ui.reader.ChapterSeparator +import ca.gosyer.jui.ui.reader.ReaderImage +import ca.gosyer.jui.ui.reader.model.MoveTo +import ca.gosyer.jui.ui.reader.model.PageMove +import ca.gosyer.jui.ui.reader.model.ReaderChapter +import ca.gosyer.jui.ui.reader.model.ReaderPage import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.VerticalPager import com.google.accompanist.pager.rememberPagerState diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsAdvancedScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAdvancedScreen.kt similarity index 79% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsAdvancedScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAdvancedScreen.kt index 0c89c6a9..8381c4ea 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsAdvancedScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAdvancedScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -17,17 +17,17 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment 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.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 -import ca.gosyer.uicore.vm.ViewModel -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.data.update.UpdatePreferences +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.SwitchPreference +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAppearanceScreen.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAppearanceScreen.kt index 14ab8f9f..2d037e75 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAppearanceScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.border import androidx.compose.foundation.layout.Box @@ -33,26 +33,26 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp 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.navigation.Toolbar -import ca.gosyer.ui.base.prefs.ChoicePreference -import ca.gosyer.ui.base.prefs.ColorPreference -import ca.gosyer.ui.base.prefs.SwitchPreference -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 -import ca.gosyer.uicore.theme.themes -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.data.ui.UiPreferences +import ca.gosyer.jui.data.ui.model.ThemeMode +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.ChoicePreference +import ca.gosyer.jui.ui.base.prefs.ColorPreference +import ca.gosyer.jui.ui.base.prefs.SwitchPreference +import ca.gosyer.jui.ui.base.theme.AppColorsPreferenceState +import ca.gosyer.jui.ui.base.theme.asStateFlow +import ca.gosyer.jui.ui.base.theme.getDarkColors +import ca.gosyer.jui.ui.base.theme.getLightColors +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.theme.Theme +import ca.gosyer.jui.uicore.theme.themes +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsBackupScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBackupScreen.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsBackupScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBackupScreen.kt index a68e0c16..c2e16a1c 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsBackupScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBackupScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -33,25 +33,25 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import ca.gosyer.core.io.SYSTEM -import ca.gosyer.core.io.copyTo -import ca.gosyer.core.io.saveTo -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.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.ui.util.lang.toSource -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 -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.core.io.SYSTEM +import ca.gosyer.jui.core.io.copyTo +import ca.gosyer.jui.core.io.saveTo +import ca.gosyer.jui.core.lang.throwIfCancellation +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.server.interactions.BackupInteractionHandler +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.ui.base.file.rememberFileChooser +import ca.gosyer.jui.ui.base.file.rememberFileSaver +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.PreferenceRow +import ca.gosyer.jui.ui.util.lang.toSource +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsBrowseScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBrowseScreen.kt similarity index 85% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsBrowseScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBrowseScreen.kt index 04760199..720f9c07 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsBrowseScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBrowseScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -17,11 +17,11 @@ import androidx.compose.runtime.Composable 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.navigation.Toolbar -import ca.gosyer.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsDownloadsScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsDownloadsScreen.kt similarity index 85% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsDownloadsScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsDownloadsScreen.kt index 5478f9c2..d5f459cf 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsDownloadsScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsDownloadsScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -17,11 +17,11 @@ import androidx.compose.runtime.Composable 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.navigation.Toolbar -import ca.gosyer.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsGeneralScreen.kt similarity index 88% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsGeneralScreen.kt index 45379416..9220e02b 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsGeneralScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -20,22 +20,22 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ca.gosyer.core.lang.getDefault -import ca.gosyer.core.lang.getDisplayName -import ca.gosyer.data.ui.UiPreferences -import ca.gosyer.data.ui.model.StartScreen -import ca.gosyer.i18n.MR -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 -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.core.lang.getDefault +import ca.gosyer.jui.core.lang.getDisplayName +import ca.gosyer.jui.data.ui.UiPreferences +import ca.gosyer.jui.data.ui.model.StartScreen +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.ChoicePreference +import ca.gosyer.jui.ui.base.prefs.SwitchPreference +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.resources.rememberReadText +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsLibraryScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsLibraryScreen.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsLibraryScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsLibraryScreen.kt index 9b42c73a..c5ea70c2 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsLibraryScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsLibraryScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Box @@ -33,23 +33,23 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ca.gosyer.core.logging.CKLogger -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.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 -import ca.gosyer.uicore.vm.ViewModel -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.library.LibraryPreferences +import ca.gosyer.jui.data.library.model.DisplayMode +import ca.gosyer.jui.data.server.interactions.CategoryInteractionHandler +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.ChoicePreference +import ca.gosyer.jui.ui.base.prefs.PreferenceRow +import ca.gosyer.jui.ui.categories.rememberCategoriesLauncher +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsParentalControlsScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsParentalControlsScreen.kt similarity index 85% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsParentalControlsScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsParentalControlsScreen.kt index a8226c2e..eb47155a 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsParentalControlsScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsParentalControlsScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -17,11 +17,11 @@ import androidx.compose.runtime.Composable 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.navigation.Toolbar -import ca.gosyer.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsReaderScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsReaderScreen.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsReaderScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsReaderScreen.kt index b7f01182..845c3928 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsReaderScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsReaderScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -21,24 +21,24 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEach -import ca.gosyer.data.reader.ReaderModePreferences -import ca.gosyer.data.reader.ReaderPreferences -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.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 -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.data.reader.ReaderModePreferences +import ca.gosyer.jui.data.reader.ReaderPreferences +import ca.gosyer.jui.data.reader.model.Direction +import ca.gosyer.jui.data.reader.model.ImageScale +import ca.gosyer.jui.data.reader.model.NavigationMode +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.ChoicePreference +import ca.gosyer.jui.ui.base.prefs.ExpandablePreference +import ca.gosyer.jui.ui.base.prefs.SwitchPreference +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.prefs.asStateIn +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsScreen.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsScreen.kt index ef6bf124..fc2903c2 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -25,12 +25,12 @@ import androidx.compose.runtime.Composable 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.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.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.PreferenceRow +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsSecurityScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsSecurityScreen.kt similarity index 85% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsSecurityScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsSecurityScreen.kt index 26869b1d..19b0dde3 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsSecurityScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsSecurityScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -17,11 +17,11 @@ import androidx.compose.runtime.Composable 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.navigation.Toolbar -import ca.gosyer.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsServerScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsServerScreen.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsServerScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsServerScreen.kt index d294aef6..480e6bd4 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsServerScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsServerScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -22,24 +22,24 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.unit.dp -import ca.gosyer.core.logging.CKLogger -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.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 -import ca.gosyer.uicore.resources.stringResource -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.model.Auth +import ca.gosyer.jui.data.server.model.Proxy +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.ChoicePreference +import ca.gosyer.jui.ui.base.prefs.EditTextPreference +import ca.gosyer.jui.ui.base.prefs.PreferenceRow +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.prefs.asStateIn +import ca.gosyer.jui.uicore.prefs.asStringStateIn +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsTrackingScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsTrackingScreen.kt similarity index 85% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsTrackingScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsTrackingScreen.kt index 78c879c6..29dd9b60 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/settings/SettingsTrackingScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsTrackingScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -17,11 +17,11 @@ import androidx.compose.runtime.Composable 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.navigation.Toolbar -import ca.gosyer.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/SourcesScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/SourcesScreen.kt similarity index 86% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/SourcesScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/SourcesScreen.kt index fdbcf47c..e5f5c2c3 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/SourcesScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/SourcesScreen.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources +package ca.gosyer.jui.ui.sources import androidx.compose.runtime.Composable -import ca.gosyer.ui.sources.components.SourcesMenu +import ca.gosyer.jui.ui.sources.components.SourcesMenu import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/SourceScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreen.kt similarity index 87% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/SourceScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreen.kt index 6ea13cd1..0b5741cf 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/SourceScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreen.kt @@ -4,17 +4,17 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse +package ca.gosyer.jui.ui.sources.browse import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.data.models.Source -import ca.gosyer.ui.manga.MangaScreen -import ca.gosyer.ui.sources.browse.components.SourceScreenContent -import ca.gosyer.ui.sources.browse.filter.SourceFiltersViewModel -import ca.gosyer.ui.sources.components.LocalSourcesNavigator -import ca.gosyer.ui.sources.settings.SourceSettingsScreen -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.ui.manga.MangaScreen +import ca.gosyer.jui.ui.sources.browse.components.SourceScreenContent +import ca.gosyer.jui.ui.sources.browse.filter.SourceFiltersViewModel +import ca.gosyer.jui.ui.sources.components.LocalSourcesNavigator +import ca.gosyer.jui.ui.sources.settings.SourceSettingsScreen +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.navigator.LocalNavigator diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/SourceScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreenViewModel.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/SourceScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreenViewModel.kt index 6e63e315..a140ddb2 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/SourceScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreenViewModel.kt @@ -4,18 +4,18 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse +package ca.gosyer.jui.ui.sources.browse -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.catalog.CatalogPreferences -import ca.gosyer.data.library.LibraryPreferences -import ca.gosyer.data.library.model.DisplayMode -import ca.gosyer.data.models.Manga -import ca.gosyer.data.models.MangaPage -import ca.gosyer.data.models.Source -import ca.gosyer.data.server.interactions.SourceInteractionHandler -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.catalog.CatalogPreferences +import ca.gosyer.jui.data.library.LibraryPreferences +import ca.gosyer.jui.data.library.model.DisplayMode +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.models.MangaPage +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.data.server.interactions.SourceInteractionHandler +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.catch diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaBadges.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaBadges.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaBadges.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaBadges.kt index 3357c3cc..c0ebfeeb 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaBadges.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaBadges.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse.components +package ca.gosyer.jui.ui.sources.browse.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Row @@ -15,8 +15,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.resources.stringResource @Composable fun SourceMangaBadges( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaComfortableGrid.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaComfortableGrid.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaComfortableGrid.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaComfortableGrid.kt index 1e2530ea..fc970dbe 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaComfortableGrid.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaComfortableGrid.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse.components +package ca.gosyer.jui.ui.sources.browse.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -32,11 +32,11 @@ import androidx.compose.ui.text.TextStyle 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.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.mangaAspectRatio -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaCompactGrid.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaCompactGrid.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaCompactGrid.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaCompactGrid.kt index 07dbe45a..c5eb1132 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaCompactGrid.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaCompactGrid.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse.components +package ca.gosyer.jui.ui.sources.browse.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -35,11 +35,11 @@ import androidx.compose.ui.text.TextStyle 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.uicore.components.VerticalScrollbar -import ca.gosyer.uicore.components.mangaAspectRatio -import ca.gosyer.uicore.components.rememberScrollbarAdapter -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaList.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaList.kt similarity index 88% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaList.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaList.kt index 4722c0a7..945a28c8 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceMangaList.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceMangaList.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse.components +package ca.gosyer.jui.ui.sources.browse.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -24,12 +24,12 @@ import androidx.compose.ui.Modifier 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.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 ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.uicore.components.MangaListItem +import ca.gosyer.jui.uicore.components.MangaListItemImage +import ca.gosyer.jui.uicore.components.MangaListItemTitle +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceScreenContent.kt similarity index 96% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceScreenContent.kt index 985d23d7..b31fd979 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/components/SourceScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/components/SourceScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse.components +package ca.gosyer.jui.ui.sources.browse.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -43,19 +43,19 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEach -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.navigation.ActionItem -import ca.gosyer.ui.base.navigation.BackHandler -import ca.gosyer.ui.base.navigation.Toolbar -import ca.gosyer.ui.sources.browse.filter.SourceFiltersMenu -import ca.gosyer.ui.sources.browse.filter.model.SourceFiltersView -import ca.gosyer.uicore.components.DropdownMenu -import ca.gosyer.uicore.components.DropdownMenuItem -import ca.gosyer.uicore.components.LoadingScreen -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.data.library.model.DisplayMode +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.navigation.ActionItem +import ca.gosyer.jui.ui.base.navigation.BackHandler +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.sources.browse.filter.SourceFiltersMenu +import ca.gosyer.jui.ui.sources.browse.filter.model.SourceFiltersView +import ca.gosyer.jui.uicore.components.DropdownMenu +import ca.gosyer.jui.uicore.components.DropdownMenuItem +import ca.gosyer.jui.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.resources.stringResource @Composable fun SourceScreenContent( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersMenu.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersMenu.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersMenu.kt index 8eafdbf7..268ef006 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse.filter +package ca.gosyer.jui.ui.sources.browse.filter import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.animateFloatAsState @@ -56,14 +56,14 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow 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.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 ca.gosyer.jui.data.models.sourcefilters.SortFilter +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.prefs.ExpandablePreference +import ca.gosyer.jui.ui.sources.browse.filter.model.SourceFiltersView +import ca.gosyer.jui.uicore.components.Spinner +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import kotlinx.coroutines.flow.filterIsInstance @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersViewModel.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersViewModel.kt index ad979b4a..7d78bd88 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/SourceFiltersViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersViewModel.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse.filter +package ca.gosyer.jui.ui.sources.browse.filter -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.models.sourcefilters.SourceFilter -import ca.gosyer.data.server.interactions.SourceInteractionHandler -import ca.gosyer.ui.sources.browse.filter.model.SourceFiltersView -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.models.sourcefilters.SourceFilter +import ca.gosyer.jui.data.server.interactions.SourceInteractionHandler +import ca.gosyer.jui.ui.sources.browse.filter.model.SourceFiltersView +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.catch diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/model/SourceFiltersView.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/model/SourceFiltersView.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/model/SourceFiltersView.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/model/SourceFiltersView.kt index 7e339d3d..14959f8c 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/browse/filter/model/SourceFiltersView.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/model/SourceFiltersView.kt @@ -4,17 +4,17 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.browse.filter.model +package ca.gosyer.jui.ui.sources.browse.filter.model -import ca.gosyer.data.models.sourcefilters.CheckBoxFilter -import ca.gosyer.data.models.sourcefilters.GroupFilter -import ca.gosyer.data.models.sourcefilters.HeaderFilter -import ca.gosyer.data.models.sourcefilters.SelectFilter -import ca.gosyer.data.models.sourcefilters.SeparatorFilter -import ca.gosyer.data.models.sourcefilters.SortFilter -import ca.gosyer.data.models.sourcefilters.SourceFilter -import ca.gosyer.data.models.sourcefilters.TextFilter -import ca.gosyer.data.models.sourcefilters.TriStateFilter +import ca.gosyer.jui.data.models.sourcefilters.CheckBoxFilter +import ca.gosyer.jui.data.models.sourcefilters.GroupFilter +import ca.gosyer.jui.data.models.sourcefilters.HeaderFilter +import ca.gosyer.jui.data.models.sourcefilters.SelectFilter +import ca.gosyer.jui.data.models.sourcefilters.SeparatorFilter +import ca.gosyer.jui.data.models.sourcefilters.SortFilter +import ca.gosyer.jui.data.models.sourcefilters.SourceFilter +import ca.gosyer.jui.data.models.sourcefilters.TextFilter +import ca.gosyer.jui.data.models.sourcefilters.TriStateFilter import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/components/SourcesMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/components/SourcesMenu.kt similarity index 93% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/components/SourcesMenu.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/components/SourcesMenu.kt index 294c3545..0180fbc6 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/components/SourcesMenu.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/components/SourcesMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.components +package ca.gosyer.jui.ui.sources.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxWithConstraints @@ -33,14 +33,14 @@ import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.FilterQuality import androidx.compose.ui.unit.DpOffset 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.uicore.image.KamelImage -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.components.CursorPoint +import ca.gosyer.jui.ui.base.components.TooltipArea +import ca.gosyer.jui.ui.sources.home.SourceHomeScreen +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage +import ca.gosyer.jui.uicore.resources.stringResource import io.kamel.image.lazyPainterResource expect fun Modifier.sourceSideMenuItem( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/components/SourcesNavigator.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/components/SourcesNavigator.kt similarity index 96% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/components/SourcesNavigator.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/components/SourcesNavigator.kt index 4e54d381..094b3af3 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/components/SourcesNavigator.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/components/SourcesNavigator.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.components +package ca.gosyer.jui.ui.sources.components import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -18,10 +18,10 @@ import androidx.compose.runtime.saveable.mapSaver import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.snapshots.SnapshotStateMap import androidx.compose.runtime.staticCompositionLocalOf -import ca.gosyer.data.models.Source -import ca.gosyer.ui.sources.browse.SourceScreen -import ca.gosyer.ui.sources.globalsearch.GlobalSearchScreen -import ca.gosyer.ui.sources.home.SourceHomeScreen +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.ui.sources.browse.SourceScreen +import ca.gosyer.jui.ui.sources.globalsearch.GlobalSearchScreen +import ca.gosyer.jui.ui.sources.home.SourceHomeScreen import cafe.adriel.voyager.core.lifecycle.ScreenLifecycleStore import cafe.adriel.voyager.core.lifecycle.rememberScreenLifecycleOwner import cafe.adriel.voyager.core.model.ScreenModelStore diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchScreen.kt similarity index 80% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchScreen.kt index dd80dfa0..3376a3c8 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchScreen.kt @@ -4,15 +4,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.globalsearch +package ca.gosyer.jui.ui.sources.globalsearch import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.manga.MangaScreen -import ca.gosyer.ui.sources.browse.SourceScreen -import ca.gosyer.ui.sources.components.LocalSourcesNavigator -import ca.gosyer.ui.sources.globalsearch.components.GlobalSearchScreenContent -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.manga.MangaScreen +import ca.gosyer.jui.ui.sources.browse.SourceScreen +import ca.gosyer.jui.ui.sources.components.LocalSourcesNavigator +import ca.gosyer.jui.ui.sources.globalsearch.components.GlobalSearchScreenContent +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey @@ -46,7 +46,7 @@ class GlobalSearchScreen(private val initialQuery: String) : Screen { } }, onMangaClick = { - navigator push MangaScreen(it.id) + navigator push ca.gosyer.jui.ui.manga.MangaScreen(it.id) } ) } diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchViewModel.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchViewModel.kt index 4bb91fd9..5941d1eb 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/GlobalSearchViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchViewModel.kt @@ -4,18 +4,18 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.globalsearch +package ca.gosyer.jui.ui.sources.globalsearch import androidx.compose.runtime.snapshots.SnapshotStateMap -import ca.gosyer.core.lang.IO -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.catalog.CatalogPreferences -import ca.gosyer.data.models.MangaPage -import ca.gosyer.data.models.Source -import ca.gosyer.data.server.interactions.SourceInteractionHandler -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.lang.IO +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.catalog.CatalogPreferences +import ca.gosyer.jui.data.models.MangaPage +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.data.server.interactions.SourceInteractionHandler +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchMangaComfortableGrid.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchMangaComfortableGrid.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchMangaComfortableGrid.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchMangaComfortableGrid.kt index 76c4da83..208b97a4 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchMangaComfortableGrid.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchMangaComfortableGrid.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.globalsearch.components +package ca.gosyer.jui.ui.sources.globalsearch.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -25,10 +25,10 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.times -import ca.gosyer.data.models.Manga -import ca.gosyer.ui.sources.browse.components.SourceMangaBadges -import ca.gosyer.uicore.components.mangaAspectRatio -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.ui.sources.browse.components.SourceMangaBadges +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchMangaCompactGrid.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchMangaCompactGrid.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchMangaCompactGrid.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchMangaCompactGrid.kt index 74e09e34..a631ad30 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchMangaCompactGrid.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchMangaCompactGrid.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.globalsearch.components +package ca.gosyer.jui.ui.sources.globalsearch.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio @@ -28,10 +28,10 @@ import androidx.compose.ui.text.TextStyle 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.sources.browse.components.SourceMangaBadges -import ca.gosyer.uicore.components.mangaAspectRatio -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.ui.sources.browse.components.SourceMangaBadges +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt index 81d124de..5f0686e3 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/components/GlobalSearchScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.globalsearch.components +package ca.gosyer.jui.ui.sources.globalsearch.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -33,18 +33,18 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -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.localeToString -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 +import ca.gosyer.jui.data.library.model.DisplayMode +import ca.gosyer.jui.data.models.Manga +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.components.localeToString +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.sources.globalsearch.GlobalSearchViewModel.Search +import ca.gosyer.jui.uicore.components.ErrorScreen +import ca.gosyer.jui.uicore.components.HorizontalScrollbar +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource @Composable fun GlobalSearchScreenContent( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/SourceHomeScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreen.kt similarity index 83% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/SourceHomeScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreen.kt index bd517719..dcf20dda 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/SourceHomeScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreen.kt @@ -4,15 +4,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.home +package ca.gosyer.jui.ui.sources.home import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.sources.browse.SourceScreen -import ca.gosyer.ui.sources.components.LocalSourcesNavigator -import ca.gosyer.ui.sources.globalsearch.GlobalSearchScreen -import ca.gosyer.ui.sources.home.components.SourceHomeScreenContent -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.sources.browse.SourceScreen +import ca.gosyer.jui.ui.sources.components.LocalSourcesNavigator +import ca.gosyer.jui.ui.sources.globalsearch.GlobalSearchScreen +import ca.gosyer.jui.ui.sources.home.components.SourceHomeScreenContent +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/SourceHomeScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt similarity index 88% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/SourceHomeScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt index b1cb4671..e3d3646d 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/SourceHomeScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.home +package ca.gosyer.jui.ui.sources.home -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.catalog.CatalogPreferences -import ca.gosyer.data.models.Source -import ca.gosyer.data.server.interactions.SourceInteractionHandler -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.catalog.CatalogPreferences +import ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.data.server.interactions.SourceInteractionHandler +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.asStateFlow diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/components/SourceHomeScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/components/SourceHomeScreenContent.kt similarity index 92% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/components/SourceHomeScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/components/SourceHomeScreenContent.kt index eec05c6e..36ce9d0c 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/home/components/SourceHomeScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/components/SourceHomeScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.home.components +package ca.gosyer.jui.ui.sources.home.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -42,18 +42,18 @@ import androidx.compose.ui.graphics.FilterQuality import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp 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.localeToString -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 ca.gosyer.jui.data.models.Source +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.components.TooltipArea +import ca.gosyer.jui.ui.base.components.localeToString +import ca.gosyer.jui.ui.base.navigation.ActionItem +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.extensions.components.LanguageDialog +import ca.gosyer.jui.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.image.KamelImage +import ca.gosyer.jui.uicore.resources.stringResource import com.vanpra.composematerialdialogs.rememberMaterialDialogState import io.kamel.image.lazyPainterResource diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreen.kt similarity index 84% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreen.kt index ea2eb99d..10bfec0b 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreen.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.settings +package ca.gosyer.jui.ui.sources.settings import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.sources.settings.components.SourceSettingsScreenContent -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.sources.settings.components.SourceSettingsScreenContent +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreenViewModel.kt similarity index 86% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreenViewModel.kt index 5b5ccebf..30fa569c 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/SourceSettingsScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreenViewModel.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.settings +package ca.gosyer.jui.ui.sources.settings -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.models.sourcepreference.SourcePreference -import ca.gosyer.data.server.interactions.SourceInteractionHandler -import ca.gosyer.ui.sources.settings.model.SourceSettingsView -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.models.sourcepreference.SourcePreference +import ca.gosyer.jui.data.server.interactions.SourceInteractionHandler +import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.catch diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/components/SourceSettingsScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/components/SourceSettingsScreenContent.kt similarity index 84% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/components/SourceSettingsScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/components/SourceSettingsScreenContent.kt index 0d2012e3..b44e3de1 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/components/SourceSettingsScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/components/SourceSettingsScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.settings.components +package ca.gosyer.jui.ui.sources.settings.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -27,24 +27,24 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier 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.dialog.getMaterialDialogProperties -import ca.gosyer.ui.base.navigation.Toolbar -import ca.gosyer.ui.base.prefs.ChoiceDialog -import ca.gosyer.ui.base.prefs.MultiSelectDialog -import ca.gosyer.ui.base.prefs.PreferenceRow -import ca.gosyer.ui.sources.settings.model.SourceSettingsView -import ca.gosyer.ui.sources.settings.model.SourceSettingsView.CheckBox -import ca.gosyer.ui.sources.settings.model.SourceSettingsView.EditText -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 ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.presentation.build.BuildKonfig +import ca.gosyer.jui.ui.base.dialog.getMaterialDialogProperties +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.ui.base.prefs.ChoiceDialog +import ca.gosyer.jui.ui.base.prefs.MultiSelectDialog +import ca.gosyer.jui.ui.base.prefs.PreferenceRow +import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView +import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView.CheckBox +import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView.EditText +import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView.List +import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView.MultiSelect +import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView.Switch +import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView.TwoState +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.keyboardHandler +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import com.vanpra.composematerialdialogs.MaterialDialog import com.vanpra.composematerialdialogs.message import com.vanpra.composematerialdialogs.rememberMaterialDialogState diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/model/SourceSettingsView.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/model/SourceSettingsView.kt similarity index 91% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/model/SourceSettingsView.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/model/SourceSettingsView.kt index 66da03a4..552f0590 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/sources/settings/model/SourceSettingsView.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/model/SourceSettingsView.kt @@ -4,16 +4,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.settings.model +package ca.gosyer.jui.ui.sources.settings.model -import ca.gosyer.data.models.sourcepreference.CheckBoxPreference -import ca.gosyer.data.models.sourcepreference.EditTextPreference -import ca.gosyer.data.models.sourcepreference.ListPreference -import ca.gosyer.data.models.sourcepreference.MultiSelectListPreference -import ca.gosyer.data.models.sourcepreference.SourcePreference -import ca.gosyer.data.models.sourcepreference.SwitchPreference -import ca.gosyer.data.models.sourcepreference.TwoStateProps -import ca.gosyer.ui.util.lang.stringFormat +import ca.gosyer.jui.data.models.sourcepreference.CheckBoxPreference +import ca.gosyer.jui.data.models.sourcepreference.EditTextPreference +import ca.gosyer.jui.data.models.sourcepreference.ListPreference +import ca.gosyer.jui.data.models.sourcepreference.MultiSelectListPreference +import ca.gosyer.jui.data.models.sourcepreference.SourcePreference +import ca.gosyer.jui.data.models.sourcepreference.SwitchPreference +import ca.gosyer.jui.data.models.sourcepreference.TwoStateProps +import ca.gosyer.jui.ui.util.lang.stringFormat import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/UpdatesScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreen.kt similarity index 80% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/UpdatesScreen.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreen.kt index cf758d3e..d6d0d7f6 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/UpdatesScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreen.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.updates +package ca.gosyer.jui.ui.updates import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import ca.gosyer.ui.manga.MangaScreen -import ca.gosyer.ui.reader.rememberReaderLauncher -import ca.gosyer.ui.updates.components.UpdatesScreenContent -import ca.gosyer.uicore.vm.viewModel +import ca.gosyer.jui.ui.manga.MangaScreen +import ca.gosyer.jui.ui.reader.rememberReaderLauncher +import ca.gosyer.jui.ui.updates.components.UpdatesScreenContent +import ca.gosyer.jui.uicore.vm.viewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey @@ -32,7 +32,7 @@ class UpdatesScreen : Screen { updates = vm.updates.collectAsState().value, loadNextPage = vm::loadNextPage, openChapter = readerLauncher::launch, - openManga = { navigator push MangaScreen(it) }, + openManga = { navigator push ca.gosyer.jui.ui.manga.MangaScreen(it) }, downloadChapter = vm::downloadChapter, deleteDownloadedChapter = vm::deleteDownloadedChapter, stopDownloadingChapter = vm::stopDownloadingChapter diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/UpdatesScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt similarity index 89% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/UpdatesScreenViewModel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt index 8202f712..11750c7d 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/UpdatesScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt @@ -4,16 +4,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.updates +package ca.gosyer.jui.ui.updates -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.download.DownloadService -import ca.gosyer.data.models.Chapter -import ca.gosyer.data.server.interactions.ChapterInteractionHandler -import ca.gosyer.data.server.interactions.UpdatesInteractionHandler -import ca.gosyer.ui.base.chapter.ChapterDownloadItem -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler +import ca.gosyer.jui.data.server.interactions.UpdatesInteractionHandler +import ca.gosyer.jui.ui.base.chapter.ChapterDownloadItem +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/components/UpdatesScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/components/UpdatesScreenContent.kt similarity index 85% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/components/UpdatesScreenContent.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/components/UpdatesScreenContent.kt index 02c552b3..6b7944c2 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/updates/components/UpdatesScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/components/UpdatesScreenContent.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.updates.components +package ca.gosyer.jui.ui.updates.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -28,21 +28,21 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.FilterQuality import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -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.navigation.Toolbar -import ca.gosyer.uicore.components.LoadingScreen -import ca.gosyer.uicore.components.MangaListItem -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 ca.gosyer.jui.data.models.Chapter +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.chapter.ChapterDownloadIcon +import ca.gosyer.jui.ui.base.chapter.ChapterDownloadItem +import ca.gosyer.jui.ui.base.navigation.Toolbar +import ca.gosyer.jui.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.components.MangaListItem +import ca.gosyer.jui.uicore.components.MangaListItemColumn +import ca.gosyer.jui.uicore.components.MangaListItemImage +import ca.gosyer.jui.uicore.components.MangaListItemSubtitle +import ca.gosyer.jui.uicore.components.MangaListItemTitle +import ca.gosyer.jui.uicore.components.VerticalScrollbar +import ca.gosyer.jui.uicore.components.mangaAspectRatio +import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter +import ca.gosyer.jui.uicore.resources.stringResource import io.kamel.image.lazyPainterResource @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Color.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Color.kt similarity index 82% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Color.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Color.kt index d38b3693..dc0a2df1 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Color.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Color.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.compose +package ca.gosyer.jui.ui.util.compose import androidx.compose.ui.graphics.Color @@ -12,4 +12,4 @@ val Long.color get() = Color(this) expect fun Color.toHexString(): String -expect fun Color.toLong(): Long \ No newline at end of file +expect fun Color.toLong(): Long diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Image.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Image.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt index 47e49675..39d5d5f1 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Image.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.compose +package ca.gosyer.jui.ui.util.compose import androidx.compose.ui.graphics.ImageBitmap import io.ktor.utils.io.ByteReadChannel diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Offset.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Offset.kt similarity index 94% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Offset.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Offset.kt index 332f143f..bed2e7fb 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/compose/Offset.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/compose/Offset.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.compose +package ca.gosyer.jui.ui.util.compose import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/Collator.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/Collator.kt similarity index 90% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/Collator.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/Collator.kt index 8069ef01..27ab8a47 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/Collator.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/Collator.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang import io.fluidsonic.locale.Locale @@ -12,4 +12,4 @@ expect fun Collator(locale: Locale): Collator expect class Collator { fun compare(source: String, target: String): Int -} \ No newline at end of file +} diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/Okio.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/Okio.kt similarity index 77% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/Okio.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/Okio.kt index d6037155..78b4b4f0 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/Okio.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/Okio.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang import io.ktor.utils.io.ByteReadChannel import okio.Source -expect fun ByteReadChannel.toSource(): Source \ No newline at end of file +expect fun ByteReadChannel.toSource(): Source diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/PriorityChannel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/PriorityChannel.kt similarity index 81% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/PriorityChannel.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/PriorityChannel.kt index dd0a034f..3ea945ac 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/PriorityChannel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/PriorityChannel.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi @@ -12,7 +12,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.channels.Channel @OptIn(DelicateCoroutinesApi::class) -expect inline fun > priorityChannel( +expect inline fun > priorityChannel( maxCapacity: Int = 4096, scope: CoroutineScope = GlobalScope -): Channel \ No newline at end of file +): Channel diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/StringFormat.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/StringFormat.kt similarity index 87% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/StringFormat.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/StringFormat.kt index b03767bb..67d8d99b 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/lang/StringFormat.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/lang/StringFormat.kt @@ -4,6 +4,6 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang -expect fun stringFormat(string: String, vararg args: Any?): String \ No newline at end of file +expect fun stringFormat(string: String, vararg args: Any?): String diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/system/Flow.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/system/Flow.kt similarity index 95% rename from presentation/src/commonMain/kotlin/ca/gosyer/ui/util/system/Flow.kt rename to presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/system/Flow.kt index f97b94ac..dcd5cb16 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/ui/util/system/Flow.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/util/system/Flow.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.system +package ca.gosyer.jui.ui.util.system import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/UiComponent.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt similarity index 78% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/UiComponent.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt index 0026af91..2a6c6d07 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/UiComponent.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/UiComponent.kt @@ -4,14 +4,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base +package ca.gosyer.jui.ui.base -import ca.gosyer.core.di.AppScope -import ca.gosyer.data.DataComponent -import ca.gosyer.ui.base.image.KamelConfigProvider -import ca.gosyer.ui.base.vm.ViewModelFactoryImpl -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.LocalViewModelFactory +import ca.gosyer.jui.core.di.AppScope +import ca.gosyer.jui.data.DataComponent +import ca.gosyer.jui.ui.base.image.KamelConfigProvider +import ca.gosyer.jui.ui.base.vm.ViewModelFactoryImpl +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.LocalViewModelFactory import io.kamel.core.config.KamelConfig import io.kamel.image.config.LocalKamelConfig import io.kamel.image.config.resourcesFetcher diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/components/DesktopTooltipArea.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/components/DesktopTooltipArea.kt similarity index 96% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/components/DesktopTooltipArea.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/components/DesktopTooltipArea.kt index 05378ad2..580e303c 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/components/DesktopTooltipArea.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/components/DesktopTooltipArea.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.jui.ui.base.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.runtime.Composable diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/file/DesktopFileChooser.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/file/DesktopFileChooser.kt similarity index 94% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/file/DesktopFileChooser.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/file/DesktopFileChooser.kt index 82658f4a..023b71de 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/file/DesktopFileChooser.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/file/DesktopFileChooser.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.file +package ca.gosyer.jui.ui.base.file import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import ca.gosyer.core.lang.launchDefault +import ca.gosyer.jui.core.lang.launchDefault import kotlinx.coroutines.CoroutineScope import okio.Source import okio.source diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/file/DesktopFileSaver.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/file/DesktopFileSaver.kt similarity index 95% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/file/DesktopFileSaver.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/file/DesktopFileSaver.kt index f6d0fb3c..16a6624b 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/file/DesktopFileSaver.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/file/DesktopFileSaver.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.file +package ca.gosyer.jui.ui.base.file import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import ca.gosyer.core.lang.launchDefault +import ca.gosyer.jui.core.lang.launchDefault import kotlinx.coroutines.CoroutineScope import okio.Sink import okio.sink diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt similarity index 89% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt index 6878446f..58771b58 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/navigation/ActionIcon.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/navigation/ActionIcon.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.foundation.layout.padding import androidx.compose.material.Icon @@ -14,7 +14,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import ca.gosyer.uicore.components.BoxWithTooltipSurface +import ca.gosyer.jui.uicore.components.BoxWithTooltipSurface @Composable actual fun ActionIcon(onClick: () -> Unit, contentDescription: String, icon: ImageVector) { diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/navigation/DesktopBackHandler.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/navigation/DesktopBackHandler.kt similarity index 89% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/navigation/DesktopBackHandler.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/navigation/DesktopBackHandler.kt index e7bc6168..5ca5d8ee 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/navigation/DesktopBackHandler.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/navigation/DesktopBackHandler.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.navigation +package ca.gosyer.jui.ui.base.navigation import androidx.compose.runtime.Composable diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/prefs/DesktopColorExtensions.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/prefs/DesktopColorExtensions.kt similarity index 95% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/prefs/DesktopColorExtensions.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/prefs/DesktopColorExtensions.kt index 87ac6dce..15602307 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/prefs/DesktopColorExtensions.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/prefs/DesktopColorExtensions.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.prefs +package ca.gosyer.jui.ui.base.prefs import androidx.compose.ui.graphics.Color diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt similarity index 90% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt index c2464fde..83db3596 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/theme/ThemeScrollbarStyle.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt @@ -4,12 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.theme +package ca.gosyer.jui.ui.base.theme import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp -import ca.gosyer.uicore.components.ScrollbarStyle +import ca.gosyer.jui.uicore.components.ScrollbarStyle actual object ThemeScrollbarStyle { @Composable diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt similarity index 69% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt index f7b94d8c..e59eb3a4 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/base/vm/ViewModelFactory.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/vm/ViewModelFactory.kt @@ -4,34 +4,33 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.base.vm +package ca.gosyer.jui.ui.base.vm -import ca.gosyer.ui.base.theme.AppThemeViewModel -import ca.gosyer.ui.categories.CategoriesScreenViewModel -import ca.gosyer.ui.downloads.DownloadsScreenViewModel -import ca.gosyer.ui.extensions.ExtensionsScreenViewModel -import ca.gosyer.ui.library.LibraryScreenViewModel -import ca.gosyer.ui.main.MainViewModel -import ca.gosyer.ui.main.components.DebugOverlayViewModel -import ca.gosyer.ui.main.components.TrayViewModel -import ca.gosyer.ui.manga.MangaScreenViewModel -import ca.gosyer.ui.reader.ReaderMenuViewModel -import ca.gosyer.ui.settings.SettingsAdvancedViewModel -import ca.gosyer.ui.settings.SettingsBackupViewModel -import ca.gosyer.ui.settings.SettingsGeneralViewModel -import ca.gosyer.ui.settings.SettingsLibraryViewModel -import ca.gosyer.ui.settings.SettingsReaderViewModel -import ca.gosyer.ui.settings.SettingsServerHostViewModel -import ca.gosyer.ui.settings.SettingsServerViewModel -import ca.gosyer.ui.settings.ThemesViewModel -import ca.gosyer.ui.sources.browse.SourceScreenViewModel -import ca.gosyer.ui.sources.browse.filter.SourceFiltersViewModel -import ca.gosyer.ui.sources.globalsearch.GlobalSearchViewModel -import ca.gosyer.ui.sources.home.SourceHomeScreenViewModel -import ca.gosyer.ui.sources.settings.SourceSettingsScreenViewModel -import ca.gosyer.ui.updates.UpdatesScreenViewModel -import ca.gosyer.uicore.vm.ViewModel -import ca.gosyer.uicore.vm.ViewModelFactory +import ca.gosyer.jui.ui.base.theme.AppThemeViewModel +import ca.gosyer.jui.ui.categories.CategoriesScreenViewModel +import ca.gosyer.jui.ui.downloads.DownloadsScreenViewModel +import ca.gosyer.jui.ui.extensions.ExtensionsScreenViewModel +import ca.gosyer.jui.ui.library.LibraryScreenViewModel +import ca.gosyer.jui.ui.main.MainViewModel +import ca.gosyer.jui.ui.main.components.DebugOverlayViewModel +import ca.gosyer.jui.ui.main.components.TrayViewModel +import ca.gosyer.jui.ui.reader.ReaderMenuViewModel +import ca.gosyer.jui.ui.settings.SettingsAdvancedViewModel +import ca.gosyer.jui.ui.settings.SettingsBackupViewModel +import ca.gosyer.jui.ui.settings.SettingsGeneralViewModel +import ca.gosyer.jui.ui.settings.SettingsLibraryViewModel +import ca.gosyer.jui.ui.settings.SettingsReaderViewModel +import ca.gosyer.jui.ui.settings.SettingsServerHostViewModel +import ca.gosyer.jui.ui.settings.SettingsServerViewModel +import ca.gosyer.jui.ui.settings.ThemesViewModel +import ca.gosyer.jui.ui.sources.browse.SourceScreenViewModel +import ca.gosyer.jui.ui.sources.browse.filter.SourceFiltersViewModel +import ca.gosyer.jui.ui.sources.globalsearch.GlobalSearchViewModel +import ca.gosyer.jui.ui.sources.home.SourceHomeScreenViewModel +import ca.gosyer.jui.ui.sources.settings.SourceSettingsScreenViewModel +import ca.gosyer.jui.ui.updates.UpdatesScreenViewModel +import ca.gosyer.jui.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.ViewModelFactory import me.tatarka.inject.annotations.Inject import kotlin.reflect.KClass @@ -45,7 +44,7 @@ actual class ViewModelFactoryImpl( private val debugOverlayFactory: () -> DebugOverlayViewModel, private val trayFactory: () -> TrayViewModel, private val mainFactory: () -> MainViewModel, - private val mangaFactory: (params: MangaScreenViewModel.Params) -> MangaScreenViewModel, + private val mangaFactory: (params: ca.gosyer.jui.ui.manga.MangaScreenViewModel.Params) -> ca.gosyer.jui.ui.manga.MangaScreenViewModel, private val readerFactory: (params: ReaderMenuViewModel.Params) -> ReaderMenuViewModel, private val settingsAdvancedFactory: () -> SettingsAdvancedViewModel, private val themesFactory: () -> ThemesViewModel, @@ -74,7 +73,7 @@ actual class ViewModelFactoryImpl( DebugOverlayViewModel::class -> debugOverlayFactory() TrayViewModel::class -> trayFactory() MainViewModel::class -> mainFactory() - MangaScreenViewModel::class -> mangaFactory(arg1 as MangaScreenViewModel.Params) + ca.gosyer.jui.ui.manga.MangaScreenViewModel::class -> mangaFactory(arg1 as ca.gosyer.jui.ui.manga.MangaScreenViewModel.Params) ReaderMenuViewModel::class -> readerFactory(arg1 as ReaderMenuViewModel.Params) SettingsAdvancedViewModel::class -> settingsAdvancedFactory() ThemesViewModel::class -> themesFactory() diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/categories/CategoriesWindow.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesWindow.kt similarity index 93% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/categories/CategoriesWindow.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesWindow.kt index ce112d89..eb4347b6 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/categories/CategoriesWindow.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesWindow.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.categories +package ca.gosyer.jui.ui.categories import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -13,7 +13,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.res.painterResource import androidx.compose.ui.window.Window -import ca.gosyer.presentation.build.BuildKonfig +import ca.gosyer.jui.presentation.build.BuildKonfig import cafe.adriel.voyager.navigator.Navigator actual class CategoriesLauncher(private val notifyFinished: () -> Unit) { diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/downloads/DesktopDownloadService.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/downloads/DesktopDownloadService.kt similarity index 68% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/downloads/DesktopDownloadService.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/downloads/DesktopDownloadService.kt index 2b3524a8..71bd7f9f 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/downloads/DesktopDownloadService.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/downloads/DesktopDownloadService.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.downloads +package ca.gosyer.jui.ui.downloads -import ca.gosyer.data.base.WebsocketService -import ca.gosyer.data.download.DownloadService -import ca.gosyer.uicore.vm.ContextWrapper +import ca.gosyer.jui.data.base.WebsocketService +import ca.gosyer.jui.data.download.DownloadService +import ca.gosyer.jui.uicore.vm.ContextWrapper internal actual fun startDownloadService( contextWrapper: ContextWrapper, diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/library/components/DesktopLibraryGrid.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/library/components/DesktopLibraryGrid.kt similarity index 82% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/library/components/DesktopLibraryGrid.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/library/components/DesktopLibraryGrid.kt index a2da5c71..016a1bf3 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/library/components/DesktopLibraryGrid.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/library/components/DesktopLibraryGrid.kt @@ -4,15 +4,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.library.components +package ca.gosyer.jui.ui.library.components import androidx.compose.foundation.ContextMenuItem import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.ui.Modifier -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.components.contextMenuClickable -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.components.contextMenuClickable +import ca.gosyer.jui.uicore.resources.stringResource actual fun Modifier.libraryMangaModifier( onClickManga: () -> Unit, diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/main/components/Tray.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/Tray.kt similarity index 89% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/main/components/Tray.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/Tray.kt index ed4d1da6..d83f3332 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/main/components/Tray.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/Tray.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -14,9 +14,9 @@ import androidx.compose.ui.window.ApplicationScope import androidx.compose.ui.window.Notification import androidx.compose.ui.window.Tray import androidx.compose.ui.window.rememberTrayState -import ca.gosyer.i18n.MR -import ca.gosyer.presentation.build.BuildKonfig -import ca.gosyer.uicore.vm.LocalViewModelFactory +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.presentation.build.BuildKonfig +import ca.gosyer.jui.uicore.vm.LocalViewModelFactory import kotlinx.coroutines.launch import java.util.Locale diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/main/components/TrayViewModel.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/TrayViewModel.kt similarity index 81% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/main/components/TrayViewModel.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/TrayViewModel.kt index 9f6c8c3b..87f43428 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/main/components/TrayViewModel.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/TrayViewModel.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components -import ca.gosyer.data.update.UpdateChecker -import ca.gosyer.data.update.UpdatePreferences -import ca.gosyer.data.update.model.GithubRelease -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.data.update.UpdateChecker +import ca.gosyer.jui.data.update.UpdatePreferences +import ca.gosyer.jui.data.update.model.GithubRelease +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/manga/components/DesktopChapterItem.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/manga/components/DesktopChapterItem.kt similarity index 87% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/manga/components/DesktopChapterItem.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/manga/components/DesktopChapterItem.kt index eca44162..cdffa5ee 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/manga/components/DesktopChapterItem.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/manga/components/DesktopChapterItem.kt @@ -4,15 +4,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.manga.components +package ca.gosyer.jui.ui.manga.components import androidx.compose.foundation.ContextMenuItem import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.ui.Modifier -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.components.contextMenuClickable -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.components.contextMenuClickable +import ca.gosyer.jui.uicore.resources.stringResource actual fun Modifier.chapterItemModifier( onClick: () -> Unit, diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/reader/DesktopReaderMenu.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/reader/DesktopReaderMenu.kt similarity index 96% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/reader/DesktopReaderMenu.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/reader/DesktopReaderMenu.kt index 94e09a26..4156eece 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/reader/DesktopReaderMenu.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/reader/DesktopReaderMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.reader +package ca.gosyer.jui.ui.reader import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -24,8 +24,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.window.Window import androidx.compose.ui.window.WindowPosition import androidx.compose.ui.window.rememberWindowState -import ca.gosyer.presentation.build.BuildKonfig -import ca.gosyer.ui.util.lang.launchApplication +import ca.gosyer.jui.presentation.build.BuildKonfig +import ca.gosyer.jui.ui.util.lang.launchApplication import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.launch diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/settings/DesktopSettingsAppearenceScreen.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/settings/DesktopSettingsAppearenceScreen.kt similarity index 88% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/settings/DesktopSettingsAppearenceScreen.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/settings/DesktopSettingsAppearenceScreen.kt index f4373bd5..0661c74b 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/settings/DesktopSettingsAppearenceScreen.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/settings/DesktopSettingsAppearenceScreen.kt @@ -4,6 +4,6 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings actual val showWindowDecorationsOption: Boolean = true diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/settings/DesktopSettingsServerScreen.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/settings/DesktopSettingsServerScreen.kt similarity index 92% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/settings/DesktopSettingsServerScreen.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/settings/DesktopSettingsServerScreen.kt index 52183c1f..bdfba60f 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/settings/DesktopSettingsServerScreen.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/settings/DesktopSettingsServerScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.settings +package ca.gosyer.jui.ui.settings import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.material.Divider @@ -15,21 +15,21 @@ import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.text.input.PasswordVisualTransformation -import ca.gosyer.core.logging.CKLogger -import ca.gosyer.data.server.ServerHostPreferences -import ca.gosyer.data.server.ServerPreferences -import ca.gosyer.data.server.ServerService -import ca.gosyer.data.server.model.Auth -import ca.gosyer.i18n.MR -import ca.gosyer.ui.base.prefs.EditTextPreference -import ca.gosyer.ui.base.prefs.PreferenceRow -import ca.gosyer.ui.base.prefs.SwitchPreference -import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow -import ca.gosyer.uicore.prefs.asStateIn -import ca.gosyer.uicore.prefs.asStringStateIn -import ca.gosyer.uicore.resources.stringResource -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.core.logging.CKLogger +import ca.gosyer.jui.data.server.ServerHostPreferences +import ca.gosyer.jui.data.server.ServerPreferences +import ca.gosyer.jui.data.server.ServerService +import ca.gosyer.jui.data.server.model.Auth +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.ui.base.prefs.EditTextPreference +import ca.gosyer.jui.ui.base.prefs.PreferenceRow +import ca.gosyer.jui.ui.base.prefs.SwitchPreference +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.uicore.prefs.asStateIn +import ca.gosyer.jui.uicore.prefs.asStringStateIn +import ca.gosyer.jui.uicore.resources.stringResource +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.combine diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/sources/components/DesktopSourcesMenu.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/sources/components/DesktopSourcesMenu.kt similarity index 82% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/sources/components/DesktopSourcesMenu.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/sources/components/DesktopSourcesMenu.kt index 4c6f549b..88f53cd6 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/sources/components/DesktopSourcesMenu.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/sources/components/DesktopSourcesMenu.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.sources.components +package ca.gosyer.jui.ui.sources.components import androidx.compose.ui.Modifier -import ca.gosyer.uicore.components.combinedMouseClickable +import ca.gosyer.jui.uicore.components.combinedMouseClickable actual fun Modifier.sourceSideMenuItem( onSourceTabClick: () -> Unit, diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/Image.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt similarity index 93% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/Image.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt index 7e1af3f7..a66c2530 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/Image.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/Image.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.compose +package ca.gosyer.jui.ui.util.compose import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap -import ca.gosyer.data.server.Http +import ca.gosyer.jui.data.server.Http import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.get import io.ktor.utils.io.ByteReadChannel diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/Theme.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/Theme.kt similarity index 95% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/Theme.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/Theme.kt index 1a7f78ee..87c656dd 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/Theme.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/Theme.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.compose +package ca.gosyer.jui.ui.util.compose import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.painter.Painter @@ -14,7 +14,7 @@ import androidx.compose.ui.window.FrameWindowScope import androidx.compose.ui.window.Window import androidx.compose.ui.window.WindowState import androidx.compose.ui.window.rememberWindowState -import ca.gosyer.ui.base.theme.AppTheme +import ca.gosyer.jui.ui.base.theme.AppTheme @Composable fun ThemedWindow( diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/WindowGet.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/WindowGet.kt similarity index 95% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/WindowGet.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/WindowGet.kt index bfa18383..45af5028 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/compose/WindowGet.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/compose/WindowGet.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.compose +package ca.gosyer.jui.ui.util.compose import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowPlacement import androidx.compose.ui.window.WindowPosition -import ca.gosyer.data.ui.model.WindowSettings +import ca.gosyer.jui.data.ui.model.WindowSettings data class WindowGet( val offset: WindowPosition, diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/lang/CoroutineExtensions.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/lang/CoroutineExtensions.kt similarity index 94% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/lang/CoroutineExtensions.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/lang/CoroutineExtensions.kt index 1bbfa7e4..71421a36 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/lang/CoroutineExtensions.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/lang/CoroutineExtensions.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang import androidx.compose.runtime.Composable import androidx.compose.ui.window.ApplicationScope diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/system/File.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/system/File.kt similarity index 96% rename from presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/system/File.kt rename to presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/system/File.kt index 32a9f6a1..f18402a8 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/ui/util/system/File.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/util/system/File.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.system +package ca.gosyer.jui.ui.util.system -import ca.gosyer.core.lang.launchUI +import ca.gosyer.jui.core.lang.launchUI import kotlinx.coroutines.DelicateCoroutinesApi import okio.Path import okio.Path.Companion.toOkioPath diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/components/DebugOverlayViewModel.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlayViewModel.kt similarity index 91% rename from presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/components/DebugOverlayViewModel.kt rename to presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlayViewModel.kt index a56bffaa..4162ebdd 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/main/components/DebugOverlayViewModel.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/main/components/DebugOverlayViewModel.kt @@ -4,10 +4,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.main.components +package ca.gosyer.jui.ui.main.components -import ca.gosyer.uicore.vm.ContextWrapper -import ca.gosyer.uicore.vm.ViewModel +import ca.gosyer.jui.uicore.vm.ContextWrapper +import ca.gosyer.jui.uicore.vm.ViewModel import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel import kotlinx.coroutines.delay diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/compose/JvmColor.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/compose/JvmColor.kt similarity index 88% rename from presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/compose/JvmColor.kt rename to presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/compose/JvmColor.kt index 5de41a93..0cd0700c 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/compose/JvmColor.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/compose/JvmColor.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.compose +package ca.gosyer.jui.ui.util.compose import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb @@ -13,4 +13,4 @@ actual fun Color.toHexString(): String { return String.format("#%06X", (0xFFFFFF and toArgb())) } -actual fun Color.toLong() = String.format("%06X", 0xFFFFFF and toArgb()).toLong(16) \ No newline at end of file +actual fun Color.toLong() = String.format("%06X", 0xFFFFFF and toArgb()).toLong(16) diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/Collator.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/Collator.kt similarity index 94% rename from presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/Collator.kt rename to presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/Collator.kt index 57a1c800..6b293d9d 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/Collator.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/Collator.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang import io.fluidsonic.locale.Locale import io.fluidsonic.locale.toPlatform @@ -21,4 +21,4 @@ actual class Collator(private val jvmCollator: JvmCollator) { actual fun compare(source: String, target: String): Int { return jvmCollator.compare(source, target) } -} \ No newline at end of file +} diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/JvmOkio.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/JvmOkio.kt similarity index 91% rename from presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/JvmOkio.kt rename to presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/JvmOkio.kt index d57aa3bb..d3a88738 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/JvmOkio.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/JvmOkio.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang import io.ktor.utils.io.ByteReadChannel import io.ktor.utils.io.jvm.javaio.toInputStream @@ -13,4 +13,4 @@ import okio.source actual fun ByteReadChannel.toSource(): Source { return toInputStream().source() -} \ No newline at end of file +} diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/JvmPriorityChannel.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/JvmPriorityChannel.kt similarity index 74% rename from presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/JvmPriorityChannel.kt rename to presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/JvmPriorityChannel.kt index 83667013..9dff2299 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/JvmPriorityChannel.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/JvmPriorityChannel.kt @@ -4,13 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import io.github.kerubistan.kroki.coroutines.priorityChannel as krokiCoroutinesPriorityChannel -actual inline fun > priorityChannel( +actual inline fun > priorityChannel( maxCapacity: Int, scope: CoroutineScope -): Channel = krokiCoroutinesPriorityChannel() \ No newline at end of file +): Channel = krokiCoroutinesPriorityChannel() diff --git a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/StringFormat.kt b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/StringFormat.kt similarity index 91% rename from presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/StringFormat.kt rename to presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/StringFormat.kt index 2e84c691..d82a8149 100644 --- a/presentation/src/jvmMain/kotlin/ca/gosyer/ui/util/lang/StringFormat.kt +++ b/presentation/src/jvmMain/kotlin/ca/gosyer/jui/ui/util/lang/StringFormat.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.ui.util.lang +package ca.gosyer.jui.ui.util.lang import java.util.Formatter @@ -12,4 +12,4 @@ actual fun stringFormat(string: String, vararg args: Any?): String { return Formatter().use { it.format(string, *args).toString() } -} \ No newline at end of file +} diff --git a/ui-core/build.gradle.kts b/ui-core/build.gradle.kts index 511812d5..c19eb6fa 100644 --- a/ui-core/build.gradle.kts +++ b/ui-core/build.gradle.kts @@ -74,5 +74,5 @@ kotlin { } buildkonfig { - packageName = "ca.gosyer.uicore.build" + packageName = "ca.gosyer.jui.uicore.build" } diff --git a/ui-core/src/androidMain/AndroidManifest.xml b/ui-core/src/androidMain/AndroidManifest.xml index cb1e2e3e..87d63ff6 100644 --- a/ui-core/src/androidMain/AndroidManifest.xml +++ b/ui-core/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ 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/jui/uicore/components/AndroidDropDownMenu.kt similarity index 98% rename from ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidDropDownMenu.kt rename to ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidDropDownMenu.kt index ad6adb8d..3105f462 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidDropDownMenu.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidDropDownMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.ColumnScope diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidScrollbar.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidScrollbar.kt similarity index 92% rename from ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidScrollbar.kt rename to ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidScrollbar.kt index 5481d167..6efb6c35 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/components/AndroidScrollbar.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidScrollbar.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.ScrollState import androidx.compose.foundation.interaction.MutableInteractionSource @@ -21,7 +21,7 @@ actual interface ScrollbarAdapter { actual class ScrollbarStyle -actual val LocalScrollbarStyle: ProvidableCompositionLocal = staticCompositionLocalOf { ScrollbarStyle() } +actual val LocalScrollbarStyle: ProvidableCompositionLocal = staticCompositionLocalOf { ca.gosyer.jui.uicore.components.ScrollbarStyle() } @Composable internal actual fun RealVerticalScrollbar( diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidFileResource.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidFileResource.kt similarity index 93% rename from ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidFileResource.kt rename to ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidFileResource.kt index 55cc3d1b..bdfeaee9 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidFileResource.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidFileResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import androidx.compose.runtime.remember diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidImageResource.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidImageResource.kt similarity index 92% rename from ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidImageResource.kt rename to ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidImageResource.kt index a8d61a5c..6148f5b0 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidImageResource.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidImageResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.painter.Painter diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidStringResource.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidStringResource.kt similarity index 97% rename from ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidStringResource.kt rename to ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidStringResource.kt index 52806fb4..7954d91f 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/resources/AndroidStringResource.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/resources/AndroidStringResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt similarity index 97% rename from ui-core/src/androidMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt rename to ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt index 5f1799a5..191deff2 100644 --- a/ui-core/src/androidMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt +++ b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.vm +package ca.gosyer.jui.uicore.vm import android.content.Context import android.widget.Toast diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/AroundLayout.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/AroundLayout.kt similarity index 98% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/AroundLayout.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/AroundLayout.kt index 31bb21d3..a9a61a4f 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/AroundLayout.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/AroundLayout.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropDownMenu.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropDownMenu.kt similarity index 98% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropDownMenu.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropDownMenu.kt index 8375375d..cc567688 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropDownMenu.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropDownMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.ColumnScope diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropdownIconButton.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropdownIconButton.kt similarity index 98% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropdownIconButton.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropdownIconButton.kt index 8551a0b3..000840f8 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/DropdownIconButton.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropdownIconButton.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/ErrorScreen.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/ErrorScreen.kt similarity index 93% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/ErrorScreen.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/ErrorScreen.kt index 7d1aa133..bd94517f 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/ErrorScreen.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/ErrorScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -17,8 +17,8 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.sp -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.resources.stringResource import kotlin.random.Random @Composable diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/KeyboardHandler.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/KeyboardHandler.kt similarity index 96% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/KeyboardHandler.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/KeyboardHandler.kt index 9fb0be53..f56ed7c8 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/KeyboardHandler.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/KeyboardHandler.kt @@ -1,4 +1,4 @@ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/LoadingScreen.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/LoadingScreen.kt similarity index 92% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/LoadingScreen.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/LoadingScreen.kt index 5e6bd766..8ba59eb3 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/LoadingScreen.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/LoadingScreen.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.layout.BoxWithConstraints @@ -15,8 +15,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import ca.gosyer.i18n.MR -import ca.gosyer.uicore.resources.stringResource +import ca.gosyer.jui.i18n.MR +import ca.gosyer.jui.uicore.resources.stringResource @Composable fun LoadingScreen( diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Manga.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Manga.kt similarity index 97% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Manga.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Manga.kt index 3f72cfa9..c12f47cd 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Manga.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Manga.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio @@ -30,7 +30,7 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.core.Resource @Composable diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/MangaListItem.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/MangaListItem.kt similarity index 96% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/MangaListItem.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/MangaListItem.kt index a544787b..17b3755c 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/MangaListItem.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/MangaListItem.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope @@ -19,7 +19,7 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow -import ca.gosyer.uicore.image.KamelImage +import ca.gosyer.jui.uicore.image.KamelImage import io.kamel.core.Resource @Composable diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Scrollbar.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Scrollbar.kt similarity index 98% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Scrollbar.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Scrollbar.kt index 72e843e0..5b70703d 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Scrollbar.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Scrollbar.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.ScrollState import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Spinner.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Spinner.kt similarity index 98% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Spinner.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Spinner.kt index 01ed6085..fc894a8c 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/components/Spinner.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/Spinner.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.border import androidx.compose.foundation.clickable diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/image/KamelImage.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/image/KamelImage.kt similarity index 92% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/image/KamelImage.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/image/KamelImage.kt index cc018446..1290784c 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/image/KamelImage.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/image/KamelImage.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.image +package ca.gosyer.jui.uicore.image import androidx.compose.animation.core.FiniteAnimationSpec import androidx.compose.animation.core.tween @@ -16,8 +16,8 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.DefaultAlpha import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.layout.ContentScale -import ca.gosyer.uicore.components.ErrorScreen -import ca.gosyer.uicore.components.LoadingScreen +import ca.gosyer.jui.uicore.components.ErrorScreen +import ca.gosyer.jui.uicore.components.LoadingScreen import io.kamel.core.Resource import io.kamel.image.KamelImage as BaseKamelImage diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/ColorPreference.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/ColorPreference.kt similarity index 95% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/ColorPreference.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/ColorPreference.kt index ab3721d0..778725cd 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/ColorPreference.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/ColorPreference.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.prefs +package ca.gosyer.jui.uicore.prefs import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import ca.gosyer.core.prefs.Preference +import ca.gosyer.jui.core.prefs.Preference import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/IntStringPreference.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/IntStringPreference.kt similarity index 94% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/IntStringPreference.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/IntStringPreference.kt index 7c6b5480..89b84a9b 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/IntStringPreference.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/IntStringPreference.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.prefs +package ca.gosyer.jui.uicore.prefs -import ca.gosyer.core.prefs.Preference +import ca.gosyer.jui.core.prefs.Preference import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/PreferenceMutableState.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/PreferenceMutableState.kt similarity index 92% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/PreferenceMutableState.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/PreferenceMutableState.kt index 326c1f30..2417e5de 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/prefs/PreferenceMutableState.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/prefs/PreferenceMutableState.kt @@ -4,9 +4,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.prefs +package ca.gosyer.jui.uicore.prefs -import ca.gosyer.core.prefs.Preference +import ca.gosyer.jui.core.prefs.Preference import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.launchIn diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/FileResource.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/FileResource.kt similarity index 90% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/FileResource.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/FileResource.kt index 6b3553a7..15c5ac93 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/FileResource.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/FileResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import dev.icerock.moko.resources.FileResource diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/ImageResource.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/ImageResource.kt similarity index 91% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/ImageResource.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/ImageResource.kt index 87c5c303..3474ac10 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/ImageResource.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/ImageResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.painter.Painter diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/StringResource.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/StringResource.kt similarity index 94% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/StringResource.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/StringResource.kt index 7d9cc549..ed019e1d 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/resources/StringResource.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/resources/StringResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import dev.icerock.moko.resources.PluralsResource diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/theme/RandomColors.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/RandomColors.kt similarity index 96% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/theme/RandomColors.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/RandomColors.kt index 215f9f7f..ee541a0d 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/theme/RandomColors.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/RandomColors.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.theme +package ca.gosyer.jui.uicore.theme import androidx.compose.ui.graphics.Color import kotlin.math.abs diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/theme/Themes.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/Themes.kt similarity index 97% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/theme/Themes.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/Themes.kt index efec8ac1..06582683 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/theme/Themes.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/Themes.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.theme +package ca.gosyer.jui.uicore.theme import androidx.compose.material.Colors import androidx.compose.material.darkColors diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ComposeViewModel.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ComposeViewModel.kt similarity index 96% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ComposeViewModel.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ComposeViewModel.kt index d0f65d1c..f4f594e0 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ComposeViewModel.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ComposeViewModel.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.vm +package ca.gosyer.jui.uicore.vm import androidx.compose.runtime.Composable import androidx.compose.runtime.DisallowComposableCalls diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt similarity index 94% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt index 7beb706b..f230ab08 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.vm +package ca.gosyer.jui.uicore.vm import dev.icerock.moko.resources.StringResource diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ViewModel.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ViewModel.kt similarity index 88% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ViewModel.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ViewModel.kt index 37b05e09..9c98bf93 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ViewModel.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ViewModel.kt @@ -4,11 +4,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.vm +package ca.gosyer.jui.uicore.vm -import ca.gosyer.core.lang.launchUI -import ca.gosyer.core.prefs.Preference -import ca.gosyer.uicore.prefs.PreferenceMutableStateFlow +import ca.gosyer.jui.core.lang.launchUI +import ca.gosyer.jui.core.prefs.Preference +import ca.gosyer.jui.uicore.prefs.PreferenceMutableStateFlow import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.coroutineScope import dev.icerock.moko.resources.StringResource diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ViewModelFactory.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ViewModelFactory.kt similarity index 95% rename from ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ViewModelFactory.kt rename to ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ViewModelFactory.kt index 198028bf..3b6f188b 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/uicore/vm/ViewModelFactory.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ViewModelFactory.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.vm +package ca.gosyer.jui.uicore.vm import androidx.compose.runtime.compositionLocalOf import kotlin.reflect.KClass diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/BoxWithTooltipSurface.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/BoxWithTooltipSurface.kt similarity index 96% rename from ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/BoxWithTooltipSurface.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/BoxWithTooltipSurface.kt index 7dbe1f30..d70a6a3d 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/BoxWithTooltipSurface.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/BoxWithTooltipSurface.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.TooltipArea import androidx.compose.foundation.TooltipPlacement diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopDropDownMenu.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopDropDownMenu.kt similarity index 97% rename from ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopDropDownMenu.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopDropDownMenu.kt index 46222132..f35fd1e7 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopDropDownMenu.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopDropDownMenu.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.ColumnScope diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopScrollbar.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopScrollbar.kt similarity index 97% rename from ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopScrollbar.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopScrollbar.kt index 36845bac..a8a00de6 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/DesktopScrollbar.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/DesktopScrollbar.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.ScrollState import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/MouseClickable.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/MouseClickable.kt similarity index 99% rename from ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/MouseClickable.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/MouseClickable.kt index 6cb1fb66..ff881909 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/components/MouseClickable.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/components/MouseClickable.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.components +package ca.gosyer.jui.uicore.components import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.MouseClickScope diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopFileResource.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopFileResource.kt similarity index 91% rename from ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopFileResource.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopFileResource.kt index 2c753e33..4dd1755e 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopFileResource.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopFileResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import androidx.compose.runtime.remember diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopImageResource.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopImageResource.kt similarity index 93% rename from ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopImageResource.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopImageResource.kt index 387afc79..e65a6292 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopImageResource.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopImageResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import androidx.compose.runtime.remember diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopStringResource.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopStringResource.kt similarity index 96% rename from ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopStringResource.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopStringResource.kt index 5e6a80e2..40dbc3be 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/resources/DesktopStringResource.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/resources/DesktopStringResource.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.resources +package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import dev.icerock.moko.resources.PluralsResource diff --git a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt similarity index 95% rename from ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt rename to ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt index 389ba555..b38e4fd5 100644 --- a/ui-core/src/desktopMain/kotlin/ca/gosyer/uicore/vm/ContextWrapper.kt +++ b/ui-core/src/desktopMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt @@ -4,7 +4,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package ca.gosyer.uicore.vm +package ca.gosyer.jui.uicore.vm import dev.icerock.moko.resources.StringResource import dev.icerock.moko.resources.format