nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: remember scroll position in LibraryFragment (#285)

Browse source
This commit is contained in:
Jarne Demeulemeester 2023-02-11 10:41:28 +01:00 committed by GitHub
parent 3a8aaaa0f6
commit a2e581bc91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LibraryFragment.kt
View file

@ -150,6 +150,8 @@ class LibraryFragment : Fragment() {
viewLifecycleOwner.lifecycleScope.launch { viewLifecycleOwner.lifecycleScope.launch {
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
if (viewModel.itemsloaded) return@repeatOnLifecycle
// Sorting options // Sorting options
val sortBy = SortBy.fromString(preferences.sortBy) val sortBy = SortBy.fromString(preferences.sortBy)
val sortOrder = try { val sortOrder = try {

6
core/src/main/java/dev/jdtech/jellyfin/viewmodels/LibraryViewModel.kt
View file

@ -3,6 +3,7 @@ package dev.jdtech.jellyfin.viewmodels
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import androidx.paging.PagingData import androidx.paging.PagingData
import androidx.paging.cachedIn
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import dev.jdtech.jellyfin.repository.JellyfinRepository import dev.jdtech.jellyfin.repository.JellyfinRepository
import dev.jdtech.jellyfin.models.SortBy import dev.jdtech.jellyfin.models.SortBy
@ -26,6 +27,8 @@ constructor(
private val _uiState = MutableStateFlow<UiState>(UiState.Loading) private val _uiState = MutableStateFlow<UiState>(UiState.Loading)
val uiState = _uiState.asStateFlow() val uiState = _uiState.asStateFlow()
var itemsloaded = false
sealed class UiState { sealed class UiState {
data class Normal(val items: Flow<PagingData<BaseItemDto>>) : UiState() data class Normal(val items: Flow<PagingData<BaseItemDto>>) : UiState()
object Loading : UiState() object Loading : UiState()
@ -38,6 +41,7 @@ constructor(
sortBy: SortBy = SortBy.defaultValue, sortBy: SortBy = SortBy.defaultValue,
sortOrder: SortOrder = SortOrder.ASCENDING sortOrder: SortOrder = SortOrder.ASCENDING
) { ) {
itemsloaded = true
Timber.d("$libraryType") Timber.d("$libraryType")
val itemType = when (libraryType) { val itemType = when (libraryType) {
"movies" -> listOf(BaseItemKind.MOVIE) "movies" -> listOf(BaseItemKind.MOVIE)
@ -54,7 +58,7 @@ constructor(
recursive = true, recursive = true,
sortBy = sortBy, sortBy = sortBy,
sortOrder = sortOrder sortOrder = sortOrder
) ).cachedIn(viewModelScope)
_uiState.emit(UiState.Normal(items)) _uiState.emit(UiState.Normal(items))
} catch (e: Exception) { } catch (e: Exception) {
_uiState.emit(UiState.Error(e)) _uiState.emit(UiState.Error(e))