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

Waipoint dialog: added variable to decide - overlap controls with dialog or not. Added showing waypoint reached dialog in routing helper announceGpxWaypoints

Browse source
This commit is contained in:
Denis 2014-07-28 21:52:00 +03:00
parent f2209eea40
commit 9ec98b0f4f
5 changed files with 31 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -19,6 +19,7 @@ import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.access.AccessibleToast;
import net.osmand.plus.access.AccessibilityMode;
import net.osmand.plus.activities.DayNightHelper;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.SavingTrackHelper;
import net.osmand.plus.activities.SettingsActivity;
import net.osmand.plus.api.SQLiteAPI;
@ -77,6 +78,7 @@ public class OsmandApplication extends Application {
public static final String EXCEPTION_PATH = "exception.log"; //$NON-NLS-1$
private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class);
public MapActivity mapActivity;
ResourceManager resourceManager = null;
PoiFiltersHelper poiFilters = null;

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -301,6 +301,7 @@ public class MapActivity extends AccessibleActivity {
}
settings.MAP_ACTIVITY_ENABLED.set(true);
app.mapActivity = this;
checkExternalStorage();
showAndHideMapPosition();
@ -559,6 +560,7 @@ public class MapActivity extends AccessibleActivity {
settings.setLastKnownMapZoom(mapView.getZoom());
settings.MAP_ACTIVITY_ENABLED.set(false);
app.mapActivity = null;
app.getResourceManager().interruptRendering();
app.getResourceManager().setBusyIndicator(null);
OsmandPlugin.onMapActivityPause(this);

3
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -25,6 +25,7 @@ import net.osmand.plus.routing.AlarmInfo.AlarmInfoType;
import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo;
import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
import net.osmand.plus.routing.RouteProvider.RouteService;
import net.osmand.plus.sherpafy.WaypointDialogHelper;
import net.osmand.plus.voice.CommandPlayer;
import net.osmand.router.RouteCalculationProgress;
import net.osmand.router.RouteSegmentResult;
@ -328,6 +329,8 @@ public class RoutingHelper {
}
if(!Algorithms.isEmpty(s)) {
voiceRouter.announceWaypoint(s);
WaypointDialogHelper dialogHelper = new WaypointDialogHelper(app);
dialogHelper.addDialogWithShift();
}
}
}

101
OsmAnd/src/net/osmand/plus/sherpafy/WaypointDialogHelper.java
View file

@ -15,6 +15,7 @@ import android.widget.LinearLayout;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.api.render.Paint;
import net.osmand.plus.views.MapControlsLayer;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.plus.views.controls.*;
@ -27,10 +28,12 @@ public class WaypointDialogHelper {
private OsmandApplication app;
private FrameLayout mainLayout;
public WaypointDialogHelper(MapActivity activity, OsmandApplication app, FrameLayout layout) {
this.mapActivity = activity;
public static boolean OVERLAP_LAYOUT = true;
public WaypointDialogHelper(OsmandApplication app) {
this.mapActivity = app.mapActivity;
this.app = app;
this.mainLayout = (FrameLayout) layout.getChildAt(0);
this.mainLayout = (FrameLayout) ((FrameLayout) mapActivity.getLayout()).getChildAt(0);
}
public void addDialogWithShift() {
@ -62,101 +65,39 @@ public class WaypointDialogHelper {
if (mainLayout != null) {
mainLayout.removeView(parent);
if (checkIfDialogExists()) {
shiftButtons(0, 120, 120);
if (checkIfDialogExists() && OVERLAP_LAYOUT) {
shiftButtons();
}
}
}
});
if (reachedView != null) {
mainLayout.addView(reachedView, 1, params);
if (reachedView != null && mainLayout != null) {
mainLayout.addView(reachedView, params);
waitBeforeLayoutIsResized(reachedView);
}
}
private boolean checkIfDialogExists() {
if (mainLayout == null){
return true;
}
if (mainLayout.findViewById(R.id.package_delivered_layout) != null) {
return false;
}
return true;
}
private void shiftButtons(int marginBottom, int marginRight, int marginLeft) {
if (mainLayout == null) {
private void shiftButtons() {
if (mainLayout == null || mapActivity == null) {
return;
}
MapControlsLayer mapControls = mapActivity.getMapLayers().getMapControlsLayer();
mapControls.shiftControl();
// FrameLayout.LayoutParams btnp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
// Button menu = (Button) mainLayout.findViewById(MapMenuControls.BACK_TO_MENU_BTN_ID);
// if (menu == null){
// menu = (Button) mainLayout.findViewById(SmallMapMenuControls.SMALL_MENU_CONTROL_ID);
// }
// if (menu != null) {
// btnp.setMargins(0, 0, 0, marginBottom);
// btnp.gravity = Gravity.BOTTOM;
// menu.setLayoutParams(btnp);
// }
//
// Button navigate = (Button) mainLayout.findViewById(MapNavigateControl.NAVIGATE_BUTTON_ID);
// if (navigate != null) {
// btnp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
// btnp.gravity = Gravity.BOTTOM | Gravity.RIGHT;
// btnp.setMargins(0, 0, 0, marginBottom);
// //btnp.setMargins(0, 0, 120, marginBottom);
// navigate.setLayoutParams(btnp);
// }
//
// Button stop = (Button) mainLayout.findViewById(MapCancelControl.CANCEL_BUTTON_ID);
// if (stop != null) {
// btnp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
// btnp.gravity = Gravity.BOTTOM;
// //TODO calculate left margin
// btnp.setMargins(139, 0, 0, marginBottom);
// stop.setLayoutParams(btnp);
// }
//
// ImageButton routePref = (ImageButton) mainLayout.findViewById(MapRoutePreferencesControl.ROUTE_PREFERENCES_BTN_ID);
// if (routePref != null){
// btnp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
// btnp.gravity = Gravity.BOTTOM | Gravity.RIGHT;
// //TODO right left margin
// btnp.setMargins(0, 0, 120, marginBottom);
// routePref.setLayoutParams(btnp);
// }
//
// Button routeInfo = (Button) mainLayout.findViewById(MapRouteInfoControl.ROUTE_INFO_BUTTON_ID);
// if (routeInfo != null) {
// btnp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
// btnp.gravity = Gravity.BOTTOM;
// //TODO calculate left margin
// btnp.setMargins(259, 0, 0, marginBottom);
// routeInfo.setLayoutParams(btnp);
// } else {
// //if navigation doesnt exists - we need to push zoom buttons top
// // otherwise they're placed at the right side
// //image resource to know layout size
// Button zoomIn = (Button) mainLayout.findViewById(MapZoomControls.ZOOM_IN_BTN_ID);
// Drawable d = mapActivity.getApplicationContext().getResources().getDrawable(R.drawable.map_zoom_in);
// if (zoomIn != null) {
// btnp = new FrameLayout.LayoutParams(d.getMinimumWidth(), d.getMinimumHeight());
// btnp.gravity = Gravity.BOTTOM | Gravity.RIGHT;
// btnp.setMargins(0, 0, marginRight, marginBottom);
// zoomIn.setLayoutParams(btnp);
// }
//
// Button zoomOut = (Button) mainLayout.findViewById(MapZoomControls.ZOOM_OUT_BTN_ID);
// if (zoomOut != null) {
// d = mapActivity.getApplicationContext().getResources().getDrawable(R.drawable.map_zoom_out);
// btnp = new FrameLayout.LayoutParams(d.getMinimumWidth(), d.getMinimumHeight());
// btnp.gravity = Gravity.BOTTOM | Gravity.RIGHT;
// btnp.setMargins(0, 0, 0, marginBottom);
// zoomOut.setLayoutParams(btnp);
// }
// }
if (mapControls != null){
mapControls.shiftControl();
}
}
@ -179,8 +120,8 @@ public class WaypointDialogHelper {
}
protected void onPostExecute(Void result) {
if (height > 0) {
shiftButtons(height, 120, 120);
if (height > 0 && OVERLAP_LAYOUT) {
shiftButtons();
}
}
}.execute(reachedView);

3
OsmAnd/src/net/osmand/plus/views/controls/MapControls.java
View file

@ -3,6 +3,7 @@ package net.osmand.plus.views.controls;
import net.osmand.data.RotatedTileBox;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.sherpafy.WaypointDialogHelper;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import android.content.Context;
import android.graphics.Canvas;
@ -99,7 +100,7 @@ public abstract class MapControls {
}
//if there's dialog opened we need to shift elements top
View sherpafyDialog = parent.findViewById(R.id.package_delivered_layout);
if (sherpafyDialog != null && ((gravity & Gravity.BOTTOM) == Gravity.BOTTOM)){
if (sherpafyDialog != null && ((gravity & Gravity.BOTTOM) == Gravity.BOTTOM) && WaypointDialogHelper.OVERLAP_LAYOUT){
params.bottomMargin = sherpafyDialog.getHeight();
}
button.setLayoutParams(params);