tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing issue (not hiding progress dialo) on manual refresh.

master
Tomasz Półgrabia 2016-10-09 22:33:20 +02:00
parent e7e1ee81e4
commit 23da6515ce
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java
View File

@ -33,6 +33,7 @@ import pl.tpolgrabia.urbanexplorer.events.LocationChangedEvent;
import pl.tpolgrabia.urbanexplorer.handlers.GooglePlacesLongClickItemHandler; import pl.tpolgrabia.urbanexplorer.handlers.GooglePlacesLongClickItemHandler;
import pl.tpolgrabia.urbanexplorer.handlers.GooglePlacesScrollListener; import pl.tpolgrabia.urbanexplorer.handlers.GooglePlacesScrollListener;
import pl.tpolgrabia.urbanexplorer.worker.GooglePlacesWorker; import pl.tpolgrabia.urbanexplorer.worker.GooglePlacesWorker;
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingFinishEvent;
import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent; import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent;
import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils; import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils;
import pl.tpolgrabia.urbanexplorerutils.utils.SettingsUtils; import pl.tpolgrabia.urbanexplorerutils.utils.SettingsUtils;
@ -79,6 +80,7 @@ public class PlacesFragment extends Fragment {
final ListView placesWidget = (ListView) inflatedView.findViewById(R.id.google_places); final ListView placesWidget = (ListView) inflatedView.findViewById(R.id.google_places);
placesWidget.setOnItemLongClickListener(new GooglePlacesLongClickItemHandler(this, placesWidget)); placesWidget.setOnItemLongClickListener(new GooglePlacesLongClickItemHandler(this, placesWidget));
placesWidget.setOnScrollListener(new GooglePlacesScrollListener(this)); placesWidget.setOnScrollListener(new GooglePlacesScrollListener(this));
placesWidget.setAdapter(new PlacesAdapter(getActivity(), places));
return inflatedView; return inflatedView;
} }
@ -214,8 +216,10 @@ public class PlacesFragment extends Fragment {
if (!semaphore.tryAcquire()) { if (!semaphore.tryAcquire()) {
// running // running
lg.debug("Active fetching nearby, quitting..."); lg.debug("Active fetching nearby, quitting...");
EventBus.getDefault().post(new DataLoadingFinishEvent(this));
return; return;
} }
Toast.makeText(getActivity(), Toast.makeText(getActivity(),
String.format(AppConstants.DEF_APP_LOCALE, String.format(AppConstants.DEF_APP_LOCALE,
"Fetching nearby places %.3f,%.3f", "Fetching nearby places %.3f,%.3f",
@ -289,8 +293,7 @@ public class PlacesFragment extends Fragment {
noMoreResults = true; noMoreResults = true;
} }
MainActivity activity = (MainActivity) getActivity(); EventBus.getDefault().post(new DataLoadingFinishEvent(this));
activity.hideProgress();
semaphore.release(); semaphore.release();
} }
@ -339,6 +342,7 @@ public class PlacesFragment extends Fragment {
if (getView() == null) { if (getView() == null) {
lg.debug("Sorry, headless fragment"); lg.debug("Sorry, headless fragment");
EventBus.getDefault().post(new DataLoadingFinishEvent(this));
return; return;
} }
@ -354,7 +358,9 @@ public class PlacesFragment extends Fragment {
private void cleanAdapter() { private void cleanAdapter() {
ListView plagesWidget = (ListView) getView().findViewById(R.id.google_places); ListView plagesWidget = (ListView) getView().findViewById(R.id.google_places);
PlacesAdapter adapter = (PlacesAdapter) plagesWidget.getAdapter(); PlacesAdapter adapter = (PlacesAdapter) plagesWidget.getAdapter();
adapter.clear(); if (adapter != null) {
adapter.clear();
}
} }
} }