Added navigation quick actions. QA refactoring.
This commit is contained in:
Alexey Kulish
parent
a6dbfbae4f
commit
13b35b10d7
26 changed files with 3103 additions and 2515 deletions
|
|
@ -9,6 +9,12 @@
|
|||
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
|
||||
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
|
||||
-->
|
||||
<string name="quick_action_add_destination">Add destination</string>
|
||||
<string name="quick_action_replace_destination">Replace destination</string>
|
||||
<string name="quick_action_add_first_intermediate">Add first intermediate</string>
|
||||
<string name="quick_action_add_destination_desc">Tapping the action button will add a destination at the screen center location.</string>
|
||||
<string name="quick_action_replace_destination_desc">Tapping the action button will replace location of the destination with the screen center location.</string>
|
||||
<string name="quick_action_add_first_intermediate_desc">Tapping the action button will add a first intermediate point at the screen center location.</string>
|
||||
<string name="no_overlay">No overlay</string>
|
||||
<string name="no_underlay">No underlay</string>
|
||||
<string name="subscribe_email_error">Error</string>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
package net.osmand.plus.audionotes;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class TakeAudioNoteAction extends QuickAction {
|
||||
public static final int TYPE = 8;
|
||||
|
||||
public TakeAudioNoteAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public TakeAudioNoteAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
|
||||
if (plugin != null)
|
||||
plugin.recordAudio(latLon.getLatitude(), latLon.getLongitude(), activity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_take_audio_note_descr);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
package net.osmand.plus.audionotes;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class TakePhotoNoteAction extends QuickAction {
|
||||
public static final int TYPE = 10;
|
||||
|
||||
public TakePhotoNoteAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public TakePhotoNoteAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
|
||||
if (plugin != null)
|
||||
plugin.takePhoto(latLon.getLatitude(), latLon.getLongitude(), activity, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_take_photo_note_descr);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
package net.osmand.plus.audionotes;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class TakeVideoNoteAction extends QuickAction {
|
||||
public static final int TYPE = 9;
|
||||
|
||||
public TakeVideoNoteAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public TakeVideoNoteAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
|
||||
if (plugin != null)
|
||||
plugin.recordVideo(latLon.getLatitude(), latLon.getLongitude(), activity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_take_video_note_descr);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
}
|
||||
52
OsmAnd/src/net/osmand/plus/parkingpoint/ParkingAction.java
Normal file
52
OsmAnd/src/net/osmand/plus/parkingpoint/ParkingAction.java
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
package net.osmand.plus.parkingpoint;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class ParkingAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 7;
|
||||
|
||||
public ParkingAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public ParkingAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
ParkingPositionPlugin plugin = OsmandPlugin.getEnabledPlugin(ParkingPositionPlugin.class);
|
||||
|
||||
if (plugin != null) {
|
||||
|
||||
LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
plugin.showAddParkingDialog(activity, latLon.getLatitude(), latLon.getLongitude());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_add_parking_descr);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -8,9 +8,17 @@ import com.google.gson.reflect.TypeToken;
|
|||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
|
||||
import net.osmand.plus.audionotes.TakeAudioNoteAction;
|
||||
import net.osmand.plus.audionotes.TakePhotoNoteAction;
|
||||
import net.osmand.plus.audionotes.TakeVideoNoteAction;
|
||||
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
|
||||
import net.osmand.plus.osmedit.OsmEditingPlugin;
|
||||
import net.osmand.plus.parkingpoint.ParkingAction;
|
||||
import net.osmand.plus.parkingpoint.ParkingPositionPlugin;
|
||||
import net.osmand.plus.quickaction.actions.AddOSMBugAction;
|
||||
import net.osmand.plus.quickaction.actions.AddPOIAction;
|
||||
import net.osmand.plus.quickaction.actions.MapSourceAction;
|
||||
import net.osmand.plus.quickaction.actions.MapStyleAction;
|
||||
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
|
|
@ -74,9 +82,9 @@ public class QuickActionRegistry {
|
|||
|
||||
if (OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class) == null) {
|
||||
|
||||
if (action.type == QuickActionFactory.TakeAudioNoteAction.TYPE ||
|
||||
action.type == QuickActionFactory.TakePhotoNoteAction.TYPE ||
|
||||
action.type == QuickActionFactory.TakeVideoNoteAction.TYPE) {
|
||||
if (action.type == TakeAudioNoteAction.TYPE ||
|
||||
action.type == TakePhotoNoteAction.TYPE ||
|
||||
action.type == TakeVideoNoteAction.TYPE) {
|
||||
|
||||
skip = true;
|
||||
}
|
||||
|
|
@ -84,17 +92,16 @@ public class QuickActionRegistry {
|
|||
|
||||
if (OsmandPlugin.getEnabledPlugin(ParkingPositionPlugin.class) == null) {
|
||||
|
||||
if (action.type == QuickActionFactory.ParkingAction.TYPE) {
|
||||
if (action.type == ParkingAction.TYPE) {
|
||||
skip = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (OsmandPlugin.getEnabledPlugin(NauticalMapsPlugin.class) == null) {
|
||||
|
||||
if (action.type == QuickActionFactory.MapStyleAction.TYPE) {
|
||||
if (action.type == MapStyleAction.TYPE) {
|
||||
|
||||
if (((QuickActionFactory.MapStyleAction) QuickActionFactory.produceAction(action))
|
||||
.getFilteredStyles().isEmpty()){
|
||||
if (((MapStyleAction) QuickActionFactory.produceAction(action)).getFilteredStyles().isEmpty()){
|
||||
|
||||
skip = true;
|
||||
}
|
||||
|
|
@ -103,18 +110,18 @@ public class QuickActionRegistry {
|
|||
|
||||
if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) == null) {
|
||||
|
||||
if (action.type == QuickActionFactory.MapSourceAction.TYPE) {
|
||||
if (action.type == MapSourceAction.TYPE) {
|
||||
skip = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class) == null) {
|
||||
|
||||
if (action.type == QuickActionFactory.AddPOIAction.TYPE) {
|
||||
if (action.type == AddPOIAction.TYPE) {
|
||||
skip = true;
|
||||
}
|
||||
|
||||
if (action.type == QuickActionFactory.AddOSMBugAction.TYPE) {
|
||||
if (action.type == AddOSMBugAction.TYPE) {
|
||||
skip = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import net.osmand.plus.IconsCache;
|
|||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.helpers.AndroidUiHelper;
|
||||
import net.osmand.plus.quickaction.actions.NewAction;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -63,7 +64,7 @@ public class QuickActionsWidget extends LinearLayout {
|
|||
public void setActions(List<QuickAction> actions){
|
||||
|
||||
this.actions = actions;
|
||||
this.actions.add(new QuickActionFactory.NewAction());
|
||||
this.actions.add(new NewAction());
|
||||
|
||||
removeAllViews();
|
||||
setupLayout(getContext(), countPage());
|
||||
|
|
|
|||
271
OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
Normal file
271
OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
Normal file
|
|
@ -0,0 +1,271 @@
|
|||
package net.osmand.plus.quickaction;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.StringRes;
|
||||
import android.support.v4.view.MotionEventCompat;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.support.v7.widget.helper.ItemTouchHelper;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public abstract class SwitchableAction<T> extends QuickAction {
|
||||
|
||||
private transient EditText title;
|
||||
|
||||
protected SwitchableAction(int type) {
|
||||
super(type);
|
||||
}
|
||||
|
||||
public SwitchableAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAutoGeneratedTitle(EditText title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, final MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_switchable_action, parent, false);
|
||||
|
||||
final RecyclerView list = (RecyclerView) view.findViewById(R.id.list);
|
||||
|
||||
final QuickActionItemTouchHelperCallback touchHelperCallback = new QuickActionItemTouchHelperCallback();
|
||||
final ItemTouchHelper touchHelper = new ItemTouchHelper(touchHelperCallback);
|
||||
|
||||
final Adapter adapter = new Adapter(new QuickActionListFragment.OnStartDragListener() {
|
||||
@Override
|
||||
public void onStartDrag(RecyclerView.ViewHolder viewHolder) {
|
||||
touchHelper.startDrag(viewHolder);
|
||||
}
|
||||
});
|
||||
|
||||
touchHelperCallback.setItemMoveCallback(adapter);
|
||||
touchHelper.attachToRecyclerView(list);
|
||||
|
||||
if (!getParams().isEmpty()) {
|
||||
adapter.addItems(loadListFromParams());
|
||||
}
|
||||
|
||||
list.setAdapter(adapter);
|
||||
|
||||
TextView dscrTitle = (TextView) view.findViewById(R.id.textDscrTitle);
|
||||
TextView dscrHint = (TextView) view.findViewById(R.id.textDscrHint);
|
||||
Button addBtn = (Button) view.findViewById(R.id.btnAdd);
|
||||
|
||||
dscrTitle.setText(parent.getContext().getString(getDiscrTitle()) + ":");
|
||||
dscrHint.setText(getDiscrHint());
|
||||
addBtn.setText(getAddBtnText());
|
||||
addBtn.setOnClickListener(getOnAddBtnClickListener(activity, adapter));
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fillParams(View root, MapActivity activity) {
|
||||
|
||||
final RecyclerView list = (RecyclerView) root.findViewById(R.id.list);
|
||||
final Adapter adapter = (Adapter) list.getAdapter();
|
||||
|
||||
boolean hasParams = adapter.itemsList != null && !adapter.itemsList.isEmpty();
|
||||
|
||||
if (hasParams) saveListToParams(adapter.itemsList);
|
||||
|
||||
return hasParams;
|
||||
}
|
||||
|
||||
protected class Adapter extends RecyclerView.Adapter<Adapter.ItemHolder> implements QuickActionItemTouchHelperCallback.OnItemMoveCallback {
|
||||
|
||||
private List<T> itemsList = new ArrayList<>();
|
||||
private final QuickActionListFragment.OnStartDragListener onStartDragListener;
|
||||
|
||||
public Adapter(QuickActionListFragment.OnStartDragListener onStartDragListener) {
|
||||
this.onStartDragListener = onStartDragListener;
|
||||
this.itemsList = new ArrayList<>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Adapter.ItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
LayoutInflater inflater = LayoutInflater.from(parent.getContext());
|
||||
return new Adapter.ItemHolder(inflater.inflate(R.layout.quick_action_switchable_item, parent, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(final Adapter.ItemHolder holder, final int position) {
|
||||
final T item = itemsList.get(position);
|
||||
|
||||
holder.title.setText(getItemName(item));
|
||||
|
||||
holder.handleView.setOnTouchListener(new View.OnTouchListener() {
|
||||
@Override
|
||||
public boolean onTouch(View v, MotionEvent event) {
|
||||
if (MotionEventCompat.getActionMasked(event) ==
|
||||
MotionEvent.ACTION_DOWN) {
|
||||
onStartDragListener.onStartDrag(holder);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
holder.closeBtn.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
||||
String oldTitle = getTitle(itemsList);
|
||||
String defaultName = holder.handleView.getContext().getString(getNameRes());
|
||||
|
||||
deleteItem(holder.getAdapterPosition());
|
||||
|
||||
if (oldTitle.equals(title.getText().toString()) || title.getText().toString().equals(defaultName)) {
|
||||
|
||||
String newTitle = getTitle(itemsList);
|
||||
title.setText(newTitle);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return itemsList.size();
|
||||
}
|
||||
|
||||
public void deleteItem(int position) {
|
||||
|
||||
if (position == -1) {
|
||||
return;
|
||||
}
|
||||
|
||||
itemsList.remove(position);
|
||||
notifyItemRemoved(position);
|
||||
}
|
||||
|
||||
public void addItems(List<T> data) {
|
||||
|
||||
if (!itemsList.containsAll(data)) {
|
||||
|
||||
itemsList.addAll(data);
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
}
|
||||
|
||||
public void addItem(T item, Context context) {
|
||||
|
||||
if (!itemsList.contains(item)) {
|
||||
|
||||
String oldTitle = getTitle(itemsList);
|
||||
String defaultName = context.getString(getNameRes());
|
||||
|
||||
int oldSize = itemsList.size();
|
||||
itemsList.add(item);
|
||||
|
||||
notifyItemRangeInserted(oldSize, itemsList.size() - oldSize);
|
||||
|
||||
if (oldTitle.equals(title.getText().toString()) || title.getText().toString().equals(defaultName)) {
|
||||
|
||||
String newTitle = getTitle(itemsList);
|
||||
title.setText(newTitle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
|
||||
|
||||
int selectedPosition = viewHolder.getAdapterPosition();
|
||||
int targetPosition = target.getAdapterPosition();
|
||||
|
||||
if (selectedPosition < 0 || targetPosition < 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
String oldTitle = getTitle(itemsList);
|
||||
String defaultName = recyclerView.getContext().getString(getNameRes());
|
||||
|
||||
Collections.swap(itemsList, selectedPosition, targetPosition);
|
||||
if (selectedPosition - targetPosition < -1) {
|
||||
|
||||
notifyItemMoved(selectedPosition, targetPosition);
|
||||
notifyItemMoved(targetPosition - 1, selectedPosition);
|
||||
|
||||
} else if (selectedPosition - targetPosition > 1) {
|
||||
|
||||
notifyItemMoved(selectedPosition, targetPosition);
|
||||
notifyItemMoved(targetPosition + 1, selectedPosition);
|
||||
|
||||
} else {
|
||||
|
||||
notifyItemMoved(selectedPosition, targetPosition);
|
||||
}
|
||||
|
||||
notifyItemChanged(selectedPosition);
|
||||
notifyItemChanged(targetPosition);
|
||||
|
||||
if (oldTitle.equals(title.getText().toString()) || title.getText().toString().equals(defaultName)) {
|
||||
|
||||
String newTitle = getTitle(itemsList);
|
||||
title.setText(newTitle);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewDropped(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
|
||||
}
|
||||
|
||||
public class ItemHolder extends RecyclerView.ViewHolder {
|
||||
public TextView title;
|
||||
public ImageView handleView;
|
||||
public ImageView closeBtn;
|
||||
|
||||
public ItemHolder(View itemView) {
|
||||
super(itemView);
|
||||
|
||||
title = (TextView) itemView.findViewById(R.id.title);
|
||||
handleView = (ImageView) itemView.findViewById(R.id.handle_view);
|
||||
closeBtn = (ImageView) itemView.findViewById(R.id.closeImageButton);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract String getTitle(List<T> filters);
|
||||
|
||||
protected abstract void saveListToParams(List<T> list);
|
||||
|
||||
protected abstract List<T> loadListFromParams();
|
||||
|
||||
protected abstract String getItemName(T item);
|
||||
|
||||
protected abstract
|
||||
@StringRes
|
||||
int getAddBtnText();
|
||||
|
||||
protected abstract
|
||||
@StringRes
|
||||
int getDiscrHint();
|
||||
|
||||
protected abstract
|
||||
@StringRes
|
||||
int getDiscrTitle();
|
||||
|
||||
protected abstract String getListKey();
|
||||
|
||||
protected abstract View.OnClickListener getOnAddBtnClickListener(MapActivity activity, final Adapter adapter);
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.support.v7.widget.SwitchCompat;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.EditText;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.osmedit.OsmEditingPlugin;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class AddOSMBugAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 12;
|
||||
|
||||
private static final String KEY_MESSAGE = "message";
|
||||
private static final String KEY_SHO_DIALOG = "dialog";
|
||||
|
||||
public AddOSMBugAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public AddOSMBugAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
|
||||
|
||||
if (plugin != null) {
|
||||
|
||||
LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
if (getParams().isEmpty()) {
|
||||
|
||||
plugin.openOsmNote(activity, latLon.getLatitude(), latLon.getLongitude(), "", true);
|
||||
|
||||
} else {
|
||||
|
||||
plugin.openOsmNote(activity, latLon.getLatitude(), latLon.getLongitude(),
|
||||
getParams().get(KEY_MESSAGE),
|
||||
!Boolean.valueOf(getParams().get(KEY_SHO_DIALOG)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_add_bug, parent, false);
|
||||
|
||||
SwitchCompat showDialog = (SwitchCompat) view.findViewById(R.id.dialogSwitch);
|
||||
EditText message = (EditText) view.findViewById(R.id.message_edit);
|
||||
|
||||
if (!getParams().isEmpty()) {
|
||||
|
||||
showDialog.setChecked(Boolean.valueOf(getParams().get(KEY_SHO_DIALOG)));
|
||||
message.setText(getParams().get(KEY_MESSAGE));
|
||||
}
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fillParams(View root, MapActivity activity) {
|
||||
|
||||
SwitchCompat showDialog = (SwitchCompat) root.findViewById(R.id.dialogSwitch);
|
||||
EditText message = (EditText) root.findViewById(R.id.message_edit);
|
||||
|
||||
getParams().put(KEY_SHO_DIALOG, String.valueOf(showDialog.isChecked()));
|
||||
getParams().put(KEY_MESSAGE, message.getText().toString());
|
||||
|
||||
return !(Boolean.valueOf(getParams().get(KEY_SHO_DIALOG)) && getParams().get(KEY_MESSAGE).isEmpty());
|
||||
}
|
||||
}
|
||||
550
OsmAnd/src/net/osmand/plus/quickaction/actions/AddPOIAction.java
Normal file
550
OsmAnd/src/net/osmand/plus/quickaction/actions/AddPOIAction.java
Normal file
|
|
@ -0,0 +1,550 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.support.design.widget.TextInputLayout;
|
||||
import android.support.v7.widget.SwitchCompat;
|
||||
import android.text.Editable;
|
||||
import android.text.TextWatcher;
|
||||
import android.util.TypedValue;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.AutoCompleteTextView;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
|
||||
import net.osmand.CallbackWithObject;
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.osm.AbstractPoiType;
|
||||
import net.osmand.osm.MapPoiTypes;
|
||||
import net.osmand.osm.PoiCategory;
|
||||
import net.osmand.osm.PoiType;
|
||||
import net.osmand.osm.edit.Node;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.osmedit.EditPoiData;
|
||||
import net.osmand.plus.osmedit.EditPoiDialogFragment;
|
||||
import net.osmand.plus.osmedit.OpenstreetmapLocalUtil;
|
||||
import net.osmand.plus.osmedit.OpenstreetmapPoint;
|
||||
import net.osmand.plus.osmedit.OpenstreetmapUtil;
|
||||
import net.osmand.plus.osmedit.OsmEditingPlugin;
|
||||
import net.osmand.plus.osmedit.OsmPoint;
|
||||
import net.osmand.plus.osmedit.dialogs.PoiSubTypeDialogFragment;
|
||||
import net.osmand.plus.quickaction.CreateEditActionDialog;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
import net.osmand.plus.quickaction.QuickActionFactory;
|
||||
import net.osmand.util.Algorithms;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static net.osmand.plus.osmedit.AdvancedEditPoiFragment.addPoiToStringSet;
|
||||
import static net.osmand.plus.osmedit.EditPoiData.POI_TYPE_TAG;
|
||||
|
||||
public class AddPOIAction extends QuickAction {
|
||||
public static final int TYPE = 13;
|
||||
public static final String KEY_TAG = "key_tag";
|
||||
public static final String KEY_DIALOG = "dialog";
|
||||
|
||||
private transient EditText title;
|
||||
private transient String prevType = "";
|
||||
|
||||
public AddPOIAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public AddPOIAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(final MapActivity activity) {
|
||||
|
||||
LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
|
||||
if (plugin == null) return;
|
||||
Node node = new Node(latLon.getLatitude(), latLon.getLongitude(), -1);
|
||||
node.replaceTags(getTagsFromParams());
|
||||
EditPoiData editPoiData = new EditPoiData(node, activity.getMyApplication());
|
||||
if (Boolean.valueOf(getParams().get(KEY_DIALOG))) {
|
||||
Node newNode = editPoiData.getEntity();
|
||||
EditPoiDialogFragment editPoiDialogFragment =
|
||||
EditPoiDialogFragment.createInstance(newNode, true, getTagsFromParams());
|
||||
editPoiDialogFragment.show(activity.getSupportFragmentManager(),
|
||||
EditPoiDialogFragment.TAG);
|
||||
} else {
|
||||
OpenstreetmapUtil mOpenstreetmapUtil;
|
||||
if (activity.getMyApplication().getSettings().OFFLINE_EDITION.get()
|
||||
|| !activity.getMyApplication().getSettings().isInternetConnectionAvailable(true)) {
|
||||
mOpenstreetmapUtil = plugin.getPoiModificationLocalUtil();
|
||||
} else {
|
||||
mOpenstreetmapUtil = plugin.getPoiModificationRemoteUtil();
|
||||
}
|
||||
|
||||
final boolean offlineEdit = mOpenstreetmapUtil instanceof OpenstreetmapLocalUtil;
|
||||
Node newNode = new Node(node.getLatitude(), node.getLongitude(), node.getId());
|
||||
OsmPoint.Action action = newNode.getId() < 0 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
|
||||
for (Map.Entry<String, String> tag : editPoiData.getTagValues().entrySet()) {
|
||||
if (tag.getKey().equals(EditPoiData.POI_TYPE_TAG)) {
|
||||
final PoiType poiType = editPoiData.getAllTranslatedSubTypes().get(tag.getValue().trim().toLowerCase());
|
||||
if (poiType != null) {
|
||||
newNode.putTag(poiType.getOsmTag(), poiType.getOsmValue());
|
||||
if (poiType.getOsmTag2() != null) {
|
||||
newNode.putTag(poiType.getOsmTag2(), poiType.getOsmValue2());
|
||||
}
|
||||
} else if (!Algorithms.isEmpty(tag.getValue())) {
|
||||
newNode.putTag(editPoiData.getPoiCategory().getDefaultTag(), tag.getValue());
|
||||
|
||||
}
|
||||
if (offlineEdit && !Algorithms.isEmpty(tag.getValue())) {
|
||||
newNode.putTag(tag.getKey(), tag.getValue());
|
||||
}
|
||||
} else if (!Algorithms.isEmpty(tag.getKey()) && !Algorithms.isEmpty(tag.getValue())) {
|
||||
newNode.putTag(tag.getKey(), tag.getValue());
|
||||
}
|
||||
}
|
||||
EditPoiDialogFragment.commitNode(action, newNode, mOpenstreetmapUtil.getEntityInfo(newNode.getId()), "", false,
|
||||
new CallbackWithObject<Node>() {
|
||||
|
||||
@Override
|
||||
public boolean processResult(Node result) {
|
||||
if (result != null) {
|
||||
OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
|
||||
if (plugin != null && offlineEdit) {
|
||||
List<OpenstreetmapPoint> points = plugin.getDBPOI().getOpenstreetmapPoints();
|
||||
if (activity instanceof MapActivity && points.size() > 0) {
|
||||
OsmPoint point = points.get(points.size() - 1);
|
||||
activity.getContextMenu().showOrUpdate(
|
||||
new LatLon(point.getLatitude(), point.getLongitude()),
|
||||
plugin.getOsmEditsLayer(activity).getObjectName(point), point);
|
||||
}
|
||||
}
|
||||
|
||||
if (activity instanceof MapActivity) {
|
||||
activity.getMapView().refreshMap(true);
|
||||
}
|
||||
} else {
|
||||
// OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
|
||||
// mOpenstreetmapUtil = plugin.getPoiModificationLocalUtil();
|
||||
// Button saveButton = (Button) view.findViewById(R.id.saveButton);
|
||||
// saveButton.setText(mOpenstreetmapUtil instanceof OpenstreetmapRemoteUtil
|
||||
// ? R.string.shared_string_upload : R.string.shared_string_save);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}, activity, mOpenstreetmapUtil);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAutoGeneratedTitle(EditText title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(final ViewGroup parent, final MapActivity activity) {
|
||||
final View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_add_poi_layout, parent, false);
|
||||
|
||||
final OsmandApplication application = activity.getMyApplication();
|
||||
Drawable deleteDrawable = application.getIconsCache().getPaintedIcon(R.drawable.ic_action_remove_dark,
|
||||
activity.getResources().getColor(R.color.dash_search_icon_dark));
|
||||
|
||||
final LinearLayout editTagsLineaLayout =
|
||||
(LinearLayout) view.findViewById(R.id.editTagsList);
|
||||
|
||||
final MapPoiTypes poiTypes = application.getPoiTypes();
|
||||
final Map<String, PoiType> allTranslatedNames = poiTypes.getAllTranslatedNames(true);
|
||||
final TagAdapterLinearLayoutHack mAdapter = new TagAdapterLinearLayoutHack(editTagsLineaLayout, getTagsFromParams(), deleteDrawable);
|
||||
// It is possible to not restart initialization every time, and probably move initialization to appInit
|
||||
Map<String, PoiType> translatedTypes = poiTypes.getAllTranslatedNames(true);
|
||||
HashSet<String> tagKeys = new HashSet<>();
|
||||
HashSet<String> valueKeys = new HashSet<>();
|
||||
for (AbstractPoiType abstractPoiType : translatedTypes.values()) {
|
||||
addPoiToStringSet(abstractPoiType, tagKeys, valueKeys);
|
||||
}
|
||||
addPoiToStringSet(poiTypes.getOtherMapCategory(), tagKeys, valueKeys);
|
||||
tagKeys.addAll(EditPoiDialogFragment.BASIC_TAGS);
|
||||
mAdapter.setTagData(tagKeys.toArray(new String[tagKeys.size()]));
|
||||
mAdapter.setValueData(valueKeys.toArray(new String[valueKeys.size()]));
|
||||
Button addTagButton = (Button) view.findViewById(R.id.addTagButton);
|
||||
addTagButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
for (int i = 0; i < editTagsLineaLayout.getChildCount(); i++) {
|
||||
View item = editTagsLineaLayout.getChildAt(i);
|
||||
if (((EditText) item.findViewById(R.id.tagEditText)).getText().toString().isEmpty() &&
|
||||
((EditText) item.findViewById(R.id.valueEditText)).getText().toString().isEmpty())
|
||||
return;
|
||||
}
|
||||
mAdapter.addTagView("", "");
|
||||
}
|
||||
});
|
||||
|
||||
mAdapter.updateViews();
|
||||
|
||||
final TextInputLayout poiTypeTextInputLayout = (TextInputLayout) view.findViewById(R.id.poiTypeTextInputLayout);
|
||||
final AutoCompleteTextView poiTypeEditText = (AutoCompleteTextView) view.findViewById(R.id.poiTypeEditText);
|
||||
final SwitchCompat showDialog = (SwitchCompat) view.findViewById(R.id.saveButton);
|
||||
// showDialog.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||
// @Override
|
||||
// public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||
// getParams().put(KEY_DIALOG, Boolean.toString(isChecked));
|
||||
// }
|
||||
// });
|
||||
showDialog.setChecked(Boolean.valueOf(getParams().get(KEY_DIALOG)));
|
||||
|
||||
final String text = getTagsFromParams().get(POI_TYPE_TAG);
|
||||
poiTypeEditText.addTextChangedListener(new TextWatcher() {
|
||||
@Override
|
||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterTextChanged(Editable s) {
|
||||
String tp = s.toString();
|
||||
putTagIntoParams(POI_TYPE_TAG, tp);
|
||||
PoiCategory category = getCategory(allTranslatedNames);
|
||||
|
||||
if (category != null) {
|
||||
poiTypeTextInputLayout.setHint(category.getTranslation());
|
||||
}
|
||||
|
||||
String add = application.getString(R.string.shared_string_add);
|
||||
|
||||
if (title != null) {
|
||||
|
||||
if (prevType.equals(title.getText().toString())
|
||||
|| title.getText().toString().equals(activity.getString(getNameRes()))
|
||||
|| title.getText().toString().equals((add + " "))) {
|
||||
|
||||
if (!tp.isEmpty()) {
|
||||
|
||||
title.setText(add + " " + tp);
|
||||
prevType = title.getText().toString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
poiTypeEditText.setText(text != null ? text : "");
|
||||
poiTypeEditText.setOnTouchListener(new View.OnTouchListener() {
|
||||
@Override
|
||||
public boolean onTouch(final View v, MotionEvent event) {
|
||||
final EditText editText = (EditText) v;
|
||||
final int DRAWABLE_RIGHT = 2;
|
||||
if (event.getAction() == MotionEvent.ACTION_UP) {
|
||||
if (event.getX() >= (editText.getRight()
|
||||
- editText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width()
|
||||
- editText.getPaddingRight())) {
|
||||
PoiCategory category = getCategory(allTranslatedNames);
|
||||
PoiCategory tempPoiCategory = (category != null) ? category : poiTypes.getOtherPoiCategory();
|
||||
PoiSubTypeDialogFragment f =
|
||||
PoiSubTypeDialogFragment.createInstance(tempPoiCategory);
|
||||
f.setOnItemSelectListener(new PoiSubTypeDialogFragment.OnItemSelectListener() {
|
||||
@Override
|
||||
public void select(String category) {
|
||||
poiTypeEditText.setText(category);
|
||||
}
|
||||
});
|
||||
|
||||
CreateEditActionDialog parentFragment = (CreateEditActionDialog) activity.getSupportFragmentManager().findFragmentByTag(CreateEditActionDialog.TAG);
|
||||
f.show(activity.getSupportFragmentManager(), "PoiSubTypeDialogFragment");
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
setUpAdapterForPoiTypeEditText(activity, allTranslatedNames, poiTypeEditText);
|
||||
|
||||
ImageButton onlineDocumentationButton =
|
||||
(ImageButton) view.findViewById(R.id.onlineDocumentationButton);
|
||||
onlineDocumentationButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
activity.startActivity(new Intent(Intent.ACTION_VIEW,
|
||||
Uri.parse("https://wiki.openstreetmap.org/wiki/Map_Features")));
|
||||
}
|
||||
});
|
||||
|
||||
boolean isLightTheme = activity.getMyApplication().getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
|
||||
final int colorId = isLightTheme ? R.color.inactive_item_orange : R.color.dash_search_icon_dark;
|
||||
final int color = activity.getResources().getColor(colorId);
|
||||
onlineDocumentationButton.setImageDrawable(activity.getMyApplication().getIconsCache().getPaintedIcon(R.drawable.ic_action_help, color));
|
||||
// poiTypeEditText.setCompoundDrawables(null, null, activity.getMyApplication().getIconsCache().getPaintedIcon(R.drawable.ic_action_arrow_drop_down, color), null);
|
||||
|
||||
// Button addTypeButton = (Button) view.findViewById(R.id.addTypeButton);
|
||||
// addTypeButton.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// PoiSubTypeDialogFragment f = PoiSubTypeDialogFragment.createInstance(poiTypes.getOtherPoiCategory());
|
||||
// f.setOnItemSelectListener(new PoiSubTypeDialogFragment.OnItemSelectListener() {
|
||||
// @Override
|
||||
// public void select(String category) {
|
||||
// putTagIntoParams(POI_TYPE_TAG, category);
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// CreateEditActionDialog parentFragment = (CreateEditActionDialog) activity.getSupportFragmentManager().findFragmentByTag(CreateEditActionDialog.TAG);
|
||||
// f.show(parentFragment.getChildFragmentManager(), "PoiSubTypeDialogFragment");
|
||||
// }
|
||||
// });
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
|
||||
private void setUpAdapterForPoiTypeEditText(final MapActivity activity, final Map<String, PoiType> allTranslatedNames, final AutoCompleteTextView poiTypeEditText) {
|
||||
final Map<String, PoiType> subCategories = new LinkedHashMap<>();
|
||||
// PoiCategory ct = editPoiData.getPoiCategory();
|
||||
// if (ct != null) {
|
||||
// for (PoiType s : ct.getPoiTypes()) {
|
||||
// if (!s.isReference() && !s.isNotEditableOsm() && s.getBaseLangType() == null) {
|
||||
// addMapEntryAdapter(subCategories, s.getTranslation(), s);
|
||||
// if(!s.getKeyName().contains("osmand")) {
|
||||
// addMapEntryAdapter(subCategories, s.getKeyName().replace('_', ' '), s);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
for (Map.Entry<String, PoiType> s : allTranslatedNames.entrySet()) {
|
||||
addMapEntryAdapter(subCategories, s.getKey(), s.getValue());
|
||||
}
|
||||
final ArrayAdapter<Object> adapter;
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||
adapter = new ArrayAdapter<>(activity,
|
||||
R.layout.list_textview, subCategories.keySet().toArray());
|
||||
} else {
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = activity.getTheme();
|
||||
theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
|
||||
final int textColor = typedValue.data;
|
||||
|
||||
adapter = new ArrayAdapter<Object>(activity,
|
||||
R.layout.list_textview, subCategories.keySet().toArray()) {
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
final View view = super.getView(position, convertView, parent);
|
||||
((TextView) view.findViewById(R.id.textView)).setTextColor(textColor);
|
||||
return view;
|
||||
}
|
||||
};
|
||||
}
|
||||
adapter.sort(new Comparator<Object>() {
|
||||
@Override
|
||||
public int compare(Object lhs, Object rhs) {
|
||||
return lhs.toString().compareTo(rhs.toString());
|
||||
}
|
||||
});
|
||||
poiTypeEditText.setAdapter(adapter);
|
||||
poiTypeEditText.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
||||
|
||||
@Override
|
||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
||||
Object item = parent.getAdapter().getItem(position);
|
||||
poiTypeEditText.setText(item.toString());
|
||||
setUpAdapterForPoiTypeEditText(activity, allTranslatedNames, poiTypeEditText);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNothingSelected(AdapterView<?> parent) {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private PoiCategory getCategory(Map<String, PoiType> allTranslatedNames) {
|
||||
String tp = getTagsFromParams().get(POI_TYPE_TAG);
|
||||
if (tp == null) return null;
|
||||
PoiType pt = allTranslatedNames.get(tp.toLowerCase());
|
||||
if (pt != null) {
|
||||
return pt.getCategory();
|
||||
} else
|
||||
return null;
|
||||
}
|
||||
|
||||
private void addMapEntryAdapter(final Map<String, PoiType> subCategories, String key, PoiType v) {
|
||||
if (!subCategories.containsKey(key.toLowerCase())) {
|
||||
subCategories.put(Algorithms.capitalizeFirstLetterAndLowercase(key), v);
|
||||
}
|
||||
}
|
||||
|
||||
private class TagAdapterLinearLayoutHack {
|
||||
private final LinearLayout linearLayout;
|
||||
private final Map<String, String> tagsData;
|
||||
private final ArrayAdapter<String> tagAdapter;
|
||||
private final ArrayAdapter<String> valueAdapter;
|
||||
private final Drawable deleteDrawable;
|
||||
|
||||
public TagAdapterLinearLayoutHack(LinearLayout linearLayout,
|
||||
Map<String, String> tagsData,
|
||||
Drawable deleteDrawable) {
|
||||
this.linearLayout = linearLayout;
|
||||
this.tagsData = tagsData;
|
||||
this.deleteDrawable = deleteDrawable;
|
||||
|
||||
tagAdapter = new ArrayAdapter<>(linearLayout.getContext(), R.layout.list_textview);
|
||||
valueAdapter = new ArrayAdapter<>(linearLayout.getContext(), R.layout.list_textview);
|
||||
}
|
||||
|
||||
public void updateViews() {
|
||||
linearLayout.removeAllViews();
|
||||
List<Map.Entry<String, String>> entries = new ArrayList<>(tagsData.entrySet());
|
||||
for (Map.Entry<String, String> tag : entries) {
|
||||
if (tag.getKey().equals(POI_TYPE_TAG)
|
||||
/*|| tag.getKey().equals(OSMSettings.OSMTagKey.NAME.getValue())*/)
|
||||
continue;
|
||||
addTagView(tag.getKey(), tag.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
public void addTagView(String tg, String vl) {
|
||||
View convertView = LayoutInflater.from(linearLayout.getContext())
|
||||
.inflate(R.layout.poi_tag_list_item, null, false);
|
||||
final AutoCompleteTextView tagEditText =
|
||||
(AutoCompleteTextView) convertView.findViewById(R.id.tagEditText);
|
||||
ImageButton deleteItemImageButton =
|
||||
(ImageButton) convertView.findViewById(R.id.deleteItemImageButton);
|
||||
deleteItemImageButton.setImageDrawable(deleteDrawable);
|
||||
final String[] previousTag = new String[]{tg};
|
||||
deleteItemImageButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
linearLayout.removeView((View) v.getParent());
|
||||
tagsData.remove(tagEditText.getText().toString());
|
||||
setTagsIntoParams(tagsData);
|
||||
}
|
||||
});
|
||||
final AutoCompleteTextView valueEditText =
|
||||
(AutoCompleteTextView) convertView.findViewById(R.id.valueEditText);
|
||||
tagEditText.setText(tg);
|
||||
tagEditText.setAdapter(tagAdapter);
|
||||
tagEditText.setThreshold(1);
|
||||
tagEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
|
||||
@Override
|
||||
public void onFocusChange(View v, boolean hasFocus) {
|
||||
if (!hasFocus) {
|
||||
String s = tagEditText.getText().toString();
|
||||
tagsData.remove(previousTag[0]);
|
||||
tagsData.put(s.toString(), valueEditText.getText().toString());
|
||||
previousTag[0] = s.toString();
|
||||
setTagsIntoParams(tagsData);
|
||||
} else {
|
||||
tagAdapter.getFilter().filter(tagEditText.getText());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
valueEditText.setText(vl);
|
||||
valueEditText.addTextChangedListener(new TextWatcher() {
|
||||
@Override
|
||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterTextChanged(Editable s) {
|
||||
tagsData.put(tagEditText.getText().toString(), s.toString());
|
||||
setTagsIntoParams(tagsData);
|
||||
}
|
||||
});
|
||||
|
||||
initAutocompleteTextView(valueEditText, valueAdapter);
|
||||
|
||||
linearLayout.addView(convertView);
|
||||
tagEditText.requestFocus();
|
||||
}
|
||||
|
||||
public void setTagData(String[] tags) {
|
||||
tagAdapter.clear();
|
||||
for (String s : tags) {
|
||||
tagAdapter.add(s);
|
||||
}
|
||||
tagAdapter.sort(String.CASE_INSENSITIVE_ORDER);
|
||||
tagAdapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
public void setValueData(String[] values) {
|
||||
valueAdapter.clear();
|
||||
for (String s : values) {
|
||||
valueAdapter.add(s);
|
||||
}
|
||||
valueAdapter.sort(String.CASE_INSENSITIVE_ORDER);
|
||||
valueAdapter.notifyDataSetChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private static void initAutocompleteTextView(final AutoCompleteTextView textView,
|
||||
final ArrayAdapter<String> adapter) {
|
||||
|
||||
textView.setOnFocusChangeListener(new View.OnFocusChangeListener() {
|
||||
@Override
|
||||
public void onFocusChange(View v, boolean hasFocus) {
|
||||
if (hasFocus) {
|
||||
adapter.getFilter().filter(textView.getText());
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fillParams(View root, MapActivity activity) {
|
||||
getParams().put(KEY_DIALOG, Boolean.toString(((SwitchCompat) root.findViewById(R.id.saveButton)).isChecked()));
|
||||
return !getParams().isEmpty() && (getParams().get(KEY_TAG) != null || !getTagsFromParams().isEmpty());
|
||||
}
|
||||
|
||||
private Map<String, String> getTagsFromParams() {
|
||||
Map<String, String> quickActions = null;
|
||||
if (getParams().get(KEY_TAG) != null) {
|
||||
String json = getParams().get(KEY_TAG);
|
||||
Type type = new TypeToken<LinkedHashMap<String, String>>() {
|
||||
}.getType();
|
||||
quickActions = new Gson().fromJson(json, type);
|
||||
}
|
||||
return quickActions != null ? quickActions : new LinkedHashMap<String, String>();
|
||||
}
|
||||
|
||||
private void setTagsIntoParams(Map<String, String> tags) {
|
||||
getParams().put(KEY_TAG, new Gson().toJson(tags));
|
||||
}
|
||||
|
||||
private void putTagIntoParams(String tag, String value) {
|
||||
Map<String, String> tagsFromParams = getTagsFromParams();
|
||||
tagsFromParams.put(tag, value);
|
||||
setTagsIntoParams(tagsFromParams);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,211 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.app.ProgressDialog;
|
||||
import android.support.v7.widget.SwitchCompat;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.FavouritesDbHelper;
|
||||
import net.osmand.plus.GeocodingLookupService;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.mapcontextmenu.editors.EditCategoryDialogFragment;
|
||||
import net.osmand.plus.mapcontextmenu.editors.SelectCategoryDialogFragment;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
import net.osmand.plus.widgets.AutoCompleteTextViewEx;
|
||||
|
||||
public class FavoriteAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 3;
|
||||
|
||||
public static final String KEY_NAME = "name";
|
||||
public static final String KEY_DIALOG = "dialog";
|
||||
public static final String KEY_CATEGORY_NAME = "category_name";
|
||||
public static final String KEY_CATEGORY_COLOR = "category_color";
|
||||
|
||||
public FavoriteAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public FavoriteAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(final MapActivity activity) {
|
||||
|
||||
final LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
final String title = getParams().get(KEY_NAME);
|
||||
|
||||
if (title == null || title.isEmpty()) {
|
||||
|
||||
final Dialog progressDialog = new ProgressDialog(activity);
|
||||
progressDialog.setCancelable(false);
|
||||
progressDialog.setTitle(R.string.search_address);
|
||||
progressDialog.show();
|
||||
|
||||
GeocodingLookupService.AddressLookupRequest lookupRequest = new GeocodingLookupService.AddressLookupRequest(latLon,
|
||||
|
||||
new GeocodingLookupService.OnAddressLookupResult() {
|
||||
|
||||
@Override
|
||||
public void geocodingDone(String address) {
|
||||
|
||||
if (progressDialog != null) progressDialog.dismiss();
|
||||
|
||||
if (activity != null) {
|
||||
|
||||
activity.getContextMenu().getFavoritePointEditor().add(latLon, address, "",
|
||||
getParams().get(KEY_CATEGORY_NAME),
|
||||
Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)),
|
||||
!Boolean.valueOf(getParams().get(KEY_DIALOG)));
|
||||
}
|
||||
}
|
||||
|
||||
}, null);
|
||||
|
||||
activity.getMyApplication().getGeocodingLookupService().lookupAddress(lookupRequest);
|
||||
|
||||
} else activity.getContextMenu().getFavoritePointEditor().add(latLon, title, "",
|
||||
getParams().get(KEY_CATEGORY_NAME),
|
||||
Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)),
|
||||
!Boolean.valueOf(getParams().get(KEY_DIALOG)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(final ViewGroup parent, final MapActivity activity) {
|
||||
|
||||
FavouritesDbHelper helper = activity.getMyApplication().getFavorites();
|
||||
|
||||
final View root = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_add_favorite, parent, false);
|
||||
|
||||
parent.addView(root);
|
||||
|
||||
AutoCompleteTextViewEx categoryEdit = (AutoCompleteTextViewEx) root.findViewById(R.id.category_edit);
|
||||
SwitchCompat showDialog = (SwitchCompat) root.findViewById(R.id.saveButton);
|
||||
ImageView categoryImage = (ImageView) root.findViewById(R.id.category_image);
|
||||
EditText name = (EditText) root.findViewById(R.id.name_edit);
|
||||
|
||||
if (!getParams().isEmpty()) {
|
||||
|
||||
showDialog.setChecked(Boolean.valueOf(getParams().get(KEY_DIALOG)));
|
||||
categoryImage.setColorFilter(Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)));
|
||||
name.setText(getParams().get(KEY_NAME));
|
||||
categoryEdit.setText(getParams().get(KEY_CATEGORY_NAME));
|
||||
|
||||
if (getParams().get(KEY_NAME).isEmpty() && Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)) == 0) {
|
||||
|
||||
categoryEdit.setText(activity.getString(R.string.shared_string_favorites));
|
||||
categoryImage.setColorFilter(activity.getResources().getColor(R.color.color_favorite));
|
||||
}
|
||||
|
||||
} else if (helper.getFavoriteGroups().size() > 0) {
|
||||
|
||||
FavouritesDbHelper.FavoriteGroup group = helper.getFavoriteGroups().get(0);
|
||||
|
||||
if (group.name.isEmpty() && group.color == 0) {
|
||||
|
||||
group.name = activity.getString(R.string.shared_string_favorites);
|
||||
|
||||
categoryEdit.setText(activity.getString(R.string.shared_string_favorites));
|
||||
categoryImage.setColorFilter(activity.getResources().getColor(R.color.color_favorite));
|
||||
|
||||
} else {
|
||||
|
||||
categoryEdit.setText(group.name);
|
||||
categoryImage.setColorFilter(group.color);
|
||||
}
|
||||
|
||||
getParams().put(KEY_CATEGORY_NAME, group.name);
|
||||
getParams().put(KEY_CATEGORY_COLOR, String.valueOf(group.color));
|
||||
|
||||
} else {
|
||||
|
||||
categoryEdit.setText(activity.getString(R.string.shared_string_favorites));
|
||||
categoryImage.setColorFilter(activity.getResources().getColor(R.color.color_favorite));
|
||||
|
||||
getParams().put(KEY_CATEGORY_NAME, "");
|
||||
getParams().put(KEY_CATEGORY_COLOR, "0");
|
||||
}
|
||||
|
||||
categoryEdit.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(final View view) {
|
||||
|
||||
SelectCategoryDialogFragment dialogFragment = SelectCategoryDialogFragment.createInstance("");
|
||||
|
||||
dialogFragment.show(
|
||||
activity.getSupportFragmentManager(),
|
||||
SelectCategoryDialogFragment.TAG);
|
||||
|
||||
dialogFragment.setSelectionListener(new SelectCategoryDialogFragment.CategorySelectionListener() {
|
||||
@Override
|
||||
public void onCategorySelected(String category, int color) {
|
||||
|
||||
fillGroupParams(root, category, color);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
SelectCategoryDialogFragment dialogFragment = (SelectCategoryDialogFragment)
|
||||
activity.getSupportFragmentManager().findFragmentByTag(SelectCategoryDialogFragment.TAG);
|
||||
|
||||
if (dialogFragment != null) {
|
||||
|
||||
dialogFragment.setSelectionListener(new SelectCategoryDialogFragment.CategorySelectionListener() {
|
||||
@Override
|
||||
public void onCategorySelected(String category, int color) {
|
||||
|
||||
fillGroupParams(root, category, color);
|
||||
}
|
||||
});
|
||||
|
||||
} else {
|
||||
|
||||
EditCategoryDialogFragment dialog = (EditCategoryDialogFragment)
|
||||
activity.getSupportFragmentManager().findFragmentByTag(EditCategoryDialogFragment.TAG);
|
||||
|
||||
if (dialog != null) {
|
||||
|
||||
dialogFragment.setSelectionListener(new SelectCategoryDialogFragment.CategorySelectionListener() {
|
||||
@Override
|
||||
public void onCategorySelected(String category, int color) {
|
||||
|
||||
fillGroupParams(root, category, color);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fillParams(View root, MapActivity activity) {
|
||||
|
||||
getParams().put(KEY_NAME, ((EditText) root.findViewById(R.id.name_edit)).getText().toString());
|
||||
getParams().put(KEY_DIALOG, Boolean.toString(((SwitchCompat) root.findViewById(R.id.saveButton)).isChecked()));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private void fillGroupParams(View root, String name, int color) {
|
||||
|
||||
if (color == 0)
|
||||
color = root.getContext().getResources().getColor(R.color.color_favorite);
|
||||
|
||||
((AutoCompleteTextViewEx) root.findViewById(R.id.category_edit)).setText(name);
|
||||
((ImageView) root.findViewById(R.id.category_image)).setColorFilter(color);
|
||||
|
||||
getParams().put(KEY_CATEGORY_NAME, name);
|
||||
getParams().put(KEY_CATEGORY_COLOR, String.valueOf(color));
|
||||
}
|
||||
}
|
||||
183
OsmAnd/src/net/osmand/plus/quickaction/actions/GPXAction.java
Normal file
183
OsmAnd/src/net/osmand/plus/quickaction/actions/GPXAction.java
Normal file
|
|
@ -0,0 +1,183 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.app.ProgressDialog;
|
||||
import android.support.v7.widget.SwitchCompat;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.GeocodingLookupService;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.mapcontextmenu.editors.EditCategoryDialogFragment;
|
||||
import net.osmand.plus.mapcontextmenu.editors.SelectCategoryDialogFragment;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
import net.osmand.plus.widgets.AutoCompleteTextViewEx;
|
||||
|
||||
public class GPXAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 6;
|
||||
|
||||
public static final String KEY_NAME = "name";
|
||||
public static final String KEY_DIALOG = "dialog";
|
||||
public static final String KEY_CATEGORY_NAME = "category_name";
|
||||
public static final String KEY_CATEGORY_COLOR = "category_color";
|
||||
|
||||
public GPXAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public GPXAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(final MapActivity activity) {
|
||||
|
||||
final LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
final String title = getParams().get(KEY_NAME);
|
||||
|
||||
if (title == null || title.isEmpty()) {
|
||||
|
||||
final Dialog progressDialog = new ProgressDialog(activity);
|
||||
progressDialog.setCancelable(false);
|
||||
progressDialog.setTitle(R.string.search_address);
|
||||
progressDialog.show();
|
||||
|
||||
GeocodingLookupService.AddressLookupRequest lookupRequest = new GeocodingLookupService.AddressLookupRequest(latLon,
|
||||
|
||||
new GeocodingLookupService.OnAddressLookupResult() {
|
||||
|
||||
@Override
|
||||
public void geocodingDone(String address) {
|
||||
|
||||
progressDialog.dismiss();
|
||||
activity.getContextMenu().addWptPt(latLon, address,
|
||||
getParams().get(KEY_CATEGORY_NAME),
|
||||
Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)),
|
||||
!Boolean.valueOf(getParams().get(KEY_DIALOG)));
|
||||
}
|
||||
|
||||
}, null);
|
||||
|
||||
activity.getMyApplication().getGeocodingLookupService().lookupAddress(lookupRequest);
|
||||
|
||||
} else activity.getContextMenu().addWptPt(latLon, title,
|
||||
getParams().get(KEY_CATEGORY_NAME),
|
||||
Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)),
|
||||
!Boolean.valueOf(getParams().get(KEY_DIALOG)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(final ViewGroup parent, final MapActivity activity) {
|
||||
|
||||
final View root = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_add_gpx, parent, false);
|
||||
|
||||
parent.addView(root);
|
||||
|
||||
AutoCompleteTextViewEx categoryEdit = (AutoCompleteTextViewEx) root.findViewById(R.id.category_edit);
|
||||
SwitchCompat showDialog = (SwitchCompat) root.findViewById(R.id.saveButton);
|
||||
ImageView categoryImage = (ImageView) root.findViewById(R.id.category_image);
|
||||
EditText name = (EditText) root.findViewById(R.id.name_edit);
|
||||
|
||||
if (!getParams().isEmpty()) {
|
||||
|
||||
showDialog.setChecked(Boolean.valueOf(getParams().get(KEY_DIALOG)));
|
||||
categoryImage.setColorFilter(Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)));
|
||||
name.setText(getParams().get(KEY_NAME));
|
||||
categoryEdit.setText(getParams().get(KEY_CATEGORY_NAME));
|
||||
|
||||
if (getParams().get(KEY_NAME).isEmpty() && Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)) == 0) {
|
||||
|
||||
categoryEdit.setText("");
|
||||
categoryImage.setColorFilter(activity.getResources().getColor(R.color.icon_color));
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
categoryEdit.setText("");
|
||||
categoryImage.setColorFilter(activity.getResources().getColor(R.color.icon_color));
|
||||
|
||||
getParams().put(KEY_CATEGORY_NAME, "");
|
||||
getParams().put(KEY_CATEGORY_COLOR, "0");
|
||||
}
|
||||
|
||||
categoryEdit.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(final View view) {
|
||||
|
||||
SelectCategoryDialogFragment dialogFragment = SelectCategoryDialogFragment.createInstance("");
|
||||
|
||||
dialogFragment.show(
|
||||
activity.getSupportFragmentManager(),
|
||||
SelectCategoryDialogFragment.TAG);
|
||||
|
||||
dialogFragment.setSelectionListener(new SelectCategoryDialogFragment.CategorySelectionListener() {
|
||||
@Override
|
||||
public void onCategorySelected(String category, int color) {
|
||||
|
||||
fillGroupParams(root, category, color);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
SelectCategoryDialogFragment dialogFragment = (SelectCategoryDialogFragment)
|
||||
activity.getSupportFragmentManager().findFragmentByTag(SelectCategoryDialogFragment.TAG);
|
||||
|
||||
if (dialogFragment != null) {
|
||||
|
||||
dialogFragment.setSelectionListener(new SelectCategoryDialogFragment.CategorySelectionListener() {
|
||||
@Override
|
||||
public void onCategorySelected(String category, int color) {
|
||||
|
||||
fillGroupParams(root, category, color);
|
||||
}
|
||||
});
|
||||
|
||||
} else {
|
||||
|
||||
EditCategoryDialogFragment dialog = (EditCategoryDialogFragment)
|
||||
activity.getSupportFragmentManager().findFragmentByTag(EditCategoryDialogFragment.TAG);
|
||||
|
||||
if (dialog != null) {
|
||||
|
||||
dialogFragment.setSelectionListener(new SelectCategoryDialogFragment.CategorySelectionListener() {
|
||||
@Override
|
||||
public void onCategorySelected(String category, int color) {
|
||||
|
||||
fillGroupParams(root, category, color);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fillParams(View root, MapActivity activity) {
|
||||
|
||||
getParams().put(KEY_NAME, ((EditText) root.findViewById(R.id.name_edit)).getText().toString());
|
||||
getParams().put(KEY_DIALOG, Boolean.toString(((SwitchCompat) root.findViewById(R.id.saveButton)).isChecked()));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private void fillGroupParams(View root, String name, int color) {
|
||||
|
||||
if (color == 0) color = root.getContext().getResources().getColor(R.color.icon_color);
|
||||
|
||||
((AutoCompleteTextViewEx) root.findViewById(R.id.category_edit)).setText(name);
|
||||
((ImageView) root.findViewById(R.id.category_image)).setColorFilter(color);
|
||||
|
||||
getParams().put(KEY_CATEGORY_NAME, name);
|
||||
getParams().put(KEY_CATEGORY_COLOR, String.valueOf(color));
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,168 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.content.DialogInterface;
|
||||
import android.support.v4.util.Pair;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.view.View;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
import net.osmand.plus.quickaction.SwitchableAction;
|
||||
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class MapOverlayAction extends SwitchableAction<Pair<String, String>> {
|
||||
|
||||
public static final int TYPE = 15;
|
||||
|
||||
private final static String KEY_OVERLAYS = "overlays";
|
||||
private final static String KEY_NO_OVERLAY = "no_overlay";
|
||||
|
||||
public MapOverlayAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public MapOverlayAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitle(List<Pair<String, String>> filters) {
|
||||
|
||||
if (filters.isEmpty()) return "";
|
||||
|
||||
return filters.size() > 1
|
||||
? filters.get(0).second + " +" + (filters.size() - 1)
|
||||
: filters.get(0).second;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveListToParams(List<Pair<String, String>> list) {
|
||||
|
||||
getParams().put(getListKey(), new Gson().toJson(list));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Pair<String, String>> loadListFromParams() {
|
||||
|
||||
String json = getParams().get(getListKey());
|
||||
|
||||
if (json == null || json.isEmpty()) return new ArrayList<>();
|
||||
|
||||
Type listType = new TypeToken<ArrayList<Pair<String, String>>>() {
|
||||
}.getType();
|
||||
|
||||
return new Gson().fromJson(json, listType);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getItemName(Pair<String, String> item) {
|
||||
return item.second;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
OsmandRasterMapsPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class);
|
||||
|
||||
if (plugin != null) {
|
||||
|
||||
OsmandSettings settings = activity.getMyApplication().getSettings();
|
||||
List<Pair<String, String>> sources = loadListFromParams();
|
||||
|
||||
Pair<String, String> currentSource = new Pair<>(
|
||||
settings.MAP_OVERLAY.get(),
|
||||
settings.MAP_OVERLAY.get());
|
||||
|
||||
Pair<String, String> nextSource = sources.get(0);
|
||||
int index = sources.indexOf(currentSource);
|
||||
|
||||
if (index >= 0 && index + 1 < sources.size()) {
|
||||
nextSource = sources.get(index + 1);
|
||||
}
|
||||
|
||||
boolean hasOverlay = !nextSource.first.equals(KEY_NO_OVERLAY);
|
||||
if (hasOverlay) {
|
||||
settings.MAP_OVERLAY.set(nextSource.first);
|
||||
settings.MAP_OVERLAY_PREVIOUS.set(nextSource.first);
|
||||
} else {
|
||||
settings.MAP_OVERLAY.set(null);
|
||||
settings.MAP_OVERLAY_PREVIOUS.set(null);
|
||||
}
|
||||
|
||||
plugin.updateMapLayers(activity.getMapView(), settings.MAP_OVERLAY, activity.getMapLayers());
|
||||
Toast.makeText(activity, activity.getString(R.string.quick_action_map_overlay_switch, nextSource.second), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getAddBtnText() {
|
||||
return R.string.quick_action_map_overlay_action;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDiscrHint() {
|
||||
return R.string.quick_action_page_list_descr;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDiscrTitle() {
|
||||
return R.string.quick_action_map_overlay_title;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getListKey() {
|
||||
return KEY_OVERLAYS;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected View.OnClickListener getOnAddBtnClickListener(final MapActivity activity, final Adapter adapter) {
|
||||
return new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
|
||||
final OsmandSettings settings = activity.getMyApplication().getSettings();
|
||||
Map<String, String> entriesMap = settings.getTileSourceEntries();
|
||||
entriesMap.put(KEY_NO_OVERLAY, activity.getString(R.string.no_overlay));
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
|
||||
final ArrayList<String> keys = new ArrayList<>(entriesMap.keySet());
|
||||
final String[] items = new String[entriesMap.size()];
|
||||
int i = 0;
|
||||
|
||||
for (String it : entriesMap.values()) {
|
||||
items[i++] = it;
|
||||
}
|
||||
|
||||
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(activity, R.layout.dialog_text_item);
|
||||
arrayAdapter.addAll(items);
|
||||
builder.setAdapter(arrayAdapter, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int i) {
|
||||
|
||||
Pair<String, String> layer = new Pair<>(
|
||||
keys.get(i), items[i]);
|
||||
|
||||
adapter.addItem(layer, activity);
|
||||
|
||||
dialog.dismiss();
|
||||
|
||||
}
|
||||
}).setNegativeButton(R.string.shared_string_cancel, null);
|
||||
|
||||
builder.show();
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,176 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.content.DialogInterface;
|
||||
import android.support.v4.util.Pair;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.view.View;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
import net.osmand.plus.quickaction.SwitchableAction;
|
||||
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class MapSourceAction extends SwitchableAction<Pair<String, String>> {
|
||||
|
||||
public static final int TYPE = 17;
|
||||
|
||||
private final static String KEY_SOURCE = "source";
|
||||
private final String LAYER_OSM_VECTOR = "LAYER_OSM_VECTOR";
|
||||
|
||||
public MapSourceAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public MapSourceAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitle(List<Pair<String, String>> filters) {
|
||||
|
||||
if (filters.isEmpty()) return "";
|
||||
|
||||
return filters.size() > 1
|
||||
? filters.get(0).second + " +" + (filters.size() - 1)
|
||||
: filters.get(0).second;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveListToParams(List<Pair<String, String>> list) {
|
||||
|
||||
getParams().put(getListKey(), new Gson().toJson(list));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Pair<String, String>> loadListFromParams() {
|
||||
|
||||
String json = getParams().get(getListKey());
|
||||
|
||||
if (json == null || json.isEmpty()) return new ArrayList<>();
|
||||
|
||||
Type listType = new TypeToken<ArrayList<Pair<String, String>>>() {
|
||||
}.getType();
|
||||
|
||||
return new Gson().fromJson(json, listType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {
|
||||
|
||||
OsmandSettings settings = activity.getMyApplication().getSettings();
|
||||
List<Pair<String, String>> sources = loadListFromParams();
|
||||
|
||||
Pair<String, String> currentSource = settings.MAP_ONLINE_DATA.get()
|
||||
? new Pair<>(settings.MAP_TILE_SOURCES.get(), settings.MAP_TILE_SOURCES.get())
|
||||
: new Pair<>(LAYER_OSM_VECTOR, activity.getString(R.string.vector_data));
|
||||
|
||||
Pair<String, String> nextSource = sources.get(0);
|
||||
int index = sources.indexOf(currentSource);
|
||||
|
||||
if (index >= 0 && index + 1 < sources.size()) {
|
||||
nextSource = sources.get(index + 1);
|
||||
}
|
||||
|
||||
if (nextSource.first.equals(LAYER_OSM_VECTOR)) {
|
||||
|
||||
settings.MAP_ONLINE_DATA.set(false);
|
||||
activity.getMapLayers().updateMapSource(activity.getMapView(), null);
|
||||
|
||||
} else {
|
||||
|
||||
settings.MAP_TILE_SOURCES.set(nextSource.first);
|
||||
settings.MAP_ONLINE_DATA.set(true);
|
||||
activity.getMapLayers().updateMapSource(activity.getMapView(), settings.MAP_TILE_SOURCES);
|
||||
}
|
||||
|
||||
Toast.makeText(activity, activity.getString(R.string.quick_action_map_source_switch, nextSource.second), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getAddBtnText() {
|
||||
return R.string.quick_action_map_source_action;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDiscrHint() {
|
||||
return R.string.quick_action_page_list_descr;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDiscrTitle() {
|
||||
return R.string.quick_action_map_source_title;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getListKey() {
|
||||
return KEY_SOURCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected View.OnClickListener getOnAddBtnClickListener(final MapActivity activity, final Adapter adapter) {
|
||||
return new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
|
||||
final OsmandSettings settings = activity.getMyApplication().getSettings();
|
||||
final LinkedHashMap<String, String> entriesMap = new LinkedHashMap<>();
|
||||
|
||||
entriesMap.put(LAYER_OSM_VECTOR, activity.getString(R.string.vector_data));
|
||||
entriesMap.putAll(settings.getTileSourceEntries());
|
||||
|
||||
final List<Map.Entry<String, String>> entriesMapList = new ArrayList<>(entriesMap.entrySet());
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
|
||||
|
||||
final String[] items = new String[entriesMapList.size()];
|
||||
int i = 0;
|
||||
|
||||
for (Map.Entry<String, String> entry : entriesMapList) {
|
||||
items[i++] = entry.getValue();
|
||||
}
|
||||
|
||||
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(activity, R.layout.dialog_text_item);
|
||||
|
||||
arrayAdapter.addAll(items);
|
||||
builder.setAdapter(arrayAdapter, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int i) {
|
||||
|
||||
Pair<String, String> layer = new Pair<>(
|
||||
entriesMapList.get(i).getKey(),
|
||||
entriesMapList.get(i).getValue());
|
||||
|
||||
adapter.addItem(layer, activity);
|
||||
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
builder.setNegativeButton(R.string.shared_string_dismiss, null);
|
||||
builder.show();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getItemName(Pair<String, String> item) {
|
||||
return item.second;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,194 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.content.DialogInterface;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Toast;
|
||||
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.dialogs.ConfigureMapMenu;
|
||||
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
import net.osmand.plus.quickaction.SwitchableAction;
|
||||
import net.osmand.plus.render.RendererRegistry;
|
||||
import net.osmand.plus.views.OsmandMapTileView;
|
||||
import net.osmand.render.RenderingRulesStorage;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class MapStyleAction extends SwitchableAction<String> {
|
||||
|
||||
public static final int TYPE = 14;
|
||||
|
||||
private final static String KEY_STYLES = "styles";
|
||||
|
||||
public MapStyleAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public MapStyleAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
List<String> mapStyles = getFilteredStyles();
|
||||
|
||||
String curStyle = activity.getMyApplication().getSettings().RENDERER.get();
|
||||
int index = mapStyles.indexOf(curStyle);
|
||||
String nextStyle = mapStyles.get(0);
|
||||
|
||||
if (index >= 0 && index + 1 < mapStyles.size()) {
|
||||
nextStyle = mapStyles.get(index + 1);
|
||||
}
|
||||
|
||||
RenderingRulesStorage loaded = activity.getMyApplication()
|
||||
.getRendererRegistry().getRenderer(nextStyle);
|
||||
|
||||
if (loaded != null) {
|
||||
|
||||
OsmandMapTileView view = activity.getMapView();
|
||||
view.getSettings().RENDERER.set(nextStyle);
|
||||
|
||||
activity.getMyApplication().getRendererRegistry().setCurrentSelectedRender(loaded);
|
||||
ConfigureMapMenu.refreshMapComplete(activity);
|
||||
|
||||
Toast.makeText(activity, activity.getString(R.string.quick_action_map_style_switch, nextStyle), Toast.LENGTH_SHORT).show();
|
||||
|
||||
} else {
|
||||
|
||||
Toast.makeText(activity, R.string.renderer_load_exception, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
public List<String> getFilteredStyles() {
|
||||
|
||||
List<String> filtered = new ArrayList<>();
|
||||
boolean enabled = OsmandPlugin.getEnabledPlugin(NauticalMapsPlugin.class) != null;
|
||||
|
||||
if (enabled) return loadListFromParams();
|
||||
else {
|
||||
|
||||
for (String style : loadListFromParams()) {
|
||||
|
||||
if (!style.equals(RendererRegistry.NAUTICAL_RENDER)) {
|
||||
filtered.add(style);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return filtered;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getAddBtnText() {
|
||||
return R.string.quick_action_map_style_action;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDiscrHint() {
|
||||
return R.string.quick_action_page_list_descr;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDiscrTitle() {
|
||||
return R.string.quick_action_map_styles;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getListKey() {
|
||||
return KEY_STYLES;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected View.OnClickListener getOnAddBtnClickListener(final MapActivity activity, final Adapter adapter) {
|
||||
return new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
|
||||
AlertDialog.Builder bld = new AlertDialog.Builder(activity);
|
||||
bld.setTitle(R.string.renderers);
|
||||
|
||||
final OsmandApplication app = activity.getMyApplication();
|
||||
final List<String> visibleNamesList = new ArrayList<>();
|
||||
final Collection<String> rendererNames = app.getRendererRegistry().getRendererNames();
|
||||
final String[] items = rendererNames.toArray(new String[rendererNames.size()]);
|
||||
final boolean nauticalPluginDisabled = OsmandPlugin.getEnabledPlugin(NauticalMapsPlugin.class) == null;
|
||||
|
||||
for (String item : items) {
|
||||
|
||||
if (nauticalPluginDisabled && item.equals(RendererRegistry.NAUTICAL_RENDER)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
visibleNamesList.add(item.replace('_', ' ').replace('-', ' '));
|
||||
}
|
||||
|
||||
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(activity, R.layout.dialog_text_item);
|
||||
|
||||
arrayAdapter.addAll(visibleNamesList);
|
||||
bld.setAdapter(arrayAdapter, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
|
||||
String renderer = visibleNamesList.get(i);
|
||||
RenderingRulesStorage loaded = app.getRendererRegistry().getRenderer(renderer);
|
||||
|
||||
if (loaded != null) {
|
||||
|
||||
adapter.addItem(renderer, activity);
|
||||
}
|
||||
|
||||
dialogInterface.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
bld.setNegativeButton(R.string.shared_string_dismiss, null);
|
||||
bld.show();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveListToParams(List<String> styles) {
|
||||
getParams().put(getListKey(), TextUtils.join(",", styles));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<String> loadListFromParams() {
|
||||
|
||||
List<String> styles = new ArrayList<>();
|
||||
|
||||
String filtersId = getParams().get(getListKey());
|
||||
|
||||
if (filtersId != null && !filtersId.trim().isEmpty()) {
|
||||
Collections.addAll(styles, filtersId.split(","));
|
||||
}
|
||||
|
||||
return styles;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getItemName(String item) {
|
||||
return item;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitle(List<String> filters) {
|
||||
|
||||
if (filters.isEmpty()) return "";
|
||||
|
||||
return filters.size() > 1
|
||||
? filters.get(0) + " +" + (filters.size() - 1)
|
||||
: filters.get(0);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,171 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.content.DialogInterface;
|
||||
import android.support.v4.util.Pair;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.view.View;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
import net.osmand.plus.quickaction.SwitchableAction;
|
||||
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class MapUnderlayAction extends SwitchableAction<Pair<String, String>> {
|
||||
|
||||
public static final int TYPE = 16;
|
||||
|
||||
private final static String KEY_UNDERLAYS = "underlays";
|
||||
private final static String KEY_NO_UNDERLAY = "no_underlay";
|
||||
|
||||
public MapUnderlayAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public MapUnderlayAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitle(List<Pair<String, String>> filters) {
|
||||
|
||||
if (filters.isEmpty()) return "";
|
||||
|
||||
return filters.size() > 1
|
||||
? filters.get(0).second + " +" + (filters.size() - 1)
|
||||
: filters.get(0).second;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveListToParams(List<Pair<String, String>> list) {
|
||||
|
||||
getParams().put(getListKey(), new Gson().toJson(list));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Pair<String, String>> loadListFromParams() {
|
||||
|
||||
String json = getParams().get(getListKey());
|
||||
|
||||
if (json == null || json.isEmpty()) return new ArrayList<>();
|
||||
|
||||
Type listType = new TypeToken<ArrayList<Pair<String, String>>>() {
|
||||
}.getType();
|
||||
|
||||
return new Gson().fromJson(json, listType);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getItemName(Pair<String, String> item) {
|
||||
return item.second;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
OsmandRasterMapsPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class);
|
||||
|
||||
if (plugin != null) {
|
||||
|
||||
OsmandSettings settings = activity.getMyApplication().getSettings();
|
||||
List<Pair<String, String>> sources = loadListFromParams();
|
||||
|
||||
Pair<String, String> currentSource = new Pair<>(
|
||||
settings.MAP_UNDERLAY.get(),
|
||||
settings.MAP_UNDERLAY.get());
|
||||
|
||||
Pair<String, String> nextSource = sources.get(0);
|
||||
int index = sources.indexOf(currentSource);
|
||||
|
||||
if (index >= 0 && index + 1 < sources.size()) {
|
||||
nextSource = sources.get(index + 1);
|
||||
}
|
||||
|
||||
boolean hasUnderlay = !nextSource.first.equals(KEY_NO_UNDERLAY);
|
||||
if (hasUnderlay) {
|
||||
settings.MAP_UNDERLAY.set(nextSource.first);
|
||||
settings.MAP_UNDERLAY_PREVIOUS.set(nextSource.first);
|
||||
} else {
|
||||
settings.MAP_UNDERLAY.set(null);
|
||||
settings.MAP_UNDERLAY_PREVIOUS.set(null);
|
||||
}
|
||||
|
||||
final OsmandSettings.CommonPreference<Boolean> hidePolygonsPref =
|
||||
activity.getMyApplication().getSettings().getCustomRenderBooleanProperty("noPolygons");
|
||||
hidePolygonsPref.set(hasUnderlay);
|
||||
|
||||
plugin.updateMapLayers(activity.getMapView(), settings.MAP_UNDERLAY, activity.getMapLayers());
|
||||
Toast.makeText(activity, activity.getString(R.string.quick_action_map_underlay_switch, nextSource.second), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getAddBtnText() {
|
||||
return R.string.quick_action_map_underlay_action;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDiscrHint() {
|
||||
return R.string.quick_action_page_list_descr;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDiscrTitle() {
|
||||
return R.string.quick_action_map_underlay_title;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getListKey() {
|
||||
return KEY_UNDERLAYS;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected View.OnClickListener getOnAddBtnClickListener(final MapActivity activity, final Adapter adapter) {
|
||||
return new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
|
||||
final OsmandSettings settings = activity.getMyApplication().getSettings();
|
||||
Map<String, String> entriesMap = settings.getTileSourceEntries();
|
||||
entriesMap.put(KEY_NO_UNDERLAY, activity.getString(R.string.no_underlay));
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
|
||||
final ArrayList<String> keys = new ArrayList<>(entriesMap.keySet());
|
||||
final String[] items = new String[entriesMap.size()];
|
||||
int i = 0;
|
||||
|
||||
for (String it : entriesMap.values()) {
|
||||
items[i++] = it;
|
||||
}
|
||||
|
||||
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(activity, R.layout.dialog_text_item);
|
||||
arrayAdapter.addAll(items);
|
||||
builder.setAdapter(arrayAdapter, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int i) {
|
||||
|
||||
Pair<String, String> layer = new Pair<>(
|
||||
keys.get(i), items[i]);
|
||||
|
||||
adapter.addItem(layer, activity);
|
||||
|
||||
dialog.dismiss();
|
||||
|
||||
}
|
||||
}).setNegativeButton(R.string.shared_string_cancel, null);
|
||||
|
||||
builder.show();
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.PointDescription;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class MarkerAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 2;
|
||||
|
||||
public MarkerAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public MarkerAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
LatLon latLon = activity.getMapView()
|
||||
.getCurrentRotatedTileBox()
|
||||
.getCenterLatLon();
|
||||
|
||||
PointDescription pointDescription = new PointDescription(
|
||||
latLon.getLatitude(),
|
||||
latLon.getLongitude());
|
||||
|
||||
if (pointDescription.isLocation() && pointDescription.getName().equals(PointDescription.getAddressNotFoundStr(activity)))
|
||||
pointDescription = new PointDescription(PointDescription.POINT_TYPE_LOCATION, "");
|
||||
|
||||
activity.getMapActions().addMapMarker(
|
||||
latLon.getLatitude(),
|
||||
latLon.getLongitude(),
|
||||
pointDescription);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_add_marker_descr);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class NavAddDestinationAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 20;
|
||||
|
||||
public NavAddDestinationAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public NavAddDestinationAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
LatLon latLon = activity.getMapView().getCurrentRotatedTileBox().getCenterLatLon();
|
||||
activity.getMapLayers().getMapControlsLayer().addDestination(latLon);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_add_destination_desc);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class NavAddFirstIntermediateAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 22;
|
||||
|
||||
public NavAddFirstIntermediateAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public NavAddFirstIntermediateAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
LatLon latLon = activity.getMapView().getCurrentRotatedTileBox().getCenterLatLon();
|
||||
activity.getMapLayers().getMapControlsLayer().addFirstIntermediate(latLon);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_add_first_intermediate_desc);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class NavReplaceDestinationAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 21;
|
||||
|
||||
public NavReplaceDestinationAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public NavReplaceDestinationAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
LatLon latLon = activity.getMapView().getCurrentRotatedTileBox().getCenterLatLon();
|
||||
activity.getMapLayers().getMapControlsLayer().replaceDestination(latLon);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_replace_destination_desc);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class NavVoiceAction extends QuickAction {
|
||||
public static final int TYPE = 11;
|
||||
|
||||
public NavVoiceAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public NavVoiceAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
boolean voice = activity.getMyApplication().getSettings().VOICE_MUTE.get();
|
||||
|
||||
activity.getMyApplication().getSettings().VOICE_MUTE.set(!voice);
|
||||
activity.getRoutingHelper().getVoiceRouter().setMute(!voice);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_navigation_voice_descr);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getActionText(OsmandApplication application) {
|
||||
|
||||
return application.getSettings().VOICE_MUTE.get()
|
||||
? application.getString(R.string.quick_action_navigation_voice_off)
|
||||
: application.getString(R.string.quick_action_navigation_voice_on);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isActionWithSlash(OsmandApplication application) {
|
||||
|
||||
return application.getSettings().VOICE_MUTE.get();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.AddQuickActionDialog;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class NewAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 1;
|
||||
|
||||
public NewAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public NewAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
AddQuickActionDialog dialog = new AddQuickActionDialog();
|
||||
dialog.show(activity.getSupportFragmentManager(), AddQuickActionDialog.TAG);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
|
||||
public class ShowHideFavoritesAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 4;
|
||||
|
||||
public ShowHideFavoritesAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public ShowHideFavoritesAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
activity.getMyApplication().getSettings().SHOW_FAVORITES.set(
|
||||
!activity.getMyApplication().getSettings().SHOW_FAVORITES.get());
|
||||
|
||||
activity.getMapLayers().updateLayers(activity.getMapView());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
|
||||
((TextView) view.findViewById(R.id.text)).setText(
|
||||
R.string.quick_action_showhide_favorites_descr);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getActionText(OsmandApplication application) {
|
||||
|
||||
return application.getSettings().SHOW_FAVORITES.get()
|
||||
? application.getString(R.string.quick_action_favorites_hide)
|
||||
: application.getString(R.string.quick_action_favorites_show);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isActionWithSlash(OsmandApplication application) {
|
||||
|
||||
return application.getSettings().SHOW_FAVORITES.get();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,362 @@
|
|||
package net.osmand.plus.quickaction.actions;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.text.TextUtils;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.plus.ContextMenuAdapter;
|
||||
import net.osmand.plus.ContextMenuItem;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.poi.PoiFiltersHelper;
|
||||
import net.osmand.plus.poi.PoiUIFilter;
|
||||
import net.osmand.plus.quickaction.QuickAction;
|
||||
import net.osmand.plus.quickaction.QuickActionFactory;
|
||||
import net.osmand.plus.render.RenderingIcons;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public class ShowHidePoiAction extends QuickAction {
|
||||
|
||||
public static final int TYPE = 5;
|
||||
|
||||
public static final String KEY_FILTERS = "filters";
|
||||
|
||||
private transient EditText title;
|
||||
|
||||
public ShowHidePoiAction() {
|
||||
super(TYPE);
|
||||
}
|
||||
|
||||
public ShowHidePoiAction(QuickAction quickAction) {
|
||||
super(quickAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getActionText(OsmandApplication application) {
|
||||
|
||||
return !isCurrentFilters(application)
|
||||
? application.getString(R.string.quick_action_poi_show, getName(application))
|
||||
: application.getString(R.string.quick_action_poi_hide, getName(application));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isActionWithSlash(OsmandApplication application) {
|
||||
|
||||
return isCurrentFilters(application);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAutoGeneratedTitle(EditText title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIconRes(Context context) {
|
||||
|
||||
if (getParams().get(KEY_FILTERS) == null || getParams().get(KEY_FILTERS).isEmpty()) {
|
||||
|
||||
return super.getIconRes();
|
||||
|
||||
} else {
|
||||
|
||||
OsmandApplication app = (OsmandApplication) context.getApplicationContext();
|
||||
List<String> filters = new ArrayList<>();
|
||||
|
||||
String filtersId = getParams().get(KEY_FILTERS);
|
||||
Collections.addAll(filters, filtersId.split(","));
|
||||
|
||||
if (app.getPoiFilters() == null) return super.getIconRes();
|
||||
|
||||
PoiUIFilter filter = app.getPoiFilters().getFilterById(filters.get(0));
|
||||
|
||||
if (filter == null) return super.getIconRes();
|
||||
|
||||
Object res = filter.getIconResource();
|
||||
|
||||
if (res instanceof String && RenderingIcons.containsBigIcon(res.toString())) {
|
||||
|
||||
return RenderingIcons.getBigIconResourceId(res.toString());
|
||||
|
||||
} else return super.getIconRes();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MapActivity activity) {
|
||||
|
||||
PoiFiltersHelper pf = activity.getMyApplication().getPoiFilters();
|
||||
List<PoiUIFilter> poiFilters = loadPoiFilters(activity.getMyApplication().getPoiFilters());
|
||||
|
||||
if (!isCurrentFilters(pf.getSelectedPoiFilters(), poiFilters)) {
|
||||
|
||||
pf.clearSelectedPoiFilters();
|
||||
|
||||
for (PoiUIFilter filter : poiFilters) {
|
||||
pf.addSelectedPoiFilter(filter);
|
||||
}
|
||||
|
||||
} else pf.clearSelectedPoiFilters();
|
||||
|
||||
activity.getMapLayers().updateLayers(activity.getMapView());
|
||||
}
|
||||
|
||||
private boolean isCurrentFilters(OsmandApplication application) {
|
||||
|
||||
PoiFiltersHelper pf = application.getPoiFilters();
|
||||
List<PoiUIFilter> poiFilters = loadPoiFilters(application.getPoiFilters());
|
||||
|
||||
return isCurrentFilters(pf.getSelectedPoiFilters(), poiFilters);
|
||||
}
|
||||
|
||||
private boolean isCurrentFilters(Set<PoiUIFilter> currentPoiFilters, List<PoiUIFilter> poiFilters) {
|
||||
|
||||
if (currentPoiFilters.size() != poiFilters.size()) return false;
|
||||
|
||||
return currentPoiFilters.containsAll(poiFilters);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawUI(ViewGroup parent, final MapActivity activity) {
|
||||
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_show_hide_poi, parent, false);
|
||||
|
||||
RecyclerView list = (RecyclerView) view.findViewById(R.id.list);
|
||||
Button addFilter = (Button) view.findViewById(R.id.btnAddCategory);
|
||||
|
||||
final Adapter adapter = new Adapter(!getParams().isEmpty()
|
||||
? loadPoiFilters(activity.getMyApplication().getPoiFilters())
|
||||
: new ArrayList<PoiUIFilter>());
|
||||
|
||||
list.setAdapter(adapter);
|
||||
|
||||
addFilter.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
showSingleChoicePoiFilterDialog(activity.getMyApplication(), activity, adapter);
|
||||
}
|
||||
});
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
|
||||
public class Adapter extends RecyclerView.Adapter<Adapter.Holder> {
|
||||
|
||||
private List<PoiUIFilter> filters;
|
||||
|
||||
public Adapter(List<PoiUIFilter> filters) {
|
||||
this.filters = filters;
|
||||
}
|
||||
|
||||
private void addItem(PoiUIFilter filter) {
|
||||
|
||||
if (!filters.contains(filter)) {
|
||||
|
||||
filters.add(filter);
|
||||
savePoiFilters(filters);
|
||||
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Adapter.Holder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
|
||||
return new Adapter.Holder(LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.quick_action_deletable_list_item, parent, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(final Adapter.Holder holder, final int position) {
|
||||
|
||||
final PoiUIFilter filter = filters.get(position);
|
||||
|
||||
Object res = filter.getIconResource();
|
||||
|
||||
if (res instanceof String && RenderingIcons.containsBigIcon(res.toString())) {
|
||||
holder.icon.setImageResource(RenderingIcons.getBigIconResourceId(res.toString()));
|
||||
} else {
|
||||
holder.icon.setImageResource(R.drawable.mx_user_defined);
|
||||
}
|
||||
|
||||
holder.title.setText(filter.getName());
|
||||
holder.delete.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
|
||||
String oldTitle = getTitle(filters);
|
||||
|
||||
filters.remove(position);
|
||||
savePoiFilters(filters);
|
||||
|
||||
notifyDataSetChanged();
|
||||
|
||||
if (oldTitle.equals(title.getText().toString()) || title.getText().toString().equals(getName(holder.title.getContext()))) {
|
||||
|
||||
String newTitle = getTitle(filters);
|
||||
title.setText(newTitle);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return filters.size();
|
||||
}
|
||||
|
||||
class Holder extends RecyclerView.ViewHolder {
|
||||
|
||||
private TextView title;
|
||||
private ImageView icon;
|
||||
private ImageView delete;
|
||||
|
||||
public Holder(View itemView) {
|
||||
super(itemView);
|
||||
|
||||
title = (TextView) itemView.findViewById(R.id.title);
|
||||
icon = (ImageView) itemView.findViewById(R.id.icon);
|
||||
delete = (ImageView) itemView.findViewById(R.id.delete);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void savePoiFilters(List<PoiUIFilter> poiFilters) {
|
||||
|
||||
List<String> filters = new ArrayList<>();
|
||||
|
||||
for (PoiUIFilter f : poiFilters) {
|
||||
filters.add(f.getFilterId());
|
||||
}
|
||||
|
||||
getParams().put(KEY_FILTERS, TextUtils.join(",", filters));
|
||||
}
|
||||
|
||||
private List<PoiUIFilter> loadPoiFilters(PoiFiltersHelper helper) {
|
||||
|
||||
List<String> filters = new ArrayList<>();
|
||||
|
||||
String filtersId = getParams().get(KEY_FILTERS);
|
||||
|
||||
if (filtersId != null && !filtersId.trim().isEmpty()) {
|
||||
Collections.addAll(filters, filtersId.split(","));
|
||||
}
|
||||
|
||||
List<PoiUIFilter> poiFilters = new ArrayList<>();
|
||||
|
||||
for (String f : filters) {
|
||||
|
||||
PoiUIFilter filter = helper.getFilterById(f);
|
||||
|
||||
if (filter != null) {
|
||||
poiFilters.add(filter);
|
||||
}
|
||||
}
|
||||
|
||||
return poiFilters;
|
||||
}
|
||||
|
||||
private void showSingleChoicePoiFilterDialog(final OsmandApplication app, final MapActivity activity, final Adapter filtersAdapter) {
|
||||
|
||||
final PoiFiltersHelper poiFilters = app.getPoiFilters();
|
||||
final ContextMenuAdapter adapter = new ContextMenuAdapter();
|
||||
|
||||
adapter.addItem(new ContextMenuItem.ItemBuilder()
|
||||
.setTitleId(R.string.shared_string_search, app)
|
||||
.setIcon(R.drawable.ic_action_search_dark).createItem());
|
||||
|
||||
final List<PoiUIFilter> list = new ArrayList<>();
|
||||
list.add(poiFilters.getCustomPOIFilter());
|
||||
|
||||
for (PoiUIFilter f : poiFilters.getTopDefinedPoiFilters()) {
|
||||
addFilterToList(adapter, list, f);
|
||||
}
|
||||
for (PoiUIFilter f : poiFilters.getSearchPoiFilters()) {
|
||||
addFilterToList(adapter, list, f);
|
||||
}
|
||||
|
||||
final ArrayAdapter<ContextMenuItem> listAdapter =
|
||||
adapter.createListAdapter(activity, app.getSettings().isLightContent());
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
|
||||
builder.setAdapter(listAdapter, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
|
||||
String oldTitle = getTitle(filtersAdapter.filters);
|
||||
|
||||
filtersAdapter.addItem(list.get(which));
|
||||
|
||||
if (oldTitle.equals(title.getText().toString()) || title.getText().toString().equals(getName(activity))) {
|
||||
|
||||
String newTitle = getTitle(filtersAdapter.filters);
|
||||
title.setText(newTitle);
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
builder.setTitle(R.string.show_poi_over_map);
|
||||
builder.setNegativeButton(R.string.shared_string_dismiss, null);
|
||||
|
||||
final AlertDialog alertDialog = builder.create();
|
||||
|
||||
alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||
@Override
|
||||
public void onShow(DialogInterface dialog) {
|
||||
Button neutralButton = alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL);
|
||||
Drawable drawable = app.getIconsCache().getThemedIcon(R.drawable.ic_action_multiselect);
|
||||
neutralButton.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
|
||||
}
|
||||
});
|
||||
|
||||
alertDialog.show();
|
||||
}
|
||||
|
||||
private String getTitle(List<PoiUIFilter> filters) {
|
||||
|
||||
if (filters.isEmpty()) return "";
|
||||
|
||||
return filters.size() > 1
|
||||
? filters.get(0).getName() + " +" + (filters.size() - 1)
|
||||
: filters.get(0).getName();
|
||||
}
|
||||
|
||||
private void addFilterToList(final ContextMenuAdapter adapter,
|
||||
final List<PoiUIFilter> list,
|
||||
final PoiUIFilter f) {
|
||||
list.add(f);
|
||||
ContextMenuItem.ItemBuilder builder = new ContextMenuItem.ItemBuilder();
|
||||
|
||||
builder.setTitle(f.getName());
|
||||
|
||||
if (RenderingIcons.containsBigIcon(f.getIconId())) {
|
||||
builder.setIcon(RenderingIcons.getBigIconResourceId(f.getIconId()));
|
||||
} else {
|
||||
builder.setIcon(R.drawable.mx_user_defined);
|
||||
}
|
||||
|
||||
builder.setColor(ContextMenuItem.INVALID_ID);
|
||||
builder.setSkipPaintingWithoutColor(true);
|
||||
adapter.addItem(builder.createItem());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fillParams(View root, MapActivity activity) {
|
||||
return !getParams().isEmpty() && (getParams().get(KEY_FILTERS) != null || !getParams().get(KEY_FILTERS).isEmpty());
|
||||
}
|
||||
}
|
||||
|
|
@ -63,6 +63,7 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
public static final int REQUEST_ADDRESS_SELECT = 2;
|
||||
private static final int REQUEST_LOCATION_FOR_NAVIGATION_PERMISSION = 200;
|
||||
private static final int REQUEST_LOCATION_FOR_NAVIGATION_FAB_PERMISSION = 201;
|
||||
private static final int REQUEST_LOCATION_FOR_ADD_DESTINATION_PERMISSION = 202;
|
||||
|
||||
public MapHudButton createHudButton(View iv, int resId) {
|
||||
MapHudButton mc = new MapHudButton();
|
||||
|
|
@ -103,6 +104,7 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
private ContextMenuLayer contextMenuLayer;
|
||||
private MapQuickActionLayer mapQuickActionLayer;
|
||||
private boolean forceShowCompass;
|
||||
private LatLon requestedLatLon;
|
||||
|
||||
public MapControlsLayer(MapActivity activity) {
|
||||
this.mapActivity = activity;
|
||||
|
|
@ -480,18 +482,7 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
DirectionsDialogs.addWaypointDialogAndLaunchMap(mapActivity, latLon.getLatitude(),
|
||||
latLon.getLongitude(), pointDescription);
|
||||
} else if (targets.getIntermediatePoints().isEmpty()) {
|
||||
boolean hasPointToStart = settings.restorePointToStart();
|
||||
targets.navigateToPoint(latLon, true, -1, pointDescription);
|
||||
if (!hasPointToStart) {
|
||||
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true, true);
|
||||
} else {
|
||||
TargetPoint start = targets.getPointToStart();
|
||||
if (start != null) {
|
||||
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, start.point, start.getOriginalPointDescription(), true, true);
|
||||
} else {
|
||||
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true, true);
|
||||
}
|
||||
}
|
||||
startRoutePlanningWithDestination(latLon, pointDescription, targets);
|
||||
menu.close();
|
||||
} else {
|
||||
AlertDialog.Builder bld = new AlertDialog.Builder(mapActivity);
|
||||
|
|
@ -528,6 +519,85 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
}
|
||||
}
|
||||
|
||||
private void startRoutePlanningWithDestination(LatLon latLon, PointDescription pointDescription, TargetPointsHelper targets) {
|
||||
boolean hasPointToStart = settings.restorePointToStart();
|
||||
targets.navigateToPoint(latLon, true, -1, pointDescription);
|
||||
if (!hasPointToStart) {
|
||||
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true, true);
|
||||
} else {
|
||||
TargetPoint start = targets.getPointToStart();
|
||||
if (start != null) {
|
||||
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, start.point, start.getOriginalPointDescription(), true, true);
|
||||
} else {
|
||||
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private PointDescription getPointDescriptionForTarget(LatLon latLon) {
|
||||
final MapContextMenu menu = mapActivity.getContextMenu();
|
||||
PointDescription pointDescription;
|
||||
if (menu.isActive() && latLon.equals(menu.getLatLon())) {
|
||||
pointDescription = menu.getPointDescriptionForTarget();
|
||||
} else {
|
||||
pointDescription = new PointDescription(PointDescription.POINT_TYPE_LOCATION, "");
|
||||
}
|
||||
return pointDescription;
|
||||
}
|
||||
|
||||
public void addDestination(LatLon latLon) {
|
||||
if (latLon != null) {
|
||||
if (!OsmAndLocationProvider.isLocationPermissionAvailable(mapActivity)) {
|
||||
requestedLatLon = latLon;
|
||||
ActivityCompat.requestPermissions(mapActivity,
|
||||
new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
|
||||
REQUEST_LOCATION_FOR_ADD_DESTINATION_PERMISSION);
|
||||
} else {
|
||||
PointDescription pointDescription = getPointDescriptionForTarget(latLon);
|
||||
mapActivity.getContextMenu().close();
|
||||
final TargetPointsHelper targets = mapActivity.getMyApplication().getTargetPointsHelper();
|
||||
RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper();
|
||||
if (routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode()) {
|
||||
targets.navigateToPoint(latLon, true, targets.getIntermediatePoints().size() + 1, pointDescription);
|
||||
} else if (targets.getIntermediatePoints().isEmpty()) {
|
||||
startRoutePlanningWithDestination(latLon, pointDescription, targets);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void addFirstIntermediate(LatLon latLon) {
|
||||
if (latLon != null) {
|
||||
RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper();
|
||||
if (routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode()) {
|
||||
PointDescription pointDescription = getPointDescriptionForTarget(latLon);
|
||||
mapActivity.getContextMenu().close();
|
||||
final TargetPointsHelper targets = mapActivity.getMyApplication().getTargetPointsHelper();
|
||||
if (routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode()) {
|
||||
targets.navigateToPoint(latLon, true, 0, pointDescription);
|
||||
} else if (targets.getIntermediatePoints().isEmpty()) {
|
||||
startRoutePlanningWithDestination(latLon, pointDescription, targets);
|
||||
}
|
||||
} else {
|
||||
addDestination(latLon);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void replaceDestination(LatLon latLon) {
|
||||
RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper();
|
||||
if (latLon != null) {
|
||||
if (routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode()) {
|
||||
PointDescription pointDescription = getPointDescriptionForTarget(latLon);
|
||||
mapActivity.getContextMenu().close();
|
||||
final TargetPointsHelper targets = mapActivity.getMyApplication().getTargetPointsHelper();
|
||||
targets.navigateToPoint(latLon, true, -1, pointDescription);
|
||||
} else {
|
||||
addDestination(latLon);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void switchToRouteFollowingLayout() {
|
||||
touchEvent = 0;
|
||||
mapActivity.getMyApplication().getRoutingHelper().setRoutePlanningMode(false);
|
||||
|
|
@ -1125,6 +1195,9 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
} else if (requestCode == REQUEST_LOCATION_FOR_NAVIGATION_FAB_PERMISSION
|
||||
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||
navigateFab();
|
||||
} else if (requestCode == REQUEST_LOCATION_FOR_ADD_DESTINATION_PERMISSION
|
||||
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||
addDestination(requestedLatLon);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue