Migrate to Metro DI (#3608)

Assisted-by: Claude:claude-opus-5
This commit is contained in:
AntsyLich
2026-08-17 00:47:48 +06:00
committed by GitHub
parent 1e5b1dc5e7
commit b2015d1ef3
314 changed files with 2416 additions and 2010 deletions
@@ -0,0 +1,85 @@
package mihon.app.di
import android.content.Context
import androidx.sqlite.driver.bundled.BundledSQLiteDriver
import app.cash.sqldelight.db.SqlDriver
import com.eygraber.sqldelight.androidx.driver.AndroidxSqliteConfiguration
import com.eygraber.sqldelight.androidx.driver.AndroidxSqliteDatabaseType
import com.eygraber.sqldelight.androidx.driver.AndroidxSqliteDriver
import com.eygraber.sqldelight.androidx.driver.FileProvider
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.BindingContainer
import dev.zacsweers.metro.Provides
import dev.zacsweers.metro.SingleIn
import kotlinx.serialization.json.Json
import kotlinx.serialization.protobuf.ProtoBuf
import nl.adaptivity.xmlutil.XmlDeclMode
import nl.adaptivity.xmlutil.core.XmlVersion
import nl.adaptivity.xmlutil.serialization.XML
import tachiyomi.data.Chapters
import tachiyomi.data.Database
import tachiyomi.data.DateColumnAdapter
import tachiyomi.data.History
import tachiyomi.data.Mangas
import tachiyomi.data.MemoColumnAdapter
import tachiyomi.data.StringListColumnAdapter
import tachiyomi.data.UpdateStrategyColumnAdapter
@BindingContainer
object AppBindings {
@Provides
@SingleIn(AppScope::class)
fun providesSqlDriver(context: Context): SqlDriver {
return AndroidxSqliteDriver(
driver = BundledSQLiteDriver(),
databaseType = AndroidxSqliteDatabaseType.FileProvider(context, "tachiyomi.db"),
schema = Database.Schema,
configuration = AndroidxSqliteConfiguration(
isForeignKeyConstraintsEnabled = true,
),
)
}
@Provides
@SingleIn(AppScope::class)
fun providesDatabase(driver: SqlDriver): Database {
return Database(
driver = driver,
historyAdapter = History.Adapter(
last_readAdapter = DateColumnAdapter,
),
mangasAdapter = Mangas.Adapter(
genreAdapter = StringListColumnAdapter,
update_strategyAdapter = UpdateStrategyColumnAdapter,
memoAdapter = MemoColumnAdapter,
),
chaptersAdapter = Chapters.Adapter(
memoAdapter = MemoColumnAdapter,
),
)
}
@Provides
@SingleIn(AppScope::class)
fun providesJson(): Json = Json {
ignoreUnknownKeys = true
explicitNulls = false
}
@Provides
@SingleIn(AppScope::class)
fun providesXML(): XML = XML.v1 {
policy {
ignoreUnknownChildren()
autoPolymorphic = true
}
xmlDeclMode = XmlDeclMode.Charset
xmlVersion = XmlVersion.XML10
setIndent(2)
}
@Provides
@SingleIn(AppScope::class)
fun providesProtoBuf(): ProtoBuf = ProtoBuf
}
+122
View File
@@ -0,0 +1,122 @@
package mihon.app.di
import android.content.Context
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.DependencyGraph
import dev.zacsweers.metro.Provides
import dev.zacsweers.metrox.viewmodel.MetroViewModelFactory
import dev.zacsweers.metrox.viewmodel.ViewModelGraph
import eu.kanade.domain.base.BasePreferences
import eu.kanade.domain.extension.interactor.TrustExtension
import eu.kanade.domain.source.service.SourcePreferences
import eu.kanade.domain.track.interactor.AddTracks
import eu.kanade.domain.track.service.DelayedTrackingUpdateJob
import eu.kanade.domain.track.service.TrackPreferences
import eu.kanade.domain.ui.UiPreferences
import eu.kanade.tachiyomi.App
import eu.kanade.tachiyomi.core.security.PrivacyPreferences
import eu.kanade.tachiyomi.core.security.SecurityPreferences
import eu.kanade.tachiyomi.data.backup.create.BackupCreateJob
import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
import eu.kanade.tachiyomi.data.cache.ChapterCache
import eu.kanade.tachiyomi.data.download.DownloadCache
import eu.kanade.tachiyomi.data.download.DownloadJob
import eu.kanade.tachiyomi.data.download.DownloadManager
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
import eu.kanade.tachiyomi.data.library.MetadataUpdateJob
import eu.kanade.tachiyomi.data.notification.NotificationReceiver
import eu.kanade.tachiyomi.data.track.TrackerManager
import eu.kanade.tachiyomi.data.updater.AppUpdateChecker
import eu.kanade.tachiyomi.extension.ExtensionManager
import eu.kanade.tachiyomi.extension.util.ExtensionInstallActivity
import eu.kanade.tachiyomi.network.NetworkHelper
import eu.kanade.tachiyomi.network.NetworkPreferences
import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegateImpl
import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
import eu.kanade.tachiyomi.ui.setting.track.BaseOAuthLoginActivity
import eu.kanade.tachiyomi.ui.webview.WebViewActivity
import eu.kanade.tachiyomi.util.CrashLogUtil
import kotlinx.serialization.json.Json
import mihon.core.metro.IsDebugBuild
import mihon.domain.extension.interactor.GetExtensionStoreCountAsFlow
import tachiyomi.domain.backup.service.BackupPreferences
import tachiyomi.domain.category.interactor.GetCategories
import tachiyomi.domain.category.interactor.ResetCategoryFlags
import tachiyomi.domain.download.service.DownloadPreferences
import tachiyomi.domain.library.service.LibraryPreferences
import tachiyomi.domain.manga.interactor.GetFavorites
import tachiyomi.domain.manga.interactor.ResetViewerFlags
import tachiyomi.domain.source.service.SourceManager
import tachiyomi.domain.storage.service.StoragePreferences
import tachiyomi.domain.track.interactor.InsertTrack
@DependencyGraph(
scope = AppScope::class,
bindingContainers = [AppBindings::class],
)
interface AppGraph : ViewModelGraph {
fun inject(app: App)
fun inject(mainActivity: MainActivity)
fun inject(readerActivity: ReaderActivity)
fun inject(webViewActivity: WebViewActivity)
fun inject(baseOAuthLoginActivity: BaseOAuthLoginActivity)
fun inject(libraryUpdateJob: LibraryUpdateJob)
fun inject(metadataUpdateJob: MetadataUpdateJob)
fun inject(backupRestoreJob: BackupRestoreJob)
fun inject(backupCreateJob: BackupCreateJob)
fun inject(delayedTrackingUpdateJob: DelayedTrackingUpdateJob)
fun inject(downloadJob: DownloadJob)
fun inject(notificationReceiver: NotificationReceiver)
fun inject(notificationReceiver: SecureActivityDelegateImpl)
fun inject(extensionInstallActivity: ExtensionInstallActivity)
val context: Context
val viewModelFactory: MetroViewModelFactory
val basePreferences: BasePreferences
val uiPreferences: UiPreferences
val readerPreferences: ReaderPreferences
val networkPreferences: NetworkPreferences
val libraryPreferences: LibraryPreferences
val sourcePreferences: SourcePreferences
val trackPreferences: TrackPreferences
val backupPreferences: BackupPreferences
val storagePreferences: StoragePreferences
val privacyPreferences: PrivacyPreferences
val securityPreferences: SecurityPreferences
val downloadPreferences: DownloadPreferences
val crashLogUtil: CrashLogUtil
val downloadManager: DownloadManager
val updateChecker: AppUpdateChecker
val trustExtension: TrustExtension
val sourceManager: SourceManager
val trackerManager: TrackerManager
val extensionManager: ExtensionManager
val chapterCache: ChapterCache
val downloadCache: DownloadCache
val json: Json
val networkHelper: NetworkHelper
val getFavorites: GetFavorites
val getCategories: GetCategories
val resetViewerFlags: ResetViewerFlags
val resetCategoryFlags: ResetCategoryFlags
val addTracks: AddTracks
val insertTrack: InsertTrack
val getExtensionStoreCountAsFlow: GetExtensionStoreCountAsFlow
@DependencyGraph.Factory
fun interface Factory {
fun create(@Provides context: Context, @Provides @IsDebugBuild isDebugBuild: Boolean): AppGraph
}
}
@@ -0,0 +1,6 @@
package mihon.app.di
import android.content.Context
import mihon.core.metro.metroGraph
val Context.appGraph get() = metroGraph<AppGraph>()
@@ -0,0 +1,21 @@
package mihon.app.di
import androidx.lifecycle.ViewModel
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.SingleIn
import dev.zacsweers.metrox.viewmodel.ManualViewModelAssistedFactory
import dev.zacsweers.metrox.viewmodel.MetroViewModelFactory
import dev.zacsweers.metrox.viewmodel.ViewModelAssistedFactory
import kotlin.reflect.KClass
@Inject
@SingleIn(AppScope::class)
@ContributesBinding(AppScope::class)
class MihonViewModelFactory(
override val viewModelProviders: Map<KClass<out ViewModel>, () -> ViewModel>,
override val assistedFactoryProviders: Map<KClass<out ViewModel>, () -> ViewModelAssistedFactory>,
override val manualAssistedFactoryProviders:
Map<KClass<out ManualViewModelAssistedFactory>, () -> ManualViewModelAssistedFactory>,
) : MetroViewModelFactory()
@@ -0,0 +1,49 @@
package mihon.app.di.injekt
import dev.zacsweers.metro.Inject
import eu.kanade.domain.track.service.TrackPreferences
import eu.kanade.tachiyomi.data.cache.CoverCache
import eu.kanade.tachiyomi.extension.ExtensionManager
import eu.kanade.tachiyomi.network.JavaScriptEngine
import eu.kanade.tachiyomi.network.NetworkHelper
import kotlinx.serialization.json.Json
import kotlinx.serialization.protobuf.ProtoBuf
import nl.adaptivity.xmlutil.serialization.XML
import tachiyomi.core.common.preference.PreferenceStore
import uy.kohesive.injekt.api.InjektModule
import uy.kohesive.injekt.api.InjektRegistrar
import uy.kohesive.injekt.api.addSingleton
@Inject
class MetroInteropModule(
private val json: Json,
private val protoBuf: ProtoBuf,
private val xml: XML,
private val networkHelper: NetworkHelper,
private val javaScriptEngine: JavaScriptEngine,
private val preferenceStore: PreferenceStore,
private val trackPreferences: TrackPreferences,
private val extensionManager: ExtensionManager,
private val coverCache: CoverCache,
) : InjektModule {
override fun InjektRegistrar.registerInjectables() {
addSingleton(json)
addSingleton(protoBuf)
addSingleton(xml)
addSingleton(networkHelper)
addSingleton(javaScriptEngine)
addSingleton(preferenceStore)
addSingleton(trackPreferences)
addSingleton(extensionManager)
addSingleton(coverCache)
}
}
@@ -1,13 +1,6 @@
package mihon.core.migration
import uy.kohesive.injekt.Injekt
class MigrationContext(
val dryrun: Boolean,
val previousVersion: Int,
) {
inline fun <reified T> get(): T? {
return Injekt.getInstanceOrNull(T::class.java)
}
}
)
@@ -1,5 +1,8 @@
package mihon.core.migration.migrations
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoSet
import dev.zacsweers.metro.Inject
import mihon.core.migration.Migration
import mihon.core.migration.MigrationContext
import tachiyomi.core.common.util.lang.withIOContext
@@ -7,14 +10,16 @@ import tachiyomi.domain.category.interactor.GetCategories
import tachiyomi.domain.download.service.DownloadPreferences
import tachiyomi.domain.library.service.LibraryPreferences
class CategoryPreferencesCleanupMigration : Migration {
@Inject
@ContributesIntoSet(AppScope::class)
class CategoryPreferencesCleanupMigration(
private val libraryPreferences: LibraryPreferences,
private val downloadPreferences: DownloadPreferences,
private val getCategories: GetCategories,
) : Migration {
override val version: Float = 10f
override suspend fun invoke(migrationContext: MigrationContext): Boolean = withIOContext {
val libraryPreferences = migrationContext.get<LibraryPreferences>() ?: return@withIOContext false
val downloadPreferences = migrationContext.get<DownloadPreferences>() ?: return@withIOContext false
val getCategories = migrationContext.get<GetCategories>() ?: return@withIOContext false
val allCategories = getCategories.await().map { it.id.toString() }.toSet()
val defaultCategory = libraryPreferences.defaultCategory.get()
@@ -1,17 +1,24 @@
package mihon.core.migration.migrations
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoSet
import dev.zacsweers.metro.Inject
import eu.kanade.domain.base.BasePreferences
import mihon.core.common.FeatureFlags
import mihon.core.migration.Migration
import mihon.core.migration.MigrationContext
import kotlin.uuid.ExperimentalUuidApi
class InstallationIdMigration : Migration {
@Inject
@ContributesIntoSet(AppScope::class)
class InstallationIdMigration(
private val basePreferences: BasePreferences,
) : Migration {
override val version: Float = Migration.ALWAYS
@OptIn(ExperimentalUuidApi::class)
override suspend fun invoke(migrationContext: MigrationContext): Boolean {
val installationId = migrationContext.get<BasePreferences>()?.installationId ?: return false
val installationId = basePreferences.installationId
if (!installationId.isSet()) installationId.set(FeatureFlags.newInstallationId())
return true
}
@@ -1,13 +0,0 @@
package mihon.core.migration.migrations
import mihon.core.migration.Migration
val migrations: List<Migration>
get() = listOf(
SetupBackupCreateMigration(),
SetupLibraryUpdateMigration(),
TrustExtensionRepositoryMigration(),
CategoryPreferencesCleanupMigration(),
InstallationIdMigration(),
VerticalNavigatorMigration(),
)
@@ -1,15 +1,21 @@
package mihon.core.migration.migrations
import android.app.Application
import android.content.Context
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoSet
import dev.zacsweers.metro.Inject
import eu.kanade.tachiyomi.data.backup.create.BackupCreateJob
import mihon.core.migration.Migration
import mihon.core.migration.MigrationContext
class SetupBackupCreateMigration : Migration {
@Inject
@ContributesIntoSet(AppScope::class)
class SetupBackupCreateMigration(
private val context: Context,
) : Migration {
override val version: Float = Migration.ALWAYS
override suspend fun invoke(migrationContext: MigrationContext): Boolean {
val context = migrationContext.get<Application>() ?: return false
BackupCreateJob.setupTask(context)
return true
}
@@ -1,15 +1,21 @@
package mihon.core.migration.migrations
import android.app.Application
import android.content.Context
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoSet
import dev.zacsweers.metro.Inject
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
import mihon.core.migration.Migration
import mihon.core.migration.MigrationContext
class SetupLibraryUpdateMigration : Migration {
@Inject
@ContributesIntoSet(AppScope::class)
class SetupLibraryUpdateMigration(
private val context: Context,
) : Migration {
override val version: Float = Migration.ALWAYS
override suspend fun invoke(migrationContext: MigrationContext): Boolean {
val context = migrationContext.get<Application>() ?: return false
LibraryUpdateJob.setupTask(context)
return true
}
@@ -1,5 +1,8 @@
package mihon.core.migration.migrations
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoSet
import dev.zacsweers.metro.Inject
import eu.kanade.domain.source.service.SourcePreferences
import logcat.LogPriority
import mihon.core.migration.Migration
@@ -8,12 +11,15 @@ import mihon.domain.extension.repository.ExtensionStoreRepository
import tachiyomi.core.common.util.lang.withIOContext
import tachiyomi.core.common.util.system.logcat
class TrustExtensionRepositoryMigration : Migration {
@Inject
@ContributesIntoSet(AppScope::class)
class TrustExtensionRepositoryMigration(
private val sourcePreferences: SourcePreferences,
private val repository: ExtensionStoreRepository,
) : Migration {
override val version: Float = 7f
override suspend fun invoke(migrationContext: MigrationContext): Boolean = withIOContext {
val sourcePreferences = migrationContext.get<SourcePreferences>() ?: return@withIOContext false
val repository = migrationContext.get<ExtensionStoreRepository>() ?: return@withIOContext false
for ((index, source) in sourcePreferences.extensionRepos.get().withIndex()) {
try {
repository.insertFromPreference(
@@ -1,5 +1,8 @@
package mihon.core.migration.migrations
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoSet
import dev.zacsweers.metro.Inject
import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
import mihon.core.migration.Migration
@@ -7,13 +10,15 @@ import mihon.core.migration.MigrationContext
import tachiyomi.core.common.preference.PreferenceStore
import tachiyomi.core.common.util.lang.withIOContext
class VerticalNavigatorMigration : Migration {
@Inject
@ContributesIntoSet(AppScope::class)
class VerticalNavigatorMigration(
private val preferenceStore: PreferenceStore,
private val readerPreferences: ReaderPreferences,
) : Migration {
override val version: Float = 25f
override suspend fun invoke(migrationContext: MigrationContext): Boolean = withIOContext {
val preferenceStore = migrationContext.get<PreferenceStore>() ?: return@withIOContext false
val readerPreferences = migrationContext.get<ReaderPreferences>() ?: return@withIOContext false
if (migrationContext.previousVersion == 24) {
val oldVerticalNavigator = preferenceStore.getBoolean("pref_webtoon_vertical_navigator", true)
if (oldVerticalNavigator.get()) {
@@ -1,5 +1,6 @@
package mihon.domain.migration.usecases
import dev.zacsweers.metro.Inject
import eu.kanade.domain.manga.interactor.UpdateManga
import eu.kanade.domain.manga.model.hasCustomCover
import eu.kanade.domain.source.service.SourcePreferences
@@ -22,6 +23,7 @@ import tachiyomi.domain.track.interactor.GetTracks
import tachiyomi.domain.track.interactor.InsertTrack
import kotlin.time.Clock
@Inject
class MigrateMangaUseCase(
private val sourcePreferences: SourcePreferences,
private val trackerManager: TrackerManager,
@@ -1,5 +1,6 @@
package mihon.domain.source.interactor
import dev.zacsweers.metro.Inject
import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource
import eu.kanade.domain.chapter.model.toSChapter
import eu.kanade.domain.manga.model.hasCustomCover
@@ -22,6 +23,7 @@ import tachiyomi.domain.source.service.SourceManager
import tachiyomi.source.local.isLocal
import kotlin.time.Clock
@Inject
class UpdateMangaFromRemote(
private val sourceManager: SourceManager,
private val chapterRepository: ChapterRepository,
@@ -38,9 +38,14 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastForEachIndexed
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoMap
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.binding
import dev.zacsweers.metrox.viewmodel.ViewModelKey
import dev.zacsweers.metrox.viewmodel.metroViewModel
import eu.kanade.domain.source.service.SourcePreferences
import eu.kanade.presentation.browse.components.SourceIcon
import eu.kanade.presentation.components.AppBar
@@ -68,8 +73,6 @@ import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
import tachiyomi.presentation.core.screens.LoadingScreen
import tachiyomi.presentation.core.util.shouldExpandFAB
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class MigrationConfigScreen(private val mangaIds: Collection<Long>) : Screen() {
@@ -79,7 +82,7 @@ class MigrationConfigScreen(private val mangaIds: Collection<Long>) : Screen() {
override fun Content() {
val navigator = LocalNavigator.currentOrThrow
val viewModel = viewModel<Model>()
val viewModel = metroViewModel<Model>()
val state by viewModel.state.collectAsState()
var migrationSheetOpen by rememberSaveable { mutableStateOf(false) }
@@ -308,9 +311,12 @@ class MigrationConfigScreen(private val mangaIds: Collection<Long>) : Screen() {
}
}
@Inject
@ViewModelKey
@ContributesIntoMap(AppScope::class, binding = binding<ViewModel>())
class Model(
val sourcePreferences: SourcePreferences = Injekt.get(),
private val sourceManager: SourceManager = Injekt.get(),
val sourcePreferences: SourcePreferences,
private val sourceManager: SourceManager,
) : ViewModel() {
val state: StateFlow<Model.State>
@@ -19,8 +19,13 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.util.fastForEach
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewmodel.compose.viewModel
import cafe.adriel.voyager.core.screen.Screen
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoMap
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.binding
import dev.zacsweers.metrox.viewmodel.ViewModelKey
import dev.zacsweers.metrox.viewmodel.metroViewModel
import eu.kanade.domain.manga.model.hasCustomCover
import eu.kanade.domain.source.service.SourcePreferences
import eu.kanade.tachiyomi.data.cache.CoverCache
@@ -39,8 +44,6 @@ import tachiyomi.presentation.core.components.LabeledCheckbox
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
import tachiyomi.presentation.core.screens.LoadingScreen
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@Composable
internal fun Screen.MigrateMangaDialog(
@@ -52,7 +55,7 @@ internal fun Screen.MigrateMangaDialog(
) {
val scope = rememberCoroutineScope()
val viewModel = viewModel<MigrateDialogViewModel>()
val viewModel = metroViewModel<MigrateDialogViewModel>()
LaunchedEffect(current, target) {
viewModel.init(current, target)
}
@@ -125,11 +128,14 @@ internal fun Screen.MigrateMangaDialog(
)
}
@Inject
@ViewModelKey
@ContributesIntoMap(AppScope::class, binding = binding<ViewModel>())
class MigrateDialogViewModel(
private val sourcePreference: SourcePreferences = Injekt.get(),
private val coverCache: CoverCache = Injekt.get(),
private val downloadManager: DownloadManager = Injekt.get(),
private val migrateManga: MigrateMangaUseCase = Injekt.get(),
private val sourcePreference: SourcePreferences,
private val coverCache: CoverCache,
private val downloadManager: DownloadManager,
private val migrateManga: MigrateMangaUseCase,
) : ViewModel() {
val state: StateFlow<MigrateDialogViewModel.State>
@@ -7,10 +7,9 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.viewmodel.CreationExtras
import androidx.lifecycle.viewmodel.compose.viewModel
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import dev.zacsweers.metrox.viewmodel.assistedMetroViewModel
import eu.kanade.presentation.util.Screen
import eu.kanade.tachiyomi.ui.browse.migration.search.MigrateSearchScreen
import eu.kanade.tachiyomi.ui.manga.MangaScreen
@@ -31,13 +30,10 @@ class MigrationListScreen(private val mangaIds: Collection<Long>, private val ex
@Composable
override fun Content() {
val navigator = LocalNavigator.currentOrThrow
val viewModel = viewModel<MigrationListViewModel>(
factory = MigrationListViewModel.Factory,
extras = CreationExtras {
set(MigrationListViewModel.MANGA_IDS_KEY, mangaIds)
set(MigrationListViewModel.EXTRA_SEARCH_QUERY_KEY, extraSearchQuery)
},
)
val viewModel =
assistedMetroViewModel<MigrationListViewModel, MigrationListViewModel.Factory> {
create(mangaIds = mangaIds, extraSearchQuery = extraSearchQuery)
}
val state by viewModel.state.collectAsState()
val context = LocalContext.current
@@ -3,9 +3,13 @@ package mihon.feature.migration.list
import androidx.annotation.FloatRange
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.CreationExtras
import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.Assisted
import dev.zacsweers.metro.AssistedFactory
import dev.zacsweers.metro.AssistedInject
import dev.zacsweers.metro.ContributesIntoMap
import dev.zacsweers.metrox.viewmodel.ManualViewModelAssistedFactory
import dev.zacsweers.metrox.viewmodel.ManualViewModelAssistedFactoryKey
import eu.kanade.domain.source.service.SourcePreferences
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.getNameForMangaInfo
@@ -38,37 +42,28 @@ import tachiyomi.domain.manga.interactor.GetManga
import tachiyomi.domain.manga.interactor.NetworkToLocalManga
import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.source.service.SourceManager
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@AssistedInject
class MigrationListViewModel(
mangaIds: Collection<Long>,
extraSearchQuery: String?,
private val preferences: SourcePreferences = Injekt.get(),
private val sourceManager: SourceManager = Injekt.get(),
private val getManga: GetManga = Injekt.get(),
private val networkToLocalManga: NetworkToLocalManga = Injekt.get(),
private val getChaptersByMangaId: GetChaptersByMangaId = Injekt.get(),
private val migrateManga: MigrateMangaUseCase = Injekt.get(),
private val updateMangaFromRemote: UpdateMangaFromRemote = Injekt.get(),
@Assisted mangaIds: Collection<Long>,
@Assisted extraSearchQuery: String?,
private val preferences: SourcePreferences,
private val sourceManager: SourceManager,
private val getManga: GetManga,
private val networkToLocalManga: NetworkToLocalManga,
private val getChaptersByMangaId: GetChaptersByMangaId,
private val migrateManga: MigrateMangaUseCase,
private val updateMangaFromRemote: UpdateMangaFromRemote,
) : ViewModel() {
val state: StateFlow<MigrationListViewModel.State>
field = MutableStateFlow<MigrationListViewModel.State>(State())
companion object {
val MANGA_IDS_KEY = CreationExtras.Key<Collection<Long>>()
val EXTRA_SEARCH_QUERY_KEY = CreationExtras.Key<String?>()
val Factory = viewModelFactory {
initializer {
MigrationListViewModel(
mangaIds = get(MANGA_IDS_KEY)!!,
extraSearchQuery = get(EXTRA_SEARCH_QUERY_KEY),
)
}
}
@AssistedFactory
@ManualViewModelAssistedFactoryKey
@ContributesIntoMap(AppScope::class)
interface Factory : ManualViewModelAssistedFactory {
fun create(mangaIds: Collection<Long>, extraSearchQuery: String?): MigrationListViewModel
}
private val smartSearchEngine = SmartSourceSearchEngine(extraSearchQuery)
@@ -21,6 +21,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import dev.zacsweers.metrox.viewmodel.metroViewModel
import eu.kanade.presentation.category.visualName
import eu.kanade.presentation.components.TabbedDialog
import eu.kanade.presentation.components.TabbedDialogPaddings
@@ -41,7 +42,7 @@ class UpcomingScreen : Screen() {
override fun Content() {
val navigator = LocalNavigator.currentOrThrow
val viewModel = viewModel<UpcomingViewModel>()
val viewModel = metroViewModel<UpcomingViewModel>()
val state by viewModel.state.collectAsStateWithLifecycle()
when (state.dialog) {
@@ -5,6 +5,11 @@ import androidx.compose.ui.util.fastMap
import androidx.compose.ui.util.fastMapIndexedNotNull
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesIntoMap
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.binding
import dev.zacsweers.metrox.viewmodel.ViewModelKey
import eu.kanade.core.util.insertSeparatorsReversed
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
@@ -30,15 +35,16 @@ import tachiyomi.domain.category.interactor.GetCategories
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.upcoming.service.UpcomingPreferences
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import kotlin.time.Clock
import kotlin.time.Duration.Companion.seconds
@Inject
@ViewModelKey
@ContributesIntoMap(AppScope::class, binding = binding<ViewModel>())
class UpcomingViewModel(
private val getUpcomingManga: GetUpcomingManga = Injekt.get(),
val getCategories: GetCategories = Injekt.get(),
val upcomingPreferences: UpcomingPreferences = Injekt.get(),
private val getUpcomingManga: GetUpcomingManga,
val getCategories: GetCategories,
val upcomingPreferences: UpcomingPreferences,
) : ViewModel() {
val excludedCategories = upcomingPreferences.filterExcludedCategories