Skip to content
Snippets Groups Projects
Commit 9038f50a authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Disable swipe to refresh when the medialibrary is not initiated

parent 432d5fa1
No related branches found
No related tags found
1 merge request!1009Permissions and onboarding
......@@ -35,6 +35,8 @@ import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.floatingactionbutton.FloatingActionButton
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.ObsoleteCoroutinesApi
import org.videolan.medialibrary.MLServiceLocator
import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.resources.AppContextProvider
......@@ -123,6 +125,11 @@ class PlaylistFragment : BaseAudioBrowser<PlaylistsViewModel>(), SwipeRefreshLay
}
override fun onResume() {
swipeRefreshLayout.visibility = if (Medialibrary.getInstance().isInitiated) View.VISIBLE else View.GONE
super.onResume()
}
private fun updateEmptyView() {
binding.emptyLoading.state =
if (!Permissions.canReadStorage(AppContextProvider.appContext)) EmptyLoadingState.MISSING_PERMISSION else if (viewModel.provider.loading.value == true && empty) EmptyLoadingState.LOADING else if (empty) EmptyLoadingState.EMPTY else EmptyLoadingState.NONE
......
......@@ -39,6 +39,7 @@ import com.google.android.material.tabs.TabLayout
import kotlinx.android.synthetic.main.audio_browser.*
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.ObsoleteCoroutinesApi
import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.resources.CTX_PLAY_ALL
......@@ -219,6 +220,11 @@ class AudioBrowserFragment : BaseAudioBrowser<AudioBrowserViewModel>() {
})
}
override fun onResume() {
swipeRefreshLayout.visibility = if (Medialibrary.getInstance().isInitiated) View.VISIBLE else View.GONE
super.onResume()
}
override fun onStart() {
super.onStart()
setFabPlayShuffleAllVisibility()
......@@ -301,7 +307,7 @@ class AudioBrowserFragment : BaseAudioBrowser<AudioBrowserViewModel>() {
super.onTabSelected(tab)
songs_fast_scroller?.setRecyclerView(lists[tab.position], viewModel.providers[tab.position])
settings.putSingle(KEY_AUDIO_CURRENT_TAB, tab.position)
setRefreshing(viewModel.providers[currentTab].isRefreshing)
if (Medialibrary.getInstance().isInitiated) setRefreshing(viewModel.providers[currentTab].isRefreshing)
activity?.invalidateOptionsMenu()
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment