Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2024-11-27 14:41:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Touch: fix loading-overlay #33

Browse source
This commit is contained in:
Felix 2019-02-01 23:51:37 +01:00
parent 113e0eb397
commit 288c11481a
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
touch/src/main/java/de/nicidienase/chaosflix/touch/browse/eventslist/EventsListFragment.java
View file

@ -102,27 +102,28 @@ public class EventsListFragment extends BrowseFragment implements SearchView.OnQ
binding.list.setAdapter(eventAdapter); binding.list.setAdapter(eventAdapter);
Observer<List<Event>> listObserver = persistentEvents -> { Observer<List<Event>> listObserver = persistentEvents -> {
setLoadingOverlayVisibility(false);
if (persistentEvents != null) { if (persistentEvents != null) {
setEvents(persistentEvents); setEvents(persistentEvents);
if (persistentEvents.size() > 0) {
setLoadingOverlayVisibility(false);
}
} }
}; };
if (type == TYPE_BOOKMARKS) { if (type == TYPE_BOOKMARKS) {
setupToolbar(binding.incToolbar.toolbar, R.string.bookmarks); setupToolbar(binding.incToolbar.toolbar, R.string.bookmarks);
getViewModel().getBookmarkedEvents().observe(this, listObserver); getViewModel().getBookmarkedEvents().observe(this, listObserver);
setLoadingOverlayVisibility(false);
} else if (type == TYPE_IN_PROGRESS) { } else if (type == TYPE_IN_PROGRESS) {
setupToolbar(binding.incToolbar.toolbar, R.string.continue_watching); setupToolbar(binding.incToolbar.toolbar, R.string.continue_watching);
getViewModel().getInProgressEvents().observe(this, listObserver); getViewModel().getInProgressEvents().observe(this, listObserver);
setLoadingOverlayVisibility(false);
} else if (type == TYPE_EVENTS) { } else if (type == TYPE_EVENTS) {
{ {
setupToolbar(binding.incToolbar.toolbar, conference.getTitle(), false); setupToolbar(binding.incToolbar.toolbar, conference.getTitle(), false);
eventAdapter.setShowTags(conference.getTagsUsefull()); eventAdapter.setShowTags(conference.getTagsUsefull());
getViewModel().getEventsforConference(conference).observe(this, listObserver); getViewModel().getEventsforConference(conference).observe(this, events -> {
if(events != null){
setEvents(events);
setLoadingOverlayVisibility(false);
}
});
getViewModel().updateEventsForConference(conference).observe(this, state -> { getViewModel().updateEventsForConference(conference).observe(this, state -> {
Downloader.DownloaderState downloaderState = state.getState(); Downloader.DownloaderState downloaderState = state.getState();
switch (downloaderState) { switch (downloaderState) {