diff --git a/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt b/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt index c2f92e92..d14e5d66 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt @@ -22,10 +22,10 @@ import ua.acclorite.book_story.data.mapper.file.FileMapper import ua.acclorite.book_story.data.mapper.file.FileMapperImpl import ua.acclorite.book_story.data.mapper.history.HistoryMapper import ua.acclorite.book_story.data.mapper.history.HistoryMapperImpl -import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.data.parser.FileParserImpl -import ua.acclorite.book_story.data.parser.TextParser -import ua.acclorite.book_story.data.parser.TextParserImpl +import ua.acclorite.book_story.data.parser.file.FileParser +import ua.acclorite.book_story.data.parser.file.FileParserImpl +import ua.acclorite.book_story.data.parser.text.TextParser +import ua.acclorite.book_story.data.parser.text.TextParserImpl import ua.acclorite.book_story.data.repository.BookRepositoryImpl import ua.acclorite.book_story.data.repository.CategoryRepositoryImpl import ua.acclorite.book_story.data.repository.ColorPresetRepositoryImpl 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/document/DocumentParser.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/document/DocumentParser.kt index 09f2bdfe..e0c25143 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/document/DocumentParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser +package ua.acclorite.book_story.data.parser.document import android.graphics.Bitmap import android.graphics.BitmapFactory diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/document/MarkdownParser.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/document/MarkdownParser.kt index 47394f0a..74337a90 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/document/MarkdownParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser +package ua.acclorite.book_story.data.parser.document import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.LinkAnnotation @@ -30,7 +30,7 @@ class MarkdownParser @Inject constructor( private val commonmarkParser: Parser ) { /** - * Parses markdown text to [androidx.compose.ui.text.AnnotatedString]. + * Parses markdown text to [AnnotatedString]. * * @return Parsed annotated string. */ 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/file/EpubFileParser.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt index 1d741b76..4a2fafe4 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/file/EpubFileParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.epub +package ua.acclorite.book_story.data.parser.file import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -16,7 +16,6 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.common.BookWithCover import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.FileParser import ua.acclorite.book_story.domain.model.library.Book import java.io.File import java.net.URLDecoder 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/file/Fb2FileParser.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt index 984d4594..7b9bf45c 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/file/Fb2FileParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.fb2 +package ua.acclorite.book_story.data.parser.file import org.jsoup.Jsoup import org.jsoup.parser.Parser @@ -12,7 +12,6 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.common.BookWithCover import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.FileParser import ua.acclorite.book_story.domain.model.library.Book import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParser.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParser.kt index fb9bd1b9..0c327b03 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser +package ua.acclorite.book_story.data.parser.file import ua.acclorite.book_story.data.model.common.BookWithCover import ua.acclorite.book_story.data.model.file.CachedFile diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParserImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParserImpl.kt similarity index 83% rename from app/src/main/java/ua/acclorite/book_story/data/parser/FileParserImpl.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParserImpl.kt index 36173cea..8503898b 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParserImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParserImpl.kt @@ -4,16 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser +package ua.acclorite.book_story.data.parser.file import android.util.Log import ua.acclorite.book_story.data.model.common.BookWithCover import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.epub.EpubFileParser -import ua.acclorite.book_story.data.parser.fb2.Fb2FileParser -import ua.acclorite.book_story.data.parser.html.HtmlFileParser -import ua.acclorite.book_story.data.parser.pdf.PdfFileParser -import ua.acclorite.book_story.data.parser.txt.TxtFileParser import javax.inject.Inject private const val FILE_PARSER = "File Parser" 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/file/HtmlFileParser.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlFileParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt index 95d43a71..3ec75de1 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/file/HtmlFileParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.html +package ua.acclorite.book_story.data.parser.file import org.jsoup.Jsoup import org.jsoup.parser.Parser @@ -12,7 +12,6 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.common.BookWithCover import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.FileParser import ua.acclorite.book_story.domain.model.library.Book import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt index 954dad66..8bbc2a77 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/file/PdfFileParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.pdf +package ua.acclorite.book_story.data.parser.file import android.app.Application import com.tom_roush.pdfbox.android.PDFBoxResourceLoader @@ -13,7 +13,6 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.common.BookWithCover import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.FileParser import ua.acclorite.book_story.domain.model.library.Book 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/file/TxtFileParser.kt similarity index 92% rename from app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt index c304c515..0b4b56f1 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/file/TxtFileParser.kt @@ -4,13 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.txt +package ua.acclorite.book_story.data.parser.file import ua.acclorite.book_story.R import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.common.BookWithCover import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.FileParser import ua.acclorite.book_story.domain.model.library.Book 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/text/EpubTextParser.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt index 93952d5a..2775b0e4 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/text/EpubTextParser.kt @@ -6,7 +6,7 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package ua.acclorite.book_story.data.parser.epub +package ua.acclorite.book_story.data.parser.text import android.util.Log import androidx.core.net.toUri @@ -22,8 +22,7 @@ import ua.acclorite.book_story.core.data.ExtensionsData import ua.acclorite.book_story.core.helpers.addAll import ua.acclorite.book_story.core.helpers.containsVisibleText 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.data.parser.document.DocumentParser import ua.acclorite.book_story.domain.model.reader.ReaderText import java.io.File import java.net.URLDecoder 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/text/HtmlTextParser.kt similarity index 90% rename from app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlTextParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt index c8043c73..c80e5ced 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/text/HtmlTextParser.kt @@ -4,15 +4,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.html +package ua.acclorite.book_story.data.parser.text import android.util.Log import kotlinx.coroutines.yield import org.jsoup.Jsoup import org.jsoup.parser.Parser import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.DocumentParser -import ua.acclorite.book_story.data.parser.TextParser +import ua.acclorite.book_story.data.parser.document.DocumentParser import ua.acclorite.book_story.domain.model.reader.ReaderText import javax.inject.Inject 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/text/PdfTextParser.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt index f5919651..898435fb 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/text/PdfTextParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.pdf +package ua.acclorite.book_story.data.parser.text import android.app.Application import android.util.Log @@ -14,8 +14,7 @@ import com.tom_roush.pdfbox.text.PDFTextStripper import kotlinx.coroutines.yield import ua.acclorite.book_story.core.helpers.clearAllMarkdown 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.data.parser.document.MarkdownParser import ua.acclorite.book_story.domain.model.reader.ReaderText import javax.inject.Inject 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/text/TextParser.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParser.kt index 7d70f502..451cd904 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/text/TextParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser +package ua.acclorite.book_story.data.parser.text import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.domain.model.reader.ReaderText 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/text/TextParserImpl.kt similarity index 85% rename from app/src/main/java/ua/acclorite/book_story/data/parser/TextParserImpl.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParserImpl.kt index 9f6916cd..966cf5b0 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/text/TextParserImpl.kt @@ -4,17 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser +package ua.acclorite.book_story.data.parser.text import android.util.Log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.epub.EpubTextParser -import ua.acclorite.book_story.data.parser.html.HtmlTextParser -import ua.acclorite.book_story.data.parser.pdf.PdfTextParser -import ua.acclorite.book_story.data.parser.txt.TxtTextParser -import ua.acclorite.book_story.data.parser.xml.XmlTextParser import ua.acclorite.book_story.domain.model.reader.ReaderText import javax.inject.Inject 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/text/TxtTextParser.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt index 8606d554..7e575244 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/text/TxtTextParser.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.txt +package ua.acclorite.book_story.data.parser.text import android.util.Log import kotlinx.coroutines.Dispatchers @@ -12,8 +12,7 @@ import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.core.helpers.clearAllMarkdown 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.data.parser.document.MarkdownParser import ua.acclorite.book_story.domain.model.reader.ReaderText 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/text/XmlTextParser.kt similarity index 90% rename from app/src/main/java/ua/acclorite/book_story/data/parser/xml/XmlTextParser.kt rename to app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt index 57a0625f..a5222c08 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/text/XmlTextParser.kt @@ -4,15 +4,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.data.parser.xml +package ua.acclorite.book_story.data.parser.text import android.util.Log import kotlinx.coroutines.yield import org.jsoup.Jsoup import org.jsoup.parser.Parser import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.DocumentParser -import ua.acclorite.book_story.data.parser.TextParser +import ua.acclorite.book_story.data.parser.document.DocumentParser import ua.acclorite.book_story.domain.model.reader.ReaderText import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt index 89930859..42d5c328 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 @@ -12,8 +12,8 @@ import ua.acclorite.book_story.core.CoverImage import ua.acclorite.book_story.data.local.room.BookDatabase import ua.acclorite.book_story.data.mapper.book.BookMapper import ua.acclorite.book_story.data.mapper.file.FileMapper -import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.data.parser.TextParser +import ua.acclorite.book_story.data.parser.file.FileParser +import ua.acclorite.book_story.data.parser.text.TextParser import ua.acclorite.book_story.domain.model.file.File import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.domain.model.reader.ReaderText 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 3c7b935d..8656286f 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 @@ -13,7 +13,7 @@ import ua.acclorite.book_story.data.local.room.BookDatabase import ua.acclorite.book_story.data.mapper.file.FileMapper import ua.acclorite.book_story.data.model.common.BookWithCover import ua.acclorite.book_story.data.model.file.CachedFile -import ua.acclorite.book_story.data.parser.FileParser +import ua.acclorite.book_story.data.parser.file.FileParser 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