pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed incorrect mwm size in search.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-08-13 14:27:46 +03:00 • committed by Vladimir Byko-Ianko
parent 95b2219aa6
commit f25e278da3
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
View file

@ -240,7 +240,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
ci.update();
LinearLayoutManager lm = (LinearLayoutManager)mRecycler.getLayoutManager();
LinearLayoutManager lm = (LinearLayoutManager) mRecycler.getLayoutManager();
int first = lm.findFirstVisibleItemPosition();
int last = lm.findLastVisibleItemPosition();
if (first == RecyclerView.NO_POSITION || last == RecyclerView.NO_POSITION)
@ -258,11 +258,13 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
public void onStatusChanged(List<MapManager.StorageCallbackData> data)
{
for (MapManager.StorageCallbackData item : data)
{
if (item.isLeafNode && item.newStatus == CountryItem.STATUS_FAILED)
{
MapManager.showError(mActivity, item, null);
break;
}
}
if (mSearchResultsMode)
{
@ -270,7 +272,9 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
updateItem(item.countryId);
}
else
{
refreshData();
}
}
@Override
@ -519,7 +523,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
if (mItem.status == CountryItem.STATUS_ENQUEUED || mItem.status == CountryItem.STATUS_PROGRESS)
size = mItem.enqueuedSize;
else
size = (mMyMapsMode ? mItem.size : mItem.totalSize);
size = ((!mSearchResultsMode && mMyMapsMode) ? mItem.size : mItem.totalSize);
mSize.setText(StringUtils.getFileSizeString(size));
mStatusIcon.update(mItem);
@ -585,9 +589,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
void refreshData()
{
mSearchResultsMode = false;
mSearchQuery = null;
mItems.clear();
String parent = getCurrentRootId();
@ -610,12 +611,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
processData();
}
void cancelSearch()
{
if (mSearchResultsMode)
refreshData();
}
void setSearchResultsMode(Collection<CountryItem> results, String query)
{
mSearchResultsMode = true;
@ -626,6 +621,13 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
processData();
}
void resetSearchResultsMode()
{
mSearchResultsMode = false;
mSearchQuery = null;
refreshData();
}
private void processData()
{
if (!mSearchResultsMode)
@ -719,7 +721,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
if (!refresh)
return;
refreshData();
if (mSearchResultsMode)
resetSearchResultsMode();
else
refreshData();
mFragment.update();
}

2
android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
View file

@ -88,7 +88,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
if (!mAdapter.isSearchResultsMode())
return;
mAdapter.cancelSearch();
mAdapter.resetSearchResultsMode();
onSearchEnd();
}