diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt index be0e9790..e8977320 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt @@ -85,7 +85,6 @@ class HomeFragment : Fragment() { private fun setupView() { binding.refreshLayout.setOnRefreshListener { viewModel.refreshData() - // binding.refreshLayout.isRefreshing = false } binding.viewsRecyclerView.adapter = ViewListAdapter( diff --git a/app/src/main/java/dev/jdtech/jellyfin/models/CollectionType.kt b/app/src/main/java/dev/jdtech/jellyfin/models/CollectionType.kt index 250e7498..114968d3 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/models/CollectionType.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/models/CollectionType.kt @@ -1,21 +1,16 @@ package dev.jdtech.jellyfin.models -import dev.jdtech.jellyfin.models.CollectionType.Books -import dev.jdtech.jellyfin.models.CollectionType.HomeVideos -import dev.jdtech.jellyfin.models.CollectionType.LiveTv -import dev.jdtech.jellyfin.models.CollectionType.Music -import dev.jdtech.jellyfin.models.CollectionType.Playlists -import dev.jdtech.jellyfin.models.CollectionType.BoxSets - -enum class CollectionType (val type: String) { +enum class CollectionType(val type: String) { HomeVideos("homevideos"), Music("music"), Playlists("playlists"), Books("books"), LiveTv("livetv"), - BoxSets("boxsets") -} + BoxSets("boxsets"); -fun unsupportedCollections() = listOf( - HomeVideos, Music, Playlists, Books, LiveTv, BoxSets -) \ No newline at end of file + companion object { + val unsupportedCollections = listOf( + HomeVideos, Music, Playlists, Books, LiveTv, BoxSets + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt index b9866977..faedff31 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt @@ -9,8 +9,8 @@ import dev.jdtech.jellyfin.R import dev.jdtech.jellyfin.adapters.HomeItem import dev.jdtech.jellyfin.adapters.HomeItem.Section import dev.jdtech.jellyfin.adapters.HomeItem.ViewItem +import dev.jdtech.jellyfin.models.CollectionType import dev.jdtech.jellyfin.models.HomeSection -import dev.jdtech.jellyfin.models.unsupportedCollections import dev.jdtech.jellyfin.repository.JellyfinRepository import dev.jdtech.jellyfin.utils.syncPlaybackProgress import dev.jdtech.jellyfin.utils.toView @@ -93,7 +93,7 @@ class HomeViewModel @Inject internal constructor( private suspend fun loadViews() = repository .getUserViews() - .filter { view -> unsupportedCollections().none { it.type == view.collectionType } } + .filter { view -> CollectionType.unsupportedCollections.none { it.type == view.collectionType } } .map { view -> view to repository.getLatestMedia(view.id) } .filter { (_, latest) -> latest.isNotEmpty() } .map { (view, latest) -> view.toView().apply { items = latest } } 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 6c98b421..b6c18088 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt @@ -2,7 +2,7 @@ package dev.jdtech.jellyfin.viewmodels import androidx.lifecycle.* import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.models.unsupportedCollections +import dev.jdtech.jellyfin.models.CollectionType import dev.jdtech.jellyfin.repository.JellyfinRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.collect @@ -39,7 +39,7 @@ constructor( try { val items = jellyfinRepository.getItems() val collections = - items.filter { collection -> unsupportedCollections().none { it.type == collection.collectionType } } + items.filter { collection -> CollectionType.unsupportedCollections.none { it.type == collection.collectionType } } uiState.emit(UiState.Normal(collections)) } catch (e: Exception) { uiState.emit(