diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt index 2852438d..99a06634 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt @@ -30,7 +30,7 @@ class MediaFragment : Fragment() { binding.viewModel = viewModel binding.viewsRecyclerView.adapter = CollectionListAdapter(CollectionListAdapter.OnClickListener { library -> - nagivateToLibraryFragment(library) + navigateToLibraryFragment(library) }) viewModel.finishedLoading.observe(viewLifecycleOwner, { @@ -42,7 +42,7 @@ class MediaFragment : Fragment() { return binding.root } - private fun nagivateToLibraryFragment(library: BaseItemDto) { + private fun navigateToLibraryFragment(library: BaseItemDto) { findNavController().navigate( MediaFragmentDirections.actionNavigationMediaToLibraryFragment( library.id, diff --git a/app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepository.kt b/app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepository.kt index a7d98bdf..8bb2ffe3 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepository.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepository.kt @@ -6,7 +6,7 @@ import java.util.* interface JellyfinRepository { suspend fun getItem(itemId: UUID): BaseItemDto - suspend fun getItems(parentId: UUID): List + suspend fun getItems(parentId: UUID? = null): List suspend fun getSeasons(seriesId: UUID): List diff --git a/app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt b/app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt index a5920811..854dd0a3 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt @@ -15,7 +15,7 @@ class JellyfinRepositoryImpl(private val jellyfinApi: JellyfinApi) : JellyfinRep return item } - override suspend fun getItems(parentId: UUID): List { + override suspend fun getItems(parentId: UUID?): List { val items: List withContext(Dispatchers.IO) { items = jellyfinApi.itemsApi.getItems( diff --git a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt index b0d639a2..22012ace 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt @@ -1,23 +1,18 @@ package dev.jdtech.jellyfin.viewmodels -import android.app.Application import androidx.lifecycle.* import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.api.JellyfinApi -import kotlinx.coroutines.Dispatchers +import dev.jdtech.jellyfin.repository.JellyfinRepository import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import org.jellyfin.sdk.model.api.BaseItemDto -import java.util.* import javax.inject.Inject @HiltViewModel class MediaViewModel @Inject constructor( - application: Application + private val jellyfinRepository: JellyfinRepository ) : ViewModel() { - private val jellyfinApi = JellyfinApi.getInstance(application, "") private val _collections = MutableLiveData>() val collections: LiveData> = _collections @@ -27,17 +22,9 @@ constructor( init { viewModelScope.launch { - val items = getItems(jellyfinApi.userId!!) + val items = jellyfinRepository.getItems() _collections.value = items _finishedLoading.value = true } } - - private suspend fun getItems(userId: UUID): List? { - var items: List? - withContext(Dispatchers.IO) { - items = jellyfinApi.itemsApi.getItems(userId).content.items - } - return items - } } \ No newline at end of file