Fix loading states for Audio and Browse tabs

application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.kt

@@ -277,7 +277,7 @@ class AudioBrowserFragment : BaseAudioBrowser<AudioBrowserViewModel>() {
     override fun enableSearchOption() = true
 
     private fun updateEmptyView() {
-        empty_loading.state = if (empty) EmptyLoadingState.EMPTY else EmptyLoadingState.NONE
+        empty_loading.state = if (viewModel.providers[currentTab].loading.value == true) EmptyLoadingState.LOADING else  if (empty) EmptyLoadingState.EMPTY else EmptyLoadingState.NONE
         setFabPlayShuffleAllVisibility()
     }
 

application/vlc-android/src/org/videolan/vlc/gui/browser/MainBrowserFragment.kt

@@ -134,7 +134,11 @@ class MainBrowserFragment : BaseFragment(), View.OnClickListener, CtxActionRecei
         localViewModel.dataset.observe(viewLifecycleOwner, Observer<List<MediaLibraryItem>> { list ->
             list?.let {
                 storageBrowserAdapter.update(it)
-                localEntry.loading.state = if (list.isEmpty()) EmptyLoadingState.EMPTY else EmptyLoadingState.NONE
+                localEntry.loading.state = when {
+                    list.isNotEmpty() -> EmptyLoadingState.NONE
+                    localViewModel.loading.value == true -> EmptyLoadingState.LOADING
+                    else -> EmptyLoadingState.EMPTY
+                }
             }
         })
         localViewModel.loading.observe(viewLifecycleOwner, Observer {
@@ -154,12 +158,19 @@ class MainBrowserFragment : BaseFragment(), View.OnClickListener, CtxActionRecei
         favoritesViewModel = BrowserFavoritesModel(requireContext())
         containerAdapterAssociation[favoritesBrowserContainer] = Pair(favoritesAdapter, favoritesViewModel)
         favoritesViewModel.favorites.observe(viewLifecycleOwner, Observer { list ->
-            list?.let {
+            list.let {
                 if (list.isEmpty()) favoritesEntry.setGone() else   favoritesEntry.setVisible()
                 favoritesAdapter.update(it)
-                favoritesEntry.loading.state = if (list.isEmpty()) EmptyLoadingState.EMPTY else EmptyLoadingState.NONE
+                favoritesEntry.loading.state = when {
+                    list.isNotEmpty() -> EmptyLoadingState.NONE
+                    localViewModel.loading.value == true -> EmptyLoadingState.LOADING
+                    else -> EmptyLoadingState.EMPTY
+                }
             }
         })
+        favoritesViewModel.provider.loading.observe(viewLifecycleOwner, Observer {
+            if (it) localEntry.loading.state = EmptyLoadingState.LOADING
+        })
         favoritesViewModel.provider.descriptionUpdate.observe(viewLifecycleOwner, Observer { pair ->
             if (pair != null) favoritesAdapter.notifyItemChanged(pair.first, pair.second)
         })
@@ -230,7 +241,7 @@ class MainBrowserFragment : BaseFragment(), View.OnClickListener, CtxActionRecei
             return
         }
         val dialog = NetworkServerDialog()
-        mw?.let { dialog.setServer(it) }
+        mw.let { dialog.setServer(it) }
         dialog.show(fm, "fragment_add_server")
     }