diff --git a/desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppMigrations.kt b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppMigrations.kt index 697edaea..d3e829be 100644 --- a/desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppMigrations.kt +++ b/desktop/src/main/kotlin/ca/gosyer/jui/desktop/AppMigrations.kt @@ -10,10 +10,10 @@ import ca.gosyer.appdirs.AppDirs import ca.gosyer.jui.desktop.build.BuildConfig import ca.gosyer.jui.domain.migration.service.MigrationPreferences import ca.gosyer.jui.uicore.vm.ContextWrapper +import com.diamondedge.logging.logging import me.tatarka.inject.annotations.Inject import okio.FileSystem import okio.Path.Companion.toPath -import com.diamondedge.logging.logging @Inject class AppMigrations( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/ServerListeners.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/ServerListeners.kt index c28882fb..45fdb70f 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/ServerListeners.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/ServerListeners.kt @@ -6,6 +6,7 @@ package ca.gosyer.jui.domain +import com.diamondedge.logging.logging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -20,7 +21,6 @@ import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class ServerListeners { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ExportBackupFile.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ExportBackupFile.kt index fb95d19d..a6e695b4 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ExportBackupFile.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ExportBackupFile.kt @@ -7,11 +7,11 @@ package ca.gosyer.jui.domain.backup.interactor import ca.gosyer.jui.domain.backup.service.BackupRepository +import com.diamondedge.logging.logging import io.ktor.client.request.HttpRequestBuilder import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class ExportBackupFile( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ImportBackupFile.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ImportBackupFile.kt index 8a0faf9b..e98c9903 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ImportBackupFile.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ImportBackupFile.kt @@ -7,13 +7,13 @@ package ca.gosyer.jui.domain.backup.interactor import ca.gosyer.jui.domain.backup.service.BackupRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject import okio.FileSystem import okio.Path import okio.SYSTEM -import com.diamondedge.logging.logging @Inject class ImportBackupFile( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ValidateBackupFile.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ValidateBackupFile.kt index b3ffb0db..3f7c35f4 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ValidateBackupFile.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ValidateBackupFile.kt @@ -7,13 +7,13 @@ package ca.gosyer.jui.domain.backup.interactor import ca.gosyer.jui.domain.backup.service.BackupRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject import okio.FileSystem import okio.Path import okio.SYSTEM -import com.diamondedge.logging.logging @Inject class ValidateBackupFile( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/base/WebsocketService.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/base/WebsocketService.kt index 659a6a03..95ff3980 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/base/WebsocketService.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/base/WebsocketService.kt @@ -9,6 +9,7 @@ package ca.gosyer.jui.domain.base import ca.gosyer.jui.core.lang.throwIfCancellation import ca.gosyer.jui.domain.server.Http import ca.gosyer.jui.domain.server.service.ServerPreferences +import com.diamondedge.logging.logging import io.ktor.client.plugins.websocket.ws import io.ktor.http.URLProtocol import io.ktor.websocket.Frame @@ -24,7 +25,6 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.serialization.json.Json -import com.diamondedge.logging.logging @OptIn(DelicateCoroutinesApi::class) abstract class WebsocketService( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/AddMangaToCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/AddMangaToCategory.kt index 7298c721..ca9beda7 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/AddMangaToCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/AddMangaToCategory.kt @@ -10,12 +10,12 @@ import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.category.model.Category import ca.gosyer.jui.domain.category.service.CategoryRepository import ca.gosyer.jui.domain.manga.model.Manga +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.map import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class AddMangaToCategory( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/CreateCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/CreateCategory.kt index bdf6fae0..d62efd1e 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/CreateCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/CreateCategory.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.service.CategoryRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class CreateCategory( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/DeleteCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/DeleteCategory.kt index 1f501f7b..4928dbf1 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/DeleteCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/DeleteCategory.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.model.Category import ca.gosyer.jui.domain.category.service.CategoryRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class DeleteCategory( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetCategories.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetCategories.kt index 8adb9d23..62280533 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetCategories.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetCategories.kt @@ -7,11 +7,11 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.service.CategoryRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetCategories( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaCategories.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaCategories.kt index 210df00b..a5e926e7 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaCategories.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaCategories.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.service.CategoryRepository import ca.gosyer.jui.domain.manga.model.Manga +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetMangaCategories( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaListFromCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaListFromCategory.kt index f83bcbe6..21c81fc1 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaListFromCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaListFromCategory.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.category.model.Category import ca.gosyer.jui.domain.category.service.CategoryRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.flow.take import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetMangaListFromCategory( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ModifyCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ModifyCategory.kt index b20ad197..bc112e41 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ModifyCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ModifyCategory.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.model.Category import ca.gosyer.jui.domain.category.service.CategoryRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class ModifyCategory( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/RemoveMangaFromCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/RemoveMangaFromCategory.kt index 8bca621f..2dfeb147 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/RemoveMangaFromCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/RemoveMangaFromCategory.kt @@ -10,12 +10,12 @@ import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.category.model.Category import ca.gosyer.jui.domain.category.service.CategoryRepository import ca.gosyer.jui.domain.manga.model.Manga +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.map import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class RemoveMangaFromCategory( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ReorderCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ReorderCategory.kt index 7f27b4b0..be0be957 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ReorderCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ReorderCategory.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.service.CategoryRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class ReorderCategory( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/UpdateCategoryMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/UpdateCategoryMeta.kt index 364713e3..0735ea0f 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/UpdateCategoryMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/UpdateCategoryMeta.kt @@ -8,11 +8,11 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.model.Category import ca.gosyer.jui.domain.category.service.CategoryRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdateCategoryMeta( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/DeleteChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/DeleteChapterDownload.kt index d428a030..3b484984 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/DeleteChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/DeleteChapterDownload.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.onEach import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging import kotlin.jvm.JvmName @Inject diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapter.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapter.kt index 646acf24..0974c11b 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapter.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapter.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.flow.take import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetChapter( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapterPages.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapterPages.kt index d29175d0..baed485f 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapterPages.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapterPages.kt @@ -7,11 +7,11 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import com.diamondedge.logging.logging import io.ktor.client.request.HttpRequestBuilder import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetChapterPages( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapters.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapters.kt index c7b8ff36..1703f533 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapters.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapters.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.service.ChapterRepository import ca.gosyer.jui.domain.manga.model.Manga +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.flow.take import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetChapters( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/RefreshChapters.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/RefreshChapters.kt index d2c208e9..c7e17620 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/RefreshChapters.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/RefreshChapters.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.service.ChapterRepository import ca.gosyer.jui.domain.manga.model.Manga +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class RefreshChapters( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapter.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapter.kt index 719c5937..7e3622d0 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapter.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapter.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.onEach import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging import kotlin.jvm.JvmName @Inject diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMeta.kt index 8beb5f8f..dd893417 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMeta.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdateChapterMeta( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt index 7a291cf3..aee22b05 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.download.service.DownloadRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class BatchChapterDownload( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ClearDownloadQueue.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ClearDownloadQueue.kt index 9cce6b69..a2b6e201 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ClearDownloadQueue.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ClearDownloadQueue.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.download.service.DownloadRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class ClearDownloadQueue( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt index df33d4c5..deae4359 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.download.service.DownloadRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class QueueChapterDownload( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ReorderChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ReorderChapterDownload.kt index 665fc42d..61d79228 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ReorderChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ReorderChapterDownload.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.download.service.DownloadRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class ReorderChapterDownload( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StartDownloading.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StartDownloading.kt index 12524f45..8b6e3f63 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StartDownloading.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StartDownloading.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.download.service.DownloadRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class StartDownloading( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt index 8a9d5131..c427ee57 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.download.service.DownloadRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class StopChapterDownload( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopDownloading.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopDownloading.kt index 08ff6948..f610c33b 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopDownloading.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopDownloading.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.download.service.DownloadRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class StopDownloading( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/GetExtensionList.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/GetExtensionList.kt index 8ddbddd7..b785d0cc 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/GetExtensionList.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/GetExtensionList.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.extension.interactor import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetExtensionList( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtension.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtension.kt index d5d46bcc..bc2e4dc9 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtension.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtension.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.extension.interactor import ca.gosyer.jui.domain.extension.model.Extension import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class InstallExtension( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtensionFile.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtensionFile.kt index dafdb6cf..ec5c92f8 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtensionFile.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtensionFile.kt @@ -7,13 +7,13 @@ package ca.gosyer.jui.domain.extension.interactor import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject import okio.FileSystem import okio.Path import okio.SYSTEM -import com.diamondedge.logging.logging @Inject class InstallExtensionFile( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UninstallExtension.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UninstallExtension.kt index faa0a44c..c3c75a5f 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UninstallExtension.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UninstallExtension.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.extension.interactor import ca.gosyer.jui.domain.extension.model.Extension import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UninstallExtension( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UpdateExtension.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UpdateExtension.kt index b3c7c913..867f9efb 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UpdateExtension.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UpdateExtension.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.extension.interactor import ca.gosyer.jui.domain.extension.model.Extension import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdateExtension( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/GetGlobalMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/GetGlobalMeta.kt index 069e6bc6..0c671290 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/GetGlobalMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/GetGlobalMeta.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.global.interactor import ca.gosyer.jui.domain.global.service.GlobalRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetGlobalMeta( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/UpdateGlobalMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/UpdateGlobalMeta.kt index 7b78aff9..fc696f3a 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/UpdateGlobalMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/UpdateGlobalMeta.kt @@ -8,11 +8,11 @@ package ca.gosyer.jui.domain.global.interactor import ca.gosyer.jui.domain.global.model.GlobalMeta import ca.gosyer.jui.domain.global.service.GlobalRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdateGlobalMeta( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/AddMangaToLibrary.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/AddMangaToLibrary.kt index a98e5fcb..2bf11540 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/AddMangaToLibrary.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/AddMangaToLibrary.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.library.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.library.service.LibraryRepository import ca.gosyer.jui.domain.manga.model.Manga +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class AddMangaToLibrary( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/RemoveMangaFromLibrary.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/RemoveMangaFromLibrary.kt index fc9cfb68..988954bc 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/RemoveMangaFromLibrary.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/RemoveMangaFromLibrary.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.library.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.library.service.LibraryRepository import ca.gosyer.jui.domain.manga.model.Manga +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class RemoveMangaFromLibrary( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryUpdateService.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryUpdateService.kt index 9a2ad45e..2a7ebb0a 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryUpdateService.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryUpdateService.kt @@ -10,11 +10,11 @@ import ca.gosyer.jui.domain.base.WebsocketService import ca.gosyer.jui.domain.library.model.UpdateStatus import ca.gosyer.jui.domain.server.Http import ca.gosyer.jui.domain.server.service.ServerPreferences +import com.diamondedge.logging.logging import io.ktor.websocket.Frame import io.ktor.websocket.readText import kotlinx.coroutines.flow.MutableStateFlow import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class LibraryUpdateService( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetManga.kt index 84375a06..b271805b 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetManga.kt @@ -9,11 +9,11 @@ package ca.gosyer.jui.domain.manga.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.model.Manga import ca.gosyer.jui.domain.manga.service.MangaRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.flow.take import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetManga( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshManga.kt index 1276e6df..271d7d72 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshManga.kt @@ -9,12 +9,12 @@ package ca.gosyer.jui.domain.manga.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.model.Manga import ca.gosyer.jui.domain.manga.service.MangaRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.flow.take import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class RefreshManga( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/UpdateMangaMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/UpdateMangaMeta.kt index 2a855ee6..13fd0bff 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/UpdateMangaMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/UpdateMangaMeta.kt @@ -9,13 +9,13 @@ package ca.gosyer.jui.domain.manga.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.model.Manga import ca.gosyer.jui.domain.manga.service.MangaRepository +import com.diamondedge.logging.logging import io.ktor.http.decodeURLQueryComponent import io.ktor.http.encodeURLQueryComponent import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdateMangaMeta( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/server/HttpClient.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/server/HttpClient.kt index 1fd87adb..cab143d5 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/server/HttpClient.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/server/HttpClient.kt @@ -10,6 +10,7 @@ import ca.gosyer.jui.domain.build.BuildKonfig import ca.gosyer.jui.domain.server.model.Auth import ca.gosyer.jui.domain.server.model.Proxy import ca.gosyer.jui.domain.server.service.ServerPreferences +import com.diamondedge.logging.logging import io.ktor.client.HttpClient import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngineConfig @@ -30,7 +31,6 @@ import io.ktor.http.URLBuilder import io.ktor.http.URLProtocol import io.ktor.serialization.kotlinx.json.json import kotlinx.serialization.json.Json -import com.diamondedge.logging.logging import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds import io.ktor.client.plugins.auth.Auth as AuthPlugin diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/AboutServer.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/AboutServer.kt index 5baea144..e0e24b1c 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/AboutServer.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/AboutServer.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.settings.interactor import ca.gosyer.jui.domain.settings.service.SettingsRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class AboutServer( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/GetSettings.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/GetSettings.kt index 52184f34..9cdd9e7d 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/GetSettings.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/GetSettings.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.settings.interactor import ca.gosyer.jui.domain.settings.service.SettingsRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetSettings( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/SetSettings.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/SetSettings.kt index 26ad1bd0..283a7cf3 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/SetSettings.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/settings/interactor/SetSettings.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.settings.interactor import ca.gosyer.jui.domain.settings.model.SetSettingsInput import ca.gosyer.jui.domain.settings.service.SettingsRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class SetSettings( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetFilterList.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetFilterList.kt index a7bbf424..b053deb1 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetFilterList.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetFilterList.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source import ca.gosyer.jui.domain.source.service.SourceRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetFilterList( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetLatestManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetLatestManga.kt index 540e30a2..ec73250a 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetLatestManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetLatestManga.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source import ca.gosyer.jui.domain.source.service.SourceRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetLatestManga( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetPopularManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetPopularManga.kt index 6d6af90e..ead8f8d5 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetPopularManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetPopularManga.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source import ca.gosyer.jui.domain.source.service.SourceRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetPopularManga( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSearchManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSearchManga.kt index 86178a4b..e5c52753 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSearchManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSearchManga.kt @@ -9,10 +9,10 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source import ca.gosyer.jui.domain.source.model.sourcefilters.SourceFilter import ca.gosyer.jui.domain.source.service.SourceRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetSearchManga( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceList.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceList.kt index 682c5f4a..3110b1b9 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceList.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceList.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.service.SourceRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetSourceList( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceSettings.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceSettings.kt index 9d90e34b..0661c342 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceSettings.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceSettings.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source import ca.gosyer.jui.domain.source.service.SourceRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetSourceSettings( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceSetting.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceSetting.kt index f1b8e40b..9bfb0a61 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceSetting.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceSetting.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.sourcepreference.SourcePreference import ca.gosyer.jui.domain.source.service.SourceRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class SetSourceSetting( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SourcePager.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SourcePager.kt index 62299ee5..debc7f85 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SourcePager.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SourcePager.kt @@ -10,6 +10,7 @@ import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.interactor.GetManga import ca.gosyer.jui.domain.manga.model.Manga import ca.gosyer.jui.domain.source.model.MangaPage +import com.diamondedge.logging.logging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -27,7 +28,6 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging fun interface GetMangaPage { suspend fun get(page: Int): MangaPage? diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/model/sourcefilters/SourceFilterChange.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/model/sourcefilters/SourceFilterChange.kt index 1f559ef5..ff2890de 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/model/sourcefilters/SourceFilterChange.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/model/sourcefilters/SourceFilterChange.kt @@ -7,7 +7,6 @@ package ca.gosyer.jui.domain.source.model.sourcefilters import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json @Serializable diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/model/sourcepreference/SourcePreferenceChange.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/model/sourcepreference/SourcePreferenceChange.kt index f1840910..71eeb809 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/model/sourcepreference/SourcePreferenceChange.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/model/sourcepreference/SourcePreferenceChange.kt @@ -7,7 +7,6 @@ package ca.gosyer.jui.domain.source.model.sourcepreference import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json @Serializable diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/GetRecentUpdates.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/GetRecentUpdates.kt index 78c53ccf..2e83977c 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/GetRecentUpdates.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/GetRecentUpdates.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.updates.interactor import ca.gosyer.jui.domain.updates.service.UpdatesRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GetRecentUpdates( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateCategory.kt index 23dcb238..5dde2a72 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateCategory.kt @@ -8,10 +8,10 @@ package ca.gosyer.jui.domain.updates.interactor import ca.gosyer.jui.domain.category.model.Category import ca.gosyer.jui.domain.updates.service.UpdatesRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdateCategory( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateChecker.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateChecker.kt index 271df044..9279b9c0 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateChecker.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateChecker.kt @@ -10,6 +10,7 @@ import ca.gosyer.jui.domain.build.BuildKonfig import ca.gosyer.jui.domain.server.Http import ca.gosyer.jui.domain.updates.model.GithubRelease import ca.gosyer.jui.domain.updates.service.UpdatePreferences +import com.diamondedge.logging.logging import io.ktor.client.call.body import io.ktor.client.request.get import kotlinx.coroutines.Dispatchers @@ -19,7 +20,6 @@ import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdateChecker( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateLibrary.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateLibrary.kt index 194e80ae..8b8ce891 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateLibrary.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateLibrary.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.domain.updates.interactor import ca.gosyer.jui.domain.updates.service.UpdatesRepository +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdateLibrary( diff --git a/domain/src/desktopMain/kotlin/ca/gosyer/jui/domain/server/service/ServerService.kt b/domain/src/desktopMain/kotlin/ca/gosyer/jui/domain/server/service/ServerService.kt index 1ce867d0..01fb6c84 100644 --- a/domain/src/desktopMain/kotlin/ca/gosyer/jui/domain/server/service/ServerService.kt +++ b/domain/src/desktopMain/kotlin/ca/gosyer/jui/domain/server/service/ServerService.kt @@ -10,6 +10,7 @@ import ca.gosyer.jui.core.io.copyTo import ca.gosyer.jui.core.io.userDataDir import ca.gosyer.jui.core.lang.withIOContext import ca.gosyer.jui.domain.build.BuildKonfig +import com.diamondedge.logging.logging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers @@ -27,7 +28,6 @@ import okio.Path import okio.Path.Companion.toPath import okio.buffer import okio.source -import com.diamondedge.logging.logging import java.io.File.pathSeparatorChar import java.io.IOException import java.io.Reader diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreenViewModel.kt index 462d97bd..6ccda859 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/CategoriesScreenViewModel.kt @@ -15,6 +15,7 @@ import ca.gosyer.jui.domain.category.interactor.ReorderCategory import ca.gosyer.jui.domain.category.model.Category import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.minus import kotlinx.collections.immutable.persistentListOf @@ -25,7 +26,6 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class CategoriesScreenViewModel( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesScreenContent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesScreenContent.kt index 3295a33d..9e19a83c 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesScreenContent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/categories/components/CategoriesScreenContent.kt @@ -57,13 +57,13 @@ import ca.gosyer.jui.uicore.components.VerticalScrollbar import ca.gosyer.jui.uicore.components.rememberScrollbarAdapter import ca.gosyer.jui.uicore.components.scrollbarPadding import ca.gosyer.jui.uicore.resources.stringResource +import com.diamondedge.logging.logging import com.vanpra.composematerialdialogs.rememberMaterialDialogState import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import com.diamondedge.logging.logging private val log = logging() diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt index 461a64da..9e916f0e 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt @@ -17,6 +17,7 @@ import ca.gosyer.jui.domain.download.interactor.StopDownloading import ca.gosyer.jui.domain.download.service.DownloadService import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineScope @@ -29,7 +30,6 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class DownloadsScreenViewModel( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt index 726e4221..23b2d2c9 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/extensions/ExtensionsScreenViewModel.kt @@ -21,6 +21,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionPreferences import ca.gosyer.jui.i18n.MR import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentSetOf @@ -38,7 +39,6 @@ import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Inject import okio.FileSystem import okio.Source -import com.diamondedge.logging.logging import kotlin.random.Random @Inject diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreenViewModel.kt index 8a84d209..c1be77a6 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/library/LibraryScreenViewModel.kt @@ -27,6 +27,7 @@ import ca.gosyer.jui.ui.base.state.getStateFlow import ca.gosyer.jui.ui.util.lang.CollatorComparator import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList @@ -49,7 +50,6 @@ import kotlinx.coroutines.flow.toList import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Stable sealed class LibraryState { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/about/AboutViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/about/AboutViewModel.kt index 8dbb81e7..a69187e8 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/about/AboutViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/about/AboutViewModel.kt @@ -14,6 +14,7 @@ import ca.gosyer.jui.domain.updates.interactor.UpdateChecker.Update import ca.gosyer.jui.i18n.MR import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -23,7 +24,6 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging import kotlin.time.Instant @Inject diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/LibraryUpdatesViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/LibraryUpdatesViewModel.kt index 0cafc3f1..13ef921f 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/LibraryUpdatesViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/main/components/LibraryUpdatesViewModel.kt @@ -10,13 +10,13 @@ import ca.gosyer.jui.domain.base.WebsocketService.Actions import ca.gosyer.jui.domain.library.service.LibraryUpdateService import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.asStateFlow import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class LibraryUpdatesViewModel( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt index b7538f2e..899a934e 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt @@ -32,6 +32,7 @@ import ca.gosyer.jui.ui.base.chapter.ChapterDownloadState import ca.gosyer.jui.ui.base.model.StableHolder import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList @@ -53,7 +54,6 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class MangaScreenViewModel( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ChapterLoader.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ChapterLoader.kt index 64272a06..b1c7a121 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ChapterLoader.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ChapterLoader.kt @@ -13,6 +13,7 @@ import ca.gosyer.jui.ui.base.image.BitmapDecoderFactory import ca.gosyer.jui.ui.reader.loader.PagesState import ca.gosyer.jui.ui.reader.loader.TachideskPageLoader import ca.gosyer.jui.ui.reader.model.ReaderChapter +import com.diamondedge.logging.logging import com.seiko.imageloader.cache.disk.DiskCache import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.dropWhile @@ -20,7 +21,6 @@ import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.take -import com.diamondedge.logging.logging class ChapterLoader( private val readerPreferences: ReaderPreferences, diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt index 1437fea7..fb2c68c9 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt @@ -19,6 +19,7 @@ import ca.gosyer.jui.ui.base.model.StableHolder import ca.gosyer.jui.ui.reader.model.ReaderChapter import ca.gosyer.jui.ui.reader.model.ReaderPage import cafe.adriel.voyager.core.concurrent.AtomicInt32 +import com.diamondedge.logging.logging import com.seiko.imageloader.asImageBitmap import com.seiko.imageloader.cache.disk.DiskCache import com.seiko.imageloader.component.decoder.DecodeResult @@ -49,7 +50,6 @@ import okio.BufferedSource import okio.FileSystem import okio.buffer import okio.use -import com.diamondedge.logging.logging class TachideskPageLoader( val chapter: ReaderChapter, diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderChapter.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderChapter.kt index 958a6356..7d64b33b 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderChapter.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/model/ReaderChapter.kt @@ -10,6 +10,7 @@ import androidx.compose.runtime.Immutable import ca.gosyer.jui.domain.chapter.model.Chapter import ca.gosyer.jui.ui.reader.loader.PageLoader import ca.gosyer.jui.ui.reader.loader.PagesState +import com.diamondedge.logging.logging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -21,7 +22,6 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.stateIn -import com.diamondedge.logging.logging @Immutable data class ReaderChapter( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAdvancedScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAdvancedScreen.kt index d54efc14..345bdc3e 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAdvancedScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAdvancedScreen.kt @@ -47,6 +47,7 @@ import ca.gosyer.jui.uicore.vm.ViewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey +import com.diamondedge.logging.logging import kotlinx.coroutines.currentCoroutineContext import kotlinx.coroutines.delay import kotlinx.coroutines.flow.SharingStarted @@ -54,7 +55,6 @@ import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.isActive import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging import kotlin.time.Duration.Companion.seconds class SettingsAdvancedScreen : Screen { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBackupScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBackupScreen.kt index 9896b6e9..1d9a3c31 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBackupScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsBackupScreen.kt @@ -65,6 +65,7 @@ import ca.gosyer.jui.uicore.vm.ViewModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.uniqueScreenKey +import com.diamondedge.logging.logging import com.vanpra.composematerialdialogs.MaterialDialog import com.vanpra.composematerialdialogs.MaterialDialogState import com.vanpra.composematerialdialogs.listItems @@ -95,7 +96,6 @@ import okio.Path import okio.Sink import okio.Source import okio.buffer -import com.diamondedge.logging.logging import kotlin.random.Random class SettingsBackupScreen : Screen { diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreenViewModel.kt index eb417eb5..184eb48c 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/SourceScreenViewModel.kt @@ -21,6 +21,7 @@ import ca.gosyer.jui.ui.base.state.SavedStateHandle import ca.gosyer.jui.ui.base.state.getStateFlow import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.cancel @@ -31,7 +32,6 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging class SourceScreenViewModel( private val source: Source, diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersViewModel.kt index 4272ca7c..fee3d2f9 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersViewModel.kt @@ -13,6 +13,7 @@ import ca.gosyer.jui.ui.base.state.getStateFlow import ca.gosyer.jui.ui.sources.browse.filter.model.SourceFiltersView import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList @@ -24,7 +25,6 @@ import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.onEach import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging class SourceFiltersViewModel( private val sourceId: Long, diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchViewModel.kt index a808804e..96598506 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchViewModel.kt @@ -17,6 +17,7 @@ import ca.gosyer.jui.ui.base.state.SavedStateHandle import ca.gosyer.jui.ui.base.state.getStateFlow import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList @@ -41,7 +42,6 @@ import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withPermit import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class GlobalSearchViewModel( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt index b228d75c..6354ae84 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/home/SourceHomeScreenViewModel.kt @@ -17,6 +17,7 @@ import ca.gosyer.jui.ui.base.state.SavedStateHandle import ca.gosyer.jui.ui.base.state.getStateFlow import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentSetOf import kotlinx.collections.immutable.toImmutableList @@ -32,7 +33,6 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.stateIn import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class SourceHomeScreenViewModel( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreenViewModel.kt index a77d3880..1d228946 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/settings/SourceSettingsScreenViewModel.kt @@ -12,6 +12,7 @@ import ca.gosyer.jui.domain.source.model.sourcepreference.SourcePreference import ca.gosyer.jui.ui.sources.settings.model.SourceSettingsView import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList @@ -26,7 +27,6 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.supervisorScope import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class SourceSettingsScreenViewModel( diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt index 44d9b8e8..08dd8d81 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt @@ -20,6 +20,7 @@ import ca.gosyer.jui.domain.updates.interactor.UpdatesPager import ca.gosyer.jui.ui.base.chapter.ChapterDownloadItem import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList @@ -38,7 +39,6 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class UpdatesScreenViewModel( diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/TrayViewModel.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/TrayViewModel.kt index 5f6dded9..9b31b58c 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/TrayViewModel.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/main/components/TrayViewModel.kt @@ -9,6 +9,7 @@ package ca.gosyer.jui.ui.main.components import ca.gosyer.jui.domain.updates.interactor.UpdateChecker import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.SharingStarted @@ -16,7 +17,6 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.shareIn import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class TrayViewModel( diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/image/ImageLoaderImage.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/image/ImageLoaderImage.kt index ea42ac37..8e2d5b87 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/image/ImageLoaderImage.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/image/ImageLoaderImage.kt @@ -35,12 +35,12 @@ import androidx.compose.ui.graphics.drawscope.DrawScope.Companion.DefaultFilterQ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.dp import ca.gosyer.jui.uicore.components.LoadingScreen +import com.diamondedge.logging.logging import com.seiko.imageloader.model.ImageAction import com.seiko.imageloader.model.ImageRequest import com.seiko.imageloader.rememberImageAction import com.seiko.imageloader.rememberImageActionPainter import com.seiko.imageloader.rememberImagePainter -import com.diamondedge.logging.logging private val log = logging()