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

Add item delete / reset action

Browse source
This commit is contained in:
Victor Shcherb 2020-05-05 12:13:12 +02:00
parent b821db8357
commit 0de37eab3b
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -560,6 +560,7 @@ public class ContextMenuAdapter {
boolean onIntegerValueChangedListener(int newValue);
}
public static abstract class OnRowItemClick implements ItemClickListener {
//boolean return type needed to describe if drawer needed to be close or not

18
OsmAnd/src/net/osmand/plus/ContextMenuItem.java
View file

@ -37,6 +37,7 @@ public class ContextMenuItem {
private final ContextMenuAdapter.ItemClickListener itemClickListener;
private final ContextMenuAdapter.OnIntegerValueChangedListener integerListener;
private final ContextMenuAdapter.ProgressListener progressListener;
private final OnItemDeleteAction itemDeleteAction;
private final boolean hideDivider;
private final boolean hideCompoundButton;
private final int minHeight;
@ -61,6 +62,7 @@ public class ContextMenuItem {
ContextMenuAdapter.ItemClickListener itemClickListener,
ContextMenuAdapter.OnIntegerValueChangedListener integerListener,
ContextMenuAdapter.ProgressListener progressListener,
OnItemDeleteAction itemDeleteAction,
boolean hideDivider,
boolean hideCompoundButton,
int minHeight,
@ -85,6 +87,7 @@ public class ContextMenuItem {
this.integerListener = integerListener;
this.progressListener = progressListener;
this.hideDivider = hideDivider;
this.itemDeleteAction = itemDeleteAction;
this.hideCompoundButton = hideCompoundButton;
this.minHeight = minHeight;
this.tag = tag;
@ -170,6 +173,8 @@ public class ContextMenuItem {
return description;
}
public OnItemDeleteAction getItemDeleteAction() { return itemDeleteAction; }
public ContextMenuAdapter.ItemClickListener getItemClickListener() {
return itemClickListener;
}
@ -273,6 +278,7 @@ public class ContextMenuItem {
private ContextMenuAdapter.ItemClickListener mItemClickListener = null;
private ContextMenuAdapter.OnIntegerValueChangedListener mIntegerListener = null;
private ContextMenuAdapter.ProgressListener mProgressListener = null;
private OnItemDeleteAction itemDeleteAction;
private boolean mSkipPaintingWithoutColor;
private boolean mHideDivider;
private boolean mHideCompoundButton;
@ -374,6 +380,10 @@ public class ContextMenuItem {
return this;
}
public void setItemDeleteAction(OnItemDeleteAction itemDeleteAction) {
this.itemDeleteAction = itemDeleteAction;
}
public ItemBuilder hideDivider(boolean hideDivider) {
mHideDivider = hideDivider;
return this;
@ -406,8 +416,14 @@ public class ContextMenuItem {
public ContextMenuItem createItem() {
return new ContextMenuItem(mTitleId, mTitle, mIcon, mColorRes, mSecondaryIcon,
mSelected, mProgress, mLayout, mLoading, mIsCategory, mIsClickable, mSkipPaintingWithoutColor,
mPosition, mOrder, mDescription, mItemClickListener, mIntegerListener, mProgressListener,
mPosition, mOrder, mDescription, mItemClickListener, mIntegerListener, mProgressListener, itemDeleteAction,
mHideDivider, mHideCompoundButton, mMinHeight, mTag, mId);
}
}
// when action is deleted or reset
public interface OnItemDeleteAction {
boolean itemWasDeleted(boolean profileOnly);
}
}

3
OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
View file

@ -158,8 +158,7 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
if (activity instanceof MapActivity) {
switch (screenType) {
case DRAWER:
MapActivityActions mapActivityActions = new MapActivityActions((MapActivity) activity);
contextMenuAdapter = mapActivityActions.createMainOptionsMenu();
contextMenuAdapter = ((MapActivity) activity).getMapActions().createMainOptionsMenu();
break;
case CONFIGURE_MAP:
ConfigureMapMenu configureMapMenu = new ConfigureMapMenu();