From 1d73fd8a91913cf3d7734a9fa56fca8ffcdb30d3 Mon Sep 17 00:00:00 2001 From: Acclorite <2ma0bhpk@anonaddy.com> Date: Mon, 2 Jun 2025 20:41:52 +0300 Subject: [PATCH] refactor(domain): move models in domain to model/ --- .../ua/acclorite/book_story/data/mapper/book/BookMapper.kt | 2 +- .../acclorite/book_story/data/mapper/book/BookMapperImpl.kt | 2 +- .../book_story/data/mapper/category/CategoryMapper.kt | 2 +- .../book_story/data/mapper/category/CategoryMapperImpl.kt | 2 +- .../data/mapper/category_sort/CategorySortMapper.kt | 2 +- .../data/mapper/category_sort/CategorySortSortMapperImpl.kt | 2 +- .../data/mapper/color_preset/ColorPresetMapper.kt | 2 +- .../data/mapper/color_preset/ColorPresetMapperImpl.kt | 2 +- .../ua/acclorite/book_story/data/mapper/file/FileMapper.kt | 2 +- .../acclorite/book_story/data/mapper/file/FileMapperImpl.kt | 2 +- .../book_story/data/mapper/history/HistoryMapper.kt | 2 +- .../book_story/data/mapper/history/HistoryMapperImpl.kt | 2 +- .../book_story/data/model/library/BookWithCover.kt | 2 +- .../ua/acclorite/book_story/data/parser/DocumentParser.kt | 2 +- .../java/ua/acclorite/book_story/data/parser/TextParser.kt | 2 +- .../ua/acclorite/book_story/data/parser/TextParserImpl.kt | 2 +- .../acclorite/book_story/data/parser/epub/EpubFileParser.kt | 2 +- .../acclorite/book_story/data/parser/epub/EpubTextParser.kt | 2 +- .../acclorite/book_story/data/parser/fb2/Fb2FileParser.kt | 2 +- .../acclorite/book_story/data/parser/html/HtmlFileParser.kt | 2 +- .../acclorite/book_story/data/parser/html/HtmlTextParser.kt | 2 +- .../acclorite/book_story/data/parser/pdf/PdfFileParser.kt | 2 +- .../acclorite/book_story/data/parser/pdf/PdfTextParser.kt | 2 +- .../acclorite/book_story/data/parser/txt/TxtFileParser.kt | 2 +- .../acclorite/book_story/data/parser/txt/TxtTextParser.kt | 2 +- .../acclorite/book_story/data/parser/xml/XmlTextParser.kt | 2 +- .../book_story/data/repository/BookRepositoryImpl.kt | 4 ++-- .../book_story/data/repository/CategoryRepositoryImpl.kt | 4 ++-- .../book_story/data/repository/ColorPresetRepositoryImpl.kt | 2 +- .../book_story/data/repository/FileSystemRepositoryImpl.kt | 2 +- .../book_story/data/repository/HistoryRepositoryImpl.kt | 2 +- .../acclorite/book_story/data/service/FileProviderImpl.kt | 2 +- .../ua/acclorite/book_story/domain/{ => model}/file/File.kt | 2 +- .../book_story/domain/{ => model}/history/History.kt | 4 ++-- .../acclorite/book_story/domain/{ => model}/library/Book.kt | 2 +- .../book_story/domain/{ => model}/library/Category.kt | 2 +- .../book_story/domain/{ => model}/library/CategorySort.kt | 2 +- .../book_story/domain/{ => model}/reader/ColorPreset.kt | 2 +- .../book_story/domain/{ => model}/reader/ReaderText.kt | 2 +- .../book_story/domain/repository/BookRepository.kt | 4 ++-- .../book_story/domain/repository/CategoryRepository.kt | 4 ++-- .../book_story/domain/repository/ColorPresetRepository.kt | 2 +- .../book_story/domain/repository/FileSystemRepository.kt | 2 +- .../book_story/domain/repository/HistoryRepository.kt | 2 +- .../ua/acclorite/book_story/domain/service/FileProvider.kt | 2 +- .../book_story/domain/use_case/book/AddBookUseCase.kt | 2 +- .../book_story/domain/use_case/book/DeleteBookUseCase.kt | 2 +- .../book_story/domain/use_case/book/GetBookUseCase.kt | 2 +- .../book_story/domain/use_case/book/GetTextUseCase.kt | 2 +- .../book_story/domain/use_case/book/SearchBooksUseCase.kt | 2 +- .../book_story/domain/use_case/book/UpdateBookUseCase.kt | 2 +- .../domain/use_case/category/AddCategoryUseCase.kt | 2 +- .../domain/use_case/category/DeleteCategoryUseCase.kt | 2 +- .../domain/use_case/category/GetCategoriesUseCase.kt | 2 +- .../domain/use_case/category/GetCategorySortingUseCase.kt | 2 +- .../use_case/category/UpdateCategoriesOrderUseCase.kt | 2 +- .../use_case/category/UpdateCategorySortingUseCase.kt | 2 +- .../domain/use_case/category/UpdateCategoryUseCase.kt | 2 +- .../use_case/color_preset/DeleteColorPresetUseCase.kt | 2 +- .../domain/use_case/color_preset/GetColorPresetsUseCase.kt | 2 +- .../use_case/color_preset/ReorderColorPresetsUseCase.kt | 2 +- .../use_case/color_preset/SelectColorPresetUseCase.kt | 2 +- .../use_case/color_preset/UpdateColorPresetUseCase.kt | 2 +- .../domain/use_case/file_system/GetBookFromFileUseCase.kt | 2 +- .../domain/use_case/file_system/SearchFilesUseCase.kt | 2 +- .../book_story/domain/use_case/history/AddHistoryUseCase.kt | 2 +- .../domain/use_case/history/DeleteHistoryUseCase.kt | 2 +- .../domain/use_case/history/GetHistoryForBookUseCase.kt | 2 +- .../book_story/domain/use_case/history/GetHistoryUseCase.kt | 2 +- .../book_story/presentation/book_info/BookInfoEvent.kt | 2 +- .../book_story/presentation/book_info/BookInfoState.kt | 2 +- .../acclorite/book_story/presentation/browse/BrowseModel.kt | 2 +- .../book_story/presentation/history/HistoryEvent.kt | 2 +- .../book_story/presentation/history/HistoryModel.kt | 2 +- .../book_story/presentation/history/model/GroupedHistory.kt | 2 +- .../book_story/presentation/library/LibraryEvent.kt | 2 +- .../book_story/presentation/library/LibraryModel.kt | 2 +- .../book_story/presentation/library/model/SelectableBook.kt | 2 +- .../acclorite/book_story/presentation/reader/ReaderEvent.kt | 2 +- .../acclorite/book_story/presentation/reader/ReaderModel.kt | 2 +- .../acclorite/book_story/presentation/reader/ReaderState.kt | 6 +++--- .../book_story/presentation/settings/SettingsEvent.kt | 2 +- .../book_story/presentation/settings/SettingsModel.kt | 4 ++-- .../book_story/presentation/settings/SettingsState.kt | 6 +++--- .../book_story/ui/book_info/BookInfoAuthorDialog.kt | 2 +- .../book_story/ui/book_info/BookInfoBottomSheet.kt | 2 +- .../ui/book_info/BookInfoChangeCoverBottomSheet.kt | 2 +- .../ua/acclorite/book_story/ui/book_info/BookInfoContent.kt | 4 ++-- .../book_story/ui/book_info/BookInfoDescriptionDialog.kt | 2 +- .../book_story/ui/book_info/BookInfoDetailsBottomSheet.kt | 2 +- .../ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt | 4 ++-- .../ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt | 2 +- .../book_story/ui/book_info/BookInfoLayoutButton.kt | 2 +- .../book_story/ui/book_info/BookInfoLayoutDescription.kt | 2 +- .../acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt | 2 +- .../book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt | 2 +- .../book_story/ui/book_info/BookInfoLayoutInfoCover.kt | 2 +- .../book_story/ui/book_info/BookInfoLayoutInfoProgress.kt | 2 +- .../book_story/ui/book_info/BookInfoLayoutInfoTitle.kt | 2 +- .../acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt | 4 ++-- .../acclorite/book_story/ui/book_info/BookInfoPathDialog.kt | 2 +- .../acclorite/book_story/ui/book_info/BookInfoScaffold.kt | 2 +- .../book_story/ui/book_info/BookInfoTitleDialog.kt | 2 +- .../ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt | 2 +- .../book_story/ui/common/constants/CommonConstants.kt | 4 ++-- .../java/ua/acclorite/book_story/ui/history/HistoryItem.kt | 2 +- .../acclorite/book_story/ui/library/LibraryBottomSheet.kt | 4 ++-- .../ua/acclorite/book_story/ui/library/LibraryContent.kt | 4 ++-- .../ua/acclorite/book_story/ui/library/LibraryDialog.kt | 2 +- .../book_story/ui/library/LibraryFilterBottomSheet.kt | 4 ++-- .../ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt | 2 +- .../java/ua/acclorite/book_story/ui/library/LibraryPager.kt | 4 ++-- .../ua/acclorite/book_story/ui/library/LibraryScaffold.kt | 4 ++-- .../java/ua/acclorite/book_story/ui/library/LibraryTabs.kt | 2 +- .../ua/acclorite/book_story/ui/library/LibraryTopBar.kt | 2 +- .../ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt | 4 ++-- .../acclorite/book_story/ui/reader/ReaderBottomBarSlider.kt | 2 +- .../acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt | 2 +- .../java/ua/acclorite/book_story/ui/reader/ReaderContent.kt | 6 +++--- .../java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt | 2 +- .../java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt | 2 +- .../ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt | 2 +- .../book_story/ui/reader/ReaderLayoutTextChapter.kt | 2 +- .../acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt | 2 +- .../book_story/ui/reader/ReaderLayoutTextParagraph.kt | 2 +- .../ua/acclorite/book_story/ui/reader/ReaderScaffold.kt | 6 +++--- .../java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt | 4 ++-- .../book_story/ui/reader/model/ExpandableChapter.kt | 2 +- .../appearance/colors/components/ColorPresetOption.kt | 2 +- .../categories/components/LibraryCategoriesOption.kt | 2 +- 130 files changed, 155 insertions(+), 155 deletions(-) rename app/src/main/java/ua/acclorite/book_story/domain/{ => model}/file/File.kt (88%) rename app/src/main/java/ua/acclorite/book_story/domain/{ => model}/history/History.kt (73%) rename app/src/main/java/ua/acclorite/book_story/domain/{ => model}/library/Book.kt (92%) rename app/src/main/java/ua/acclorite/book_story/domain/{ => model}/library/Category.kt (84%) rename app/src/main/java/ua/acclorite/book_story/domain/{ => model}/library/CategorySort.kt (88%) rename app/src/main/java/ua/acclorite/book_story/domain/{ => model}/reader/ColorPreset.kt (89%) rename app/src/main/java/ua/acclorite/book_story/domain/{ => model}/reader/ReaderText.kt (93%) 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 76bf1369..c6c31b75 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 +import ua.acclorite.book_story.domain.model.library.Book interface BookMapper { 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 0a8a1328..911620eb 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 @@ -10,7 +10,7 @@ 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 +import ua.acclorite.book_story.domain.model.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 d635f34a..71de96da 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 +import ua.acclorite.book_story.domain.model.library.Category interface CategoryMapper { 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 1426eec8..fd8f4f71 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 +import ua.acclorite.book_story.domain.model.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 bbd97a84..36a10ba9 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.CategorySort +import ua.acclorite.book_story.domain.model.library.CategorySort interface CategorySortMapper { 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 1a6e4170..069b44a1 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.CategorySort +import ua.acclorite.book_story.domain.model.library.CategorySort import javax.inject.Inject class CategorySortSortMapperImpl @Inject constructor() : CategorySortMapper { diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapper.kt index 27247d05..03a7915b 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapper.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapper.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.color_preset import ua.acclorite.book_story.data.local.dto.ColorPresetEntity -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset interface ColorPresetMapper { fun toColorPresetEntity(colorPreset: ColorPreset, order: Int): ColorPresetEntity diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapperImpl.kt index 1db5a93b..012038b0 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapperImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapperImpl.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.data.mapper.color_preset import androidx.compose.ui.graphics.Color import ua.acclorite.book_story.data.local.dto.ColorPresetEntity -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset import javax.inject.Inject class ColorPresetMapperImpl @Inject constructor() : ColorPresetMapper { diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapper.kt index 03dfb1e3..44d77443 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapper.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapper.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.file import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.domain.file.File +import ua.acclorite.book_story.domain.model.file.File interface FileMapper { fun toCachedFile(file: File): CachedFile diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapperImpl.kt index 18b55d1e..161ca48c 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapperImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapperImpl.kt @@ -10,7 +10,7 @@ import android.app.Application import androidx.core.net.toUri import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.data.model.file.CachedFileCompat -import ua.acclorite.book_story.domain.file.File +import ua.acclorite.book_story.domain.model.file.File import javax.inject.Inject class FileMapperImpl @Inject constructor( diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapper.kt index b2720343..aa606d4f 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapper.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapper.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.history import ua.acclorite.book_story.data.local.dto.HistoryEntity -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History interface HistoryMapper { suspend fun toHistoryEntity(history: History): HistoryEntity diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapperImpl.kt index a0d00720..60736be8 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapperImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapperImpl.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.mapper.history import ua.acclorite.book_story.data.local.dto.HistoryEntity -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History import javax.inject.Inject class HistoryMapperImpl @Inject constructor() : HistoryMapper { diff --git a/app/src/main/java/ua/acclorite/book_story/data/model/library/BookWithCover.kt b/app/src/main/java/ua/acclorite/book_story/data/model/library/BookWithCover.kt index 3172ec7d..b779c13a 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/model/library/BookWithCover.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/model/library/BookWithCover.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.data.model.library import androidx.compose.runtime.Immutable import ua.acclorite.book_story.core.CoverImage -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.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 8688736a..ef5cb8d5 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 @@ -11,7 +11,7 @@ import android.graphics.BitmapFactory 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.domain.model.reader.ReaderText import ua.acclorite.book_story.ui.common.util.clearAllMarkdown import ua.acclorite.book_story.ui.common.util.clearMarkdown import ua.acclorite.book_story.ui.common.util.containsVisibleText 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 ed1cae53..969a51f7 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 @@ -7,7 +7,7 @@ package ua.acclorite.book_story.data.parser import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.domain.reader.ReaderText +import ua.acclorite.book_story.domain.model.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 2fa9eb01..9f6916cd 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 @@ -15,7 +15,7 @@ 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.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText import javax.inject.Inject private const val TEXT_PARSER = "Text Parser" 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 1ba2a146..0093bae8 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 @@ -16,7 +16,7 @@ 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.library.Book +import ua.acclorite.book_story.domain.model.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 27709890..8e589653 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 @@ -20,7 +20,7 @@ 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.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText import ua.acclorite.book_story.ui.common.constants.provideImageExtensions import ua.acclorite.book_story.ui.common.util.addAll import ua.acclorite.book_story.ui.common.util.containsVisibleText 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 3ce3b457..ce50fd5f 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 @@ -13,7 +13,7 @@ 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.library.Book +import ua.acclorite.book_story.domain.model.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 2812e0e9..b51bbaba 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 @@ -13,7 +13,7 @@ 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.library.Book +import ua.acclorite.book_story.domain.model.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 036d6957..c8043c73 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 @@ -13,7 +13,7 @@ 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.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText import javax.inject.Inject private const val HTML_TAG = "HTML Parser" 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 323ad4d4..bd13dd39 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 @@ -14,7 +14,7 @@ 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.library.Book +import ua.acclorite.book_story.domain.model.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 9b70647d..46c10a2c 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 @@ -15,7 +15,7 @@ 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.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText import ua.acclorite.book_story.ui.common.util.clearAllMarkdown import javax.inject.Inject 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 82cbb5a5..17fc2883 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 @@ -11,7 +11,7 @@ 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.library.Book +import ua.acclorite.book_story.domain.model.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 4b06d567..57277004 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 @@ -13,7 +13,7 @@ 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.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText import ua.acclorite.book_story.ui.common.util.clearAllMarkdown import javax.inject.Inject 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 6bc6a548..57a0625f 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 @@ -13,7 +13,7 @@ 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.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText import javax.inject.Inject private const val XML_TAG = "XML Parser" 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 ce66ee0c..cc973a36 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 @@ -11,8 +11,8 @@ import ua.acclorite.book_story.data.local.room.BookDao import ua.acclorite.book_story.data.mapper.book.BookMapper import ua.acclorite.book_story.data.parser.FileParser import ua.acclorite.book_story.data.parser.TextParser -import ua.acclorite.book_story.domain.library.Book -import ua.acclorite.book_story.domain.reader.ReaderText +import ua.acclorite.book_story.domain.model.library.Book +import ua.acclorite.book_story.domain.model.reader.ReaderText import ua.acclorite.book_story.domain.repository.BookRepository import ua.acclorite.book_story.domain.service.FileProvider import javax.inject.Inject 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 bbb54483..50dfce92 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 -import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.domain.model.library.Category +import ua.acclorite.book_story.domain.model.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/ColorPresetRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/ColorPresetRepositoryImpl.kt index e803cce5..b8230bce 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/repository/ColorPresetRepositoryImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/repository/ColorPresetRepositoryImpl.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.data.repository import ua.acclorite.book_story.data.local.room.BookDao import ua.acclorite.book_story.data.mapper.color_preset.ColorPresetMapper -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.domain.repository.ColorPresetRepository 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 9d335f7c..7670606b 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 @@ -11,7 +11,7 @@ import ua.acclorite.book_story.data.mapper.file.FileMapper 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.File +import ua.acclorite.book_story.domain.model.file.File import ua.acclorite.book_story.domain.repository.FileSystemRepository import ua.acclorite.book_story.domain.service.FileProvider import ua.acclorite.book_story.ui.common.constants.provideExtensions diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/HistoryRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/HistoryRepositoryImpl.kt index f7cad22a..5b0d7b6b 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/repository/HistoryRepositoryImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/repository/HistoryRepositoryImpl.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.data.repository import ua.acclorite.book_story.data.local.room.BookDao import ua.acclorite.book_story.data.mapper.history.HistoryMapper -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History import ua.acclorite.book_story.domain.repository.HistoryRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/ua/acclorite/book_story/data/service/FileProviderImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/service/FileProviderImpl.kt index 01da7ddf..70940e37 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/service/FileProviderImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/service/FileProviderImpl.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.data.service import android.app.Application import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.data.model.file.CachedFileCompat -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.domain.service.FileProvider import javax.inject.Inject 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/model/file/File.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/domain/file/File.kt rename to app/src/main/java/ua/acclorite/book_story/domain/model/file/File.kt index 67e3a836..223add8f 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/file/File.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/file/File.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.file +package ua.acclorite.book_story.domain.model.file import androidx.compose.runtime.Immutable 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/model/history/History.kt similarity index 73% rename from app/src/main/java/ua/acclorite/book_story/domain/history/History.kt rename to app/src/main/java/ua/acclorite/book_story/domain/model/history/History.kt index 6d8b3e4c..c997bc93 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/history/History.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/history/History.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.history +package ua.acclorite.book_story.domain.model.history import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book @Immutable data class History( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/Book.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/library/Book.kt similarity index 92% rename from app/src/main/java/ua/acclorite/book_story/domain/library/Book.kt rename to app/src/main/java/ua/acclorite/book_story/domain/model/library/Book.kt index 0a370c4b..83b6e2b9 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/Book.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/library/Book.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library +package ua.acclorite.book_story.domain.model.library import android.net.Uri import android.os.Parcelable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/Category.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/library/Category.kt similarity index 84% rename from app/src/main/java/ua/acclorite/book_story/domain/library/Category.kt rename to app/src/main/java/ua/acclorite/book_story/domain/model/library/Category.kt index 4d243159..c8ab1cdb 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/Category.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/library/Category.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library +package ua.acclorite.book_story.domain.model.library import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/library/CategorySort.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt rename to app/src/main/java/ua/acclorite/book_story/domain/model/library/CategorySort.kt index abcfe0e2..bcb6d8e8 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/library/CategorySort.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.library +package ua.acclorite.book_story.domain.model.library import androidx.compose.runtime.Immutable import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder 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/model/reader/ColorPreset.kt similarity index 89% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ColorPreset.kt rename to app/src/main/java/ua/acclorite/book_story/domain/model/reader/ColorPreset.kt index c7336937..d7d89074 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ColorPreset.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/reader/ColorPreset.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.domain.model.reader import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderText.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/reader/ReaderText.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderText.kt rename to app/src/main/java/ua/acclorite/book_story/domain/model/reader/ReaderText.kt index 0f18cd6d..dfbc0a56 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderText.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/reader/ReaderText.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.reader +package ua.acclorite.book_story.domain.model.reader import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.ImageBitmap 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 0a9bc798..f5cf5d3f 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 @@ -7,8 +7,8 @@ package ua.acclorite.book_story.domain.repository import ua.acclorite.book_story.core.CoverImage -import ua.acclorite.book_story.domain.library.Book -import ua.acclorite.book_story.domain.reader.ReaderText +import ua.acclorite.book_story.domain.model.library.Book +import ua.acclorite.book_story.domain.model.reader.ReaderText interface BookRepository { suspend fun searchBooks( 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 abb41e0a..3634682e 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 -import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.domain.model.library.Category +import ua.acclorite.book_story.domain.model.library.CategorySort interface CategoryRepository { suspend fun addCategory( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/ColorPresetRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/ColorPresetRepository.kt index 507ff8ce..45f17bcb 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/repository/ColorPresetRepository.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/ColorPresetRepository.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.repository -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset interface ColorPresetRepository { suspend fun getColorPresets(): Result> 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 67d3606c..b55ae026 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 @@ -7,7 +7,7 @@ package ua.acclorite.book_story.domain.repository import ua.acclorite.book_story.data.model.library.BookWithCover -import ua.acclorite.book_story.domain.file.File +import ua.acclorite.book_story.domain.model.file.File interface FileSystemRepository { suspend fun searchFiles( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/HistoryRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/HistoryRepository.kt index c08cc2a5..621ec8cd 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/repository/HistoryRepository.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/HistoryRepository.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.repository -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History interface HistoryRepository { suspend fun getHistoryForBook( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/service/FileProvider.kt b/app/src/main/java/ua/acclorite/book_story/domain/service/FileProvider.kt index 460f2cd1..300e31d8 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/service/FileProvider.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/service/FileProvider.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.domain.service import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book interface FileProvider { fun getFileFromBook(book: Book): Result diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/AddBookUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/AddBookUseCase.kt index f1e17e9f..a97ddeab 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/AddBookUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/AddBookUseCase.kt @@ -11,7 +11,7 @@ import ua.acclorite.book_story.core.CoverImage import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI import ua.acclorite.book_story.core.logW -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.domain.repository.BookRepository import ua.acclorite.book_story.domain.service.CoverImageHandler import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBookUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBookUseCase.kt index ff886204..88b49296 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBookUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBookUseCase.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.domain.use_case.book import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI import ua.acclorite.book_story.core.logW -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.domain.repository.BookRepository import ua.acclorite.book_story.domain.repository.HistoryRepository import ua.acclorite.book_story.domain.service.CoverImageHandler diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookUseCase.kt index 3271e004..74e1dc1d 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.book import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.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/GetTextUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetTextUseCase.kt index e6cf44d8..54ccaa73 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetTextUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetTextUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.book import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText 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/SearchBooksUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/SearchBooksUseCase.kt index f77c3d2e..3dfcdbe8 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/SearchBooksUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/SearchBooksUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.book import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.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/UpdateBookUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBookUseCase.kt index fd8b3fde..970eb883 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBookUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBookUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.book import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.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/category/AddCategoryUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/AddCategoryUseCase.kt index cd4b1936..4226e377 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/AddCategoryUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/AddCategoryUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.category import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.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/DeleteCategoryUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategoryUseCase.kt index ed974300..13f66047 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategoryUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategoryUseCase.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.domain.use_case.category import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.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/GetCategoriesUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategoriesUseCase.kt index 82d853c9..274e7c84 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategoriesUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategoriesUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.category import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.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/GetCategorySortingUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategorySortingUseCase.kt index 42c8288e..03889afd 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategorySortingUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategorySortingUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.category import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.domain.model.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/UpdateCategoriesOrderUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoriesOrderUseCase.kt index 5a33cc1a..e81f8800 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoriesOrderUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoriesOrderUseCase.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.domain.use_case.category import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.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/UpdateCategorySortingUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategorySortingUseCase.kt index 966b5e59..439bcf5e 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategorySortingUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategorySortingUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.category import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.domain.model.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/UpdateCategoryUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryUseCase.kt index f34bdd3e..0f2ced1a 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryUseCase.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.domain.use_case.category import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.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/color_preset/DeleteColorPresetUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/DeleteColorPresetUseCase.kt index ac0ff5bd..ff9a9d85 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/DeleteColorPresetUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/DeleteColorPresetUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.color_preset import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.domain.repository.ColorPresetRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/GetColorPresetsUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/GetColorPresetsUseCase.kt index 480aeddc..601ab326 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/GetColorPresetsUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/GetColorPresetsUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.color_preset import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.domain.repository.ColorPresetRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt index f11d878d..d7d97c53 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.color_preset import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.domain.repository.ColorPresetRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/SelectColorPresetUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/SelectColorPresetUseCase.kt index 7099e495..c62a8f18 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/SelectColorPresetUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/SelectColorPresetUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.color_preset import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.domain.repository.ColorPresetRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/UpdateColorPresetUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/UpdateColorPresetUseCase.kt index a16488a0..12987857 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/UpdateColorPresetUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/UpdateColorPresetUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.color_preset import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.domain.repository.ColorPresetRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFileUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFileUseCase.kt index 12325c35..f3471423 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFileUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFileUseCase.kt @@ -13,7 +13,7 @@ import ua.acclorite.book_story.core.ui.UIText 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.domain.file.File +import ua.acclorite.book_story.domain.model.file.File import ua.acclorite.book_story.domain.repository.FileSystemRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/SearchFilesUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/SearchFilesUseCase.kt index 6b55c857..86500e3f 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/SearchFilesUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/SearchFilesUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.file_system import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.file.File +import ua.acclorite.book_story.domain.model.file.File import ua.acclorite.book_story.domain.repository.FileSystemRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/AddHistoryUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/AddHistoryUseCase.kt index 8e5a8474..fa27a8ba 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/AddHistoryUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/AddHistoryUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.history import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History 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/history/DeleteHistoryUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteHistoryUseCase.kt index 0d8983a4..95b87178 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteHistoryUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteHistoryUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.history import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History 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/history/GetHistoryForBookUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryForBookUseCase.kt index 8052b788..597af272 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryForBookUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryForBookUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.history import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History 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/history/GetHistoryUseCase.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryUseCase.kt index bb38d9ae..890eba60 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryUseCase.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryUseCase.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.domain.use_case.history import ua.acclorite.book_story.core.logE import ua.acclorite.book_story.core.logI -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History import ua.acclorite.book_story.domain.repository.HistoryRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt index 66294c74..8ae17e60 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt @@ -10,7 +10,7 @@ import android.content.Context import android.net.Uri import androidx.compose.runtime.Immutable import ua.acclorite.book_story.core.ui.UIText -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.library.Category @Immutable sealed class BookInfoEvent { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt index b992ac02..23ab5541 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.presentation.book_info import androidx.compose.runtime.Immutable 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.model.library.Book import ua.acclorite.book_story.ui.common.constants.provideEmptyBook @Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt index 1666c728..736b2fa4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt @@ -24,7 +24,7 @@ import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.R import ua.acclorite.book_story.data.model.common.NullableBook -import ua.acclorite.book_story.domain.file.File +import ua.acclorite.book_story.domain.model.file.File import ua.acclorite.book_story.domain.use_case.book.AddBookUseCase import ua.acclorite.book_story.domain.use_case.file_system.GetBookFromFileUseCase import ua.acclorite.book_story.domain.use_case.file_system.SearchFilesUseCase diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt index 06846067..22d76397 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt @@ -10,7 +10,7 @@ import android.content.Context import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Immutable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History @Immutable sealed class HistoryEvent { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt index 47a67e1e..aa7c3ad3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt @@ -23,7 +23,7 @@ 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.History +import ua.acclorite.book_story.domain.model.history.History import ua.acclorite.book_story.domain.use_case.book.GetBookUseCase import ua.acclorite.book_story.domain.use_case.history.AddHistoryUseCase import ua.acclorite.book_story.domain.use_case.history.DeleteHistoryUseCase diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt index 3af88b58..05dfd09b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.presentation.history.model import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.history.History +import ua.acclorite.book_story.domain.model.history.History @Immutable data class GroupedHistory( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt index d0094105..c2799fec 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.presentation.library import android.content.Context import androidx.compose.runtime.Immutable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.library.Category @Immutable sealed class LibraryEvent { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt index 4f6af2c1..6f6481b7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt @@ -22,7 +22,7 @@ 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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.domain.use_case.book.DeleteBookUseCase import ua.acclorite.book_story.domain.use_case.book.SearchBooksUseCase import ua.acclorite.book_story.domain.use_case.book.UpdateBookUseCase diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt index efc24628..e57802e3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.presentation.library.model import androidx.compose.runtime.Immutable import ua.acclorite.book_story.core.Selected -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book @Immutable data class SelectableBook( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt index aa6c0a2b..8b328bd1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.presentation.reader import androidx.activity.ComponentActivity import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.reader.ReaderText.Chapter +import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter @Immutable sealed class ReaderEvent { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt index fc3f8d03..fed3026c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt @@ -36,7 +36,7 @@ import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.R import ua.acclorite.book_story.core.ui.UIText -import ua.acclorite.book_story.domain.reader.ReaderText.Chapter +import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.domain.use_case.book.GetBookUseCase import ua.acclorite.book_story.domain.use_case.book.GetTextUseCase import ua.acclorite.book_story.domain.use_case.book.UpdateBookUseCase diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt index 01ae8c7b..e40abf03 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt @@ -11,9 +11,9 @@ import androidx.compose.runtime.Immutable 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.model.library.Book +import ua.acclorite.book_story.domain.model.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.reader.model.Checkpoint import ua.acclorite.book_story.ui.common.constants.provideEmptyBook diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt index 5918900e..d1d64ebb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt @@ -11,7 +11,7 @@ import android.net.Uri import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color import ua.acclorite.book_story.core.ID -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder @Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt index 38352824..da3250b8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/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.CategorySort -import ua.acclorite.book_story.domain.reader.ColorPreset +import ua.acclorite.book_story.domain.model.library.CategorySort +import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.domain.use_case.category.AddCategoryUseCase import ua.acclorite.book_story.domain.use_case.category.DeleteCategoryUseCase import ua.acclorite.book_story.domain.use_case.category.GetCategoriesUseCase diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt index d4e5f06b..6cb95461 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt @@ -8,9 +8,9 @@ package ua.acclorite.book_story.presentation.settings import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Immutable -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.model.library.Category +import ua.acclorite.book_story.domain.model.library.CategorySort +import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.ui.common.constants.provideDefaultColorPreset @Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt index cdf6e86e..8b3d8e3b 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt @@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import ua.acclorite.book_story.R import ua.acclorite.book_story.core.ui.UIText -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt index e84c1e5e..926748e5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.ui.book_info import androidx.compose.runtime.Composable import ua.acclorite.book_story.core.BottomSheet -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.presentation.book_info.BookInfoScreen diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt index 74770704..2b94d85d 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt @@ -24,7 +24,7 @@ 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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt index b5ff5840..8ff07ba5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt @@ -10,8 +10,8 @@ import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable 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.domain.model.library.Book +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt index 0de0725b..c800edfe 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.ui.book_info import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt index 165f4827..c7f2fb3a 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.data.model.file.CachedFileCompat -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt index de2de5e9..641faf2c 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt @@ -8,8 +8,8 @@ package ua.acclorite.book_story.ui.book_info import androidx.compose.runtime.Composable 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.domain.model.library.Book +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.presentation.book_info.BookInfoScreen diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt index 5a9815c8..77882f61 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt @@ -17,7 +17,7 @@ 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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt index f2cbe0e1..314980f6 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt @@ -15,7 +15,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.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.util.calculateProgress diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt index 604f917b..6b09fcb0 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt @@ -39,7 +39,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.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.util.noRippleClickable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt index fb7aa214..63007048 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt index 5379e05c..c3730b95 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt @@ -20,7 +20,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.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.util.noRippleClickable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt index 149e229a..fd24c0ff 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.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.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.common.AsyncCoverImage import ua.acclorite.book_story.ui.common.util.noRippleClickable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt index d90ec1c2..4071f59e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt @@ -17,7 +17,7 @@ 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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.util.calculateProgress diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt index 3a1f30bb..ed92f3a6 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt @@ -10,7 +10,7 @@ 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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.util.noRippleClickable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt index d6297a65..2540169f 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt @@ -18,8 +18,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 -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.library.Book +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.components.dialog.CheckboxDialogItem diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt index 995ee971..a5c7521e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.ui.book_info import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt index 8394b2e2..c323d266 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt index 7a3972b3..8c1e20fc 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.ui.book_info import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -import ua.acclorite.book_story.domain.library.Book +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt index 9c838951..5c94c1cb 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt @@ -15,7 +15,7 @@ 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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent import ua.acclorite.book_story.presentation.theme.DefaultTransition import ua.acclorite.book_story.ui.common.components.common.IconButton diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/constants/CommonConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/CommonConstants.kt index 679787a6..8884853b 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/common/constants/CommonConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/CommonConstants.kt @@ -10,8 +10,8 @@ package ua.acclorite.book_story.ui.common.constants import androidx.compose.ui.graphics.Color 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.model.library.Book +import ua.acclorite.book_story.domain.model.reader.ColorPreset // Main State fun provideMainState() = "main_state" diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt index 582201a5..aac1c837 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt @@ -36,7 +36,7 @@ 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.history.History +import ua.acclorite.book_story.domain.model.history.History import ua.acclorite.book_story.ui.common.components.common.AsyncCoverImage import ua.acclorite.book_story.ui.common.components.common.IconButton import ua.acclorite.book_story.ui.common.components.common.StyledText diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt index 9c038893..267fb02e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt @@ -9,8 +9,8 @@ package ua.acclorite.book_story.ui.library import androidx.compose.foundation.pager.PagerState import androidx.compose.runtime.Composable 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.domain.model.library.Category +import ua.acclorite.book_story.domain.model.library.CategorySort import ua.acclorite.book_story.presentation.library.LibraryEvent import ua.acclorite.book_story.presentation.library.LibraryScreen import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt index 05a932b2..9c53f569 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt @@ -13,8 +13,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.focus.FocusRequester 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.domain.model.library.Category +import ua.acclorite.book_story.domain.model.library.CategorySort import ua.acclorite.book_story.presentation.library.LibraryEvent import ua.acclorite.book_story.presentation.library.model.LibraryLayout import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt index bf01e7ff..1a092f8f 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.ui.library import androidx.compose.runtime.Composable import ua.acclorite.book_story.core.Dialog -import ua.acclorite.book_story.domain.library.Category +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.library.LibraryEvent import ua.acclorite.book_story.presentation.library.LibraryScreen import ua.acclorite.book_story.presentation.library.model.SelectableBook diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt index 6571c8f5..371fa6a8 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt @@ -22,8 +22,8 @@ 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 -import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.domain.model.library.Category +import ua.acclorite.book_story.domain.model.library.CategorySort import ua.acclorite.book_story.presentation.library.LibraryEvent import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder import ua.acclorite.book_story.presentation.main.MainEvent diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt index 61712c51..8b66c8d1 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt @@ -18,7 +18,7 @@ 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.Category +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.library.LibraryEvent import ua.acclorite.book_story.presentation.library.model.SelectableBook import ua.acclorite.book_story.ui.common.components.common.StyledText diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt index cbfcdc35..33acf03c 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt @@ -14,8 +14,8 @@ 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.Category -import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.domain.model.library.Category +import ua.acclorite.book_story.domain.model.library.CategorySort import ua.acclorite.book_story.presentation.library.LibraryEvent import ua.acclorite.book_story.presentation.library.model.LibraryLayout import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt index a26c736e..798aaef0 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt @@ -18,8 +18,8 @@ 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.Category -import ua.acclorite.book_story.domain.library.CategorySort +import ua.acclorite.book_story.domain.model.library.Category +import ua.acclorite.book_story.domain.model.library.CategorySort import ua.acclorite.book_story.presentation.library.LibraryEvent import ua.acclorite.book_story.presentation.library.model.LibraryLayout import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt index 9cde6e16..9ea5a29b 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt @@ -29,7 +29,7 @@ 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 +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.ui.common.components.common.StyledText @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt index a3f8762f..9de12052 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt @@ -40,7 +40,7 @@ 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.Category +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.library.LibraryEvent import ua.acclorite.book_story.presentation.library.model.SelectableBook import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt index 908102c0..19f9f45d 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt @@ -30,8 +30,8 @@ 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 -import ua.acclorite.book_story.domain.reader.ReaderText +import ua.acclorite.book_story.domain.model.library.Book +import ua.acclorite.book_story.domain.model.reader.ReaderText import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.model.Checkpoint import ua.acclorite.book_story.presentation.theme.HorizontalExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSlider.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSlider.kt index f7097f31..3095a99f 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSlider.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/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 +import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.reader.ReaderEvent @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt index 8c6c6a6f..1a609d32 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt @@ -22,7 +22,7 @@ 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.ReaderText.Chapter +import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.common.StyledText diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt index 58369ae3..cd368945 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt @@ -21,9 +21,9 @@ import androidx.compose.ui.unit.TextUnit 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.model.library.Book +import ua.acclorite.book_story.domain.model.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.model.Checkpoint diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt index c71e1450..9e24408f 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt @@ -8,7 +8,7 @@ package ua.acclorite.book_story.ui.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.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.ReaderScreen diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt index aad18fdd..c0d7b911 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt @@ -33,7 +33,7 @@ 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.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt index 68e29160..07a71e94 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt @@ -16,7 +16,7 @@ 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.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt index 74f86661..88a56533 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.text.buildAnnotatedString 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.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment import ua.acclorite.book_story.ui.common.components.common.StyledText diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt index fefe373b..1775fbcc 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.draw.clip 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.model.reader.ReaderText import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt index 1f9687bf..c3599a0f 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt @@ -23,7 +23,7 @@ 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.ReaderText.Text +import ua.acclorite.book_story.domain.model.reader.ReaderText.Text import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt index cd7861ad..b937d4b0 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt @@ -26,9 +26,9 @@ 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 -import ua.acclorite.book_story.domain.reader.ReaderText -import ua.acclorite.book_story.domain.reader.ReaderText.Chapter +import ua.acclorite.book_story.domain.model.library.Book +import ua.acclorite.book_story.domain.model.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.model.Checkpoint diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt index af7bdf4f..1e7c0fa8 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt @@ -29,8 +29,8 @@ 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 -import ua.acclorite.book_story.domain.reader.ReaderText.Chapter +import ua.acclorite.book_story.domain.model.library.Book +import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.theme.readerBarsColor diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt index 56995e46..80c51a07 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.ui.reader.model import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.reader.ReaderText +import ua.acclorite.book_story.domain.model.reader.ReaderText @Immutable data class ExpandableChapter( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt index ed344b97..ff051a27 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt @@ -64,7 +64,7 @@ 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.model.reader.ColorPreset import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.settings.SettingsModel import ua.acclorite.book_story.presentation.theme.FadeTransitionPreservingSpace diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt index c9f2ebbd..5b7c1187 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt @@ -47,7 +47,7 @@ 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 +import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.library.LibraryScreen import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.settings.SettingsModel