Got rid of AssistedInject for ViewModels

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -15,6 +15,7 @@ import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
+import androidx.activity.viewModels
 import androidx.core.graphics.Insets
 import androidx.core.view.OnApplyWindowInsetsListener
 import androidx.core.view.WindowInsetsCompat
@@ -48,14 +49,11 @@ import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.utils.GridTouchHelper
 import org.koitharu.kotatsu.utils.IdlingDetector
 import org.koitharu.kotatsu.utils.ShareHelper
-import org.koitharu.kotatsu.utils.ext.assistedViewModels
-import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
 import org.koitharu.kotatsu.utils.ext.hasGlobalPoint
 import org.koitharu.kotatsu.utils.ext.observeWithPrevious
 import org.koitharu.kotatsu.utils.ext.postDelayed
 import org.koitharu.kotatsu.utils.ext.setValueRounded
 import java.util.concurrent.TimeUnit
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class ReaderActivity :
@@ -68,18 +66,9 @@ class ReaderActivity :
 	OnApplyWindowInsetsListener,
 	IdlingDetector.Callback {
 
-	@Inject
-	lateinit var viewModelFactory: ReaderViewModel.Factory
-
 	private val idlingDetector = IdlingDetector(TimeUnit.SECONDS.toMillis(10), this)
 
-	val viewModel by assistedViewModels {
-		viewModelFactory.create(
-			intent = MangaIntent(intent),
-			initialState = intent?.getParcelableExtraCompat(EXTRA_STATE),
-			preselectedBranch = intent?.getStringExtra(EXTRA_BRANCH),
-		)
-	}
+	private val viewModel: ReaderViewModel by viewModels()
 
 	override var pageSwitchDelay: Float
 		get() = pageSwitchTimer.delaySec
@@ -392,8 +381,8 @@ class ReaderActivity :
 	companion object {
 
 		const val ACTION_MANGA_READ = "${BuildConfig.APPLICATION_ID}.action.READ_MANGA"
-		private const val EXTRA_STATE = "state"
-		private const val EXTRA_BRANCH = "branch"
+		const val EXTRA_STATE = "state"
+		const val EXTRA_BRANCH = "branch"
 		private const val TOAST_DURATION = 1500L
 
 		fun newIntent(context: Context, manga: Manga): Intent {

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt

@@ -6,10 +6,9 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.AnyThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -56,15 +55,15 @@ import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import org.koitharu.kotatsu.utils.ext.requireValue
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import java.util.Date
+import javax.inject.Inject
 import javax.inject.Provider
 
 private const val BOUNDS_PAGE_OFFSET = 2
 private const val PREFETCH_LIMIT = 10
 
-class ReaderViewModel @AssistedInject constructor(
-	@Assisted private val intent: MangaIntent,
-	@Assisted initialState: ReaderState?,
-	@Assisted private val preselectedBranch: String?,
+@HiltViewModel
+class ReaderViewModel @Inject constructor(
+	savedStateHandle: SavedStateHandle,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val dataRepository: MangaDataRepository,
 	private val historyRepository: HistoryRepository,
@@ -74,10 +73,13 @@ class ReaderViewModel @AssistedInject constructor(
 	pageLoaderFactory: Provider<PageLoader>,
 ) : BaseViewModel() {
 
+	private val intent = MangaIntent(savedStateHandle)
+	private val preselectedBranch = savedStateHandle.get<String>(ReaderActivity.EXTRA_BRANCH)
+
 	private var loadingJob: Job? = null
 	private var pageSaveJob: Job? = null
 	private var bookmarkJob: Job? = null
-	private val currentState = MutableStateFlow(initialState)
+	private val currentState = MutableStateFlow<ReaderState?>(savedStateHandle[ReaderActivity.EXTRA_STATE])
 	private val mangaData = MutableStateFlow(intent.manga)
 	private val chapters: LongSparseArray<MangaChapter>
 		get() = chaptersLoader.chapters
@@ -393,16 +395,6 @@ class ReaderViewModel @AssistedInject constructor(
 		val ppc = 1f / chaptersCount
 		return ppc * chapterIndex + ppc * pagePercent
 	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(
-			intent: MangaIntent,
-			initialState: ReaderState?,
-			preselectedBranch: String?,
-		): ReaderViewModel
-	}
 }
 
 /**

app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt

@@ -6,6 +6,7 @@ import android.content.res.Resources
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.viewModels
 import androidx.core.graphics.Insets
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
@@ -25,10 +26,8 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
-import org.koitharu.kotatsu.utils.ext.assistedViewModels
 import org.koitharu.kotatsu.utils.ext.decodeRegion
 import org.koitharu.kotatsu.utils.ext.enqueueWith
-import org.koitharu.kotatsu.utils.ext.getParcelableExtraCompat
 import org.koitharu.kotatsu.utils.ext.setValueRounded
 import javax.inject.Inject
 import com.google.android.material.R as materialR
@@ -42,15 +41,7 @@ class ColorFilterConfigActivity :
 	@Inject
 	lateinit var coil: ImageLoader
 
-	@Inject
-	lateinit var viewModelFactory: ColorFilterConfigViewModel.Factory
-
-	private val viewModel: ColorFilterConfigViewModel by assistedViewModels {
-		viewModelFactory.create(
-			manga = checkNotNull(intent.getParcelableExtraCompat<ParcelableManga>(EXTRA_MANGA)?.manga),
-			page = checkNotNull(intent.getParcelableExtraCompat<ParcelableMangaPages>(EXTRA_PAGES)?.pages?.firstOrNull()),
-		)
-	}
+	private val viewModel: ColorFilterConfigViewModel by viewModels()
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -144,8 +135,8 @@ class ColorFilterConfigActivity :
 
 	companion object {
 
-		private const val EXTRA_PAGES = "pages"
-		private const val EXTRA_MANGA = "manga_id"
+		const val EXTRA_PAGES = "pages"
+		const val EXTRA_MANGA = "manga_id"
 
 		fun newIntent(context: Context, manga: Manga, page: MangaPage) =
 			Intent(context, ColorFilterConfigActivity::class.java)

app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt

@@ -1,24 +1,29 @@
 package org.koitharu.kotatsu.reader.ui.colorfilter
 
 import androidx.lifecycle.MutableLiveData
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
+import androidx.lifecycle.SavedStateHandle
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPages
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
+import org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity.Companion.EXTRA_MANGA
 import org.koitharu.kotatsu.utils.SingleLiveEvent
+import javax.inject.Inject
 
-class ColorFilterConfigViewModel @AssistedInject constructor(
-	@Assisted private val manga: Manga,
-	@Assisted page: MangaPage,
+@HiltViewModel
+class ColorFilterConfigViewModel @Inject constructor(
+	savedStateHandle: SavedStateHandle,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val mangaDataRepository: MangaDataRepository,
 ) : BaseViewModel() {
 
+	private val manga = checkNotNull(savedStateHandle.get<ParcelableManga>(EXTRA_MANGA)?.manga)
+
 	private var initialColorFilter: ReaderColorFilter? = null
 	val colorFilter = MutableLiveData<ReaderColorFilter?>(null)
 	val onDismiss = SingleLiveEvent<Unit>()
@@ -28,19 +33,24 @@ class ColorFilterConfigViewModel @AssistedInject constructor(
 		get() = colorFilter.value != initialColorFilter
 
 	init {
+		val page = checkNotNull(
+			savedStateHandle.get<ParcelableMangaPages>(ColorFilterConfigActivity.EXTRA_PAGES)?.pages?.firstOrNull(),
+		)
 		launchLoadingJob {
 			initialColorFilter = mangaDataRepository.getColorFilter(manga.id)
 			colorFilter.value = initialColorFilter
 		}
-		launchLoadingJob {
+		launchLoadingJob(Dispatchers.Default) {
 			val repository = mangaRepositoryFactory.create(page.source)
 			val url = repository.getPageUrl(page)
-			preview.value = MangaPage(
-				id = page.id,
-				url = url,
-				referer = page.referer,
-				preview = page.preview,
-				source = page.source,
+			preview.postValue(
+				MangaPage(
+					id = page.id,
+					url = url,
+					referer = page.referer,
+					preview = page.preview,
+					source = page.source,
+				),
 			)
 		}
 	}
@@ -60,15 +70,9 @@ class ColorFilterConfigViewModel @AssistedInject constructor(
 	}
 
 	fun save() {
-		launchLoadingJob {
+		launchLoadingJob(Dispatchers.Default) {
 			mangaDataRepository.saveColorFilter(manga, colorFilter.value)
-			onDismiss.call(Unit)
+			onDismiss.postCall(Unit)
 		}
 	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(manga: Manga, page: MangaPage): ColorFilterConfigViewModel
-	}
 }

app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt

@@ -4,12 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.viewModels
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.GridLayoutManager
 import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import javax.inject.Provider
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
@@ -23,10 +22,13 @@ import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.PageThumbnailAdapter
 import org.koitharu.kotatsu.utils.ext.getParcelableCompat
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 import org.koitharu.kotatsu.utils.ext.withArgs
+import javax.inject.Inject
+import javax.inject.Provider
 
 @AndroidEntryPoint
 class PagesThumbnailsSheet :
@@ -117,9 +119,9 @@ class PagesThumbnailsSheet :
 			(parentFragment as? OnPageSelectListener)
 				?: (activity as? OnPageSelectListener)
 			)?.run {
-			onPageSelected(item)
-			dismiss()
-		}
+				onPageSelected(item)
+				dismiss()
+			}
 	}
 
 	override fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean) {
@@ -135,7 +137,7 @@ class PagesThumbnailsSheet :
 	}
 
 	private fun getPageLoader(): PageLoader {
-		val viewModel = (activity as? ReaderActivity)?.viewModel
+		val viewModel = (activity as? ReaderActivity)?.viewModels<ReaderViewModel>()?.value
 		return viewModel?.pageLoader ?: pageLoaderProvider.get().also { pageLoader = it }
 	}