From 7bb999060635a1cabde7f057c7da3fcaed9b7d01 Mon Sep 17 00:00:00 2001 From: Acclorite <2ma0bhpk@anonaddy.com> Date: Sat, 3 May 2025 11:50:47 +0300 Subject: [PATCH] refactor(domain): refactor domain layer --- .../{domain/util => core}/Typealias.kt | 2 +- .../book_story/{domain => core}/ui/UIText.kt | 2 +- .../data/local/dto/CategorySortEntity.kt | 2 +- .../book_story/data/mapper/book/BookMapper.kt | 2 +- .../data/mapper/book/BookMapperImpl.kt | 4 +- .../data/mapper/category/CategoryMapper.kt | 2 +- .../mapper/category/CategoryMapperImpl.kt | 2 +- .../category_sort/CategorySortMapper.kt | 2 +- .../CategorySortSortMapperImpl.kt | 2 +- .../model/common}/NullableBook.kt | 5 +- .../{domain => data/model}/file/CachedFile.kt | 4 +- .../model}/file/CachedFileBuilder.kt | 2 +- .../model}/file/CachedFileCompat.kt | 2 +- .../model/library}/BookWithCover.kt | 5 +- .../book_story/data/parser/DocumentParser.kt | 6 +- .../book_story/data/parser/FileParser.kt | 4 +- .../book_story/data/parser/FileParserImpl.kt | 4 +- .../book_story/data/parser/MarkdownParser.kt | 2 +- .../book_story/data/parser/TextParser.kt | 2 +- .../book_story/data/parser/TextParserImpl.kt | 2 +- .../data/parser/epub/EpubFileParser.kt | 8 +- .../data/parser/epub/EpubTextParser.kt | 8 +- .../data/parser/fb2/Fb2FileParser.kt | 8 +- .../data/parser/html/HtmlFileParser.kt | 8 +- .../data/parser/html/HtmlTextParser.kt | 2 +- .../data/parser/pdf/PdfFileParser.kt | 8 +- .../data/parser/pdf/PdfTextParser.kt | 4 +- .../data/parser/txt/TxtFileParser.kt | 8 +- .../data/parser/txt/TxtTextParser.kt | 4 +- .../data/parser/xml/XmlTextParser.kt | 2 +- .../data/repository/BookRepositoryImpl.kt | 8 +- .../data/repository/CategoryRepositoryImpl.kt | 4 +- .../repository/FileSystemRepositoryImpl.kt | 52 ++++++++---- .../acclorite/book_story/domain/file/File.kt | 20 +++++ .../book_story/domain/history/History.kt | 2 +- .../domain/library/{book => }/Book.kt | 4 +- .../domain/library/{category => }/Category.kt | 2 +- .../library/{category => }/CategorySort.kt | 4 +- .../book_story/domain/reader/ColorPreset.kt | 2 +- .../domain/repository/BookRepository.kt | 6 +- .../domain/repository/CategoryRepository.kt | 4 +- .../domain/repository/FileSystemRepository.kt | 9 +- .../domain/use_case/book/DeleteBooks.kt | 2 +- .../domain/use_case/book/GetBookById.kt | 2 +- .../domain/use_case/book/GetBooks.kt | 2 +- .../domain/use_case/book/GetBooksById.kt | 2 +- .../domain/use_case/book/InsertBook.kt | 2 +- .../domain/use_case/book/UpdateBook.kt | 2 +- .../use_case/book/UpdateCoverImageOfBook.kt | 4 +- .../use_case/category/DeleteCategory.kt | 2 +- .../domain/use_case/category/GetCategories.kt | 2 +- .../use_case/category/GetCategorySort.kt | 2 +- .../use_case/category/InsertCategory.kt | 2 +- .../use_case/category/UpdateCategoryOrder.kt | 2 +- .../use_case/category/UpdateCategorySort.kt | 2 +- .../use_case/data_store/ChangeLanguage.kt | 2 +- .../use_case/file_system/GetBookFromFile.kt | 8 +- .../domain/use_case/file_system/GetFiles.kt | 4 +- .../presentation/about/AboutBadgeItem.kt | 4 +- .../presentation/about/AboutBadges.kt | 4 +- .../presentation/about/AboutItem.kt | 2 +- .../presentation/about/AboutLayout.kt | 12 +-- .../presentation/about/AboutTopBar.kt | 2 +- .../about/model}/Badge.kt | 2 +- .../about/model}/Credit.kt | 4 +- .../book_info/BookInfoAuthorDialog.kt | 6 +- .../book_info/BookInfoBottomSheet.kt | 4 +- .../BookInfoChangeCoverBottomSheet.kt | 4 +- .../BookInfoChangeCoverBottomSheetItem.kt | 2 +- .../presentation/book_info/BookInfoContent.kt | 8 +- .../book_info/BookInfoDeleteDialog.kt | 2 +- .../book_info/BookInfoDescriptionDialog.kt | 4 +- .../book_info/BookInfoDetailsBottomSheet.kt | 10 +-- .../BookInfoDetailsBottomSheetItem.kt | 4 +- .../presentation/book_info/BookInfoDialog.kt | 6 +- .../presentation/book_info/BookInfoLayout.kt | 6 +- .../book_info/BookInfoLayoutActionsItem.kt | 2 +- .../book_info/BookInfoLayoutBackground.kt | 2 +- .../book_info/BookInfoLayoutButton.kt | 6 +- .../book_info/BookInfoLayoutDescription.kt | 6 +- .../book_info/BookInfoLayoutInfo.kt | 2 +- .../book_info/BookInfoLayoutInfoAuthor.kt | 6 +- .../book_info/BookInfoLayoutInfoCover.kt | 6 +- .../book_info/BookInfoLayoutInfoProgress.kt | 6 +- .../book_info/BookInfoLayoutInfoTitle.kt | 6 +- .../book_info/BookInfoMoveDialog.kt | 10 +-- .../book_info/BookInfoPathDialog.kt | 4 +- .../book_info/BookInfoScaffold.kt | 2 +- .../book_info/BookInfoTitleDialog.kt | 4 +- .../presentation/book_info/BookInfoTopBar.kt | 10 +-- .../presentation/browse/BrowseAddDialog.kt | 10 +-- .../browse/BrowseAddDialogItem.kt | 8 +- .../presentation/browse/BrowseBottomSheet.kt | 2 +- .../presentation/browse/BrowseContent.kt | 10 +-- .../presentation/browse/BrowseDialog.kt | 4 +- .../browse/BrowseEmptyPlaceholder.kt | 4 +- .../browse/BrowseFilterBottomSheet.kt | 4 +- .../browse/BrowseFilterBottomSheetTabRow.kt | 2 +- .../presentation/browse/BrowseGridFileItem.kt | 12 +-- .../presentation/browse/BrowseGridItem.kt | 2 +- .../presentation/browse/BrowseGridLayout.kt | 12 +-- .../presentation/browse/BrowseItem.kt | 4 +- .../presentation/browse/BrowseLayout.kt | 8 +- .../presentation/browse/BrowseLayoutHeader.kt | 4 +- .../presentation/browse/BrowseListFileItem.kt | 10 +-- .../presentation/browse/BrowseListItem.kt | 4 +- .../presentation/browse/BrowseListLayout.kt | 10 +-- .../presentation/browse/BrowseScaffold.kt | 4 +- .../presentation/browse/BrowseTopBar.kt | 14 +-- .../components/common/AnimatedVisibility.kt | 2 +- .../components/common/AsyncCoverImage.kt | 2 +- .../components/common/CircularCheckbox.kt | 2 +- .../components/common/HighlightedText.kt | 2 +- .../components/common/IconButton.kt | 2 +- .../common/LazyColumnWithScrollbar.kt | 4 +- .../components/common/LazyGridHeader.kt | 2 +- .../common/LazyVerticalGridWithScrollbar.kt | 4 +- .../components/common/SearchTextField.kt | 2 +- .../components/common/SelectionContainer.kt | 2 +- .../components/common/Snackbar.kt | 2 +- .../components/common/SpacedItem.kt | 2 +- .../components/common/StyledText.kt | 2 +- .../components/common/Tooltip.kt | 2 +- .../components/dialog/CheckboxDialogItem.kt | 4 +- .../components/dialog/Dialog.kt | 6 +- .../components/dialog/DialogWithTextField.kt | 4 +- .../components/dialog/SelectableDialogItem.kt | 4 +- .../modal_bottom_sheet/ModalBottomSheet.kt | 2 +- .../ModalBottomSheetTabRow.kt | 4 +- .../components/modal_drawer/ModalDrawer.kt | 10 +-- .../modal_drawer/ModalDrawerSelectableItem.kt | 4 +- .../modal_drawer/ModalDrawerTitleItem.kt | 4 +- .../navigation_bar/NavigationBar.kt | 4 +- .../navigation_bar/NavigationBarItem.kt | 8 +- .../navigation_rail/NavigationRail.kt | 4 +- .../navigation_rail/NavigationRailItem.kt | 8 +- .../placeholder/EmptyPlaceholder.kt | 4 +- .../placeholder/ErrorPlaceholder.kt | 4 +- .../CircularProgressIndicator.kt | 2 +- .../components/settings/ChipsWithTitle.kt | 6 +- .../settings/ColorPickerWithTitle.kt | 4 +- .../settings/SegmentedButtonWithTitle.kt | 8 +- .../components/settings/SliderWithTitle.kt | 4 +- .../components/settings/SwitchWIthTitle.kt | 4 +- .../CollapsibleTopAppBarScrollBehavior.kt | 2 +- .../components/top_bar/TopAppBar.kt | 6 +- .../constants/AboutBadgeConstants.kt | 4 +- .../constants/CommonConstants.kt | 6 +- .../constants/CreditConstants.kt | 6 +- .../constants/DataStoreConstants.kt | 2 +- .../constants/FontConstants.kt | 6 +- .../constants/HelpTipConstants.kt | 4 +- .../constants/LanguageConstants.kt | 2 +- .../constants/LinkConstants.kt | 2 +- .../constants/ScrollbarConstants.kt | 2 +- .../constants/SupportedExtensionConstants.kt | 2 +- .../common/model}/ButtonItem.kt | 4 +- .../common/model}/Direction.kt | 2 +- .../common/model}/Position.kt | 2 +- .../util/CollectionExtensions.kt | 2 +- .../util/LifecycleExtensions.kt | 2 +- .../util/ModifierExtensions.kt | 2 +- .../util/PrimitiveExtensions.kt | 2 +- .../{core => common}/util/ToastExtensions.kt | 2 +- .../presentation/crash/CrashBottomBar.kt | 2 +- .../presentation/crash/CrashContent.kt | 2 +- .../presentation/crash/CrashLayout.kt | 2 +- .../presentation/crash/CrashScaffold.kt | 2 +- .../presentation/credits/CreditItem.kt | 4 +- .../presentation/credits/CreditsLayout.kt | 4 +- .../presentation/credits/CreditsTopBar.kt | 2 +- .../presentation/help/HelpBottomBar.kt | 2 +- .../book_story/presentation/help/HelpItem.kt | 8 +- .../presentation/help/HelpLayout.kt | 6 +- .../presentation/help/HelpTopBar.kt | 4 +- .../help/model}/HelpTip.kt | 2 +- .../presentation/history/HistoryContent.kt | 4 +- .../HistoryDeleteWholeHistoryDialog.kt | 2 +- .../presentation/history/HistoryDialog.kt | 2 +- .../history/HistoryEmptyPlaceholder.kt | 4 +- .../presentation/history/HistoryItem.kt | 8 +- .../presentation/history/HistoryLayout.kt | 8 +- .../presentation/history/HistoryScaffold.kt | 4 +- .../presentation/history/HistoryTopBar.kt | 10 +-- .../library/LibraryBackHandler.kt | 4 +- .../library/LibraryBottomSheet.kt | 8 +- .../presentation/library/LibraryContent.kt | 16 ++-- .../library/LibraryDeleteDialog.kt | 2 +- .../presentation/library/LibraryDialog.kt | 6 +- .../library/LibraryEmptyPlaceholder.kt | 2 +- .../library/LibraryFilterBottomSheet.kt | 10 +-- .../library/LibraryFilterBottomSheetTabRow.kt | 2 +- .../presentation/library/LibraryGridItem.kt | 10 +-- .../presentation/library/LibraryGridLayout.kt | 6 +- .../presentation/library/LibraryItem.kt | 6 +- .../presentation/library/LibraryLayout.kt | 4 +- .../presentation/library/LibraryListItem.kt | 8 +- .../presentation/library/LibraryListLayout.kt | 6 +- .../presentation/library/LibraryMoveDialog.kt | 10 +-- .../presentation/library/LibraryPager.kt | 14 +-- .../presentation/library/LibraryScaffold.kt | 12 +-- .../presentation/library/LibraryTabs.kt | 4 +- .../presentation/library/LibraryTopBar.kt | 16 ++-- .../license_info/LicenseInfoItem.kt | 2 +- .../license_info/LicenseInfoLayout.kt | 2 +- .../license_info/LicenseInfoTopBar.kt | 4 +- .../presentation/licenses/LicensesItem.kt | 2 +- .../presentation/licenses/LicensesLayout.kt | 4 +- .../presentation/licenses/LicensesTopBar.kt | 2 +- .../presentation/navigator/Navigator.kt | 8 +- .../navigator/NavigatorBackIconButton.kt | 2 +- .../navigator/NavigatorBottomSheet.kt | 4 +- .../navigator/NavigatorBottomSheetItem.kt | 4 +- .../navigator/NavigatorComposition.kt | 2 +- .../navigator/NavigatorIconButton.kt | 2 +- .../presentation/navigator/NavigatorTabs.kt | 4 +- .../presentation/reader/ReaderBackHandler.kt | 2 +- .../presentation/reader/ReaderBottomBar.kt | 12 +-- .../reader/ReaderBottomBarSlider.kt | 2 +- .../presentation/reader/ReaderBottomSheet.kt | 2 +- .../reader/ReaderChaptersDrawer.kt | 14 +-- .../presentation/reader/ReaderContent.kt | 20 ++--- .../presentation/reader/ReaderDrawer.kt | 2 +- .../reader/ReaderErrorPlaceholder.kt | 10 +-- .../reader/ReaderHorizontalGesture.kt | 2 +- .../presentation/reader/ReaderLayout.kt | 24 +++--- .../presentation/reader/ReaderLayoutText.kt | 8 +- .../reader/ReaderLayoutTextChapter.kt | 4 +- .../reader/ReaderLayoutTextImage.kt | 2 +- .../reader/ReaderLayoutTextParagraph.kt | 10 +-- .../reader/ReaderLoadingPlaceholder.kt | 2 +- .../presentation/reader/ReaderProgressBar.kt | 4 +- .../presentation/reader/ReaderScaffold.kt | 16 ++-- .../reader/ReaderSettingsBottomSheet.kt | 6 +- .../reader/ReaderSettingsBottomSheetTabRow.kt | 2 +- .../presentation/reader/ReaderTopBar.kt | 10 +-- .../reader/model}/ExpandableChapter.kt | 3 +- .../reader/model}/FontWithName.kt | 4 +- .../presentation/settings/SettingsLayout.kt | 2 +- .../settings/SettingsLayoutItem.kt | 2 +- .../presentation/settings/SettingsTopBar.kt | 2 +- .../appearance/AppearanceSettingsLayout.kt | 2 +- .../appearance/AppearanceSettingsTopBar.kt | 2 +- .../colors/components/ColorPresetOption.kt | 10 +-- .../components/FastColorPresetChangeOption.kt | 2 +- .../components/AbsoluteDarkOption.kt | 6 +- .../components/AppThemeOption.kt | 10 +-- .../components/DarkThemeOption.kt | 6 +- .../components/PureDarkOption.kt | 8 +- .../components/ThemeContrastOption.kt | 10 +-- .../settings/browse/BrowseSettingsLayout.kt | 2 +- .../settings/browse/BrowseSettingsTopBar.kt | 2 +- .../components/BrowseGridSizeOption.kt | 4 +- .../display/components/BrowseLayoutOption.kt | 6 +- .../filter/components/BrowseFilterOption.kt | 4 +- .../scan/components/BrowseScanOption.kt | 8 +- .../sort/components/BrowseSortOption.kt | 4 +- .../components/SettingsSubcategoryNote.kt | 2 +- .../components/SettingsSubcategoryTitle.kt | 2 +- .../settings/general/GeneralSettingsLayout.kt | 2 +- .../settings/general/GeneralSettingsTopBar.kt | 2 +- .../general/components/AppLanguageOption.kt | 6 +- .../components/DoublePressExitOption.kt | 2 +- .../settings/library/LibrarySettingsLayout.kt | 2 +- .../settings/library/LibrarySettingsTopBar.kt | 2 +- .../components/LibraryCategoriesOption.kt | 12 +-- .../components/LibraryGridSizeOption.kt | 4 +- .../display/components/LibraryLayoutOption.kt | 6 +- .../components/LibraryReadButtonOption.kt | 2 +- .../components/LibraryShowProgressOption.kt | 2 +- .../components/LibraryTitlePositionOption.kt | 8 +- .../LibraryPerCategorySortOption.kt | 2 +- .../sort/components/LibrarySortOption.kt | 4 +- .../LibraryAlwaysShowDefaultTabOption.kt | 2 +- .../components/LibraryShowBookCountOption.kt | 2 +- .../LibraryShowCategoryTabsOption.kt | 2 +- .../settings/reader/ReaderSettingsLayout.kt | 2 +- .../settings/reader/ReaderSettingsTopBar.kt | 2 +- .../components/ChapterTitleAlignmentOption.kt | 6 +- .../font/components/FontFamilyOption.kt | 6 +- .../reader/font/components/FontSizeOption.kt | 2 +- .../reader/font/components/FontStyleOption.kt | 6 +- .../font/components/FontThicknessOption.kt | 8 +- .../font/components/LetterSpacingOption.kt | 2 +- .../components/ImagesAlignmentOption.kt | 6 +- .../components/ImagesColorEffectsOption.kt | 6 +- .../ImagesCornersRoundnessOption.kt | 2 +- .../reader/images/components/ImagesOption.kt | 2 +- .../images/components/ImagesWidthOption.kt | 2 +- .../misc/components/FullscreenOption.kt | 2 +- .../components/HideBarsOnFastScrollOption.kt | 2 +- .../misc/components/KeepScreenOnOption.kt | 2 +- .../components/BottomBarPaddingOption.kt | 2 +- .../padding/components/CutoutPaddingOption.kt | 2 +- .../padding/components/SidePaddingOption.kt | 2 +- .../components/VerticalPaddingOption.kt | 2 +- .../components/ProgressBarAlignmentOption.kt | 6 +- .../components/ProgressBarFontSizeOption.kt | 2 +- .../progress/components/ProgressBarOption.kt | 2 +- .../components/ProgressBarPaddingOption.kt | 2 +- .../components/ProgressCountOption.kt | 6 +- .../HorizontalGestureAlphaAnimOption.kt | 4 +- .../components/HorizontalGestureOption.kt | 6 +- .../HorizontalGesturePullAnimOption.kt | 4 +- .../HorizontalGestureScrollOption.kt | 4 +- .../HorizontalGestureSensitivityOption.kt | 4 +- .../components/HighlightedReadingOption.kt | 2 +- .../HighlightedReadingThicknessOption.kt | 2 +- .../components/PerceptionExpanderOption.kt | 2 +- .../PerceptionExpanderPaddingOption.kt | 2 +- .../PerceptionExpanderThicknessOption.kt | 2 +- .../CustomScreenBrightnessOption.kt | 2 +- .../components/ScreenBrightnessOption.kt | 2 +- .../components/ScreenOrientationOption.kt | 6 +- .../text/components/LineHeightOption.kt | 2 +- .../text/components/ParagraphHeightOption.kt | 2 +- .../components/ParagraphIndentationOption.kt | 4 +- .../text/components/TextAlignmentOption.kt | 6 +- .../DoubleClickTranslationOption.kt | 2 +- .../presentation/start/StartContent.kt | 4 +- .../start/StartContentTransition.kt | 2 +- .../presentation/start/StartDoneBottomBar.kt | 2 +- .../presentation/start/StartDoneLayout.kt | 2 +- .../presentation/start/StartSettings.kt | 4 +- .../start/StartSettingsBottomBar.kt | 2 +- .../presentation/start/StartSettingsLayout.kt | 2 +- .../start/StartSettingsLayoutGeneral.kt | 4 +- .../start/StartSettingsScaffold.kt | 2 +- .../book_story/ui/about/AboutModel.kt | 4 +- .../book_story/ui/about/AboutScreen.kt | 4 +- .../book_story/ui/book_info/BookInfoEvent.kt | 4 +- .../book_story/ui/book_info/BookInfoModel.kt | 2 +- .../book_story/ui/book_info/BookInfoScreen.kt | 2 +- .../book_story/ui/book_info/BookInfoState.kt | 8 +- .../book_story/ui/browse/BrowseEvent.kt | 4 +- .../book_story/ui/browse/BrowseModel.kt | 54 ++++++++---- .../book_story/ui/browse/BrowseScreen.kt | 4 +- .../book_story/ui/browse/BrowseState.kt | 8 +- .../browse/model}/BrowseLayout.kt | 6 +- .../browse/model}/BrowseSortOrder.kt | 10 +-- .../file => ui/browse/model}/GroupedFiles.kt | 2 +- .../browse/model}/SelectableFile.kt | 14 +-- .../book_story/ui/crash/CrashActivity.kt | 2 +- .../book_story/ui/crash/CrashScreen.kt | 8 +- .../book_story/ui/credits/CreditsScreen.kt | 4 +- .../book_story/ui/help/HelpScreen.kt | 4 +- .../book_story/ui/history/HistoryModel.kt | 4 +- .../book_story/ui/history/HistoryScreen.kt | 2 +- .../book_story/ui/history/HistoryState.kt | 4 +- .../history/model}/GroupedHistory.kt | 5 +- .../book_story/ui/library/LibraryEvent.kt | 2 +- .../book_story/ui/library/LibraryModel.kt | 6 +- .../book_story/ui/library/LibraryScreen.kt | 2 +- .../book_story/ui/library/LibraryState.kt | 6 +- .../library/model}/LibraryLayout.kt | 6 +- .../library/model}/LibrarySortOrder.kt | 6 +- .../library/model}/LibraryTitlePosition.kt | 6 +- .../library/model}/SelectableBook.kt | 5 +- .../library/model}/SelectableNullableBook.kt | 5 +- .../ui/license_info/LicenseInfoScreen.kt | 4 +- .../book_story/ui/licenses/LicensesScreen.kt | 4 +- .../book_story/ui/main/MainActivity.kt | 12 +-- .../acclorite/book_story/ui/main/MainModel.kt | 70 +++++++-------- .../acclorite/book_story/ui/main/MainState.kt | 85 ++++++++----------- .../{domain/ui => ui/main/model}/DarkTheme.kt | 6 +- .../main/model}/HorizontalAlignment.kt | 14 ++- .../{domain/ui => ui/main/model}/PureDark.kt | 6 +- .../ui => ui/main/model}/ThemeContrast.kt | 6 +- .../{domain => ui}/navigator/Navigator.kt | 2 +- .../{domain => ui}/navigator/NavigatorItem.kt | 2 +- .../{domain => ui}/navigator/Screen.kt | 2 +- .../{domain => ui}/navigator/StackEvent.kt | 2 +- .../book_story/ui/reader/ReaderModel.kt | 12 +-- .../book_story/ui/reader/ReaderScreen.kt | 16 ++-- .../book_story/ui/reader/ReaderState.kt | 12 +-- .../reader => ui/reader/model}/Checkpoint.kt | 2 +- .../reader/model}/ReaderColorEffects.kt | 6 +- .../reader/model}/ReaderFontThickness.kt | 6 +- .../reader/model}/ReaderHorizontalGesture.kt | 6 +- .../reader/model}/ReaderProgressCount.kt | 6 +- .../reader/model}/ReaderScreenOrientation.kt | 6 +- .../reader/model}/ReaderTextAlignment.kt | 6 +- .../ui/settings/AppearanceSettingsScreen.kt | 4 +- .../ui/settings/BrowseSettingsScreen.kt | 4 +- .../ui/settings/GeneralSettingsScreen.kt | 4 +- .../ui/settings/LibrarySettingsScreen.kt | 4 +- .../ui/settings/ReaderSettingsScreen.kt | 4 +- .../book_story/ui/settings/SettingsEvent.kt | 6 +- .../book_story/ui/settings/SettingsModel.kt | 8 +- .../book_story/ui/settings/SettingsScreen.kt | 4 +- .../book_story/ui/settings/SettingsState.kt | 6 +- .../book_story/ui/start/StartScreen.kt | 10 +-- .../book_story/ui/theme/Animations.kt | 2 +- .../ua/acclorite/book_story/ui/theme/Color.kt | 2 +- .../ua/acclorite/book_story/ui/theme/Theme.kt | 2 +- .../book_story/ui/theme/Transitions.kt | 2 +- .../book_story/ui/theme/color/AquaTheme.kt | 2 +- .../book_story/ui/theme/color/BlueTheme.kt | 2 +- .../book_story/ui/theme/color/GreenTheme.kt | 2 +- .../ui/theme/color/LavenderTheme.kt | 2 +- .../book_story/ui/theme/color/MarshTheme.kt | 2 +- .../book_story/ui/theme/color/PinkTheme.kt | 2 +- .../book_story/ui/theme/color/PurpleTheme.kt | 2 +- .../book_story/ui/theme/color/RedTheme.kt | 2 +- .../book_story/ui/theme/color/YellowTheme.kt | 2 +- 405 files changed, 1040 insertions(+), 1050 deletions(-) rename app/src/main/java/ua/acclorite/book_story/{domain/util => core}/Typealias.kt (88%) rename app/src/main/java/ua/acclorite/book_story/{domain => core}/ui/UIText.kt (96%) rename app/src/main/java/ua/acclorite/book_story/{domain/library/book => data/model/common}/NullableBook.kt (81%) rename app/src/main/java/ua/acclorite/book_story/{domain => data/model}/file/CachedFile.kt (98%) rename app/src/main/java/ua/acclorite/book_story/{domain => data/model}/file/CachedFileBuilder.kt (88%) rename app/src/main/java/ua/acclorite/book_story/{domain => data/model}/file/CachedFileCompat.kt (98%) rename app/src/main/java/ua/acclorite/book_story/{domain/library/book => data/model/library}/BookWithCover.kt (65%) create mode 100644 app/src/main/java/ua/acclorite/book_story/domain/file/File.kt rename app/src/main/java/ua/acclorite/book_story/domain/library/{book => }/Book.kt (86%) rename app/src/main/java/ua/acclorite/book_story/domain/library/{category => }/Category.kt (84%) rename app/src/main/java/ua/acclorite/book_story/domain/library/{category => }/CategorySort.kt (72%) rename app/src/main/java/ua/acclorite/book_story/{domain/about => presentation/about/model}/Badge.kt (90%) rename app/src/main/java/ua/acclorite/book_story/{domain/about => presentation/about/model}/Credit.kt (76%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/AnimatedVisibility.kt (95%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/AsyncCoverImage.kt (93%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/CircularCheckbox.kt (96%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/HighlightedText.kt (97%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/IconButton.kt (98%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/LazyColumnWithScrollbar.kt (92%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/LazyGridHeader.kt (88%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/LazyVerticalGridWithScrollbar.kt (92%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/SearchTextField.kt (97%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/SelectionContainer.kt (99%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/Snackbar.kt (98%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/SpacedItem.kt (88%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/StyledText.kt (97%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/common/Tooltip.kt (94%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/dialog/CheckboxDialogItem.kt (91%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/dialog/Dialog.kt (97%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/dialog/DialogWithTextField.kt (95%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/dialog/SelectableDialogItem.kt (92%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/modal_bottom_sheet/ModalBottomSheet.kt (96%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt (91%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/modal_drawer/ModalDrawer.kt (93%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/modal_drawer/ModalDrawerSelectableItem.kt (94%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/modal_drawer/ModalDrawerTitleItem.kt (90%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/navigation_bar/NavigationBar.kt (89%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/navigation_bar/NavigationBarItem.kt (88%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/navigation_rail/NavigationRail.kt (95%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/navigation_rail/NavigationRailItem.kt (87%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/placeholder/EmptyPlaceholder.kt (94%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/placeholder/ErrorPlaceholder.kt (94%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/progress_indicator/CircularProgressIndicator.kt (94%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/settings/ChipsWithTitle.kt (90%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/settings/ColorPickerWithTitle.kt (96%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/settings/SegmentedButtonWithTitle.kt (95%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/settings/SliderWithTitle.kt (98%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/settings/SwitchWIthTitle.kt (94%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt (95%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/components/top_bar/TopAppBar.kt (95%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/AboutBadgeConstants.kt (90%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/CommonConstants.kt (84%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/CreditConstants.kt (94%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/DataStoreConstants.kt (98%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/FontConstants.kt (97%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/HelpTipConstants.kt (97%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/LanguageConstants.kt (93%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/LinkConstants.kt (90%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/ScrollbarConstants.kt (95%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/constants/SupportedExtensionConstants.kt (85%) rename app/src/main/java/ua/acclorite/book_story/{domain/ui => presentation/common/model}/ButtonItem.kt (86%) rename app/src/main/java/ua/acclorite/book_story/{domain/util => presentation/common/model}/Direction.kt (81%) rename app/src/main/java/ua/acclorite/book_story/{domain/util => presentation/common/model}/Position.kt (81%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/util/CollectionExtensions.kt (80%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/util/LifecycleExtensions.kt (96%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/util/ModifierExtensions.kt (91%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/util/PrimitiveExtensions.kt (97%) rename app/src/main/java/ua/acclorite/book_story/presentation/{core => common}/util/ToastExtensions.kt (89%) rename app/src/main/java/ua/acclorite/book_story/{domain/help => presentation/help/model}/HelpTip.kt (89%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => presentation/reader/model}/ExpandableChapter.kt (75%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => presentation/reader/model}/FontWithName.kt (77%) rename app/src/main/java/ua/acclorite/book_story/{domain/browse/display => ui/browse/model}/BrowseLayout.kt (64%) rename app/src/main/java/ua/acclorite/book_story/{domain/browse/display => ui/browse/model}/BrowseSortOrder.kt (54%) rename app/src/main/java/ua/acclorite/book_story/{domain/browse/file => ui/browse/model}/GroupedFiles.kt (86%) rename app/src/main/java/ua/acclorite/book_story/{domain/browse/file => ui/browse/model}/SelectableFile.kt (50%) rename app/src/main/java/ua/acclorite/book_story/{domain/history => ui/history/model}/GroupedHistory.kt (73%) rename app/src/main/java/ua/acclorite/book_story/{domain/library/display => ui/library/model}/LibraryLayout.kt (63%) rename app/src/main/java/ua/acclorite/book_story/{domain/library/display => ui/library/model}/LibrarySortOrder.kt (65%) rename app/src/main/java/ua/acclorite/book_story/{domain/library/display => ui/library/model}/LibraryTitlePosition.kt (61%) rename app/src/main/java/ua/acclorite/book_story/{domain/library/book => ui/library/model}/SelectableBook.kt (66%) rename app/src/main/java/ua/acclorite/book_story/{domain/library/book => ui/library/model}/SelectableNullableBook.kt (65%) rename app/src/main/java/ua/acclorite/book_story/{domain/ui => ui/main/model}/DarkTheme.kt (82%) rename app/src/main/java/ua/acclorite/book_story/{domain/util => ui/main/model}/HorizontalAlignment.kt (51%) rename app/src/main/java/ua/acclorite/book_story/{domain/ui => ui/main/model}/PureDark.kt (85%) rename app/src/main/java/ua/acclorite/book_story/{domain/ui => ui/main/model}/ThemeContrast.kt (67%) rename app/src/main/java/ua/acclorite/book_story/{domain => ui}/navigator/Navigator.kt (97%) rename app/src/main/java/ua/acclorite/book_story/{domain => ui}/navigator/NavigatorItem.kt (91%) rename app/src/main/java/ua/acclorite/book_story/{domain => ui}/navigator/Screen.kt (83%) rename app/src/main/java/ua/acclorite/book_story/{domain => ui}/navigator/StackEvent.kt (87%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => ui/reader/model}/Checkpoint.kt (85%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => ui/reader/model}/ReaderColorEffects.kt (67%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => ui/reader/model}/ReaderFontThickness.kt (76%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => ui/reader/model}/ReaderHorizontalGesture.kt (63%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => ui/reader/model}/ReaderProgressCount.kt (65%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => ui/reader/model}/ReaderScreenOrientation.kt (80%) rename app/src/main/java/ua/acclorite/book_story/{domain/reader => ui/reader/model}/ReaderTextAlignment.kt (74%) diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/Typealias.kt b/app/src/main/java/ua/acclorite/book_story/core/Typealias.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/domain/util/Typealias.kt rename to app/src/main/java/ua/acclorite/book_story/core/Typealias.kt index 7fb65b2a..08978e52 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/Typealias.kt +++ b/app/src/main/java/ua/acclorite/book_story/core/Typealias.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.util +package ua.acclorite.book_story.core import android.graphics.Bitmap diff --git a/app/src/main/java/ua/acclorite/book_story/domain/ui/UIText.kt b/app/src/main/java/ua/acclorite/book_story/core/ui/UIText.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/domain/ui/UIText.kt rename to app/src/main/java/ua/acclorite/book_story/core/ui/UIText.kt index 672d49e6..8a87d1aa 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/ui/UIText.kt +++ b/app/src/main/java/ua/acclorite/book_story/core/ui/UIText.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.ui +package ua.acclorite.book_story.core.ui import android.content.Context import android.os.Parcelable diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategorySortEntity.kt b/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategorySortEntity.kt index f83ea3df..9592b6d5 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategorySortEntity.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategorySortEntity.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.data.local.dto import androidx.room.Entity import androidx.room.PrimaryKey -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder @Entity data class CategorySortEntity( diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapper.kt index 91d07075..89c34397 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapper.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapper.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.book import ua.acclorite.book_story.data.local.dto.BookEntity -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book interface BookMapper { suspend fun toBookEntity(book: Book): BookEntity diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapperImpl.kt index e2ceaa20..f3a355bf 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapperImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapperImpl.kt @@ -8,9 +8,9 @@ package ua.acclorite.book_story.data.mapper.book import androidx.core.net.toUri import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.local.dto.BookEntity -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.domain.library.Book import javax.inject.Inject class BookMapperImpl @Inject constructor() : BookMapper { diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapper.kt index a76be73a..36031f8b 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapper.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapper.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.category import ua.acclorite.book_story.data.local.dto.CategoryEntity -import ua.acclorite.book_story.domain.library.category.Category +import ua.acclorite.book_story.domain.library.Category interface CategoryMapper { suspend fun toCategoryEntity(category: Category): CategoryEntity diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapperImpl.kt index d0f9238e..85b27151 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapperImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapperImpl.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.category import ua.acclorite.book_story.data.local.dto.CategoryEntity -import ua.acclorite.book_story.domain.library.category.Category +import ua.acclorite.book_story.domain.library.Category import javax.inject.Inject class CategoryMapperImpl @Inject constructor() : CategoryMapper { diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/category_sort/CategorySortMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/category_sort/CategorySortMapper.kt index a0666058..caa4b1ff 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/category_sort/CategorySortMapper.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/category_sort/CategorySortMapper.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.category_sort import ua.acclorite.book_story.data.local.dto.CategorySortEntity -import ua.acclorite.book_story.domain.library.category.CategorySort +import ua.acclorite.book_story.domain.library.CategorySort interface CategorySortMapper { suspend fun toCategorySortEntity(categorySort: CategorySort): CategorySortEntity diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/category_sort/CategorySortSortMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/category_sort/CategorySortSortMapperImpl.kt index be5e7c70..0e3779e3 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/category_sort/CategorySortSortMapperImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/category_sort/CategorySortSortMapperImpl.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.category_sort import ua.acclorite.book_story.data.local.dto.CategorySortEntity -import ua.acclorite.book_story.domain.library.category.CategorySort +import ua.acclorite.book_story.domain.library.CategorySort import javax.inject.Inject class CategorySortSortMapperImpl @Inject constructor() : CategorySortMapper { diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/book/NullableBook.kt b/app/src/main/java/ua/acclorite/book_story/data/model/common/NullableBook.kt similarity index 81% rename from app/src/main/java/ua/acclorite/book_story/domain/library/book/NullableBook.kt rename to app/src/main/java/ua/acclorite/book_story/data/model/common/NullableBook.kt index 3547a5e6..e0aca6ac 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/book/NullableBook.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/model/common/NullableBook.kt @@ -4,10 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.book +package ua.acclorite.book_story.data.model.common import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.data.model.library.BookWithCover @Immutable sealed class NullableBook( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/file/CachedFile.kt b/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFile.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/domain/file/CachedFile.kt rename to app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFile.kt index 5cbae56e..19b577a2 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/file/CachedFile.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFile.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.file +package ua.acclorite.book_story.data.model.file import android.content.Context import android.net.Uri @@ -168,7 +168,7 @@ class CachedFile( } /** - * Copies the file to [context].cacheDir and provides [java.io.File]. + * Copies the file to [context].cacheDir and provides [File]. * * @return null if the file is directory or failed */ diff --git a/app/src/main/java/ua/acclorite/book_story/domain/file/CachedFileBuilder.kt b/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileBuilder.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/domain/file/CachedFileBuilder.kt rename to app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileBuilder.kt index a12699c8..c3b98bde 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/file/CachedFileBuilder.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileBuilder.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.file +package ua.acclorite.book_story.data.model.file import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/file/CachedFileCompat.kt b/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileCompat.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/domain/file/CachedFileCompat.kt rename to app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileCompat.kt index 206b8cc6..cc2a817d 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/file/CachedFileCompat.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileCompat.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.file +package ua.acclorite.book_story.data.model.file import android.content.Context import android.net.Uri diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/book/BookWithCover.kt b/app/src/main/java/ua/acclorite/book_story/data/model/library/BookWithCover.kt similarity index 65% rename from app/src/main/java/ua/acclorite/book_story/domain/library/book/BookWithCover.kt rename to app/src/main/java/ua/acclorite/book_story/data/model/library/BookWithCover.kt index b13339df..3172ec7d 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/book/BookWithCover.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/model/library/BookWithCover.kt @@ -4,10 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.book +package ua.acclorite.book_story.data.model.library import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.util.CoverImage +import ua.acclorite.book_story.core.CoverImage +import ua.acclorite.book_story.domain.library.Book @Immutable data class BookWithCover( diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt index d2369470..101b8868 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.graphics.asImageBitmap import kotlinx.coroutines.yield import org.jsoup.nodes.Document import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.presentation.core.util.clearAllMarkdown -import ua.acclorite.book_story.presentation.core.util.clearMarkdown -import ua.acclorite.book_story.presentation.core.util.containsVisibleText +import ua.acclorite.book_story.presentation.common.util.clearAllMarkdown +import ua.acclorite.book_story.presentation.common.util.clearMarkdown +import ua.acclorite.book_story.presentation.common.util.containsVisibleText import java.io.File import java.util.zip.ZipEntry import java.util.zip.ZipFile diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt index 1628a4f7..f082a027 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt @@ -6,8 +6,8 @@ package ua.acclorite.book_story.data.parser -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.BookWithCover +import ua.acclorite.book_story.data.model.file.CachedFile +import ua.acclorite.book_story.data.model.library.BookWithCover interface FileParser { diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParserImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/FileParserImpl.kt index bf31dfc5..a91ebbef 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParserImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/FileParserImpl.kt @@ -7,13 +7,13 @@ package ua.acclorite.book_story.data.parser import android.util.Log +import ua.acclorite.book_story.data.model.file.CachedFile +import ua.acclorite.book_story.data.model.library.BookWithCover import ua.acclorite.book_story.data.parser.epub.EpubFileParser import ua.acclorite.book_story.data.parser.fb2.Fb2FileParser import ua.acclorite.book_story.data.parser.html.HtmlFileParser import ua.acclorite.book_story.data.parser.pdf.PdfFileParser import ua.acclorite.book_story.data.parser.txt.TxtFileParser -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.BookWithCover import javax.inject.Inject private const val FILE_PARSER = "File Parser" diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt index d670bf5e..df0a53b8 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt @@ -23,7 +23,7 @@ import org.commonmark.node.Node import org.commonmark.node.StrongEmphasis import org.commonmark.node.Text import org.commonmark.parser.Parser -import ua.acclorite.book_story.presentation.core.util.clearMarkdown +import ua.acclorite.book_story.presentation.common.util.clearMarkdown import javax.inject.Inject class MarkdownParser @Inject constructor( diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt index 5b6c22f2..ed1cae53 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.data.parser -import ua.acclorite.book_story.domain.file.CachedFile +import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.domain.reader.ReaderText interface TextParser { diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/TextParserImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/TextParserImpl.kt index c9f476b3..2fa9eb01 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/TextParserImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/TextParserImpl.kt @@ -9,12 +9,12 @@ package ua.acclorite.book_story.data.parser import android.util.Log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.data.parser.epub.EpubTextParser import ua.acclorite.book_story.data.parser.html.HtmlTextParser import ua.acclorite.book_story.data.parser.pdf.PdfTextParser import ua.acclorite.book_story.data.parser.txt.TxtTextParser import ua.acclorite.book_story.data.parser.xml.XmlTextParser -import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.reader.ReaderText import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt index 7e1a215d..1ba2a146 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt @@ -12,11 +12,11 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jsoup.Jsoup import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.data.model.file.CachedFile +import ua.acclorite.book_story.data.model.library.BookWithCover import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.book.BookWithCover -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.domain.library.Book import java.io.File import java.util.zip.ZipFile import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt index b8e475ba..cbfe9220 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt @@ -17,13 +17,13 @@ import kotlinx.coroutines.awaitAll import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import org.jsoup.Jsoup +import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.data.parser.DocumentParser import ua.acclorite.book_story.data.parser.TextParser -import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.presentation.core.constants.provideImageExtensions -import ua.acclorite.book_story.presentation.core.util.addAll -import ua.acclorite.book_story.presentation.core.util.containsVisibleText +import ua.acclorite.book_story.presentation.common.constants.provideImageExtensions +import ua.acclorite.book_story.presentation.common.util.addAll +import ua.acclorite.book_story.presentation.common.util.containsVisibleText import java.io.File import java.util.concurrent.ConcurrentLinkedQueue import java.util.zip.ZipEntry diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt index f125bae5..3ce3b457 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt @@ -9,11 +9,11 @@ package ua.acclorite.book_story.data.parser.fb2 import org.jsoup.Jsoup import org.jsoup.parser.Parser import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.data.model.file.CachedFile +import ua.acclorite.book_story.data.model.library.BookWithCover import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.book.BookWithCover -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.domain.library.Book import javax.inject.Inject class Fb2FileParser @Inject constructor() : FileParser { diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlFileParser.kt index 2e9d5266..2812e0e9 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlFileParser.kt @@ -9,11 +9,11 @@ package ua.acclorite.book_story.data.parser.html import org.jsoup.Jsoup import org.jsoup.parser.Parser import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.data.model.file.CachedFile +import ua.acclorite.book_story.data.model.library.BookWithCover import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.book.BookWithCover -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.domain.library.Book import javax.inject.Inject class HtmlFileParser @Inject constructor() : FileParser { diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlTextParser.kt index 7c6b0256..036d6957 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlTextParser.kt @@ -10,9 +10,9 @@ import android.util.Log import kotlinx.coroutines.yield import org.jsoup.Jsoup import org.jsoup.parser.Parser +import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.data.parser.DocumentParser import ua.acclorite.book_story.data.parser.TextParser -import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.reader.ReaderText import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt index 2807ad1f..323ad4d4 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt @@ -10,11 +10,11 @@ import android.app.Application import com.tom_roush.pdfbox.android.PDFBoxResourceLoader import com.tom_roush.pdfbox.pdmodel.PDDocument import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.data.model.file.CachedFile +import ua.acclorite.book_story.data.model.library.BookWithCover import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.book.BookWithCover -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.domain.library.Book import javax.inject.Inject class PdfFileParser @Inject constructor( diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt index 6ec5e951..370bb0d3 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt @@ -12,11 +12,11 @@ import com.tom_roush.pdfbox.android.PDFBoxResourceLoader import com.tom_roush.pdfbox.pdmodel.PDDocument import com.tom_roush.pdfbox.text.PDFTextStripper import kotlinx.coroutines.yield +import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.data.parser.MarkdownParser import ua.acclorite.book_story.data.parser.TextParser -import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.presentation.core.util.clearAllMarkdown +import ua.acclorite.book_story.presentation.common.util.clearAllMarkdown import javax.inject.Inject private const val PDF_TAG = "PDF Parser" diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt index 86620a16..82cbb5a5 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt @@ -7,11 +7,11 @@ package ua.acclorite.book_story.data.parser.txt import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.data.model.file.CachedFile +import ua.acclorite.book_story.data.model.library.BookWithCover import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.book.BookWithCover -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.domain.library.Book import javax.inject.Inject class TxtFileParser @Inject constructor() : FileParser { diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt index 9c7f025d..d3a17dca 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt @@ -10,11 +10,11 @@ import android.util.Log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.coroutines.yield +import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.data.parser.MarkdownParser import ua.acclorite.book_story.data.parser.TextParser -import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.presentation.core.util.clearAllMarkdown +import ua.acclorite.book_story.presentation.common.util.clearAllMarkdown import javax.inject.Inject private const val TXT_TAG = "TXT Parser" diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/xml/XmlTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/xml/XmlTextParser.kt index 736c5f89..6bc6a548 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/xml/XmlTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/xml/XmlTextParser.kt @@ -10,9 +10,9 @@ import android.util.Log import kotlinx.coroutines.yield import org.jsoup.Jsoup import org.jsoup.parser.Parser +import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.data.parser.DocumentParser import ua.acclorite.book_story.data.parser.TextParser -import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.reader.ReaderText import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt index 181b33ba..1b7ab60a 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt @@ -15,16 +15,16 @@ import android.util.Log import androidx.core.net.toUri import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import ua.acclorite.book_story.core.CoverImage import ua.acclorite.book_story.data.local.room.BookDao import ua.acclorite.book_story.data.mapper.book.BookMapper +import ua.acclorite.book_story.data.model.file.CachedFileCompat +import ua.acclorite.book_story.data.model.library.BookWithCover import ua.acclorite.book_story.data.parser.FileParser import ua.acclorite.book_story.data.parser.TextParser -import ua.acclorite.book_story.domain.file.CachedFileCompat -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.book.BookWithCover +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.reader.ReaderText import ua.acclorite.book_story.domain.repository.BookRepository -import ua.acclorite.book_story.domain.util.CoverImage import java.io.BufferedOutputStream import java.io.ByteArrayOutputStream import java.io.File diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/CategoryRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/CategoryRepositoryImpl.kt index 34f5e1d9..9b0e74af 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/repository/CategoryRepositoryImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/repository/CategoryRepositoryImpl.kt @@ -9,8 +9,8 @@ package ua.acclorite.book_story.data.repository import ua.acclorite.book_story.data.local.room.BookDao import ua.acclorite.book_story.data.mapper.category.CategoryMapper import ua.acclorite.book_story.data.mapper.category_sort.CategorySortMapper -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort import ua.acclorite.book_story.domain.repository.CategoryRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt index 6a7b84bb..744a77e3 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt @@ -9,17 +9,17 @@ package ua.acclorite.book_story.data.repository import android.app.Application import android.util.Log import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.local.room.BookDao +import ua.acclorite.book_story.data.model.common.NullableBook +import ua.acclorite.book_story.data.model.common.NullableBook.NotNull +import ua.acclorite.book_story.data.model.common.NullableBook.Null +import ua.acclorite.book_story.data.model.file.CachedFile +import ua.acclorite.book_story.data.model.file.CachedFileCompat import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.file.CachedFileCompat -import ua.acclorite.book_story.domain.library.book.NullableBook -import ua.acclorite.book_story.domain.library.book.NullableBook.NotNull -import ua.acclorite.book_story.domain.library.book.NullableBook.Null +import ua.acclorite.book_story.domain.file.File import ua.acclorite.book_story.domain.repository.FileSystemRepository -import ua.acclorite.book_story.domain.ui.UIText -import ua.acclorite.book_story.presentation.core.constants.provideExtensions +import ua.acclorite.book_story.presentation.common.constants.provideExtensions import java.util.UUID import javax.inject.Inject import javax.inject.Singleton @@ -42,7 +42,7 @@ class FileSystemRepositoryImpl @Inject constructor( * Gets all matching files from device. * Filters by [query] and sorts out not supported file formats and already added files. */ - override suspend fun getFiles(query: String): List { + override suspend fun getFiles(query: String): List { Log.i(GET_FILES, "Getting files from device, query: \"$query\".") val existingPaths = database @@ -74,21 +74,25 @@ class FileSystemRepositoryImpl @Inject constructor( return true } - fun CachedFile.getSelectableFilesFromStorage(): List { - val selectableFiles = mutableListOf() + fun CachedFile.getSelectableFilesFromStorage(): List { + val files = mutableListOf() walk { file -> if (!file.isValid()) return@walk - selectableFiles.add( - SelectableFile( - data = file, - selected = false + files.add( + File( + name = file.name, + uri = file.uri, + path = file.path, + size = file.size, + lastModified = file.lastModified, + isDirectory = file.isDirectory ) ) } - return selectableFiles + return files } fun getAllStorages(): List { @@ -119,7 +123,7 @@ class FileSystemRepositoryImpl @Inject constructor( return try { val storages = getAllStorages() - val files = mutableListOf() + val files = mutableListOf() for (storage in storages) { files.addAll(storage.getSelectableFilesFromStorage()) @@ -138,7 +142,19 @@ class FileSystemRepositoryImpl @Inject constructor( /** * Gets book from given file. If error happened, returns [NullableBook.Null]. */ - override suspend fun getBookFromFile(cachedFile: CachedFile): NullableBook { + override suspend fun getBookFromFile(file: File): NullableBook { + val cachedFile = CachedFileCompat.fromUri( + context = application, + uri = file.uri, + builder = CachedFileCompat.build( + name = file.name, + path = file.path, + size = file.size, + lastModified = file.lastModified, + isDirectory = file.isDirectory + ) + ) + val parsedBook = fileParser.parse(cachedFile) if (parsedBook == null) { Log.e(GET_BOOK_FROM_FILE, "Parsed file(${cachedFile.name}) is null.") diff --git a/app/src/main/java/ua/acclorite/book_story/domain/file/File.kt b/app/src/main/java/ua/acclorite/book_story/domain/file/File.kt new file mode 100644 index 00000000..45c8e985 --- /dev/null +++ b/app/src/main/java/ua/acclorite/book_story/domain/file/File.kt @@ -0,0 +1,20 @@ +/* + * Book's Story — free and open-source Material You eBook reader. + * Copyright (C) 2024-2025 Acclorite + * SPDX-License-Identifier: GPL-3.0-only + */ + +package ua.acclorite.book_story.domain.file + +import android.net.Uri +import androidx.compose.runtime.Immutable + +@Immutable +data class File( + val name: String, + val uri: Uri, + val path: String, + val size: Long, + val lastModified: Long, + val isDirectory: Boolean +) \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/history/History.kt b/app/src/main/java/ua/acclorite/book_story/domain/history/History.kt index 5dbd4aeb..6d8b3e4c 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/history/History.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/history/History.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.domain.history import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book @Immutable data class History( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/book/Book.kt b/app/src/main/java/ua/acclorite/book_story/domain/library/Book.kt similarity index 86% rename from app/src/main/java/ua/acclorite/book_story/domain/library/book/Book.kt rename to app/src/main/java/ua/acclorite/book_story/domain/library/Book.kt index 3919bb1c..0a370c4b 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/book/Book.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/library/Book.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.book +package ua.acclorite.book_story.domain.library import android.net.Uri import android.os.Parcelable import androidx.compose.runtime.Immutable import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.core.ui.UIText @Parcelize @Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/category/Category.kt b/app/src/main/java/ua/acclorite/book_story/domain/library/Category.kt similarity index 84% rename from app/src/main/java/ua/acclorite/book_story/domain/library/category/Category.kt rename to app/src/main/java/ua/acclorite/book_story/domain/library/Category.kt index b58c17a9..4d243159 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/category/Category.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/library/Category.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.category +package ua.acclorite.book_story.domain.library import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/category/CategorySort.kt b/app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt similarity index 72% rename from app/src/main/java/ua/acclorite/book_story/domain/library/category/CategorySort.kt rename to app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt index 20ffca8e..f1e59d53 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/category/CategorySort.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.category +package ua.acclorite.book_story.domain.library import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder @Immutable data class CategorySort( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ColorPreset.kt b/app/src/main/java/ua/acclorite/book_story/domain/reader/ColorPreset.kt index fdabd137..c7336937 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ColorPreset.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/reader/ColorPreset.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.reader import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.util.Selected +import ua.acclorite.book_story.core.Selected @Immutable data class ColorPreset( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt index dd647021..988c8d27 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt @@ -6,10 +6,10 @@ package ua.acclorite.book_story.domain.repository -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.book.BookWithCover +import ua.acclorite.book_story.core.CoverImage +import ua.acclorite.book_story.data.model.library.BookWithCover +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.domain.util.CoverImage interface BookRepository { diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/CategoryRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/CategoryRepository.kt index 358dd678..e0d4dfbb 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/repository/CategoryRepository.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/CategoryRepository.kt @@ -6,8 +6,8 @@ package ua.acclorite.book_story.domain.repository -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort interface CategoryRepository { diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt index 610c45e3..8e30a808 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt @@ -6,17 +6,16 @@ package ua.acclorite.book_story.domain.repository -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.NullableBook +import ua.acclorite.book_story.data.model.common.NullableBook +import ua.acclorite.book_story.domain.file.File interface FileSystemRepository { suspend fun getFiles( query: String = "" - ): List + ): List suspend fun getBookFromFile( - cachedFile: CachedFile + file: File ): NullableBook } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBooks.kt index f3d3cee8..a97c293c 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBooks.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBooks.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.book -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.repository.BookRepository import ua.acclorite.book_story.domain.repository.HistoryRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookById.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookById.kt index eed8e0cf..23b3e1d5 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookById.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookById.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.book -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.repository.BookRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBooks.kt index 9e951303..cb12d117 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBooks.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBooks.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.book -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.repository.BookRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBooksById.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBooksById.kt index e84d6a37..03c5fcc9 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBooksById.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBooksById.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.book -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.repository.BookRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/InsertBook.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/InsertBook.kt index 18af20f7..d9c85d5d 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/InsertBook.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/InsertBook.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.book -import ua.acclorite.book_story.domain.library.book.BookWithCover +import ua.acclorite.book_story.data.model.library.BookWithCover import ua.acclorite.book_story.domain.repository.BookRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBook.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBook.kt index 451c70b0..23076651 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBook.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBook.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.book -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.repository.BookRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateCoverImageOfBook.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateCoverImageOfBook.kt index 54cd71cc..2ea11a87 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateCoverImageOfBook.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateCoverImageOfBook.kt @@ -6,9 +6,9 @@ package ua.acclorite.book_story.domain.use_case.book -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.core.CoverImage +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.repository.BookRepository -import ua.acclorite.book_story.domain.util.CoverImage import javax.inject.Inject class UpdateCoverImageOfBook @Inject constructor( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategory.kt index fd0cad50..8b8810ac 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategory.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.category -import ua.acclorite.book_story.domain.library.category.Category +import ua.acclorite.book_story.domain.library.Category import ua.acclorite.book_story.domain.repository.CategoryRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategories.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategories.kt index 3162d0ef..7742db96 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategories.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategories.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.category -import ua.acclorite.book_story.domain.library.category.Category +import ua.acclorite.book_story.domain.library.Category import ua.acclorite.book_story.domain.repository.CategoryRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategorySort.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategorySort.kt index 451c669b..83288641 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategorySort.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategorySort.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.category -import ua.acclorite.book_story.domain.library.category.CategorySort +import ua.acclorite.book_story.domain.library.CategorySort import ua.acclorite.book_story.domain.repository.CategoryRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/InsertCategory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/InsertCategory.kt index 10a5f0f3..6bfe963b 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/InsertCategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/InsertCategory.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.category -import ua.acclorite.book_story.domain.library.category.Category +import ua.acclorite.book_story.domain.library.Category import ua.acclorite.book_story.domain.repository.CategoryRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryOrder.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryOrder.kt index ea29aac2..66946145 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryOrder.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryOrder.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.category -import ua.acclorite.book_story.domain.library.category.Category +import ua.acclorite.book_story.domain.library.Category import ua.acclorite.book_story.domain.repository.CategoryRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategorySort.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategorySort.kt index 3216a4a9..7c62af4b 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategorySort.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategorySort.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.category -import ua.acclorite.book_story.domain.library.category.CategorySort +import ua.acclorite.book_story.domain.library.CategorySort import ua.acclorite.book_story.domain.repository.CategoryRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/ChangeLanguage.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/ChangeLanguage.kt index 91c9078c..18dc1868 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/ChangeLanguage.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/ChangeLanguage.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.domain.use_case.data_store import androidx.appcompat.app.AppCompatDelegate import androidx.core.os.LocaleListCompat import ua.acclorite.book_story.domain.repository.DataStoreRepository -import ua.acclorite.book_story.presentation.core.constants.DataStoreConstants +import ua.acclorite.book_story.presentation.common.constants.DataStoreConstants import javax.inject.Inject class ChangeLanguage @Inject constructor( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFile.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFile.kt index 794f3bfa..cd9ca4dd 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFile.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFile.kt @@ -6,8 +6,8 @@ package ua.acclorite.book_story.domain.use_case.file_system -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.library.book.NullableBook +import ua.acclorite.book_story.data.model.common.NullableBook +import ua.acclorite.book_story.domain.file.File import ua.acclorite.book_story.domain.repository.FileSystemRepository import javax.inject.Inject @@ -15,7 +15,7 @@ class GetBookFromFile @Inject constructor( private val repository: FileSystemRepository ) { - suspend fun execute(cachedFile: CachedFile): NullableBook { - return repository.getBookFromFile(cachedFile) + suspend fun execute(file: File): NullableBook { + return repository.getBookFromFile(file) } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFiles.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFiles.kt index 901b6f4a..39106233 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFiles.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFiles.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.file_system -import ua.acclorite.book_story.domain.browse.file.SelectableFile +import ua.acclorite.book_story.domain.file.File import ua.acclorite.book_story.domain.repository.FileSystemRepository import javax.inject.Inject @@ -14,7 +14,7 @@ class GetFiles @Inject constructor( private val repository: FileSystemRepository ) { - suspend fun execute(query: String): List { + suspend fun execute(query: String): List { return repository.getFiles(query) } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadgeItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadgeItem.kt index 7fbfcea1..61189d17 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadgeItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadgeItem.kt @@ -11,8 +11,8 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.about.Badge -import ua.acclorite.book_story.presentation.core.components.common.IconButton +import ua.acclorite.book_story.presentation.about.model.Badge +import ua.acclorite.book_story.presentation.common.components.common.IconButton @Composable fun AboutBadgeItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadges.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadges.kt index 9a9d989f..549149f7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadges.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadges.kt @@ -18,8 +18,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.constants.provideAboutBadges -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.constants.provideAboutBadges +import ua.acclorite.book_story.presentation.common.util.showToast import ua.acclorite.book_story.ui.about.AboutEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutItem.kt index 329983f0..6817428a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutItem.kt @@ -16,7 +16,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun AboutItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutLayout.kt index d723e9e0..73149f18 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutLayout.kt @@ -26,12 +26,12 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.provideContributorsPage -import ua.acclorite.book_story.presentation.core.constants.provideIssuesPage -import ua.acclorite.book_story.presentation.core.constants.provideReleasesPage -import ua.acclorite.book_story.presentation.core.constants.provideSupportPage -import ua.acclorite.book_story.presentation.core.constants.provideTranslationPage +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.provideContributorsPage +import ua.acclorite.book_story.presentation.common.constants.provideIssuesPage +import ua.acclorite.book_story.presentation.common.constants.provideReleasesPage +import ua.acclorite.book_story.presentation.common.constants.provideSupportPage +import ua.acclorite.book_story.presentation.common.constants.provideTranslationPage import ua.acclorite.book_story.ui.about.AboutEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutTopBar.kt index c6f31908..41afa8dd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/domain/about/Badge.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/model/Badge.kt similarity index 90% rename from app/src/main/java/ua/acclorite/book_story/domain/about/Badge.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/about/model/Badge.kt index 124e5fbc..c5d1d180 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/about/Badge.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/model/Badge.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.about +package ua.acclorite.book_story.presentation.about.model import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/app/src/main/java/ua/acclorite/book_story/domain/about/Credit.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/model/Credit.kt similarity index 76% rename from app/src/main/java/ua/acclorite/book_story/domain/about/Credit.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/about/model/Credit.kt index 86c516ff..c9d403cf 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/about/Credit.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/model/Credit.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.about +package ua.acclorite.book_story.presentation.about.model import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.core.ui.UIText @Immutable data class Credit( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoAuthorDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoAuthorDialog.kt index 11b38a70..c1f2dba7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoAuthorDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoAuthorDialog.kt @@ -9,9 +9,9 @@ package ua.acclorite.book_story.presentation.book_info import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.ui.UIText -import ua.acclorite.book_story.presentation.core.components.dialog.DialogWithTextField +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBottomSheet.kt index f04e1bb0..8d911c09 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBottomSheet.kt @@ -7,8 +7,8 @@ package ua.acclorite.book_story.presentation.book_info import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.util.BottomSheet +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.ui.book_info.BookInfoEvent import ua.acclorite.book_story.ui.book_info.BookInfoScreen diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheet.kt index b29d53a5..a31fae4f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheet.kt @@ -24,8 +24,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheetItem.kt index 9c28bded..9c4ac793 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheetItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheetItem.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun LazyItemScope.BookInfoChangeCoverBottomSheetItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoContent.kt index b388f6a8..db44472f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoContent.kt @@ -8,10 +8,10 @@ package ua.acclorite.book_story.presentation.book_info import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.util.BottomSheet -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.core.Dialog +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.library.Category import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDeleteDialog.kt index 58b8eeb2..6310a8e7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDeleteDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDeleteDialog.kt @@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.dialog.Dialog +import ua.acclorite.book_story.presentation.common.components.dialog.Dialog import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDescriptionDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDescriptionDialog.kt index dbeaeac6..d921fb31 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDescriptionDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDescriptionDialog.kt @@ -8,8 +8,8 @@ package ua.acclorite.book_story.presentation.book_info import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.dialog.DialogWithTextField +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheet.kt index d533122b..4ee6ebbb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheet.kt @@ -18,11 +18,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.file.CachedFileCompat -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet -import ua.acclorite.book_story.presentation.core.constants.provideExtensions +import ua.acclorite.book_story.data.model.file.CachedFileCompat +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet +import ua.acclorite.book_story.presentation.common.constants.provideExtensions import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle import ua.acclorite.book_story.ui.book_info.BookInfoEvent import java.text.SimpleDateFormat diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheetItem.kt index 56b3041d..fd191a61 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheetItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheetItem.kt @@ -22,8 +22,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun BookInfoDetailsBottomSheetItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDialog.kt index e9304362..9c346dc8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDialog.kt @@ -7,9 +7,9 @@ package ua.acclorite.book_story.presentation.book_info import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.Dialog +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.library.Category import ua.acclorite.book_story.ui.book_info.BookInfoEvent import ua.acclorite.book_story.ui.book_info.BookInfoScreen diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayout.kt index e513e5e6..ac3cbb20 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayout.kt @@ -17,9 +17,9 @@ import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActionsItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActionsItem.kt index 56cee770..452d3542 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActionsItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActionsItem.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun BookInfoLayoutActionsItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutBackground.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutBackground.kt index 438a7114..10310b02 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutBackground.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutBackground.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.AsyncCoverImage +import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage @Composable fun BookInfoLayoutBackground(height: Dp, image: Uri) { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutButton.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutButton.kt index 02d768d7..197fce7f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutButton.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutButton.kt @@ -15,9 +15,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.calculateProgress +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.calculateProgress @Composable fun BookInfoLayoutButton( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutDescription.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutDescription.kt index ebdec8b2..28740afa 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutDescription.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutDescription.kt @@ -39,9 +39,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.noRippleClickable import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfo.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfo.kt index 000c05cd..abeb2461 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfo.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfo.kt @@ -15,7 +15,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoAuthor.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoAuthor.kt index c81d6a71..2d776928 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoAuthor.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoAuthor.kt @@ -20,9 +20,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.noRippleClickable import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoCover.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoCover.kt index 98561659..aae70d67 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoCover.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoCover.kt @@ -25,9 +25,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.AsyncCoverImage -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage +import ua.acclorite.book_story.presentation.common.util.noRippleClickable import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoProgress.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoProgress.kt index abc4fea0..49b451c8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoProgress.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoProgress.kt @@ -17,9 +17,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.calculateProgress +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.calculateProgress @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoTitle.kt index 0e2d1ca2..91f79d41 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoTitle.kt @@ -10,9 +10,9 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.noRippleClickable import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoMoveDialog.kt index c27d0703..8be09cb2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoMoveDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoMoveDialog.kt @@ -18,11 +18,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.dialog.CheckboxDialogItem -import ua.acclorite.book_story.presentation.core.components.dialog.Dialog +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.dialog.CheckboxDialogItem +import ua.acclorite.book_story.presentation.common.components.dialog.Dialog import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoPathDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoPathDialog.kt index b23eb88c..eed31cf0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoPathDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoPathDialog.kt @@ -8,8 +8,8 @@ package ua.acclorite.book_story.presentation.book_info import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.dialog.DialogWithTextField +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScaffold.kt index 92901394..904c92f2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScaffold.kt @@ -16,7 +16,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTitleDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTitleDialog.kt index f73fa2c7..fc7d95a8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTitleDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTitleDialog.kt @@ -8,8 +8,8 @@ package ua.acclorite.book_story.presentation.book_info import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.dialog.DialogWithTextField +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField import ua.acclorite.book_story.ui.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTopBar.kt index 61d04164..9b5313e9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTopBar.kt @@ -15,11 +15,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.remember import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBar -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBarData +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton import ua.acclorite.book_story.ui.book_info.BookInfoEvent import ua.acclorite.book_story.ui.theme.DefaultTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialog.kt index f058cd6a..eeb8a584 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialog.kt @@ -20,12 +20,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.NullableBook -import ua.acclorite.book_story.domain.library.book.SelectableNullableBook -import ua.acclorite.book_story.presentation.core.components.dialog.Dialog -import ua.acclorite.book_story.presentation.core.components.progress_indicator.CircularProgressIndicator -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.data.model.common.NullableBook +import ua.acclorite.book_story.presentation.common.components.dialog.Dialog +import ua.acclorite.book_story.presentation.common.components.progress_indicator.CircularProgressIndicator +import ua.acclorite.book_story.presentation.common.util.showToast import ua.acclorite.book_story.ui.browse.BrowseEvent +import ua.acclorite.book_story.ui.library.model.SelectableNullableBook import java.util.UUID @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialogItem.kt index 9633c052..d0d7c087 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialogItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialogItem.kt @@ -24,10 +24,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.NullableBook -import ua.acclorite.book_story.domain.library.book.SelectableNullableBook -import ua.acclorite.book_story.presentation.core.components.common.CircularCheckbox -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.data.model.common.NullableBook +import ua.acclorite.book_story.presentation.common.components.common.CircularCheckbox +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.ui.library.model.SelectableNullableBook @Composable fun BrowseAddDialogItem(result: SelectableNullableBook, onClick: (Boolean) -> Unit) { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBottomSheet.kt index 0c016006..c0fa19c1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBottomSheet.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.presentation.browse import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.util.BottomSheet +import ua.acclorite.book_story.core.BottomSheet import ua.acclorite.book_story.ui.browse.BrowseEvent import ua.acclorite.book_story.ui.browse.BrowseScreen diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt index 5e6be7ac..22dec398 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt @@ -12,12 +12,12 @@ import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.pullrefresh.PullRefreshState import androidx.compose.runtime.Composable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.domain.library.book.SelectableNullableBook -import ua.acclorite.book_story.domain.util.BottomSheet -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.core.Dialog import ua.acclorite.book_story.ui.browse.BrowseEvent +import ua.acclorite.book_story.ui.browse.model.BrowseLayout +import ua.acclorite.book_story.ui.browse.model.SelectableFile +import ua.acclorite.book_story.ui.library.model.SelectableNullableBook import ua.acclorite.book_story.ui.main.MainEvent @OptIn(ExperimentalMaterialApi::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseDialog.kt index a83ded1f..5079cc69 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseDialog.kt @@ -7,10 +7,10 @@ package ua.acclorite.book_story.presentation.browse import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.book.SelectableNullableBook -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.Dialog import ua.acclorite.book_story.ui.browse.BrowseEvent import ua.acclorite.book_story.ui.browse.BrowseScreen +import ua.acclorite.book_story.ui.library.model.SelectableNullableBook @Composable fun BrowseDialog( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEmptyPlaceholder.kt index 66561103..a6a46d85 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEmptyPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEmptyPlaceholder.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.placeholder.EmptyPlaceholder +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.placeholder.EmptyPlaceholder import ua.acclorite.book_story.ui.theme.Transitions @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt index c8920dc2..31287e11 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt @@ -16,8 +16,8 @@ import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import kotlinx.coroutines.launch -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet import ua.acclorite.book_story.presentation.settings.browse.display.BrowseDisplaySubcategory import ua.acclorite.book_story.presentation.settings.browse.filter.BrowseFilterSubcategory import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt index eccf2e5e..7430064b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.presentation.browse import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheetTabRow +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheetTabRow @Composable fun BrowseFilterBottomSheetTabRow( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt index ba702843..19f13247 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt @@ -28,9 +28,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.presentation.core.components.common.CircularCheckbox -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.CircularCheckbox +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.ui.browse.model.SelectableFile import ua.acclorite.book_story.ui.theme.DefaultTransition import java.text.SimpleDateFormat import java.util.Date @@ -40,10 +40,10 @@ import java.util.Locale fun BrowseGridFileItem(file: SelectableFile, hasSelectedItems: Boolean) { val lastModified = rememberSaveable { SimpleDateFormat("dd MMM yyyy", Locale.getDefault()) - .format(Date(file.data.lastModified)) + .format(Date(file.lastModified)) } - val sizeBytes = rememberSaveable { file.data.size } + val sizeBytes = rememberSaveable { file.size } val fileSizeKB = rememberSaveable { if (sizeBytes > 0) sizeBytes.toDouble() / 1024.0 else 0.0 } @@ -94,7 +94,7 @@ fun BrowseGridFileItem(file: SelectableFile, hasSelectedItems: Boolean) { Spacer(modifier = Modifier.height(8.dp)) StyledText( - text = file.data.name, + text = file.name, style = MaterialTheme.typography.bodyLarge.copy( color = MaterialTheme.colorScheme.onSurface, textAlign = TextAlign.Center, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt index 9b00d653..ec0055fd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.browse.file.SelectableFile +import ua.acclorite.book_story.ui.browse.model.SelectableFile @Composable fun BrowseGridItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt index d4141707..be1d47a6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt @@ -17,11 +17,11 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.browse.file.GroupedFiles -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.presentation.core.components.common.LazyVerticalGridWithScrollbar -import ua.acclorite.book_story.presentation.core.components.common.header -import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyVerticalGridWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.header +import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar +import ua.acclorite.book_story.ui.browse.model.GroupedFiles +import ua.acclorite.book_story.ui.browse.model.SelectableFile @Composable fun BrowseGridLayout( @@ -49,7 +49,7 @@ fun BrowseGridLayout( items( group.files, - key = { it.data.path } + key = { it.path } ) { selectableFile -> Box(Modifier.animateItem()) { itemContent(selectableFile, group.files) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt index 91128c16..165e6f1d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt @@ -8,8 +8,8 @@ package ua.acclorite.book_story.presentation.browse import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.domain.browse.file.SelectableFile +import ua.acclorite.book_story.ui.browse.model.BrowseLayout +import ua.acclorite.book_story.ui.browse.model.SelectableFile @Composable fun BrowseItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt index ba5edc53..6c483117 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt @@ -10,9 +10,9 @@ import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.runtime.Composable import androidx.compose.runtime.remember -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.domain.browse.file.GroupedFiles -import ua.acclorite.book_story.domain.browse.file.SelectableFile +import ua.acclorite.book_story.ui.browse.model.BrowseLayout +import ua.acclorite.book_story.ui.browse.model.GroupedFiles +import ua.acclorite.book_story.ui.browse.model.SelectableFile import java.io.File @Composable @@ -29,7 +29,7 @@ fun BrowseLayout( ) { val groupedFiles = remember(files, pinnedPaths) { files.groupBy { file -> - file.data.path.substringBeforeLast(File.separator) + file.path.substringBeforeLast(File.separator) }.map { (header, files) -> GroupedFiles( header = header, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayoutHeader.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayoutHeader.kt index 4665f3b0..8da1ed9b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayoutHeader.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayoutHeader.kt @@ -23,8 +23,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.noRippleClickable @Composable fun BrowseLayoutHeader( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt index ec0a1644..12764ca5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt @@ -31,8 +31,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.ui.browse.model.SelectableFile import java.text.SimpleDateFormat import java.util.Date import java.util.Locale @@ -41,10 +41,10 @@ import java.util.Locale fun RowScope.BrowseListFileItem(file: SelectableFile) { val lastModified = rememberSaveable { SimpleDateFormat("HH:mm dd MMM yyyy", Locale.getDefault()) - .format(Date(file.data.lastModified)) + .format(Date(file.lastModified)) } - val sizeBytes = rememberSaveable { file.data.size } + val sizeBytes = rememberSaveable { file.size } val fileSizeKB = rememberSaveable { if (sizeBytes > 0) sizeBytes.toDouble() / 1024.0 else 0.0 } @@ -83,7 +83,7 @@ fun RowScope.BrowseListFileItem(file: SelectableFile) { Spacer(modifier = Modifier.width(12.dp)) Column(verticalArrangement = Arrangement.Center) { StyledText( - text = file.data.name, + text = file.name, modifier = Modifier.fillMaxWidth(), style = MaterialTheme.typography.bodyLarge.copy( color = MaterialTheme.colorScheme.onSurface, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt index 7cd62800..4939a653 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt @@ -21,8 +21,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.presentation.core.components.common.CircularCheckbox +import ua.acclorite.book_story.presentation.common.components.common.CircularCheckbox +import ua.acclorite.book_story.ui.browse.model.SelectableFile import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt index a82e1c51..fa858980 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt @@ -16,10 +16,10 @@ import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.browse.file.GroupedFiles -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar +import ua.acclorite.book_story.ui.browse.model.GroupedFiles +import ua.acclorite.book_story.ui.browse.model.SelectableFile @Composable fun BrowseListLayout( @@ -43,7 +43,7 @@ fun BrowseListLayout( items( group.files, - key = { it.data.path } + key = { it.path } ) { selectableFile -> Box(Modifier.animateItem()) { itemContent(selectableFile, group.files) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt index 50605bcb..ae3b3d06 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt @@ -19,9 +19,9 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.ui.browse.BrowseEvent +import ua.acclorite.book_story.ui.browse.model.BrowseLayout +import ua.acclorite.book_story.ui.browse.model.SelectableFile import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.theme.DefaultTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt index 6f8fd30d..1aaf85a3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt @@ -26,15 +26,15 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.SearchTextField -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBar -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBarData +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.SearchTextField +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData import ua.acclorite.book_story.presentation.navigator.NavigatorIconButton import ua.acclorite.book_story.ui.browse.BrowseEvent +import ua.acclorite.book_story.ui.browse.model.BrowseLayout +import ua.acclorite.book_story.ui.browse.model.SelectableFile @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/AnimatedVisibility.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AnimatedVisibility.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/AnimatedVisibility.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AnimatedVisibility.kt index 2a0479ab..66e9a9dd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/AnimatedVisibility.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AnimatedVisibility.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.EnterTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/AsyncCoverImage.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AsyncCoverImage.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/AsyncCoverImage.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AsyncCoverImage.kt index 2bb6eed8..7cde982d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/AsyncCoverImage.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AsyncCoverImage.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import android.net.Uri import androidx.compose.runtime.Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/CircularCheckbox.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/CircularCheckbox.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/CircularCheckbox.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/CircularCheckbox.kt index e99cef90..0ea00ed5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/CircularCheckbox.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/CircularCheckbox.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/HighlightedText.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/HighlightedText.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/HighlightedText.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/HighlightedText.kt index 47e96e9d..8ab05b23 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/HighlightedText.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/HighlightedText.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.foundation.text.BasicText import androidx.compose.runtime.Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/IconButton.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/IconButton.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/IconButton.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/IconButton.kt index a93e13dd..8378b3be 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/IconButton.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/IconButton.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyColumnWithScrollbar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyColumnWithScrollbar.kt similarity index 92% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyColumnWithScrollbar.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyColumnWithScrollbar.kt index 1faffd17..4cf2db2c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyColumnWithScrollbar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyColumnWithScrollbar.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -20,7 +20,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import my.nanihadesuka.compose.InternalLazyColumnScrollbar import my.nanihadesuka.compose.ScrollbarSettings -import ua.acclorite.book_story.presentation.core.constants.provideSecondaryScrollbar +import ua.acclorite.book_story.presentation.common.constants.provideSecondaryScrollbar @Composable fun LazyColumnWithScrollbar( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyGridHeader.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyGridHeader.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyGridHeader.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyGridHeader.kt index e337506e..8cbb637e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyGridHeader.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyGridHeader.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.foundation.lazy.grid.GridItemSpan import androidx.compose.foundation.lazy.grid.LazyGridItemScope diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyVerticalGridWithScrollbar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyVerticalGridWithScrollbar.kt similarity index 92% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyVerticalGridWithScrollbar.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyVerticalGridWithScrollbar.kt index c47fc47e..a24fb872 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/LazyVerticalGridWithScrollbar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyVerticalGridWithScrollbar.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import my.nanihadesuka.compose.InternalLazyVerticalGridScrollbar import my.nanihadesuka.compose.ScrollbarSettings -import ua.acclorite.book_story.presentation.core.constants.provideSecondaryScrollbar +import ua.acclorite.book_story.presentation.common.constants.provideSecondaryScrollbar @Composable fun LazyVerticalGridWithScrollbar( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SearchTextField.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SearchTextField.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SearchTextField.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SearchTextField.kt index 997162f3..365620dd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SearchTextField.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SearchTextField.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.foundation.layout.Box import androidx.compose.foundation.text.BasicTextField diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SelectionContainer.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SelectionContainer.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SelectionContainer.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SelectionContainer.kt index a3a46c99..a79142b1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SelectionContainer.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SelectionContainer.kt @@ -6,7 +6,7 @@ @file:Suppress("DEPRECATION") -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import android.content.ClipData import android.content.ClipboardManager diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Snackbar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Snackbar.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Snackbar.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Snackbar.kt index d3e901dd..2c18a4e4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Snackbar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Snackbar.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SpacedItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SpacedItem.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SpacedItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SpacedItem.kt index 1b5da207..87bdf649 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/SpacedItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SpacedItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/StyledText.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/StyledText.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/StyledText.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/StyledText.kt index cc5f6714..1deefa61 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/StyledText.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/StyledText.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.foundation.text.BasicText import androidx.compose.material3.LocalContentColor diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Tooltip.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Tooltip.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Tooltip.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Tooltip.kt index 69ba74ef..5c4cd49c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Tooltip.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Tooltip.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.common +package ua.acclorite.book_story.presentation.common.components.common import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.PlainTooltip diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/CheckboxDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/CheckboxDialogItem.kt similarity index 91% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/CheckboxDialogItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/CheckboxDialogItem.kt index bf1f83b3..57d7e4e3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/CheckboxDialogItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/CheckboxDialogItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.dialog +package ua.acclorite.book_story.presentation.common.components.dialog import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -19,7 +19,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun CheckboxDialogItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/Dialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/Dialog.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/Dialog.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/Dialog.kt index cb658cd5..e1158b77 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/Dialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/Dialog.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.dialog +package ua.acclorite.book_story.presentation.common.components.dialog import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animateDpAsState @@ -46,8 +46,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.window.DialogWindowProvider import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.StyledText @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/DialogWithTextField.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/DialogWithTextField.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/DialogWithTextField.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/DialogWithTextField.kt index 15b9b22d..e13397fb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/DialogWithTextField.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/DialogWithTextField.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.dialog +package ua.acclorite.book_story.presentation.common.components.dialog import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -25,7 +25,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun DialogWithTextField( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/SelectableDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/SelectableDialogItem.kt similarity index 92% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/SelectableDialogItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/SelectableDialogItem.kt index bba6db9b..feb6c5b5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/dialog/SelectableDialogItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/SelectableDialogItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.dialog +package ua.acclorite.book_story.presentation.common.components.dialog import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -21,7 +21,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun SelectableDialogItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_bottom_sheet/ModalBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheet.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_bottom_sheet/ModalBottomSheet.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheet.kt index e9841382..899d68b4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_bottom_sheet/ModalBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheet.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet +package ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.ColumnScope diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt similarity index 91% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt index 97f5a8fc..8bc01bc9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet +package ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.ExperimentalMaterial3Api @@ -14,7 +14,7 @@ import androidx.compose.material3.Tab import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText /** * Primary Tab Row. Used in BottomSheet in pair with HorizontalPager. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawer.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawer.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawer.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawer.kt index 754309b3..4398ebae 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawer.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.modal_drawer +package ua.acclorite.book_story.presentation.common.components.modal_drawer import androidx.activity.compose.BackHandler import androidx.compose.animation.core.animateDpAsState @@ -39,10 +39,10 @@ import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar +import ua.acclorite.book_story.presentation.common.util.noRippleClickable /** * Modal Drawer. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawerSelectableItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerSelectableItem.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawerSelectableItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerSelectableItem.kt index d427d2fb..a5105551 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawerSelectableItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerSelectableItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.modal_drawer +package ua.acclorite.book_story.presentation.common.components.modal_drawer import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -23,7 +23,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.util.Selected +import ua.acclorite.book_story.core.Selected /** * Modal Drawer Selectable Item. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawerTitleItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerTitleItem.kt similarity index 90% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawerTitleItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerTitleItem.kt index 3d6e3376..764142a0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/modal_drawer/ModalDrawerTitleItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerTitleItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.modal_drawer +package ua.acclorite.book_story.presentation.common.components.modal_drawer import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -17,7 +17,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText /** * Modal Drawer Title Item. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_bar/NavigationBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBar.kt similarity index 89% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_bar/NavigationBar.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBar.kt index f3530b04..711a4eaf 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_bar/NavigationBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBar.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.navigation_bar +package ua.acclorite.book_story.presentation.common.components.navigation_bar import androidx.compose.material3.NavigationBar import androidx.compose.runtime.Composable @@ -12,8 +12,8 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.lifecycle.compose.collectAsStateWithLifecycle -import ua.acclorite.book_story.domain.navigator.NavigatorItem import ua.acclorite.book_story.presentation.navigator.LocalNavigator +import ua.acclorite.book_story.ui.navigator.NavigatorItem @Composable fun NavigationBar(tabs: List) { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_bar/NavigationBarItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBarItem.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_bar/NavigationBarItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBarItem.kt index d5becc8d..a9f1382a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_bar/NavigationBarItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBarItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.navigation_bar +package ua.acclorite.book_story.presentation.common.components.navigation_bar import androidx.compose.animation.Crossfade import androidx.compose.animation.core.tween @@ -17,9 +17,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.navigator.NavigatorItem -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.common.Tooltip +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.Tooltip +import ua.acclorite.book_story.ui.navigator.NavigatorItem @Composable fun RowScope.NavigationBarItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_rail/NavigationRail.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRail.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_rail/NavigationRail.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRail.kt index fd474a6e..96a138d4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_rail/NavigationRail.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRail.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.navigation_rail +package ua.acclorite.book_story.presentation.common.components.navigation_rail import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -28,8 +28,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import ua.acclorite.book_story.domain.navigator.NavigatorItem import ua.acclorite.book_story.presentation.navigator.LocalNavigator +import ua.acclorite.book_story.ui.navigator.NavigatorItem @Composable fun NavigationRail(tabs: List) { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_rail/NavigationRailItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRailItem.kt similarity index 87% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_rail/NavigationRailItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRailItem.kt index b673475c..a2c5796a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/navigation_rail/NavigationRailItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRailItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.navigation_rail +package ua.acclorite.book_story.presentation.common.components.navigation_rail import androidx.compose.animation.Crossfade import androidx.compose.animation.core.tween @@ -16,9 +16,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.navigator.NavigatorItem -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.common.Tooltip +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.Tooltip +import ua.acclorite.book_story.ui.navigator.NavigatorItem @Composable fun NavigationRailItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/placeholder/EmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/EmptyPlaceholder.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/placeholder/EmptyPlaceholder.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/EmptyPlaceholder.kt index 36eeef12..72c2c79b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/placeholder/EmptyPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/EmptyPlaceholder.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.placeholder +package ua.acclorite.book_story.presentation.common.components.placeholder import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -24,7 +24,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/placeholder/ErrorPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/ErrorPlaceholder.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/placeholder/ErrorPlaceholder.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/ErrorPlaceholder.kt index 81c08c87..5c0339a3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/placeholder/ErrorPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/ErrorPlaceholder.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.placeholder +package ua.acclorite.book_story.presentation.common.components.placeholder import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -24,7 +24,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText /** * Empty placeholder. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/progress_indicator/CircularProgressIndicator.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/progress_indicator/CircularProgressIndicator.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/progress_indicator/CircularProgressIndicator.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/progress_indicator/CircularProgressIndicator.kt index bd5b08b1..b4b1d80f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/progress_indicator/CircularProgressIndicator.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/progress_indicator/CircularProgressIndicator.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.progress_indicator +package ua.acclorite.book_story.presentation.common.components.progress_indicator import androidx.compose.material3.CircularWavyProgressIndicator import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/ChipsWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ChipsWithTitle.kt similarity index 90% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/ChipsWithTitle.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ChipsWithTitle.kt index 1715b286..f83d832c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/ChipsWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ChipsWithTitle.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.settings +package ua.acclorite.book_story.presentation.common.components.settings import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -18,8 +18,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/ColorPickerWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ColorPickerWithTitle.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/ColorPickerWithTitle.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ColorPickerWithTitle.kt index d2485bbd..a519fddd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/ColorPickerWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ColorPickerWithTitle.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.settings +package ua.acclorite.book_story.presentation.common.components.settings import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -36,7 +36,7 @@ import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.debounce import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.IconButton import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle @OptIn(FlowPreview::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SegmentedButtonWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SegmentedButtonWithTitle.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SegmentedButtonWithTitle.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SegmentedButtonWithTitle.kt index 1f212aae..a1c8aa72 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SegmentedButtonWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SegmentedButtonWithTitle.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.settings +package ua.acclorite.book_story.presentation.common.components.settings import androidx.compose.animation.expandHorizontally import androidx.compose.animation.fadeIn @@ -42,9 +42,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SliderWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SliderWithTitle.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SliderWithTitle.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SliderWithTitle.kt index 9ad1fa76..5bdc5ece 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SliderWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SliderWithTitle.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.settings +package ua.acclorite.book_story.presentation.common.components.settings import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Column @@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle import kotlin.math.roundToInt diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SwitchWIthTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SwitchWIthTitle.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SwitchWIthTitle.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SwitchWIthTitle.kt index 156c9501..617b1cd2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SwitchWIthTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SwitchWIthTitle.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.settings +package ua.acclorite.book_story.presentation.common.components.settings import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -23,7 +23,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText /** * Checkbox with title. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt index a49a64df..c3e54ce5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.top_bar +package ua.acclorite.book_story.presentation.common.components.top_bar import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/top_bar/TopAppBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/TopAppBar.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/components/top_bar/TopAppBar.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/TopAppBar.kt index 5a159035..79ea17f6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/top_bar/TopAppBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/TopAppBar.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.components.top_bar +package ua.acclorite.book_story.presentation.common.components.top_bar import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animateFloatAsState @@ -28,8 +28,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.lerp -import ua.acclorite.book_story.domain.util.ID -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility +import ua.acclorite.book_story.core.ID +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility data class TopAppBarData( val contentID: ID, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/AboutBadgeConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/AboutBadgeConstants.kt similarity index 90% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/AboutBadgeConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/AboutBadgeConstants.kt index 30942c86..5a4c18b6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/AboutBadgeConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/AboutBadgeConstants.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.about.Badge +import ua.acclorite.book_story.presentation.about.model.Badge fun provideAboutBadges() = listOf( Badge( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/CommonConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CommonConstants.kt similarity index 84% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/CommonConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CommonConstants.kt index 5101a345..d559e618 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/CommonConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CommonConstants.kt @@ -6,12 +6,12 @@ @file:Suppress("SameReturnValue") -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.reader.ColorPreset -import ua.acclorite.book_story.domain.ui.UIText // Main State fun provideMainState() = "main_state" diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/CreditConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CreditConstants.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/CreditConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CreditConstants.kt index 69097856..50c4aeb5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/CreditConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CreditConstants.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.about.Credit -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.presentation.about.model.Credit fun provideCredits() = listOf( Credit( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/DataStoreConstants.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/DataStoreConstants.kt index b271fd0f..b697b935 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/DataStoreConstants.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.doublePreferencesKey diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/FontConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/FontConstants.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/FontConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/FontConstants.kt index e0dccba0..eefac181 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/FontConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/FontConstants.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants import androidx.annotation.FontRes import androidx.compose.ui.text.ExperimentalTextApi @@ -14,8 +14,8 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontVariation import androidx.compose.ui.text.font.FontWeight import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.FontWithName -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.presentation.reader.model.FontWithName fun provideFonts(): List { return mutableListOf( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/HelpTipConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/HelpTipConstants.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/HelpTipConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/HelpTipConstants.kt index 6f90e8be..17d1cc88 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/HelpTipConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/HelpTipConstants.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.help.HelpTip import ua.acclorite.book_story.presentation.help.HelpAnnotation +import ua.acclorite.book_story.presentation.help.model.HelpTip fun provideHelpTips() = listOf( HelpTip( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/LanguageConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LanguageConstants.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/LanguageConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LanguageConstants.kt index b835e8eb..285272e0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/LanguageConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LanguageConstants.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants fun provideLanguages() = listOf( Pair("en", "English"), diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/LinkConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LinkConstants.kt similarity index 90% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/LinkConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LinkConstants.kt index c7b66566..25e38b20 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/LinkConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LinkConstants.kt @@ -6,7 +6,7 @@ @file:Suppress("SameReturnValue") -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants fun provideReleasesPage() = "https://www.github.com/Acclorite/book-story/releases/latest" diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/ScrollbarConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/ScrollbarConstants.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/ScrollbarConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/ScrollbarConstants.kt index 1df9a01f..6c907d20 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/ScrollbarConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/ScrollbarConstants.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/SupportedExtensionConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/SupportedExtensionConstants.kt similarity index 85% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/constants/SupportedExtensionConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/constants/SupportedExtensionConstants.kt index 6cf8101c..f4a38bd2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/SupportedExtensionConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/SupportedExtensionConstants.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.constants +package ua.acclorite.book_story.presentation.common.constants fun provideExtensions() = listOf( ".epub", diff --git a/app/src/main/java/ua/acclorite/book_story/domain/ui/ButtonItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/model/ButtonItem.kt similarity index 86% rename from app/src/main/java/ua/acclorite/book_story/domain/ui/ButtonItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/model/ButtonItem.kt index 5cbda653..5984f473 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/ui/ButtonItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/model/ButtonItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.ui +package ua.acclorite.book_story.presentation.common.model import androidx.compose.runtime.Immutable import androidx.compose.ui.text.TextStyle @@ -15,4 +15,4 @@ data class ButtonItem( val title: String, val textStyle: TextStyle, val selected: Boolean -) +) \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/Direction.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/model/Direction.kt similarity index 81% rename from app/src/main/java/ua/acclorite/book_story/domain/util/Direction.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/model/Direction.kt index b23ecc72..fbca8c28 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/Direction.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/model/Direction.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.util +package ua.acclorite.book_story.presentation.common.model import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/Position.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/model/Position.kt similarity index 81% rename from app/src/main/java/ua/acclorite/book_story/domain/util/Position.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/model/Position.kt index bd014f67..83c1c737 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/Position.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/model/Position.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.util +package ua.acclorite.book_story.presentation.common.model import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/CollectionExtensions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/CollectionExtensions.kt similarity index 80% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/util/CollectionExtensions.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/util/CollectionExtensions.kt index 9525854f..4710a9a2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/CollectionExtensions.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/CollectionExtensions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.util +package ua.acclorite.book_story.presentation.common.util fun MutableList.addAll(calculation: () -> List) { addAll(calculation()) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/LifecycleExtensions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/LifecycleExtensions.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/util/LifecycleExtensions.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/util/LifecycleExtensions.kt index 0d73f898..98958d23 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/LifecycleExtensions.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/LifecycleExtensions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.util +package ua.acclorite.book_story.presentation.common.util import android.annotation.SuppressLint import android.content.Intent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/ModifierExtensions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/ModifierExtensions.kt similarity index 91% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/util/ModifierExtensions.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/util/ModifierExtensions.kt index 0b5a1e17..74357efb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/ModifierExtensions.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/ModifierExtensions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.util +package ua.acclorite.book_story.presentation.common.util import androidx.compose.foundation.combinedClickable import androidx.compose.ui.Modifier diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/PrimitiveExtensions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/PrimitiveExtensions.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/util/PrimitiveExtensions.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/util/PrimitiveExtensions.kt index ffdc9fff..bafe5333 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/PrimitiveExtensions.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/PrimitiveExtensions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.util +package ua.acclorite.book_story.presentation.common.util fun String.removeTrailingZero(): String { if (!this.contains('.')) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/ToastExtensions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/ToastExtensions.kt similarity index 89% rename from app/src/main/java/ua/acclorite/book_story/presentation/core/util/ToastExtensions.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/common/util/ToastExtensions.kt index d7098bb9..3d76f3ee 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/ToastExtensions.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/common/util/ToastExtensions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.core.util +package ua.acclorite.book_story.presentation.common.util import android.content.Context import android.widget.Toast diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashBottomBar.kt index 27988d79..8141674e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashBottomBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashBottomBar.kt @@ -23,7 +23,7 @@ import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun CrashBottomBar( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashContent.kt index 470e52fc..d4c8b662 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashContent.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun CrashContent( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashLayout.kt index bf672ece..7ab9fb45 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashLayout.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun CrashLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScaffold.kt index de44c0f6..59e52742 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScaffold.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun CrashScaffold( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditItem.kt index 4bbbc45a..8c2c0743 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditItem.kt @@ -22,8 +22,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.about.Credit -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.about.model.Credit +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun CreditItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsLayout.kt index c9c4ec53..b14f64ac 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsLayout.kt @@ -14,8 +14,8 @@ import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.provideCredits +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.provideCredits import ua.acclorite.book_story.ui.about.AboutEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsTopBar.kt index d4eeb2a6..f9096fb4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpBottomBar.kt index 7ba0976e..468dcde3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpBottomBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpBottomBar.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.ui.browse.BrowseScreen import ua.acclorite.book_story.ui.main.MainEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpItem.kt index e17195ff..80757c26 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpItem.kt @@ -38,10 +38,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.help.HelpTip -import ua.acclorite.book_story.domain.util.Position -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.model.Position +import ua.acclorite.book_story.presentation.common.util.noRippleClickable +import ua.acclorite.book_story.presentation.help.model.HelpTip import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpLayout.kt index 5645406f..6be890be 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpLayout.kt @@ -14,9 +14,9 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.util.Position -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.provideHelpTips +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.provideHelpTips +import ua.acclorite.book_story.presentation.common.model.Position @Composable fun HelpLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpTopBar.kt index b72e4ae1..5a9feb4f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpTopBar.kt @@ -16,8 +16,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/domain/help/HelpTip.kt b/app/src/main/java/ua/acclorite/book_story/presentation/help/model/HelpTip.kt similarity index 89% rename from app/src/main/java/ua/acclorite/book_story/domain/help/HelpTip.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/help/model/HelpTip.kt index 85495192..8408e614 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/help/HelpTip.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/help/model/HelpTip.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.help +package ua.acclorite.book_story.presentation.help.model import androidx.annotation.StringRes import androidx.compose.runtime.Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryContent.kt index 45c3e8a9..b855da51 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryContent.kt @@ -12,9 +12,9 @@ import androidx.compose.material.pullrefresh.PullRefreshState import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.history.GroupedHistory -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.Dialog import ua.acclorite.book_story.ui.history.HistoryEvent +import ua.acclorite.book_story.ui.history.model.GroupedHistory @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDeleteWholeHistoryDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDeleteWholeHistoryDialog.kt index 18b86455..4fc1eef4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDeleteWholeHistoryDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDeleteWholeHistoryDialog.kt @@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.dialog.Dialog +import ua.acclorite.book_story.presentation.common.components.dialog.Dialog import ua.acclorite.book_story.ui.history.HistoryEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDialog.kt index bfab0ed2..6751768c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDialog.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.presentation.history import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.Dialog import ua.acclorite.book_story.ui.history.HistoryEvent import ua.acclorite.book_story.ui.history.HistoryScreen diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEmptyPlaceholder.kt index 0a8f2d71..81daeccb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEmptyPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEmptyPlaceholder.kt @@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.placeholder.EmptyPlaceholder +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.placeholder.EmptyPlaceholder import ua.acclorite.book_story.ui.theme.Transitions @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryItem.kt index 1b112d49..8989e215 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryItem.kt @@ -37,10 +37,10 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.history.History -import ua.acclorite.book_story.presentation.core.components.common.AsyncCoverImage -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.noRippleClickable import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryLayout.kt index 49e2a64a..1603dadf 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryLayout.kt @@ -17,12 +17,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.history.GroupedHistory -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar -import ua.acclorite.book_story.presentation.core.util.LocalActivity +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar +import ua.acclorite.book_story.presentation.common.util.LocalActivity import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle import ua.acclorite.book_story.ui.history.HistoryEvent +import ua.acclorite.book_story.ui.history.model.GroupedHistory import ua.acclorite.book_story.ui.theme.DefaultTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScaffold.kt index f858d537..0d91e723 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScaffold.kt @@ -19,9 +19,9 @@ import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.history.GroupedHistory -import ua.acclorite.book_story.presentation.core.components.common.Snackbar +import ua.acclorite.book_story.presentation.common.components.common.Snackbar import ua.acclorite.book_story.ui.history.HistoryEvent +import ua.acclorite.book_story.ui.history.model.GroupedHistory @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryTopBar.kt index 506043be..0bd8e819 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryTopBar.kt @@ -18,11 +18,11 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.SearchTextField -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBar -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBarData +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.SearchTextField +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData import ua.acclorite.book_story.presentation.navigator.NavigatorIconButton import ua.acclorite.book_story.ui.history.HistoryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBackHandler.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBackHandler.kt index 0d51f02d..50931fd0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBackHandler.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBackHandler.kt @@ -14,8 +14,8 @@ import androidx.compose.runtime.saveable.rememberSaveable import kotlinx.coroutines.delay import kotlinx.coroutines.launch import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.util.LocalActivity -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.util.LocalActivity +import ua.acclorite.book_story.presentation.common.util.showToast import ua.acclorite.book_story.ui.library.LibraryEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBottomSheet.kt index 7dc1e1b9..f46213d4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBottomSheet.kt @@ -8,12 +8,12 @@ package ua.acclorite.book_story.presentation.library import androidx.compose.foundation.pager.PagerState import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder -import ua.acclorite.book_story.domain.util.BottomSheet +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort import ua.acclorite.book_story.ui.library.LibraryEvent import ua.acclorite.book_story.ui.library.LibraryScreen +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.settings.SettingsEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryContent.kt index debd4aa0..b27cfa9d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryContent.kt @@ -11,15 +11,15 @@ import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.pullrefresh.PullRefreshState import androidx.compose.runtime.Composable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort -import ua.acclorite.book_story.domain.library.display.LibraryLayout -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder -import ua.acclorite.book_story.domain.library.display.LibraryTitlePosition -import ua.acclorite.book_story.domain.util.BottomSheet -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.core.Dialog +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort import ua.acclorite.book_story.ui.library.LibraryEvent +import ua.acclorite.book_story.ui.library.model.LibraryLayout +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder +import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition +import ua.acclorite.book_story.ui.library.model.SelectableBook import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.settings.SettingsEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDeleteDialog.kt index 76b6d453..7616edf0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDeleteDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDeleteDialog.kt @@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.dialog.Dialog +import ua.acclorite.book_story.presentation.common.components.dialog.Dialog import ua.acclorite.book_story.ui.library.LibraryEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDialog.kt index b90d147b..37e5696b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDialog.kt @@ -7,11 +7,11 @@ package ua.acclorite.book_story.presentation.library import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.Dialog +import ua.acclorite.book_story.domain.library.Category import ua.acclorite.book_story.ui.library.LibraryEvent import ua.acclorite.book_story.ui.library.LibraryScreen +import ua.acclorite.book_story.ui.library.model.SelectableBook @Composable fun LibraryDialog( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEmptyPlaceholder.kt index e82fdf72..87376563 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEmptyPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEmptyPlaceholder.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.placeholder.EmptyPlaceholder +import ua.acclorite.book_story.presentation.common.components.placeholder.EmptyPlaceholder import ua.acclorite.book_story.ui.theme.Transitions @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheet.kt index 881fca21..6deaa11a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheet.kt @@ -22,15 +22,15 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet import ua.acclorite.book_story.presentation.settings.library.display.LibraryDisplaySubcategory import ua.acclorite.book_story.presentation.settings.library.sort.components.LibrarySortOption import ua.acclorite.book_story.presentation.settings.library.tabs.LibraryTabsSubcategory import ua.acclorite.book_story.ui.library.LibraryEvent +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.settings.SettingsEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheetTabRow.kt index fecfd70f..fa25bb27 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheetTabRow.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheetTabRow.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.presentation.library import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheetTabRow +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheetTabRow @Composable fun LibraryFilterBottomSheetTabRow( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridItem.kt index 94fca0f3..b451d448 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridItem.kt @@ -39,11 +39,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.display.LibraryTitlePosition -import ua.acclorite.book_story.presentation.core.components.common.AsyncCoverImage -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.calculateProgress +import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.calculateProgress +import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition +import ua.acclorite.book_story.ui.library.model.SelectableBook @Composable fun LibraryGridItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridLayout.kt index 88560b8b..11c483c4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridLayout.kt @@ -14,9 +14,9 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.presentation.core.components.common.LazyVerticalGridWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyVerticalGridWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar +import ua.acclorite.book_story.ui.library.model.SelectableBook @Composable fun LibraryGridLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryItem.kt index 00e4a242..ad6e1b4e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryItem.kt @@ -7,9 +7,9 @@ package ua.acclorite.book_story.presentation.library import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.display.LibraryLayout -import ua.acclorite.book_story.domain.library.display.LibraryTitlePosition +import ua.acclorite.book_story.ui.library.model.LibraryLayout +import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition +import ua.acclorite.book_story.ui.library.model.SelectableBook @Composable fun LibraryItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryLayout.kt index f3579895..9a72ee89 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryLayout.kt @@ -7,8 +7,8 @@ package ua.acclorite.book_story.presentation.library import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.display.LibraryLayout +import ua.acclorite.book_story.ui.library.model.LibraryLayout +import ua.acclorite.book_story.ui.library.model.SelectableBook @Composable fun LibraryLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListItem.kt index 46852095..c29cdd69 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListItem.kt @@ -33,10 +33,10 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.presentation.core.components.common.AsyncCoverImage -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.calculateProgress +import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.calculateProgress +import ua.acclorite.book_story.ui.library.model.SelectableBook @Composable fun LibraryListItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListLayout.kt index 6f4d8982..0ebdd8fd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListLayout.kt @@ -13,9 +13,9 @@ import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar +import ua.acclorite.book_story.ui.library.model.SelectableBook @Composable fun LibraryListLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryMoveDialog.kt index b6958546..fd23d79d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryMoveDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryMoveDialog.kt @@ -18,12 +18,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.dialog.CheckboxDialogItem -import ua.acclorite.book_story.presentation.core.components.dialog.Dialog +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.dialog.CheckboxDialogItem +import ua.acclorite.book_story.presentation.common.components.dialog.Dialog import ua.acclorite.book_story.ui.library.LibraryEvent +import ua.acclorite.book_story.ui.library.model.SelectableBook @Composable fun LibraryMoveDialog( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryPager.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryPager.kt index 0a73826c..8a5fdc53 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryPager.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryPager.kt @@ -14,14 +14,14 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort -import ua.acclorite.book_story.domain.library.display.LibraryLayout -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder -import ua.acclorite.book_story.domain.library.display.LibraryTitlePosition -import ua.acclorite.book_story.presentation.core.util.compareByWithOrder +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.presentation.common.util.compareByWithOrder import ua.acclorite.book_story.ui.library.LibraryEvent +import ua.acclorite.book_story.ui.library.model.LibraryLayout +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder +import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition +import ua.acclorite.book_story.ui.library.model.SelectableBook import ua.acclorite.book_story.ui.theme.DefaultTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScaffold.kt index 3ce87923..20649e52 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScaffold.kt @@ -18,13 +18,13 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort -import ua.acclorite.book_story.domain.library.display.LibraryLayout -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder -import ua.acclorite.book_story.domain.library.display.LibraryTitlePosition +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort import ua.acclorite.book_story.ui.library.LibraryEvent +import ua.acclorite.book_story.ui.library.model.LibraryLayout +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder +import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition +import ua.acclorite.book_story.ui.library.model.SelectableBook @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTabs.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTabs.kt index ce84456c..a4e0ec83 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTabs.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTabs.kt @@ -29,8 +29,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun LibraryTabs( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTopBar.kt index 3093a44a..eead481c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTopBar.kt @@ -40,16 +40,16 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.SearchTextField -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBar -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBarData +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.SearchTextField +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData import ua.acclorite.book_story.presentation.navigator.NavigatorIconButton import ua.acclorite.book_story.ui.library.LibraryEvent +import ua.acclorite.book_story.ui.library.model.SelectableBook @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoItem.kt index eeb6962e..2aa2a6f6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoItem.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import com.mikepenz.aboutlibraries.entity.License -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.ui.theme.SlidingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoLayout.kt index ab59d007..991ca632 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoLayout.kt @@ -16,7 +16,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.mikepenz.aboutlibraries.entity.Library -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun LicenseInfoLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoTopBar.kt index 1ea9475f..38aea410 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoTopBar.kt @@ -17,8 +17,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import com.mikepenz.aboutlibraries.entity.Library import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton import ua.acclorite.book_story.ui.about.AboutEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesItem.kt index 7af08d93..9b1a9c47 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesItem.kt @@ -29,7 +29,7 @@ import androidx.compose.ui.unit.dp import com.mikepenz.aboutlibraries.entity.Library import com.mikepenz.aboutlibraries.ui.compose.m3.util.author import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun LicensesItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesLayout.kt index 35641121..d8f15fa5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesLayout.kt @@ -17,8 +17,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.mikepenz.aboutlibraries.entity.Library -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun LicensesLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesTopBar.kt index 40b43e30..fbdb180d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt index af7a5f67..d9d2f499 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt @@ -20,10 +20,10 @@ import androidx.compose.ui.Modifier import androidx.lifecycle.compose.collectAsStateWithLifecycle import dagger.hilt.android.lifecycle.withCreationCallback import kotlinx.coroutines.Dispatchers -import ua.acclorite.book_story.domain.navigator.Navigator -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.domain.navigator.StackEvent -import ua.acclorite.book_story.presentation.core.util.LocalActivity +import ua.acclorite.book_story.presentation.common.util.LocalActivity +import ua.acclorite.book_story.ui.navigator.Navigator +import ua.acclorite.book_story.ui.navigator.Screen +import ua.acclorite.book_story.ui.navigator.StackEvent @Composable fun rememberNavigator(initialScreen: Screen): Navigator { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBackIconButton.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBackIconButton.kt index bd883d8a..228fded7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBackIconButton.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBackIconButton.kt @@ -10,7 +10,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.ArrowBack import androidx.compose.runtime.Composable import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.IconButton @Composable fun NavigatorBackIconButton( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheet.kt index 54826c03..cf7e430f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheet.kt @@ -16,8 +16,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.channels.Channel import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.util.Position -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet +import ua.acclorite.book_story.presentation.common.model.Position import ua.acclorite.book_story.ui.about.AboutScreen import ua.acclorite.book_story.ui.help.HelpScreen import ua.acclorite.book_story.ui.settings.SettingsScreen diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheetItem.kt index 3573d078..de52b5aa 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheetItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheetItem.kt @@ -21,8 +21,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.util.Position -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.model.Position @Composable fun NavigatorBottomSheetItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorComposition.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorComposition.kt index e5cc719c..fa3f731d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorComposition.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorComposition.kt @@ -7,6 +7,6 @@ package ua.acclorite.book_story.presentation.navigator import androidx.compose.runtime.compositionLocalOf -import ua.acclorite.book_story.domain.navigator.Navigator +import ua.acclorite.book_story.ui.navigator.Navigator val LocalNavigator = compositionLocalOf { error("Navigator was not passed.") } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorIconButton.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorIconButton.kt index 22e2668b..9e375062 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorIconButton.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorIconButton.kt @@ -10,7 +10,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.MoreVert import androidx.compose.runtime.Composable import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.IconButton @Composable fun NavigatorIconButton( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorTabs.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorTabs.kt index 86ccdc0d..a31a2139 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorTabs.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorTabs.kt @@ -26,8 +26,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.flow.receiveAsFlow -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.util.LocalActivity +import ua.acclorite.book_story.presentation.common.util.LocalActivity +import ua.acclorite.book_story.ui.navigator.Screen @OptIn(ExperimentalMaterial3WindowSizeClassApi::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBackHandler.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBackHandler.kt index 878356f0..1d52c3eb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBackHandler.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBackHandler.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.presentation.reader import androidx.activity.compose.BackHandler import androidx.compose.runtime.Composable -import ua.acclorite.book_story.presentation.core.util.LocalActivity +import ua.acclorite.book_story.presentation.common.util.LocalActivity import ua.acclorite.book_story.ui.reader.ReaderEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBar.kt index a586fc70..c0c288ec 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBar.kt @@ -30,14 +30,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.reader.Checkpoint +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.domain.util.Direction -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.model.Direction +import ua.acclorite.book_story.presentation.common.util.noRippleClickable import ua.acclorite.book_story.ui.reader.ReaderEvent +import ua.acclorite.book_story.ui.reader.model.Checkpoint import ua.acclorite.book_story.ui.theme.HorizontalExpandingTransition import ua.acclorite.book_story.ui.theme.readerBarsColor diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSlider.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSlider.kt index 1a4e1088..fddc0cc4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSlider.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSlider.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Slider import androidx.compose.material3.SliderDefaults import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.ui.reader.ReaderEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomSheet.kt index e73007ab..a71e545b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomSheet.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.presentation.reader import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.util.BottomSheet +import ua.acclorite.book_story.core.BottomSheet import ua.acclorite.book_story.ui.reader.ReaderEvent import ua.acclorite.book_story.ui.reader.ReaderScreen diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderChaptersDrawer.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderChaptersDrawer.kt index 66db4772..3ef2c33e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderChaptersDrawer.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderChaptersDrawer.kt @@ -22,14 +22,14 @@ import androidx.compose.ui.draw.rotate import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ExpandableChapter import ua.acclorite.book_story.domain.reader.ReaderText.Chapter -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.modal_drawer.ModalDrawer -import ua.acclorite.book_story.presentation.core.components.modal_drawer.ModalDrawerSelectableItem -import ua.acclorite.book_story.presentation.core.components.modal_drawer.ModalDrawerTitleItem -import ua.acclorite.book_story.presentation.core.util.calculateProgress -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.modal_drawer.ModalDrawer +import ua.acclorite.book_story.presentation.common.components.modal_drawer.ModalDrawerSelectableItem +import ua.acclorite.book_story.presentation.common.components.modal_drawer.ModalDrawerTitleItem +import ua.acclorite.book_story.presentation.common.util.calculateProgress +import ua.acclorite.book_story.presentation.common.util.noRippleClickable +import ua.acclorite.book_story.presentation.reader.model.ExpandableChapter import ua.acclorite.book_story.ui.reader.ReaderEvent import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt index 2d110446..c01ad57a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt @@ -18,19 +18,19 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.reader.Checkpoint -import ua.acclorite.book_story.domain.reader.FontWithName -import ua.acclorite.book_story.domain.reader.ReaderFontThickness -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.core.Drawer +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.reader.ReaderText import ua.acclorite.book_story.domain.reader.ReaderText.Chapter -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.domain.ui.UIText -import ua.acclorite.book_story.domain.util.BottomSheet -import ua.acclorite.book_story.domain.util.Drawer -import ua.acclorite.book_story.domain.util.HorizontalAlignment +import ua.acclorite.book_story.presentation.reader.model.FontWithName +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment import ua.acclorite.book_story.ui.reader.ReaderEvent +import ua.acclorite.book_story.ui.reader.model.Checkpoint +import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment import ua.acclorite.book_story.ui.settings.SettingsEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderDrawer.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderDrawer.kt index 0c882f90..8c9e48a2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderDrawer.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderDrawer.kt @@ -7,8 +7,8 @@ package ua.acclorite.book_story.presentation.reader import androidx.compose.runtime.Composable +import ua.acclorite.book_story.core.Drawer import ua.acclorite.book_story.domain.reader.ReaderText.Chapter -import ua.acclorite.book_story.domain.util.Drawer import ua.acclorite.book_story.ui.reader.ReaderEvent import ua.acclorite.book_story.ui.reader.ReaderScreen diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderErrorPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderErrorPlaceholder.kt index 45b2dc0b..d4ae9479 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderErrorPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderErrorPlaceholder.kt @@ -19,11 +19,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.UIText -import ua.acclorite.book_story.presentation.core.components.placeholder.ErrorPlaceholder -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBar -import ua.acclorite.book_story.presentation.core.components.top_bar.TopAppBarData -import ua.acclorite.book_story.presentation.core.util.LocalActivity +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.presentation.common.components.placeholder.ErrorPlaceholder +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar +import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData +import ua.acclorite.book_story.presentation.common.util.LocalActivity import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton import ua.acclorite.book_story.ui.reader.ReaderEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderHorizontalGesture.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderHorizontalGesture.kt index 5eaa81b8..a90c5a1c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderHorizontalGesture.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderHorizontalGesture.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntOffset import kotlinx.coroutines.launch -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture import kotlin.math.abs import kotlin.math.roundToInt diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt index 65e61d56..7a4efc2b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt @@ -33,20 +33,20 @@ import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.FontWithName -import ua.acclorite.book_story.domain.reader.ReaderFontThickness -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.domain.util.HorizontalAlignment -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.components.common.SelectionContainer -import ua.acclorite.book_story.presentation.core.components.common.SpacedItem -import ua.acclorite.book_story.presentation.core.util.LocalActivity -import ua.acclorite.book_story.presentation.core.util.noRippleClickable -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.SelectionContainer +import ua.acclorite.book_story.presentation.common.components.common.SpacedItem +import ua.acclorite.book_story.presentation.common.util.LocalActivity +import ua.acclorite.book_story.presentation.common.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.util.showToast +import ua.acclorite.book_story.presentation.reader.model.FontWithName +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment import ua.acclorite.book_story.ui.reader.ReaderEvent +import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment @Composable fun ReaderLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt index df3fb37c..4fe647a2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt @@ -16,12 +16,12 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit -import ua.acclorite.book_story.domain.reader.FontWithName -import ua.acclorite.book_story.domain.reader.ReaderFontThickness import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.domain.util.HorizontalAlignment +import ua.acclorite.book_story.presentation.reader.model.FontWithName +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment import ua.acclorite.book_story.ui.reader.ReaderEvent +import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment @Composable fun LazyItemScope.ReaderLayoutText( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextChapter.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextChapter.kt index d6204a5d..8da0d615 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextChapter.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextChapter.kt @@ -22,8 +22,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.domain.reader.ReaderText.Chapter -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment @Composable fun LazyItemScope.ReaderLayoutTextChapter( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt index bf081417..83c0e6f3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.Dp import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.domain.util.HorizontalAlignment +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment @Composable fun LazyItemScope.ReaderLayoutTextImage( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextParagraph.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextParagraph.kt index 7541d1b7..6e4d7cf1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextParagraph.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextParagraph.kt @@ -23,13 +23,13 @@ import androidx.compose.ui.text.style.LineBreak import androidx.compose.ui.text.style.TextIndent import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit -import ua.acclorite.book_story.domain.reader.FontWithName -import ua.acclorite.book_story.domain.reader.ReaderFontThickness import ua.acclorite.book_story.domain.reader.ReaderText.Text -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.noRippleClickable +import ua.acclorite.book_story.presentation.reader.model.FontWithName import ua.acclorite.book_story.ui.reader.ReaderEvent +import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment @Composable fun LazyItemScope.ReaderLayoutTextParagraph( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLoadingPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLoadingPlaceholder.kt index 0740226b..dd26d43b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLoadingPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLoadingPlaceholder.kt @@ -15,7 +15,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.progress_indicator.CircularProgressIndicator +import ua.acclorite.book_story.presentation.common.components.progress_indicator.CircularProgressIndicator @Composable fun ReaderLoadingPlaceholder() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderProgressBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderProgressBar.kt index 78ea72df..f0d0dc4a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderProgressBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderProgressBar.kt @@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit -import ua.acclorite.book_story.domain.util.HorizontalAlignment -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment @Composable fun ReaderProgressBar( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt index 1877220f..366b8dbd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt @@ -26,17 +26,17 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.reader.Checkpoint -import ua.acclorite.book_story.domain.reader.FontWithName -import ua.acclorite.book_story.domain.reader.ReaderFontThickness -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.reader.ReaderText import ua.acclorite.book_story.domain.reader.ReaderText.Chapter -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.domain.util.HorizontalAlignment -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.reader.model.FontWithName +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment import ua.acclorite.book_story.ui.reader.ReaderEvent +import ua.acclorite.book_story.ui.reader.model.Checkpoint +import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment import ua.acclorite.book_story.ui.settings.SettingsEvent @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt index 36db7512..c1c9ace5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt @@ -25,9 +25,9 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import kotlinx.coroutines.launch -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet -import ua.acclorite.book_story.presentation.core.util.LocalActivity +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet +import ua.acclorite.book_story.presentation.common.util.LocalActivity import ua.acclorite.book_story.presentation.settings.appearance.colors.ColorsSubcategory import ua.acclorite.book_story.presentation.settings.reader.chapters.ChaptersSubcategory import ua.acclorite.book_story.presentation.settings.reader.font.FontSubcategory diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheetTabRow.kt index 04048fb1..7ba61fc4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheetTabRow.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheetTabRow.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.presentation.reader import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheetTabRow +import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheetTabRow @Composable fun ReaderSettingsBottomSheetTabRow( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderTopBar.kt index 3fd8f729..7215daec 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderTopBar.kt @@ -29,12 +29,12 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.reader.ReaderText.Chapter -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.LocalActivity -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.LocalActivity +import ua.acclorite.book_story.presentation.common.util.noRippleClickable import ua.acclorite.book_story.ui.reader.ReaderEvent import ua.acclorite.book_story.ui.settings.SettingsEvent import ua.acclorite.book_story.ui.theme.readerBarsColor diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ExpandableChapter.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ExpandableChapter.kt similarity index 75% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ExpandableChapter.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ExpandableChapter.kt index 02cb2f4c..3d4529ca 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ExpandableChapter.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ExpandableChapter.kt @@ -4,9 +4,10 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.presentation.reader.model import androidx.compose.runtime.Immutable +import ua.acclorite.book_story.domain.reader.ReaderText @Immutable data class ExpandableChapter( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/FontWithName.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/FontWithName.kt similarity index 77% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/FontWithName.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/FontWithName.kt index 523fdee9..dbcdb6a2 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/FontWithName.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/FontWithName.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.presentation.reader.model import androidx.compose.runtime.Immutable import androidx.compose.ui.text.font.FontFamily -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.core.ui.UIText @Immutable data class FontWithName( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayout.kt index 41829017..4574c597 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayout.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun SettingsLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayoutItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayoutItem.kt index 2c12b45d..17b29de4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayoutItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayoutItem.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.ui.theme.dynamicListItemColor @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsTopBar.kt index 9bd3efa6..1fcd5280 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsLayout.kt index d16bbdf3..2b32cc22 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsLayout.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun AppearanceSettingsLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsTopBar.kt index 08657abb..2db30d54 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/ColorPresetOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/ColorPresetOption.kt index df097968..c935e6cb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/ColorPresetOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/ColorPresetOption.kt @@ -63,12 +63,12 @@ import sh.calvin.reorderable.ReorderableCollectionItemScope import sh.calvin.reorderable.ReorderableItem import sh.calvin.reorderable.rememberReorderableLazyListState import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.Selected import ua.acclorite.book_story.domain.reader.ColorPreset -import ua.acclorite.book_story.domain.util.Selected -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.settings.ColorPickerWithTitle +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.settings.ColorPickerWithTitle import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle import ua.acclorite.book_story.ui.settings.SettingsEvent import ua.acclorite.book_story.ui.settings.SettingsModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/FastColorPresetChangeOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/FastColorPresetChangeOption.kt index 3fe0e59f..98b5a4ca 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/FastColorPresetChangeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/FastColorPresetChangeOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt index 67ef1a8a..a04dc5f1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.isDark -import ua.acclorite.book_story.domain.ui.isPureDark -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.main.model.isDark +import ua.acclorite.book_story.ui.main.model.isPureDark import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AppThemeOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AppThemeOption.kt index 451ba5c5..80c74cc9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AppThemeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AppThemeOption.kt @@ -42,14 +42,14 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ThemeContrast -import ua.acclorite.book_story.domain.ui.isDark -import ua.acclorite.book_story.domain.ui.isPureDark -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.main.model.ThemeContrast +import ua.acclorite.book_story.ui.main.model.isDark +import ua.acclorite.book_story.ui.main.model.isPureDark import ua.acclorite.book_story.ui.theme.Theme import ua.acclorite.book_story.ui.theme.animatedColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/DarkThemeOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/DarkThemeOption.kt index c38435f0..1921c586 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/DarkThemeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/DarkThemeOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.domain.ui.DarkTheme -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.main.model.DarkTheme @Composable fun DarkThemeOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/PureDarkOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/PureDarkOption.kt index f00a1034..6297a3e2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/PureDarkOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/PureDarkOption.kt @@ -12,12 +12,12 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.domain.ui.PureDark -import ua.acclorite.book_story.domain.ui.isDark -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.main.model.PureDark +import ua.acclorite.book_story.ui.main.model.isDark import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/ThemeContrastOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/ThemeContrastOption.kt index 55d30414..5fbee181 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/ThemeContrastOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/ThemeContrastOption.kt @@ -16,13 +16,13 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.domain.ui.ThemeContrast -import ua.acclorite.book_story.domain.ui.isDark -import ua.acclorite.book_story.domain.ui.isPureDark -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.main.model.ThemeContrast +import ua.acclorite.book_story.ui.main.model.isDark +import ua.acclorite.book_story.ui.main.model.isPureDark import ua.acclorite.book_story.ui.theme.BookStoryTheme import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsLayout.kt index 494e5718..7402931d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsLayout.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun BrowseSettingsLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsTopBar.kt index 7878f6a0..0d0ec101 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt index 7c01904d..cb7ae8cf 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.browse.model.BrowseLayout import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt index e4e6a991..ba709d83 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem +import ua.acclorite.book_story.ui.browse.model.BrowseLayout import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/components/BrowseFilterOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/components/BrowseFilterOption.kt index 899b70c6..9fd1be16 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/components/BrowseFilterOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/components/BrowseFilterOption.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.constants.provideExtensions +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.constants.provideExtensions import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOption.kt index 2a9257b7..f150bcc8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOption.kt @@ -39,10 +39,10 @@ import com.anggrayudi.storage.file.DocumentFileCompat import com.anggrayudi.storage.file.getBasePath import com.anggrayudi.storage.file.getRootPath import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.util.noRippleClickable -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.util.noRippleClickable +import ua.acclorite.book_story.presentation.common.util.showToast import ua.acclorite.book_story.ui.browse.BrowseScreen import ua.acclorite.book_story.ui.settings.SettingsEvent import ua.acclorite.book_story.ui.settings.SettingsModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt index eb89e995..d1cd4acf 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt @@ -31,8 +31,8 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.display.BrowseSortOrder -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.ui.browse.model.BrowseSortOrder import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryNote.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryNote.kt index fbbb36c9..301572f5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryNote.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryNote.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun SettingsSubcategoryNote( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryTitle.kt index 87fed225..a5fc52c2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryTitle.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.text.style.LineBreak import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun SettingsSubcategoryTitle( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsLayout.kt index 7272c0ea..856d5dd0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsLayout.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun GeneralSettingsLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsTopBar.kt index 7a1fb04c..c96d5411 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/AppLanguageOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/AppLanguageOption.kt index a0bae19b..37e34de0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/AppLanguageOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/AppLanguageOption.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.ChipsWithTitle -import ua.acclorite.book_story.presentation.core.constants.provideLanguages +import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.constants.provideLanguages +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/DoublePressExitOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/DoublePressExitOption.kt index fa395ef9..e84c16b0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/DoublePressExitOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/DoublePressExitOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsLayout.kt index d23b072e..fd9b40f0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsLayout.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun LibrarySettingsLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsTopBar.kt index 2719ac4e..2d939c93 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOption.kt index 9d1b2d4e..0fc112fd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOption.kt @@ -47,12 +47,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import sh.calvin.reorderable.ReorderableColumn import sh.calvin.reorderable.ReorderableScope import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.presentation.core.components.common.IconButton -import ua.acclorite.book_story.presentation.core.components.common.StyledText -import ua.acclorite.book_story.presentation.core.components.dialog.Dialog -import ua.acclorite.book_story.presentation.core.components.dialog.DialogWithTextField -import ua.acclorite.book_story.presentation.core.util.noRippleClickable +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.presentation.common.components.common.IconButton +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.dialog.Dialog +import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField +import ua.acclorite.book_story.presentation.common.util.noRippleClickable import ua.acclorite.book_story.ui.library.LibraryScreen import ua.acclorite.book_story.ui.settings.SettingsEvent import ua.acclorite.book_story.ui.settings.SettingsModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryGridSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryGridSizeOption.kt index e7843c7e..aef0a1fe 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryGridSizeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryGridSizeOption.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.display.LibraryLayout -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.library.model.LibraryLayout import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryLayoutOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryLayoutOption.kt index 9cd8cb82..e3177fdd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryLayoutOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryLayoutOption.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.display.LibraryLayout -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem +import ua.acclorite.book_story.ui.library.model.LibraryLayout import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryReadButtonOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryReadButtonOption.kt index 48b75fc3..db30b36d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryReadButtonOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryReadButtonOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryShowProgressOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryShowProgressOption.kt index 766e1b7d..28efa9bc 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryShowProgressOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryShowProgressOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryTitlePositionOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryTitlePositionOption.kt index 5728d1e6..a37d605a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryTitlePositionOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryTitlePositionOption.kt @@ -12,10 +12,10 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.display.LibraryLayout -import ua.acclorite.book_story.domain.library.display.LibraryTitlePosition -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem +import ua.acclorite.book_story.ui.library.model.LibraryLayout +import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibraryPerCategorySortOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibraryPerCategorySortOption.kt index 93658b11..d425c680 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibraryPerCategorySortOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibraryPerCategorySortOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibrarySortOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibrarySortOption.kt index 7938b98b..8a48bb1f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibrarySortOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibrarySortOption.kt @@ -29,8 +29,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder fun LazyListScope.LibrarySortOption( sortOrder: LibrarySortOrder, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt index 2c390962..8a6353be 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowBookCountOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowBookCountOption.kt index 598b11fc..3aa60fb3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowBookCountOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowBookCountOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt index 3568df2e..e85f63e9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsLayout.kt index 9f706e54..b144e108 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsLayout.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun ReaderSettingsLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsTopBar.kt index 35b15b83..43ae6e4f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsTopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt index dec0a2d0..a166f01f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment @Composable fun ChapterTitleAlignmentOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt index a1f79ffe..01cdda94 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt @@ -13,9 +13,9 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.ChipsWithTitle -import ua.acclorite.book_story.presentation.core.constants.provideFonts +import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.constants.provideFonts +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontSizeOption.kt index fb96bdc5..8f1590e7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontSizeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontSizeOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt index 04fe2e9f..258403c6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt @@ -14,9 +14,9 @@ import androidx.compose.ui.text.font.FontStyle import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle -import ua.acclorite.book_story.presentation.core.constants.provideFonts +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.constants.provideFonts +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontThicknessOption.kt index a2fcd26c..1a696e91 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontThicknessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontThicknessOption.kt @@ -13,12 +13,12 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderFontThickness -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.ChipsWithTitle -import ua.acclorite.book_story.presentation.core.constants.provideFonts +import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.constants.provideFonts +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness @Composable fun FontThicknessOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/LetterSpacingOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/LetterSpacingOption.kt index 15a0f0df..43950460 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/LetterSpacingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/LetterSpacingOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt index f15dbc61..ee922120 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.domain.util.HorizontalAlignment -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesColorEffectsOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesColorEffectsOption.kt index 8eb6ac7c..7740241b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesColorEffectsOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesColorEffectsOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderColorEffects -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderColorEffects import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesCornersRoundnessOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesCornersRoundnessOption.kt index f3544846..214a8e67 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesCornersRoundnessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesCornersRoundnessOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesOption.kt index 4987ed37..3821b6ac 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesWidthOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesWidthOption.kt index 80d85f1f..6e81c4c7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesWidthOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesWidthOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/FullscreenOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/FullscreenOption.kt index 2b49f17a..cf3c4641 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/FullscreenOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/FullscreenOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/HideBarsOnFastScrollOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/HideBarsOnFastScrollOption.kt index 6bce6f62..b20c1360 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/HideBarsOnFastScrollOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/HideBarsOnFastScrollOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/KeepScreenOnOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/KeepScreenOnOption.kt index 80b56f60..0d9898a6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/KeepScreenOnOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/KeepScreenOnOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/BottomBarPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/BottomBarPaddingOption.kt index b25ca5c9..7c892e06 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/BottomBarPaddingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/BottomBarPaddingOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/CutoutPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/CutoutPaddingOption.kt index b980c4c8..1c0b272d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/CutoutPaddingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/CutoutPaddingOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/SidePaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/SidePaddingOption.kt index 46f225f8..d219ca61 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/SidePaddingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/SidePaddingOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/VerticalPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/VerticalPaddingOption.kt index 9a5e7b5d..7a67c910 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/VerticalPaddingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/VerticalPaddingOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarAlignmentOption.kt index 50e50adf..b33d5b2a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarAlignmentOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarAlignmentOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.domain.util.HorizontalAlignment -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarFontSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarFontSizeOption.kt index c162ca7f..a137dc58 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarFontSizeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarFontSizeOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarOption.kt index c4bf61b3..acb93982 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarPaddingOption.kt index eb0ea1c1..ef00c68a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarPaddingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarPaddingOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressCountOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressCountOption.kt index 5a7f2846..a522e2aa 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressCountOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressCountOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderProgressCount -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderProgressCount @Composable fun ProgressCountOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt index 6b55e901..9fca7f6b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt @@ -11,10 +11,10 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureOption.kt index 2ff94289..5e0dc59c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture @Composable fun HorizontalGestureOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt index 28ca73ce..dd7c99b7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt @@ -11,10 +11,10 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt index 5e5ceb37..1e01f2e6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt @@ -11,10 +11,10 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt index 127656c4..33eac541 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt @@ -11,10 +11,10 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingOption.kt index 1da39628..e188d223 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt index 15e25084..133e62bb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderOption.kt index e97d6fe6..4671cff9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt index f48ae565..b62c3b30 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt index c416de57..b3ede84f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/CustomScreenBrightnessOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/CustomScreenBrightnessOption.kt index 281a3504..3e8b41f9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/CustomScreenBrightnessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/CustomScreenBrightnessOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenBrightnessOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenBrightnessOption.kt index d61077c0..069fa167 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenBrightnessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenBrightnessOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.theme.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenOrientationOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenOrientationOption.kt index 0c180f6e..6f901477 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenOrientationOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenOrientationOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderScreenOrientation -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderScreenOrientation @Composable fun ScreenOrientationOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/LineHeightOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/LineHeightOption.kt index 5ac5d77c..7af599c1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/LineHeightOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/LineHeightOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphHeightOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphHeightOption.kt index 7c8a7be3..7852ef13 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphHeightOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphHeightOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphIndentationOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphIndentationOption.kt index b3dbec0a..4d9831f0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphIndentationOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphIndentationOption.kt @@ -11,10 +11,10 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt index 337c5c57..e86521bc 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment @Composable fun TextAlignmentOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/components/DoubleClickTranslationOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/components/DoubleClickTranslationOption.kt index d81a786d..d2ac4e76 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/components/DoubleClickTranslationOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/components/DoubleClickTranslationOption.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.settings.SwitchWithTitle +import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContent.kt index 5e622a44..75caf364 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContent.kt @@ -10,9 +10,9 @@ import androidx.compose.foundation.background import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.domain.navigator.StackEvent -import ua.acclorite.book_story.domain.ui.ButtonItem +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent +import ua.acclorite.book_story.ui.navigator.StackEvent import ua.acclorite.book_story.ui.start.StartScreen @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContentTransition.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContentTransition.kt index d0eb416c..dc6fb804 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContentTransition.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContentTransition.kt @@ -11,7 +11,7 @@ import androidx.compose.animation.togetherWith import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.domain.navigator.StackEvent +import ua.acclorite.book_story.ui.navigator.StackEvent import ua.acclorite.book_story.ui.theme.Transitions @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneBottomBar.kt index 58f6a377..c98c09d4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneBottomBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneBottomBar.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun StartDoneBottomBar( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneLayout.kt index 5d08fa3f..04984134 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneLayout.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun StartDoneLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettings.kt index 531549df..264d41be 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettings.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettings.kt @@ -7,9 +7,9 @@ package ua.acclorite.book_story.presentation.start import androidx.compose.runtime.Composable -import ua.acclorite.book_story.domain.navigator.StackEvent -import ua.acclorite.book_story.domain.ui.ButtonItem +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.ui.main.MainEvent +import ua.acclorite.book_story.ui.navigator.StackEvent import ua.acclorite.book_story.ui.start.StartScreen @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsBottomBar.kt index d6b8fd7d..9575d986 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsBottomBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsBottomBar.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun StartSettingsBottomBar( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayout.kt index 9433ff4d..653568ee 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayout.kt @@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar +import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar @Composable fun StartSettingsLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutGeneral.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutGeneral.kt index 69d6891c..ee822786 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutGeneral.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutGeneral.kt @@ -17,8 +17,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.components.dialog.SelectableDialogItem +import ua.acclorite.book_story.presentation.common.components.dialog.SelectableDialogItem +import ua.acclorite.book_story.presentation.common.model.ButtonItem import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle import ua.acclorite.book_story.ui.main.MainEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsScaffold.kt index 8c44b861..74aa9af3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsScaffold.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.components.common.StyledText +import ua.acclorite.book_story.presentation.common.components.common.StyledText @Composable fun StartSettingsScaffold( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutModel.kt index d2be6c7b..b4714a8d 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutModel.kt @@ -16,8 +16,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.core.util.launchActivity -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.util.launchActivity +import ua.acclorite.book_story.presentation.common.util.showToast import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScreen.kt index fc5b0fe8..71124c44 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScreen.kt @@ -12,12 +12,12 @@ import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.hilt.navigation.compose.hiltViewModel import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen import ua.acclorite.book_story.presentation.about.AboutContent -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.ui.credits.CreditsScreen import ua.acclorite.book_story.ui.licenses.LicensesScreen +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object AboutScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEvent.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEvent.kt index 3ba33ac1..e298868b 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEvent.kt @@ -9,8 +9,8 @@ package ua.acclorite.book_story.ui.book_info import android.content.Context import android.net.Uri import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.ui.UIText +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.domain.library.Category @Immutable sealed class BookInfoEvent { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt index 10a391b9..a536d659 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt @@ -27,7 +27,7 @@ import ua.acclorite.book_story.domain.use_case.book.GetBookById import ua.acclorite.book_story.domain.use_case.book.ResetCoverImage import ua.acclorite.book_story.domain.use_case.book.UpdateBook import ua.acclorite.book_story.domain.use_case.book.UpdateCoverImageOfBook -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.util.showToast import ua.acclorite.book_story.ui.browse.BrowseScreen import ua.acclorite.book_story.ui.history.HistoryScreen import ua.acclorite.book_story.ui.library.LibraryScreen diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScreen.kt index 234b6460..b0ee33c1 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScreen.kt @@ -19,10 +19,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.getOrElse import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen import ua.acclorite.book_story.presentation.book_info.BookInfoContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.ui.history.HistoryScreen +import ua.acclorite.book_story.ui.navigator.Screen import ua.acclorite.book_story.ui.reader.ReaderScreen import ua.acclorite.book_story.ui.settings.LibrarySettingsScreen import ua.acclorite.book_story.ui.settings.SettingsModel diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoState.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoState.kt index 67aa774c..1119cc9c 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoState.kt @@ -7,10 +7,10 @@ package ua.acclorite.book_story.ui.book_info import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.util.BottomSheet -import ua.acclorite.book_story.domain.util.Dialog -import ua.acclorite.book_story.presentation.core.constants.provideEmptyBook +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.core.Dialog +import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.presentation.common.constants.provideEmptyBook @Immutable data class BookInfoState( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt index f4ff8cf7..16f3bd85 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt @@ -9,8 +9,8 @@ package ua.acclorite.book_story.ui.browse import android.content.Context import androidx.compose.runtime.Immutable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.domain.library.book.SelectableNullableBook +import ua.acclorite.book_story.ui.browse.model.SelectableFile +import ua.acclorite.book_story.ui.library.model.SelectableNullableBook @Immutable sealed class BrowseEvent { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt index 1938e0a4..972c85fb 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt @@ -22,16 +22,17 @@ import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.display.BrowseSortOrder -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.domain.library.book.NullableBook -import ua.acclorite.book_story.domain.library.book.SelectableNullableBook +import ua.acclorite.book_story.data.model.common.NullableBook +import ua.acclorite.book_story.domain.file.File import ua.acclorite.book_story.domain.use_case.book.InsertBook import ua.acclorite.book_story.domain.use_case.file_system.GetBookFromFile import ua.acclorite.book_story.domain.use_case.file_system.GetFiles -import ua.acclorite.book_story.presentation.core.util.compareByWithOrder -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.util.compareByWithOrder +import ua.acclorite.book_story.presentation.common.util.showToast +import ua.acclorite.book_story.ui.browse.model.BrowseSortOrder +import ua.acclorite.book_story.ui.browse.model.SelectableFile import ua.acclorite.book_story.ui.library.LibraryScreen +import ua.acclorite.book_story.ui.library.model.SelectableNullableBook import javax.inject.Inject @HiltViewModel @@ -182,11 +183,11 @@ class BrowseModel @Inject constructor( val editedList = _state.value.files.map { file -> if ( event.files.any { - file.data.path.startsWith(it.data.path) + file.path.startsWith(it.path) } && event.includedFileFormats.run { if (isEmpty()) return@run true any { - file.data.path.endsWith(it, ignoreCase = true) + file.path.endsWith(it, ignoreCase = true) } } ) { @@ -216,7 +217,7 @@ class BrowseModel @Inject constructor( is BrowseEvent.OnSelectFile -> { viewModelScope.launch(Dispatchers.IO) { val editedList = _state.value.files.map { file -> - if (event.file.data.path == file.data.path) { + if (event.file.path == file.path) { file.copy( selected = !file.selected ) @@ -294,7 +295,18 @@ class BrowseModel @Inject constructor( } .forEach { yield() - books.add(getBookFromFile.execute(it.data)) + books.add( + getBookFromFile.execute( + File( + name = it.name, + uri = it.uri, + path = it.path, + size = it.size, + lastModified = it.lastModified, + isDirectory = it.isDirectory + ) + ) + ) } yield() @@ -406,7 +418,17 @@ class BrowseModel @Inject constructor( yield() _state.update { it.copy( - files = this, + files = map { + SelectableFile( + name = it.name, + uri = it.uri, + path = it.path, + size = it.size, + lastModified = it.lastModified, + isDirectory = it.isDirectory, + selected = false + ) + }, hasSelectedItems = false, isLoading = false ) @@ -427,7 +449,7 @@ class BrowseModel @Inject constructor( return filter { file -> includedFilterItems.any { - file.data.path.endsWith( + file.path.endsWith( it, ignoreCase = true ) } @@ -440,19 +462,19 @@ class BrowseModel @Inject constructor( compareByWithOrder(sortOrderDescending) { when (sortOrder) { BrowseSortOrder.NAME -> { - it.data.name.trim() + it.name.trim() } BrowseSortOrder.FILE_FORMAT -> { - it.data.path.substringAfterLast(".").lowercase().trimEnd() + it.path.substringAfterLast(".").lowercase().trimEnd() } BrowseSortOrder.FILE_SIZE -> { - it.data.size + it.size } else -> { - it.data.lastModified + it.lastModified } } } diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt index 64e53bde..26c51ce4 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt @@ -24,12 +24,12 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.domain.navigator.Screen import ua.acclorite.book_story.presentation.browse.BrowseContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator +import ua.acclorite.book_story.ui.browse.model.BrowseLayout import ua.acclorite.book_story.ui.library.LibraryScreen import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.navigator.Screen import ua.acclorite.book_story.ui.settings.BrowseSettingsScreen @Parcelize diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt index 08d5c324..51cfcd84 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt @@ -7,10 +7,10 @@ package ua.acclorite.book_story.ui.browse import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.browse.file.SelectableFile -import ua.acclorite.book_story.domain.library.book.SelectableNullableBook -import ua.acclorite.book_story.domain.util.BottomSheet -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.core.Dialog +import ua.acclorite.book_story.ui.browse.model.SelectableFile +import ua.acclorite.book_story.ui.library.model.SelectableNullableBook @Immutable data class BrowseState( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseLayout.kt similarity index 64% rename from app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseLayout.kt rename to app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseLayout.kt index bfbf9ce2..bf062924 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseLayout.kt @@ -4,15 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.browse.display +package ua.acclorite.book_story.ui.browse.model import androidx.compose.runtime.Immutable @Immutable enum class BrowseLayout { LIST, GRID -} - -fun String.toBrowseLayout(): BrowseLayout { - return BrowseLayout.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseSortOrder.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseSortOrder.kt similarity index 54% rename from app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseSortOrder.kt rename to app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseSortOrder.kt index bbb7bd30..5d770c0d 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseSortOrder.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseSortOrder.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.browse.display +package ua.acclorite.book_story.ui.browse.model import androidx.compose.runtime.Immutable @@ -14,12 +14,4 @@ enum class BrowseSortOrder { FILE_FORMAT, LAST_MODIFIED, FILE_SIZE, -} - -fun String.toBrowseSortOrder(): BrowseSortOrder { - return try { - BrowseSortOrder.valueOf(this) - } catch (_: IllegalArgumentException) { - BrowseSortOrder.LAST_MODIFIED - } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/browse/file/GroupedFiles.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/model/GroupedFiles.kt similarity index 86% rename from app/src/main/java/ua/acclorite/book_story/domain/browse/file/GroupedFiles.kt rename to app/src/main/java/ua/acclorite/book_story/ui/browse/model/GroupedFiles.kt index ceda0bd5..6cc9540f 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/browse/file/GroupedFiles.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/model/GroupedFiles.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.browse.file +package ua.acclorite.book_story.ui.browse.model import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/browse/file/SelectableFile.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/model/SelectableFile.kt similarity index 50% rename from app/src/main/java/ua/acclorite/book_story/domain/browse/file/SelectableFile.kt rename to app/src/main/java/ua/acclorite/book_story/ui/browse/model/SelectableFile.kt index 8bd0a292..623f8ab6 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/browse/file/SelectableFile.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/model/SelectableFile.kt @@ -4,14 +4,18 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.browse.file +package ua.acclorite.book_story.ui.browse.model +import android.net.Uri import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.file.CachedFile -import ua.acclorite.book_story.domain.util.Selected @Immutable data class SelectableFile( - val data: CachedFile, - val selected: Selected + val name: String, + val uri: Uri, + val path: String, + val size: Long, + val lastModified: Long, + val isDirectory: Boolean, + val selected: Boolean ) \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashActivity.kt b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashActivity.kt index 42380bd5..67ebfac5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashActivity.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashActivity.kt @@ -12,7 +12,7 @@ import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.compose.foundation.isSystemInDarkTheme import androidx.core.view.WindowCompat -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast import ua.acclorite.book_story.ui.theme.BookStoryTheme import ua.acclorite.book_story.ui.theme.Theme diff --git a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScreen.kt index 7aa7835a..8aa11c12 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScreen.kt @@ -20,11 +20,11 @@ import kotlinx.coroutines.launch import kotlinx.parcelize.Parcelize import ua.acclorite.book_story.R import ua.acclorite.book_story.core.crash.CrashUtils -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.util.LocalActivity -import ua.acclorite.book_story.presentation.core.util.launchActivity -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.util.LocalActivity +import ua.acclorite.book_story.presentation.common.util.launchActivity +import ua.acclorite.book_story.presentation.common.util.showToast import ua.acclorite.book_story.presentation.crash.CrashContent +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object CrashScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScreen.kt index 0a34895c..f0378fe1 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScreen.kt @@ -12,11 +12,11 @@ import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.hilt.navigation.compose.hiltViewModel import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.credits.CreditsContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.ui.about.AboutModel +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object CreditsScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/help/HelpScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpScreen.kt index ff759d8d..1da9ebfd 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/help/HelpScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpScreen.kt @@ -12,13 +12,13 @@ import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.hilt.navigation.compose.hiltViewModel import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.help.HelpContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.ui.browse.BrowseScreen import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.navigator.Screen import ua.acclorite.book_story.ui.start.StartScreen @Parcelize diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryModel.kt index 50f973ec..5daf1c06 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryModel.kt @@ -23,14 +23,14 @@ import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.history.GroupedHistory import ua.acclorite.book_story.domain.history.History import ua.acclorite.book_story.domain.use_case.book.GetBooksById import ua.acclorite.book_story.domain.use_case.history.DeleteHistory import ua.acclorite.book_story.domain.use_case.history.DeleteWholeHistory import ua.acclorite.book_story.domain.use_case.history.GetHistory import ua.acclorite.book_story.domain.use_case.history.InsertHistory -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.util.showToast +import ua.acclorite.book_story.ui.history.model.GroupedHistory import ua.acclorite.book_story.ui.library.LibraryScreen import java.text.SimpleDateFormat import java.util.Calendar diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScreen.kt index 11c8083d..b87a7841 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScreen.kt @@ -22,11 +22,11 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.channels.Channel import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen import ua.acclorite.book_story.presentation.history.HistoryContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.ui.book_info.BookInfoScreen import ua.acclorite.book_story.ui.library.LibraryScreen +import ua.acclorite.book_story.ui.navigator.Screen import ua.acclorite.book_story.ui.reader.ReaderScreen @Parcelize diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryState.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryState.kt index 945b6701..ef1be69e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryState.kt @@ -7,8 +7,8 @@ package ua.acclorite.book_story.ui.history import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.history.GroupedHistory -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.Dialog +import ua.acclorite.book_story.ui.history.model.GroupedHistory @Immutable data class HistoryState( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/history/GroupedHistory.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/model/GroupedHistory.kt similarity index 73% rename from app/src/main/java/ua/acclorite/book_story/domain/history/GroupedHistory.kt rename to app/src/main/java/ua/acclorite/book_story/ui/history/model/GroupedHistory.kt index 3264c039..64d64bdd 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/history/GroupedHistory.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/history/model/GroupedHistory.kt @@ -4,12 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.history +package ua.acclorite.book_story.ui.history.model import androidx.compose.runtime.Immutable +import ua.acclorite.book_story.domain.history.History @Immutable data class GroupedHistory( val title: String, val history: List -) +) \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEvent.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEvent.kt index c3b4287b..0cfe9a30 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEvent.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.ui.library import android.content.Context import androidx.compose.runtime.Immutable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.library.category.Category +import ua.acclorite.book_story.domain.library.Category @Immutable sealed class LibraryEvent { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryModel.kt index b2a83041..2e8246cf 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryModel.kt @@ -22,14 +22,14 @@ import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.library.book.SelectableBook +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.use_case.book.DeleteBooks import ua.acclorite.book_story.domain.use_case.book.GetBooks import ua.acclorite.book_story.domain.use_case.book.UpdateBook -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.util.showToast import ua.acclorite.book_story.ui.browse.BrowseScreen import ua.acclorite.book_story.ui.history.HistoryScreen +import ua.acclorite.book_story.ui.library.model.SelectableBook import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScreen.kt index 8c2d786c..d1455569 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScreen.kt @@ -23,13 +23,13 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen import ua.acclorite.book_story.presentation.library.LibraryContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.ui.book_info.BookInfoScreen import ua.acclorite.book_story.ui.browse.BrowseScreen import ua.acclorite.book_story.ui.history.HistoryScreen import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.navigator.Screen import ua.acclorite.book_story.ui.reader.ReaderScreen import ua.acclorite.book_story.ui.settings.LibrarySettingsScreen import ua.acclorite.book_story.ui.settings.SettingsModel diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryState.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryState.kt index 2dca870e..f012acf2 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryState.kt @@ -7,9 +7,9 @@ package ua.acclorite.book_story.ui.library import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.library.book.SelectableBook -import ua.acclorite.book_story.domain.util.BottomSheet -import ua.acclorite.book_story.domain.util.Dialog +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.core.Dialog +import ua.acclorite.book_story.ui.library.model.SelectableBook @Immutable data class LibraryState( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/display/LibraryLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryLayout.kt similarity index 63% rename from app/src/main/java/ua/acclorite/book_story/domain/library/display/LibraryLayout.kt rename to app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryLayout.kt index 36221284..e346ad22 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/display/LibraryLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryLayout.kt @@ -4,15 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.display +package ua.acclorite.book_story.ui.library.model import androidx.compose.runtime.Immutable @Immutable enum class LibraryLayout { GRID, LIST -} - -fun String.toLibraryLayout(): LibraryLayout { - return LibraryLayout.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/display/LibrarySortOrder.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibrarySortOrder.kt similarity index 65% rename from app/src/main/java/ua/acclorite/book_story/domain/library/display/LibrarySortOrder.kt rename to app/src/main/java/ua/acclorite/book_story/ui/library/model/LibrarySortOrder.kt index fba9733c..4192133e 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/display/LibrarySortOrder.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibrarySortOrder.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.display +package ua.acclorite.book_story.ui.library.model import androidx.compose.runtime.Immutable @@ -14,8 +14,4 @@ enum class LibrarySortOrder { LAST_READ, PROGRESS, AUTHOR -} - -fun String.toLibrarySortOrder(): LibrarySortOrder { - return LibrarySortOrder.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/display/LibraryTitlePosition.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryTitlePosition.kt similarity index 61% rename from app/src/main/java/ua/acclorite/book_story/domain/library/display/LibraryTitlePosition.kt rename to app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryTitlePosition.kt index d383be87..b676fa8b 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/display/LibraryTitlePosition.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryTitlePosition.kt @@ -4,15 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.display +package ua.acclorite.book_story.ui.library.model import androidx.compose.runtime.Immutable @Immutable enum class LibraryTitlePosition { OFF, BELOW, INSIDE -} - -fun String.toLibraryTitlePosition(): LibraryTitlePosition { - return LibraryTitlePosition.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/book/SelectableBook.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableBook.kt similarity index 66% rename from app/src/main/java/ua/acclorite/book_story/domain/library/book/SelectableBook.kt rename to app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableBook.kt index 4eb871b7..6cf8b809 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/book/SelectableBook.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableBook.kt @@ -4,10 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.book +package ua.acclorite.book_story.ui.library.model import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.util.Selected +import ua.acclorite.book_story.core.Selected +import ua.acclorite.book_story.domain.library.Book @Immutable data class SelectableBook( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/book/SelectableNullableBook.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableNullableBook.kt similarity index 65% rename from app/src/main/java/ua/acclorite/book_story/domain/library/book/SelectableNullableBook.kt rename to app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableNullableBook.kt index f203996c..72569f22 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/book/SelectableNullableBook.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableNullableBook.kt @@ -4,10 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library.book +package ua.acclorite.book_story.ui.library.model import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.util.Selected +import ua.acclorite.book_story.core.Selected +import ua.acclorite.book_story.data.model.common.NullableBook @Immutable data class SelectableNullableBook( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScreen.kt index 4149f3d5..fbbff7d0 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScreen.kt @@ -18,11 +18,11 @@ import com.mikepenz.aboutlibraries.Libs import com.mikepenz.aboutlibraries.util.withJson import kotlinx.parcelize.Parcelize import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.license_info.LicenseInfoContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.ui.about.AboutModel +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize data class LicenseInfoScreen(val uniqueId: String) : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScreen.kt index e904c52a..171f430e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScreen.kt @@ -20,11 +20,11 @@ import com.mikepenz.aboutlibraries.util.withJson import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.licenses.LicensesContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.ui.license_info.LicenseInfoScreen +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object LicensesScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivity.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivity.kt index 3ac1ce04..90e550c4 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivity.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivity.kt @@ -23,12 +23,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import dagger.hilt.android.AndroidEntryPoint import okhttp3.internal.immutableListOf import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.navigator.NavigatorItem -import ua.acclorite.book_story.domain.navigator.StackEvent -import ua.acclorite.book_story.domain.ui.isDark -import ua.acclorite.book_story.domain.ui.isPureDark -import ua.acclorite.book_story.presentation.core.components.navigation_bar.NavigationBar -import ua.acclorite.book_story.presentation.core.components.navigation_rail.NavigationRail +import ua.acclorite.book_story.presentation.common.components.navigation_bar.NavigationBar +import ua.acclorite.book_story.presentation.common.components.navigation_rail.NavigationRail import ua.acclorite.book_story.presentation.main.MainActivityKeyboardManager import ua.acclorite.book_story.presentation.navigator.Navigator import ua.acclorite.book_story.presentation.navigator.NavigatorTabs @@ -38,6 +34,10 @@ import ua.acclorite.book_story.ui.history.HistoryModel import ua.acclorite.book_story.ui.history.HistoryScreen import ua.acclorite.book_story.ui.library.LibraryModel import ua.acclorite.book_story.ui.library.LibraryScreen +import ua.acclorite.book_story.ui.main.model.isDark +import ua.acclorite.book_story.ui.main.model.isPureDark +import ua.acclorite.book_story.ui.navigator.NavigatorItem +import ua.acclorite.book_story.ui.navigator.StackEvent import ua.acclorite.book_story.ui.settings.SettingsModel import ua.acclorite.book_story.ui.start.StartScreen import ua.acclorite.book_story.ui.theme.BookStoryTheme diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt index 1a49a900..5f26e82a 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt @@ -22,27 +22,27 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.coroutines.yield -import ua.acclorite.book_story.domain.browse.display.toBrowseLayout -import ua.acclorite.book_story.domain.browse.display.toBrowseSortOrder -import ua.acclorite.book_story.domain.library.display.toLibraryLayout -import ua.acclorite.book_story.domain.library.display.toLibrarySortOrder -import ua.acclorite.book_story.domain.library.display.toLibraryTitlePosition -import ua.acclorite.book_story.domain.reader.toColorEffects -import ua.acclorite.book_story.domain.reader.toFontThickness -import ua.acclorite.book_story.domain.reader.toHorizontalGesture -import ua.acclorite.book_story.domain.reader.toProgressCount -import ua.acclorite.book_story.domain.reader.toReaderScreenOrientation -import ua.acclorite.book_story.domain.reader.toTextAlignment -import ua.acclorite.book_story.domain.ui.toDarkTheme -import ua.acclorite.book_story.domain.ui.toPureDark -import ua.acclorite.book_story.domain.ui.toThemeContrast import ua.acclorite.book_story.domain.use_case.data_store.ChangeLanguage import ua.acclorite.book_story.domain.use_case.data_store.GetAllSettings import ua.acclorite.book_story.domain.use_case.data_store.SetDatastore -import ua.acclorite.book_story.domain.util.toHorizontalAlignment -import ua.acclorite.book_story.presentation.core.constants.DataStoreConstants -import ua.acclorite.book_story.presentation.core.constants.provideFonts -import ua.acclorite.book_story.presentation.core.constants.provideMainState +import ua.acclorite.book_story.presentation.common.constants.DataStoreConstants +import ua.acclorite.book_story.presentation.common.constants.provideFonts +import ua.acclorite.book_story.presentation.common.constants.provideMainState +import ua.acclorite.book_story.ui.browse.model.BrowseLayout +import ua.acclorite.book_story.ui.browse.model.BrowseSortOrder +import ua.acclorite.book_story.ui.library.model.LibraryLayout +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder +import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition +import ua.acclorite.book_story.ui.main.model.DarkTheme +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment +import ua.acclorite.book_story.ui.main.model.PureDark +import ua.acclorite.book_story.ui.main.model.ThemeContrast +import ua.acclorite.book_story.ui.reader.model.ReaderColorEffects +import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture +import ua.acclorite.book_story.ui.reader.model.ReaderProgressCount +import ua.acclorite.book_story.ui.reader.model.ReaderScreenOrientation +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment import ua.acclorite.book_story.ui.theme.toTheme import javax.inject.Inject @@ -76,7 +76,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.DARK_THEME, value = event.value, updateState = { - it.copy(darkTheme = toDarkTheme()) + it.copy(darkTheme = DarkTheme.valueOf(this)) } ) @@ -84,7 +84,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.PURE_DARK, value = event.value, updateState = { - it.copy(pureDark = toPureDark()) + it.copy(pureDark = PureDark.valueOf(this)) } ) @@ -92,7 +92,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.THEME_CONTRAST, value = event.value, updateState = { - it.copy(themeContrast = toThemeContrast()) + it.copy(themeContrast = ThemeContrast.valueOf(this)) } ) @@ -194,7 +194,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.BROWSE_LAYOUT, value = event.value, updateState = { - it.copy(browseLayout = toBrowseLayout()) + it.copy(browseLayout = BrowseLayout.valueOf(this)) } ) @@ -218,7 +218,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.BROWSE_SORT_ORDER, value = event.value, updateState = { - it.copy(browseSortOrder = toBrowseSortOrder()) + it.copy(browseSortOrder = BrowseSortOrder.valueOf(this)) } ) @@ -238,7 +238,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.TEXT_ALIGNMENT, value = event.value, updateState = { - it.copy(textAlignment = toTextAlignment()) + it.copy(textAlignment = ReaderTextAlignment.valueOf(this)) } ) @@ -334,7 +334,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.SCREEN_ORIENTATION, value = event.value, updateState = { - it.copy(screenOrientation = toReaderScreenOrientation()) + it.copy(screenOrientation = ReaderScreenOrientation.valueOf(this)) } ) @@ -358,7 +358,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.HORIZONTAL_GESTURE, value = event.value, updateState = { - it.copy(horizontalGesture = toHorizontalGesture()) + it.copy(horizontalGesture = ReaderHorizontalGesture.valueOf(this)) } ) @@ -406,7 +406,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.CHAPTER_TITLE_ALIGNMENT, value = event.value, updateState = { - it.copy(chapterTitleAlignment = toTextAlignment()) + it.copy(chapterTitleAlignment = ReaderTextAlignment.valueOf(this)) } ) @@ -430,7 +430,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.IMAGES_ALIGNMENT, value = event.value, updateState = { - it.copy(imagesAlignment = this.toHorizontalAlignment()) + it.copy(imagesAlignment = HorizontalAlignment.valueOf(this)) } ) @@ -446,7 +446,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.IMAGES_COLOR_EFFECTS, value = event.value, updateState = { - it.copy(imagesColorEffects = this.toColorEffects()) + it.copy(imagesColorEffects = ReaderColorEffects.valueOf(this)) } ) @@ -470,7 +470,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.PROGRESS_BAR_ALIGNMENT, value = event.value, updateState = { - it.copy(progressBarAlignment = this.toHorizontalAlignment()) + it.copy(progressBarAlignment = HorizontalAlignment.valueOf(this)) } ) @@ -490,7 +490,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.FONT_THICKNESS, value = event.value, updateState = { - it.copy(fontThickness = this.toFontThickness()) + it.copy(fontThickness = ReaderFontThickness.valueOf(this)) } ) @@ -498,7 +498,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.PROGRESS_COUNT, value = event.value, updateState = { - it.copy(progressCount = this.toProgressCount()) + it.copy(progressCount = ReaderProgressCount.valueOf(this)) } ) @@ -522,7 +522,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.LIBRARY_LAYOUT, value = event.value, updateState = { - it.copy(libraryLayout = this.toLibraryLayout()) + it.copy(libraryLayout = LibraryLayout.valueOf(this)) } ) @@ -562,7 +562,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.LIBRARY_TITLE_POSITION, value = event.value, updateState = { - it.copy(libraryTitlePosition = this.toLibraryTitlePosition()) + it.copy(libraryTitlePosition = LibraryTitlePosition.valueOf(this)) } ) @@ -594,7 +594,7 @@ class MainModel @Inject constructor( key = DataStoreConstants.LIBRARY_SORT_ORDER, value = event.value, updateState = { - it.copy(librarySortOrder = this.toLibrarySortOrder()) + it.copy(librarySortOrder = LibrarySortOrder.valueOf(this)) } ) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt index f268ac30..de7da0bb 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt @@ -13,39 +13,24 @@ import androidx.annotation.Keep import androidx.compose.runtime.Immutable import androidx.datastore.preferences.core.Preferences import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.browse.display.BrowseLayout -import ua.acclorite.book_story.domain.browse.display.BrowseSortOrder -import ua.acclorite.book_story.domain.browse.display.toBrowseLayout -import ua.acclorite.book_story.domain.browse.display.toBrowseSortOrder -import ua.acclorite.book_story.domain.library.display.LibraryLayout -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder -import ua.acclorite.book_story.domain.library.display.LibraryTitlePosition -import ua.acclorite.book_story.domain.library.display.toLibraryLayout -import ua.acclorite.book_story.domain.library.display.toLibrarySortOrder -import ua.acclorite.book_story.domain.library.display.toLibraryTitlePosition -import ua.acclorite.book_story.domain.reader.ReaderColorEffects -import ua.acclorite.book_story.domain.reader.ReaderFontThickness -import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture -import ua.acclorite.book_story.domain.reader.ReaderProgressCount -import ua.acclorite.book_story.domain.reader.ReaderScreenOrientation -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.domain.reader.toColorEffects -import ua.acclorite.book_story.domain.reader.toFontThickness -import ua.acclorite.book_story.domain.reader.toHorizontalGesture -import ua.acclorite.book_story.domain.reader.toProgressCount -import ua.acclorite.book_story.domain.reader.toReaderScreenOrientation -import ua.acclorite.book_story.domain.reader.toTextAlignment -import ua.acclorite.book_story.domain.ui.DarkTheme -import ua.acclorite.book_story.domain.ui.PureDark -import ua.acclorite.book_story.domain.ui.ThemeContrast -import ua.acclorite.book_story.domain.ui.toDarkTheme -import ua.acclorite.book_story.domain.ui.toPureDark -import ua.acclorite.book_story.domain.ui.toThemeContrast -import ua.acclorite.book_story.domain.util.HorizontalAlignment -import ua.acclorite.book_story.domain.util.toHorizontalAlignment -import ua.acclorite.book_story.presentation.core.constants.DataStoreConstants -import ua.acclorite.book_story.presentation.core.constants.provideFonts -import ua.acclorite.book_story.presentation.core.constants.provideLanguages +import ua.acclorite.book_story.presentation.common.constants.DataStoreConstants +import ua.acclorite.book_story.presentation.common.constants.provideFonts +import ua.acclorite.book_story.presentation.common.constants.provideLanguages +import ua.acclorite.book_story.ui.browse.model.BrowseLayout +import ua.acclorite.book_story.ui.browse.model.BrowseSortOrder +import ua.acclorite.book_story.ui.library.model.LibraryLayout +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder +import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition +import ua.acclorite.book_story.ui.main.model.DarkTheme +import ua.acclorite.book_story.ui.main.model.HorizontalAlignment +import ua.acclorite.book_story.ui.main.model.PureDark +import ua.acclorite.book_story.ui.main.model.ThemeContrast +import ua.acclorite.book_story.ui.reader.model.ReaderColorEffects +import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness +import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture +import ua.acclorite.book_story.ui.reader.model.ReaderProgressCount +import ua.acclorite.book_story.ui.reader.model.ReaderScreenOrientation +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment import ua.acclorite.book_story.ui.theme.Theme import ua.acclorite.book_story.ui.theme.toTheme import java.util.Locale @@ -176,11 +161,11 @@ data class MainState( ) { theme }, darkTheme = provideValue( - DARK_THEME, convert = { toDarkTheme() } + DARK_THEME, convert = { DarkTheme.valueOf(this) } ) { darkTheme }, pureDark = provideValue( - PURE_DARK, convert = { toPureDark() } + PURE_DARK, convert = { PureDark.valueOf(this) } ) { pureDark }, absoluteDark = provideValue( @@ -188,7 +173,7 @@ data class MainState( ) { absoluteDark }, themeContrast = provideValue( - THEME_CONTRAST, convert = { toThemeContrast() } + THEME_CONTRAST, convert = { ThemeContrast.valueOf(this) } ) { themeContrast }, showStartScreen = provideValue( @@ -232,7 +217,7 @@ data class MainState( ) { fastColorPresetChange }, browseLayout = provideValue( - BROWSE_LAYOUT, convert = { toBrowseLayout() } + BROWSE_LAYOUT, convert = { BrowseLayout.valueOf(this) } ) { browseLayout }, browseAutoGridSize = provideValue( @@ -244,7 +229,7 @@ data class MainState( ) { browseGridSize }, browseSortOrder = provideValue( - BROWSE_SORT_ORDER, convert = { toBrowseSortOrder() } + BROWSE_SORT_ORDER, convert = { BrowseSortOrder.valueOf(this) } ) { browseSortOrder }, browseSortOrderDescending = provideValue( @@ -256,7 +241,7 @@ data class MainState( ) { browseIncludedFilterItems }, textAlignment = provideValue( - TEXT_ALIGNMENT, convert = { toTextAlignment() } + TEXT_ALIGNMENT, convert = { ReaderTextAlignment.valueOf(this) } ) { textAlignment }, doublePressExit = provideValue( @@ -300,7 +285,7 @@ data class MainState( ) { perceptionExpanderThickness }, screenOrientation = provideValue( - SCREEN_ORIENTATION, convert = { toReaderScreenOrientation() } + SCREEN_ORIENTATION, convert = { ReaderScreenOrientation.valueOf(this) } ) { screenOrientation }, customScreenBrightness = provideValue( @@ -312,7 +297,7 @@ data class MainState( ) { screenBrightness }, horizontalGesture = provideValue( - HORIZONTAL_GESTURE, convert = { toHorizontalGesture() } + HORIZONTAL_GESTURE, convert = { ReaderHorizontalGesture.valueOf(this) } ) { horizontalGesture }, horizontalGestureScroll = provideValue( @@ -336,7 +321,7 @@ data class MainState( ) { highlightedReadingThickness }, chapterTitleAlignment = provideValue( - CHAPTER_TITLE_ALIGNMENT, convert = { toTextAlignment() } + CHAPTER_TITLE_ALIGNMENT, convert = { ReaderTextAlignment.valueOf(this) } ) { chapterTitleAlignment }, images = provideValue( @@ -348,7 +333,7 @@ data class MainState( ) { imagesCornersRoundness }, imagesAlignment = provideValue( - IMAGES_ALIGNMENT, convert = { toHorizontalAlignment() } + IMAGES_ALIGNMENT, convert = { HorizontalAlignment.valueOf(this) } ) { imagesAlignment }, imagesWidth = provideValue( @@ -356,7 +341,7 @@ data class MainState( ) { imagesWidth }, imagesColorEffects = provideValue( - IMAGES_COLOR_EFFECTS, convert = { toColorEffects() } + IMAGES_COLOR_EFFECTS, convert = { ReaderColorEffects.valueOf(this) } ) { imagesColorEffects }, progressBar = provideValue( @@ -368,7 +353,7 @@ data class MainState( ) { progressBarPadding }, progressBarAlignment = provideValue( - PROGRESS_BAR_ALIGNMENT, convert = { toHorizontalAlignment() } + PROGRESS_BAR_ALIGNMENT, convert = { HorizontalAlignment.valueOf(this) } ) { progressBarAlignment }, progressBarFontSize = provideValue( @@ -380,11 +365,11 @@ data class MainState( ) { browsePinnedPaths }, fontThickness = provideValue( - FONT_THICKNESS, convert = { toFontThickness() } + FONT_THICKNESS, convert = { ReaderFontThickness.valueOf(this) } ) { fontThickness }, progressCount = provideValue( - PROGRESS_COUNT, convert = { toProgressCount() } + PROGRESS_COUNT, convert = { ReaderProgressCount.valueOf(this) } ) { progressCount }, horizontalGestureAlphaAnim = provideValue( @@ -396,7 +381,7 @@ data class MainState( ) { horizontalGesturePullAnim }, libraryLayout = provideValue( - LIBRARY_LAYOUT, convert = { toLibraryLayout() } + LIBRARY_LAYOUT, convert = { LibraryLayout.valueOf(this) } ) { libraryLayout }, libraryAutoGridSize = provideValue( @@ -416,7 +401,7 @@ data class MainState( ) { libraryShowProgress }, libraryTitlePosition = provideValue( - LIBRARY_TITLE_POSITION, convert = { toLibraryTitlePosition() } + LIBRARY_TITLE_POSITION, convert = { LibraryTitlePosition.valueOf(this) } ) { libraryTitlePosition }, libraryShowBookCount = provideValue( @@ -432,7 +417,7 @@ data class MainState( ) { libraryAlwaysShowDefaultTab }, librarySortOrder = provideValue( - LIBRARY_SORT_ORDER, convert = { toLibrarySortOrder() } + LIBRARY_SORT_ORDER, convert = { LibrarySortOrder.valueOf(this) } ) { librarySortOrder }, librarySortOrderDescending = provideValue( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/ui/DarkTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/model/DarkTheme.kt similarity index 82% rename from app/src/main/java/ua/acclorite/book_story/domain/ui/DarkTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/main/model/DarkTheme.kt index 8c927728..0afcf722 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/ui/DarkTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/model/DarkTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.ui +package ua.acclorite.book_story.ui.main.model import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable @@ -17,10 +17,6 @@ enum class DarkTheme { ON } -fun String.toDarkTheme(): DarkTheme { - return DarkTheme.valueOf(this) -} - @Composable fun DarkTheme.isDark(): Boolean { return when (this) { diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/HorizontalAlignment.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/model/HorizontalAlignment.kt similarity index 51% rename from app/src/main/java/ua/acclorite/book_story/domain/util/HorizontalAlignment.kt rename to app/src/main/java/ua/acclorite/book_story/ui/main/model/HorizontalAlignment.kt index 32fc8ee7..09d0e3bc 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/HorizontalAlignment.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/model/HorizontalAlignment.kt @@ -4,16 +4,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.util +package ua.acclorite.book_story.ui.main.model +import androidx.compose.runtime.Immutable import androidx.compose.ui.Alignment +@Immutable enum class HorizontalAlignment(val alignment: Alignment) { - START(Alignment.CenterStart), - CENTER(Alignment.Center), - END(Alignment.CenterEnd) -} - -fun String.toHorizontalAlignment(): HorizontalAlignment { - return HorizontalAlignment.valueOf(this) + START(Alignment.Companion.CenterStart), + CENTER(Alignment.Companion.Center), + END(Alignment.Companion.CenterEnd) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/ui/PureDark.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/model/PureDark.kt similarity index 85% rename from app/src/main/java/ua/acclorite/book_story/domain/ui/PureDark.kt rename to app/src/main/java/ua/acclorite/book_story/ui/main/model/PureDark.kt index 6df0370f..ee94d5dc 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/ui/PureDark.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/model/PureDark.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.ui +package ua.acclorite.book_story.ui.main.model import android.content.Context import android.os.PowerManager @@ -18,10 +18,6 @@ enum class PureDark { SAVER } -fun String.toPureDark(): PureDark { - return PureDark.valueOf(this) -} - @Composable fun PureDark.isPureDark(context: Context): Boolean { val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager diff --git a/app/src/main/java/ua/acclorite/book_story/domain/ui/ThemeContrast.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/model/ThemeContrast.kt similarity index 67% rename from app/src/main/java/ua/acclorite/book_story/domain/ui/ThemeContrast.kt rename to app/src/main/java/ua/acclorite/book_story/ui/main/model/ThemeContrast.kt index 84d49783..7d2e91d4 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/ui/ThemeContrast.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/model/ThemeContrast.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.ui +package ua.acclorite.book_story.ui.main.model import androidx.compose.runtime.Immutable @@ -13,8 +13,4 @@ enum class ThemeContrast { STANDARD, MEDIUM, HIGH -} - -fun String.toThemeContrast(): ThemeContrast { - return ThemeContrast.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/navigator/Navigator.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/domain/navigator/Navigator.kt rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt index 2d7dc94c..49b6352d 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/navigator/Navigator.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.navigator +package ua.acclorite.book_story.ui.navigator import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/ua/acclorite/book_story/domain/navigator/NavigatorItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorItem.kt similarity index 91% rename from app/src/main/java/ua/acclorite/book_story/domain/navigator/NavigatorItem.kt rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorItem.kt index d83447e5..411e9f05 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/navigator/NavigatorItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorItem.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.navigator +package ua.acclorite.book_story.ui.navigator import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/app/src/main/java/ua/acclorite/book_story/domain/navigator/Screen.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/Screen.kt similarity index 83% rename from app/src/main/java/ua/acclorite/book_story/domain/navigator/Screen.kt rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/Screen.kt index e5f65ce8..16b3d808 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/navigator/Screen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/Screen.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.navigator +package ua.acclorite.book_story.ui.navigator import androidx.compose.runtime.Composable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/navigator/StackEvent.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/StackEvent.kt similarity index 87% rename from app/src/main/java/ua/acclorite/book_story/domain/navigator/StackEvent.kt rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/StackEvent.kt index bfb831b0..ce17ca8d 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/navigator/StackEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/StackEvent.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.navigator +package ua.acclorite.book_story.ui.navigator import android.os.Parcelable import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt index d2f59f75..73a84bf1 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt @@ -35,19 +35,19 @@ import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.reader.Checkpoint +import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.domain.reader.ReaderText.Chapter -import ua.acclorite.book_story.domain.ui.UIText import ua.acclorite.book_story.domain.use_case.book.GetBookById import ua.acclorite.book_story.domain.use_case.book.GetText import ua.acclorite.book_story.domain.use_case.book.UpdateBook import ua.acclorite.book_story.domain.use_case.history.GetLatestHistory -import ua.acclorite.book_story.presentation.core.util.coerceAndPreventNaN -import ua.acclorite.book_story.presentation.core.util.launchActivity -import ua.acclorite.book_story.presentation.core.util.setBrightness -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.util.coerceAndPreventNaN +import ua.acclorite.book_story.presentation.common.util.launchActivity +import ua.acclorite.book_story.presentation.common.util.setBrightness +import ua.acclorite.book_story.presentation.common.util.showToast import ua.acclorite.book_story.ui.history.HistoryScreen import ua.acclorite.book_story.ui.library.LibraryScreen +import ua.acclorite.book_story.ui.reader.model.Checkpoint import javax.inject.Inject import kotlin.math.roundToInt diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt index 6cf498b7..e06d3dc7 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt @@ -44,18 +44,18 @@ import androidx.core.view.WindowInsetsCompat import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.domain.reader.ReaderColorEffects -import ua.acclorite.book_story.domain.reader.ReaderProgressCount -import ua.acclorite.book_story.domain.reader.ReaderTextAlignment -import ua.acclorite.book_story.presentation.core.constants.provideFonts -import ua.acclorite.book_story.presentation.core.util.LocalActivity -import ua.acclorite.book_story.presentation.core.util.calculateProgress -import ua.acclorite.book_story.presentation.core.util.setBrightness +import ua.acclorite.book_story.presentation.common.constants.provideFonts +import ua.acclorite.book_story.presentation.common.util.LocalActivity +import ua.acclorite.book_story.presentation.common.util.calculateProgress +import ua.acclorite.book_story.presentation.common.util.setBrightness import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.reader.ReaderContent import ua.acclorite.book_story.ui.book_info.BookInfoScreen import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.navigator.Screen +import ua.acclorite.book_story.ui.reader.model.ReaderColorEffects +import ua.acclorite.book_story.ui.reader.model.ReaderProgressCount +import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment import ua.acclorite.book_story.ui.settings.SettingsModel import kotlin.math.roundToInt diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderState.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderState.kt index 9ada47a1..181f73f8 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderState.kt @@ -8,14 +8,14 @@ package ua.acclorite.book_story.ui.reader import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.library.book.Book -import ua.acclorite.book_story.domain.reader.Checkpoint +import ua.acclorite.book_story.core.BottomSheet +import ua.acclorite.book_story.core.Drawer +import ua.acclorite.book_story.core.ui.UIText +import ua.acclorite.book_story.domain.library.Book import ua.acclorite.book_story.domain.reader.ReaderText import ua.acclorite.book_story.domain.reader.ReaderText.Chapter -import ua.acclorite.book_story.domain.ui.UIText -import ua.acclorite.book_story.domain.util.BottomSheet -import ua.acclorite.book_story.domain.util.Drawer -import ua.acclorite.book_story.presentation.core.constants.provideEmptyBook +import ua.acclorite.book_story.presentation.common.constants.provideEmptyBook +import ua.acclorite.book_story.ui.reader.model.Checkpoint @Immutable data class ReaderState( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/Checkpoint.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/Checkpoint.kt similarity index 85% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/Checkpoint.kt rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/Checkpoint.kt index 0de4973d..cca1e44a 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/Checkpoint.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/Checkpoint.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.ui.reader.model import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderColorEffects.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderColorEffects.kt similarity index 67% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderColorEffects.kt rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderColorEffects.kt index bce340dc..3e40ca2f 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderColorEffects.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderColorEffects.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.ui.reader.model import androidx.compose.runtime.Immutable @@ -14,8 +14,4 @@ enum class ReaderColorEffects { GRAYSCALE, FONT, BACKGROUND -} - -fun String.toColorEffects(): ReaderColorEffects { - return ReaderColorEffects.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderFontThickness.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderFontThickness.kt similarity index 76% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderFontThickness.kt rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderFontThickness.kt index 4c84e3e2..3109b266 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderFontThickness.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderFontThickness.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.ui.reader.model import androidx.compose.runtime.Immutable import androidx.compose.ui.text.font.FontWeight @@ -16,8 +16,4 @@ enum class ReaderFontThickness(val thickness: FontWeight) { LIGHT(FontWeight.Light), NORMAL(FontWeight.Normal), MEDIUM(FontWeight.Medium) -} - -fun String.toFontThickness(): ReaderFontThickness { - return ReaderFontThickness.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderHorizontalGesture.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderHorizontalGesture.kt similarity index 63% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderHorizontalGesture.kt rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderHorizontalGesture.kt index 5fcdfced..59504697 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderHorizontalGesture.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderHorizontalGesture.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.ui.reader.model import androidx.compose.runtime.Immutable @@ -13,8 +13,4 @@ enum class ReaderHorizontalGesture { OFF, ON, INVERSE -} - -fun String.toHorizontalGesture(): ReaderHorizontalGesture { - return ReaderHorizontalGesture.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderProgressCount.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderProgressCount.kt similarity index 65% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderProgressCount.kt rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderProgressCount.kt index bb2d6de9..59767f07 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderProgressCount.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderProgressCount.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.ui.reader.model import androidx.compose.runtime.Immutable @@ -12,8 +12,4 @@ import androidx.compose.runtime.Immutable enum class ReaderProgressCount { PERCENTAGE, QUANTITY -} - -fun String.toProgressCount(): ReaderProgressCount { - return ReaderProgressCount.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderScreenOrientation.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderScreenOrientation.kt similarity index 80% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderScreenOrientation.kt rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderScreenOrientation.kt index 70db3d58..83fd328b 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderScreenOrientation.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderScreenOrientation.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.ui.reader.model import android.content.pm.ActivityInfo import androidx.compose.runtime.Immutable @@ -17,8 +17,4 @@ enum class ReaderScreenOrientation(val code: Int) { LANDSCAPE(ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE), LOCKED_PORTRAIT(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT), LOCKED_LANDSCAPE(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE), -} - -fun String.toReaderScreenOrientation(): ReaderScreenOrientation { - return ReaderScreenOrientation.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderTextAlignment.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderTextAlignment.kt similarity index 74% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderTextAlignment.kt rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderTextAlignment.kt index 0a59bd22..6c52d058 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderTextAlignment.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderTextAlignment.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.ui.reader.model import androidx.compose.runtime.Immutable import androidx.compose.ui.text.style.TextAlign @@ -15,8 +15,4 @@ enum class ReaderTextAlignment(val textAlignment: TextAlign) { JUSTIFY(TextAlign.Justify), CENTER(TextAlign.Center), END(TextAlign.End) -} - -fun String.toTextAlignment(): ReaderTextAlignment { - return ReaderTextAlignment.valueOf(this) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/AppearanceSettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/AppearanceSettingsScreen.kt index 2a81c441..8b6fedc8 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/AppearanceSettingsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/AppearanceSettingsScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.settings.appearance.AppearanceSettingsContent +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object AppearanceSettingsScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/BrowseSettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/BrowseSettingsScreen.kt index 0012d5da..88f6bdf9 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/BrowseSettingsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/BrowseSettingsScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.settings.browse.BrowseSettingsContent +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object BrowseSettingsScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/GeneralSettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/GeneralSettingsScreen.kt index 4a91f8dd..06200953 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/GeneralSettingsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/GeneralSettingsScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.settings.general.GeneralSettingsContent +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object GeneralSettingsScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/LibrarySettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/LibrarySettingsScreen.kt index 0806e96a..6848fac3 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/LibrarySettingsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/LibrarySettingsScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.settings.library.LibrarySettingsContent +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object LibrarySettingsScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/ReaderSettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/ReaderSettingsScreen.kt index 08dc5837..ce317fad 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/ReaderSettingsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/ReaderSettingsScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.settings.reader.ReaderSettingsContent +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object ReaderSettingsScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEvent.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEvent.kt index 672c071a..54e1bbda 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEvent.kt @@ -10,9 +10,9 @@ import android.content.Context import android.net.Uri import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.display.LibrarySortOrder -import ua.acclorite.book_story.domain.util.ID +import ua.acclorite.book_story.core.ID +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.ui.library.model.LibrarySortOrder @Immutable sealed class SettingsEvent { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsModel.kt index dbab7eb5..04920a27 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsModel.kt @@ -20,8 +20,8 @@ import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort import ua.acclorite.book_story.domain.reader.ColorPreset import ua.acclorite.book_story.domain.use_case.category.DeleteCategory import ua.acclorite.book_story.domain.use_case.category.GetCategories @@ -37,8 +37,8 @@ import ua.acclorite.book_story.domain.use_case.color_preset.SelectColorPreset import ua.acclorite.book_story.domain.use_case.color_preset.UpdateColorPreset import ua.acclorite.book_story.domain.use_case.permission.GrantPersistableUriPermission import ua.acclorite.book_story.domain.use_case.permission.ReleasePersistableUriPermission -import ua.acclorite.book_story.presentation.core.constants.provideDefaultColorPreset -import ua.acclorite.book_story.presentation.core.util.showToast +import ua.acclorite.book_story.presentation.common.constants.provideDefaultColorPreset +import ua.acclorite.book_story.presentation.common.util.showToast import javax.inject.Inject import kotlin.random.Random diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScreen.kt index 2e1e7955..c73593b1 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.presentation.core.components.top_bar.collapsibleTopAppBarScrollBehavior +import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.settings.SettingsContent +import ua.acclorite.book_story.ui.navigator.Screen @Parcelize object SettingsScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsState.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsState.kt index 218c0296..c3595c9a 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsState.kt @@ -8,10 +8,10 @@ package ua.acclorite.book_story.ui.settings import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.library.category.Category -import ua.acclorite.book_story.domain.library.category.CategorySort +import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.library.CategorySort import ua.acclorite.book_story.domain.reader.ColorPreset -import ua.acclorite.book_story.presentation.core.constants.provideDefaultColorPreset +import ua.acclorite.book_story.presentation.common.constants.provideDefaultColorPreset @Immutable data class SettingsState( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartScreen.kt index bc55042e..145b4a86 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartScreen.kt @@ -17,17 +17,17 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.navigator.Screen -import ua.acclorite.book_story.domain.navigator.StackEvent -import ua.acclorite.book_story.domain.ui.ButtonItem -import ua.acclorite.book_story.presentation.core.constants.provideLanguages -import ua.acclorite.book_story.presentation.core.util.LocalActivity +import ua.acclorite.book_story.presentation.common.constants.provideLanguages +import ua.acclorite.book_story.presentation.common.model.ButtonItem +import ua.acclorite.book_story.presentation.common.util.LocalActivity import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.start.StartContent import ua.acclorite.book_story.ui.browse.BrowseScreen import ua.acclorite.book_story.ui.help.HelpScreen import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.navigator.Screen +import ua.acclorite.book_story.ui.navigator.StackEvent @Parcelize object StartScreen : Screen, Parcelable { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt index a33e5c31..4b4cac23 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt @@ -11,7 +11,7 @@ import androidx.compose.animation.core.tween import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast @Composable private fun animateColor(targetColor: Color): Color { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt index e7024da2..98d4b3a0 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt @@ -12,7 +12,7 @@ import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast import ua.acclorite.book_story.ui.theme.color.aquaTheme import ua.acclorite.book_story.ui.theme.color.blackTheme import ua.acclorite.book_story.ui.theme.color.blueTheme diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt index 7265fac6..29204f23 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt @@ -16,7 +16,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast @Composable fun BookStoryTheme( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt index 872b9e9c..bd583661 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt @@ -30,7 +30,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.core.components.common.AnimatedVisibility +import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility import kotlin.math.roundToInt object Transitions { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt index b3016fe7..3b36d002 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF116682) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt index 23be04de..a7e54ba5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF485D92) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt index 74bf7164..512e8008 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF306A42) private val onPrimaryLight = Color(0xFFFFFFFF) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt index 1c062946..c2f4ff27 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF824C76) private val onPrimaryLight = Color(0xFFFFFFFF) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt index 73b88259..7eac00d3 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF006A65) private val onPrimaryLight = Color(0xFFFFFFFF) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt index c9688a77..bda71655 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF8C4A60) private val onPrimaryLight = Color(0xFFFFFFFF) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt index 711e8dec..3078837d 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF725188) private val onPrimaryLight = Color(0xFFFFFFFF) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt index e5c01396..4c95ab79 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF904A42) private val onPrimaryLight = Color(0xFFFFFFFF) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt index a954af3e..5714cd23 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import ua.acclorite.book_story.domain.ui.ThemeContrast +import ua.acclorite.book_story.ui.main.model.ThemeContrast private val primaryLight = Color(0xFF845415) private val onPrimaryLight = Color(0xFFFFFFFF)