Keep Settings together

This commit is contained in:
sonora 2015-01-28 16:45:41 +01:00
parent f18dbdc5d9
commit 7d35f193a0

View file

@ -859,16 +859,6 @@ public class MapActivityActions implements DialogProvider {
}).reg(); }).reg();
optionsMenuHelper.item(R.string.configure_map).icons(R.drawable.ic_action_layers_dark, R.drawable.ic_action_layers_light)
.listen(new OnContextMenuClick() {
@Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
currentDrawer = DrawerType.CONFIGURE_MAP;
prepareConfigureMap();
return false;
}
}).reg();
optionsMenuHelper.item(R.string.show_point_options) optionsMenuHelper.item(R.string.show_point_options)
.icons(R.drawable.ic_action_marker_dark, R.drawable.ic_action_marker_light) .icons(R.drawable.ic_action_marker_dark, R.drawable.ic_action_marker_light)
.listen(new OnContextMenuClick() { .listen(new OnContextMenuClick() {
@ -878,7 +868,26 @@ public class MapActivityActions implements DialogProvider {
return true; return true;
} }
}).reg(); }).reg();
optionsMenuHelper.item(R.string.configure_map).icons(R.drawable.ic_action_layers_dark, R.drawable.ic_action_layers_light)
.listen(new OnContextMenuClick() {
@Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
currentDrawer = DrawerType.CONFIGURE_MAP;
prepareConfigureMap();
return false;
}
}).reg();
optionsMenuHelper.item(R.string.layer_map_appearance).icons(R.drawable.ic_configure_screen_dark, R.drawable.ic_configure_screen_light)
.listen(new OnContextMenuClick() {
@Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
prepareConfigureScreen();
return false;
}
}).reg();
optionsMenuHelper.item(R.string.settings_activity) optionsMenuHelper.item(R.string.settings_activity)
.icons(R.drawable.ic_action_settings_light, R.drawable.ic_action_settings_dark) .icons(R.drawable.ic_action_settings_light, R.drawable.ic_action_settings_dark)
.listen(new OnContextMenuClick() { .listen(new OnContextMenuClick() {
@ -890,16 +899,6 @@ public class MapActivityActions implements DialogProvider {
} }
}).reg(); }).reg();
optionsMenuHelper.item(R.string.layer_map_appearance).icons(R.drawable.ic_configure_screen_dark, R.drawable.ic_configure_screen_light)
.listen(new OnContextMenuClick() {
@Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
prepareConfigureScreen();
return false;
}
}).reg();
//////////// Others //////////// Others
final OsmAndLocationProvider loc = app.getLocationProvider(); final OsmAndLocationProvider loc = app.getLocationProvider();
// this is development functionality so it should stay preferrably here // this is development functionality so it should stay preferrably here