Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix remove TerrainFragment from dashboard

Browse source
This commit is contained in:
veliymolfar 2020-03-23 14:43:48 +02:00
parent 2ca51a525e
commit 1bffad23f1
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -565,7 +565,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
DashboardOnMap.staticVisible = visible;
DashboardOnMap.staticVisibleType = type;
mapActivity.enableDrawer();
removeMapillaryFiltersFragment();
removeFragment(MapillaryFiltersFragment.TAG);
removeFragment(TerrainFragment.TAG);
if (visible) {
mapActivity.dismissCardDialog();
@ -782,6 +783,14 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
int top = (v == null) ? 0 : (v.getTop() - listView.getPaddingTop());
updateListAdapter();
((ListView) listView).setSelectionFromTop(index, top);
} else if (visibleType == DashboardType.TERRAIN) {
Fragment terrainFragment = mapActivity.getSupportFragmentManager().findFragmentByTag(TerrainFragment.TAG);
if (terrainFragment != null) {
mapActivity.getSupportFragmentManager().beginTransaction()
.detach(terrainFragment)
.attach(terrainFragment)
.commit();
}
} else {
listAdapter.notifyDataSetChanged();
}
@ -982,14 +991,14 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
.getFragmentTransaction().commit();
}
private void removeMapillaryFiltersFragment() {
private void removeFragment(String tag) {
FragmentManager manager = mapActivity.getSupportFragmentManager();
Fragment mapillaryFragment = manager.findFragmentByTag(MapillaryFiltersFragment.TAG);
if (mapillaryFragment != null) {
Fragment fragment = manager.findFragmentByTag(tag);
if (fragment != null) {
OsmandSettings settings = getMyApplication().getSettings();
TransactionBuilder builder = new TransactionBuilder(manager, settings, mapActivity);
builder.getFragmentTransaction()
.remove(mapillaryFragment)
.remove(fragment)
.commit();
}
}