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

quit editing mode if selectedMarker id deleted

Browse source
This commit is contained in:
Chumva 2018-06-19 11:55:04 +03:00
parent 651edd1d30
commit a3cd4a97d5
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
View file

@ -6,6 +6,7 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
@ -37,6 +38,7 @@ import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.EditorInfo;
@ -97,6 +99,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
private boolean orientationPortrait;
private boolean isGpxSaved;
private boolean isSoftKeyboardShown;
private boolean north = true;
private boolean east = true;
@ -416,6 +419,17 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
if (!isOsmandKeyboardOn() && isOsmandKeyboardCurrentlyVisible()) {
changeOsmandKeyboardVisibility(false);
}
mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
Rect r = new Rect();
mainView.getWindowVisibleDisplayFrame(r);
int screenHeight = mainView.getRootView().getHeight();
int keypadHeight = screenHeight - r.bottom;
isSoftKeyboardShown = keypadHeight > screenHeight * 0.15;
}
});
}
private void setupKeyboardItems(View keyboardView, View.OnClickListener listener, @IdRes int... itemsIds) {
@ -935,6 +949,10 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
@Override
public void removeItem(int position) {
if (selectedMarker == adapter.getItem(position)) {
dismissEditingMode();
clearInputs();
}
adapter.removeItem(position);
isGpxSaved = false;
}