Hide mapillary (dashboard, configure screen, search)

This commit is contained in:
PavelRatushny 2017-07-26 15:39:06 +03:00 committed by Alexey Kulish
parent 2d7b9bfb8f
commit 820c3df322

View file

@ -247,6 +247,7 @@ public class MapControlsLayer extends OsmandMapLayer {
configureMap.setOnClickListener(new View.OnClickListener() { configureMap.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mapActivity.dismissCardDialog();
MapActivity.clearPrevActivityIntent(); MapActivity.clearPrevActivityIntent();
mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.CONFIGURE_MAP); mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.CONFIGURE_MAP);
} }
@ -273,6 +274,7 @@ public class MapControlsLayer extends OsmandMapLayer {
search.setOnClickListener(new View.OnClickListener() { search.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mapActivity.dismissCardDialog();
mapActivity.showQuickSearch(ShowQuickSearchMode.NEW_IF_EXPIRED, false); mapActivity.showQuickSearch(ShowQuickSearchMode.NEW_IF_EXPIRED, false);
} }
}); });
@ -408,6 +410,7 @@ public class MapControlsLayer extends OsmandMapLayer {
public void onClick(View v) { public void onClick(View v) {
MapActivity.clearPrevActivityIntent(); MapActivity.clearPrevActivityIntent();
if (dash) { if (dash) {
mapActivity.dismissCardDialog();
mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.DASHBOARD); mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.DASHBOARD);
} else { } else {
mapActivity.openDrawer(); mapActivity.openDrawer();