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

Sort gps_info to bottom of the stack (very technical)

Browse source
This commit is contained in:
sonora 2016-06-26 09:48:48 +02:00
parent a5bf2c37a6
commit 40e55858ca
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/ApplicationMode.java
View file

@ -77,17 +77,17 @@ public class ApplicationMode {
regWidget("time", exceptDefault); regWidget("time", exceptDefault);
regWidget("speed", exceptPedestrianAndDefault); regWidget("speed", exceptPedestrianAndDefault);
regWidget("max_speed", CAR); regWidget("max_speed", CAR);
regWidget("gps_info", none);
regWidget("altitude", pedestrianBicycle); regWidget("altitude", pedestrianBicycle);
regWidget("gps_info", none);
// top // top
regWidget("compass", all);
regWidget("config", none); regWidget("config", none);
regWidget("layers", none);
regWidget("compass", all);
regWidget("street_name", exceptAirBoatDefault); regWidget("street_name", exceptAirBoatDefault);
regWidget("back_to_location", all); regWidget("back_to_location", all);
regWidget("monitoring_services", none); regWidget("monitoring_services", none);
regWidget("bgService", none); regWidget("bgService", none);
regWidget("layers", none);
} }

16
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -118,11 +118,11 @@ public class MapInfoLayer extends OsmandMapLayer {
NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(map, app, false); NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(map, app, false);
registerSideWidget(bigInfoControl, R.drawable.ic_action_next_turn, R.string.map_widget_next_turn, "next_turn", true, 5); registerSideWidget(bigInfoControl, R.drawable.ic_action_next_turn, R.string.map_widget_next_turn, "next_turn", true, 5);
NextTurnInfoWidget smallInfoControl = ric.createNextInfoControl(map, app, true); NextTurnInfoWidget smallInfoControl = ric.createNextInfoControl(map, app, true);
registerSideWidget(smallInfoControl, R.drawable.ic_action_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true, registerSideWidget(smallInfoControl, R.drawable.ic_action_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true, 10);
10);
NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(map, app, true); NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(map, app, true);
registerSideWidget(nextNextInfoControl, R.drawable.ic_action_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15); registerSideWidget(nextNextInfoControl, R.drawable.ic_action_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
// right stack
// register right stack
TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map); TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map);
registerSideWidget(intermediateDist, R.drawable.ic_action_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3); registerSideWidget(intermediateDist, R.drawable.ic_action_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
TextInfoWidget dist = ric.createDistanceControl(map); TextInfoWidget dist = ric.createDistanceControl(map);
@ -144,12 +144,12 @@ public class MapInfoLayer extends OsmandMapLayer {
TextInfoWidget speed = ric.createSpeedControl(map); TextInfoWidget speed = ric.createSpeedControl(map);
registerSideWidget(speed, R.drawable.ic_action_speed, R.string.map_widget_speed, "speed", false, 15); registerSideWidget(speed, R.drawable.ic_action_speed, R.string.map_widget_speed, "speed", false, 15);
TextInfoWidget gpsInfo = mic.createGPSInfoControl(map);
registerSideWidget(gpsInfo, R.drawable.ic_action_gps_info, R.string.map_widget_gps_info, "gps_info", false, 17);
TextInfoWidget maxspeed = ric.createMaxSpeedControl(map); TextInfoWidget maxspeed = ric.createMaxSpeedControl(map);
registerSideWidget(maxspeed, R.drawable.ic_action_speed_limit, R.string.map_widget_max_speed, "max_speed", false, 18); registerSideWidget(maxspeed, R.drawable.ic_action_speed_limit, R.string.map_widget_max_speed, "max_speed", false, 18);
TextInfoWidget alt = mic.createAltitudeControl(map); TextInfoWidget alt = mic.createAltitudeControl(map);
registerSideWidget(alt, R.drawable.ic_action_altitude, R.string.map_widget_altitude, "altitude", false, 20); registerSideWidget(alt, R.drawable.ic_action_altitude, R.string.map_widget_altitude, "altitude", false, 20);
TextInfoWidget gpsInfo = mic.createGPSInfoControl(map);
registerSideWidget(gpsInfo, R.drawable.ic_action_gps_info, R.string.map_widget_gps_info, "gps_info", false, 23);
TextInfoWidget plainTime = ric.createPlainTimeControl(map); TextInfoWidget plainTime = ric.createPlainTimeControl(map);
registerSideWidget(plainTime, R.drawable.ic_action_time, R.string.map_widget_plain_time, "plain_time", false, 25); registerSideWidget(plainTime, R.drawable.ic_action_time, R.string.map_widget_plain_time, "plain_time", false, 25);
TextInfoWidget battery = ric.createBatteryControl(map); TextInfoWidget battery = ric.createBatteryControl(map);
@ -157,12 +157,14 @@ public class MapInfoLayer extends OsmandMapLayer {
} }
public void recreateControls() { public void recreateControls() {
rightStack.removeAllViews();
mapInfoControls.populateStackControl(rightStack, settings.getApplicationMode(), false, expanded);
leftStack.removeAllViews(); leftStack.removeAllViews();
mapInfoControls.populateStackControl(leftStack, settings.getApplicationMode(), true, expanded); mapInfoControls.populateStackControl(leftStack, settings.getApplicationMode(), true, expanded);
leftStack.requestLayout(); leftStack.requestLayout();
rightStack.removeAllViews();
mapInfoControls.populateStackControl(rightStack, settings.getApplicationMode(), false, expanded);
rightStack.requestLayout(); rightStack.requestLayout();
expand.setVisibility(mapInfoControls.hasCollapsibles(settings.getApplicationMode())? expand.setVisibility(mapInfoControls.hasCollapsibles(settings.getApplicationMode())?
View.VISIBLE : View.GONE); View.VISIBLE : View.GONE);
this.expand.setImageResource(expanded ? R.drawable.map_up : this.expand.setImageResource(expanded ? R.drawable.map_up :