From 4e68b628811dee26a5aba023183af619df5c3e99 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 16 Aug 2023 23:10:28 -0400 Subject: [PATCH] Minor cleanup --- .../main/java/eu/kanade/domain/DomainModule.kt | 2 +- .../chapter/interactor/SyncChaptersWithSource.kt | 16 +++++++--------- .../SyncChaptersWithTrackServiceTwoWay.kt | 6 ++---- .../java/eu/kanade/domain/ui/UiPreferences.kt | 2 -- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/eu/kanade/domain/DomainModule.kt b/app/src/main/java/eu/kanade/domain/DomainModule.kt index 2e19e39b6..aac1f060d 100644 --- a/app/src/main/java/eu/kanade/domain/DomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/DomainModule.kt @@ -124,7 +124,7 @@ class DomainModule : InjektModule { addFactory { UpdateChapter(get()) } addFactory { SetReadStatus(get(), get(), get(), get()) } addFactory { ShouldUpdateDbChapter() } - addFactory { SyncChaptersWithSource(get(), get(), get(), get()) } + addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get()) } addFactory { SyncChaptersWithTrackServiceTwoWay(get(), get()) } addSingletonFactory { HistoryRepositoryImpl(get()) } diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt index 225f0cb42..6205ea365 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt @@ -20,21 +20,19 @@ import tachiyomi.domain.chapter.repository.ChapterRepository import tachiyomi.domain.chapter.service.ChapterRecognition import tachiyomi.domain.manga.model.Manga import tachiyomi.source.local.isLocal -import uy.kohesive.injekt.Injekt -import uy.kohesive.injekt.api.get import java.lang.Long.max import java.time.ZonedDateTime import java.util.Date import java.util.TreeSet class SyncChaptersWithSource( - private val downloadManager: DownloadManager = Injekt.get(), - private val downloadProvider: DownloadProvider = Injekt.get(), - private val chapterRepository: ChapterRepository = Injekt.get(), - private val shouldUpdateDbChapter: ShouldUpdateDbChapter = Injekt.get(), - private val updateManga: UpdateManga = Injekt.get(), - private val updateChapter: UpdateChapter = Injekt.get(), - private val getChapterByMangaId: GetChapterByMangaId = Injekt.get(), + private val downloadManager: DownloadManager, + private val downloadProvider: DownloadProvider, + private val chapterRepository: ChapterRepository, + private val shouldUpdateDbChapter: ShouldUpdateDbChapter, + private val updateManga: UpdateManga, + private val updateChapter: UpdateChapter, + private val getChapterByMangaId: GetChapterByMangaId, ) { /** diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt index 8867b19c1..da9ee05ea 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt @@ -9,12 +9,10 @@ import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.toChapterUpdate import tachiyomi.domain.track.interactor.InsertTrack import tachiyomi.domain.track.model.Track -import uy.kohesive.injekt.Injekt -import uy.kohesive.injekt.api.get class SyncChaptersWithTrackServiceTwoWay( - private val updateChapter: UpdateChapter = Injekt.get(), - private val insertTrack: InsertTrack = Injekt.get(), + private val updateChapter: UpdateChapter, + private val insertTrack: InsertTrack, ) { suspend fun await( diff --git a/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt b/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt index 5de3e963a..ac04a51e0 100644 --- a/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt +++ b/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt @@ -28,8 +28,6 @@ class UiPreferences( fun themeDarkAmoled() = preferenceStore.getBoolean("pref_theme_dark_amoled_key", false) - fun relativeTime() = preferenceStore.getInt("relative_time", 7) - fun dateFormat() = preferenceStore.getString("app_date_format", "") fun tabletUiMode() = preferenceStore.getEnum("tablet_ui_mode", TabletUiMode.AUTOMATIC)