Glimpse: Cleanup ViewModels parameters

Change-Id: Ic6408ade38aa0022b8187d0570d7f29535500220
This commit is contained in:
Luca Stefani 2023-09-05 10:24:04 +02:00
parent 9daf3e196e
commit ed99cf3094
2 changed files with 2 additions and 5 deletions

View File

@ -5,11 +5,9 @@
package org.lineageos.glimpse.viewmodels
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
import androidx.lifecycle.createSavedStateHandle
import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
import kotlinx.coroutines.ExperimentalCoroutinesApi
@ -20,7 +18,7 @@ import org.lineageos.glimpse.repository.MediaRepository
import org.lineageos.glimpse.utils.MediaStoreBuckets
open class MediaViewModel(
private val savedStateHandle: SavedStateHandle, private val mediaRepository: MediaRepository
private val mediaRepository: MediaRepository
) : ViewModel() {
val media = mediaRepository.media(MediaStoreBuckets.MEDIA_STORE_BUCKET_REELS.id)
val albums = mediaRepository.albums()
@ -37,7 +35,6 @@ open class MediaViewModel(
val Factory: ViewModelProvider.Factory = viewModelFactory {
initializer {
MediaViewModel(
savedStateHandle = createSavedStateHandle(),
mediaRepository = (this[APPLICATION_KEY] as GlimpseApplication).mediaRepository,
)
}

View File

@ -19,7 +19,7 @@ import org.lineageos.glimpse.repository.MediaRepository
class MediaViewerViewModel(
savedStateHandle: SavedStateHandle,
mediaRepository: MediaRepository,
) : MediaViewModel(savedStateHandle, mediaRepository) {
) : MediaViewModel(mediaRepository) {
private val mediaPositionInternal = savedStateHandle.getLiveData<Int>(MEDIA_POSITION_KEY)
val mediaPositionLiveData: LiveData<Int> = mediaPositionInternal
var mediaPosition: Int