From 3d7b6b88be83dd9662d84ef22769bd4977c348ad Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Mon, 26 Aug 2024 15:25:01 +0700 Subject: [PATCH] fix(archive): Move common code to android Since these codes still relies heavily on java and iOS doesn't have java support. --- .../tachiyomi/ui/reader/loader/EpubPageLoader.kt | 1 - .../eu/kanade/tachiyomi/util/storage/EpubFile.kt | 10 +++------- .../kotlin/yokai/core/archive/ArchiveEntry.kt | 0 .../kotlin/yokai/core/archive/ArchiveInputStream.kt | 0 .../kotlin/yokai/core/archive/ArchiveReader.kt | 0 5 files changed, 3 insertions(+), 8 deletions(-) rename core/src/{commonMain => androidMain}/kotlin/yokai/core/archive/ArchiveEntry.kt (100%) rename core/src/{commonMain => androidMain}/kotlin/yokai/core/archive/ArchiveInputStream.kt (100%) rename core/src/{commonMain => androidMain}/kotlin/yokai/core/archive/ArchiveReader.kt (100%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt index 2f8331c3db..53e0f26e74 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt @@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.ui.reader.model.ReaderPage import eu.kanade.tachiyomi.util.storage.EpubFile import yokai.core.archive.ArchiveReader -import java.nio.channels.SeekableByteChannel /** * Loader used to load a chapter from a .epub file. diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt b/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt index db17a49d7b..b1a2711749 100644 --- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt +++ b/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt @@ -1,15 +1,11 @@ package eu.kanade.tachiyomi.util.storage -import org.jsoup.Jsoup -import org.jsoup.nodes.Document -import yokai.core.archive.ArchiveReader import java.io.Closeable import java.io.File import java.io.InputStream -import java.nio.channels.SeekableByteChannel -import java.text.ParseException -import java.text.SimpleDateFormat -import java.util.Locale +import org.jsoup.Jsoup +import org.jsoup.nodes.Document +import yokai.core.archive.ArchiveReader /** * Wrapper over ZipFile to load files in epub format. diff --git a/core/src/commonMain/kotlin/yokai/core/archive/ArchiveEntry.kt b/core/src/androidMain/kotlin/yokai/core/archive/ArchiveEntry.kt similarity index 100% rename from core/src/commonMain/kotlin/yokai/core/archive/ArchiveEntry.kt rename to core/src/androidMain/kotlin/yokai/core/archive/ArchiveEntry.kt diff --git a/core/src/commonMain/kotlin/yokai/core/archive/ArchiveInputStream.kt b/core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt similarity index 100% rename from core/src/commonMain/kotlin/yokai/core/archive/ArchiveInputStream.kt rename to core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt diff --git a/core/src/commonMain/kotlin/yokai/core/archive/ArchiveReader.kt b/core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt similarity index 100% rename from core/src/commonMain/kotlin/yokai/core/archive/ArchiveReader.kt rename to core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt