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

Add UseLocationCard to markers list; add small fixes

Browse source
This commit is contained in:
Alexander Sytnyk 2017-09-27 15:13:08 +03:00
parent d974e28c13
commit dc2233e261
4 changed files with 156 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/res/layout/map_marker_item_new.xml
View file

@ -7,11 +7,21 @@
android:descendantFocusability="blocksDescendants"
android:orientation="vertical">
<include
<LinearLayout
android:id="@+id/top_divider"
layout="@layout/list_item_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible">
<View
android:layout_width="match_parent"
android:layout_height="4dp"/>
<include layout="@layout/card_top_divider"/>
</LinearLayout>
<LinearLayout
android:id="@+id/main_layout"

17
OsmAnd/res/layout/use_location_card.xml
View file

@ -3,10 +3,21 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/list_item_divider"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="4dp"/>
<include layout="@layout/card_top_divider"/>
</LinearLayout>
<LinearLayout
android:id="@+id/background_view"
@ -94,4 +105,6 @@
</LinearLayout>
<include layout="@layout/card_bottom_divider"/>
</LinearLayout>

14
OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
View file

@ -27,6 +27,7 @@ import net.osmand.plus.IconsCache;
import net.osmand.plus.MapMarkersHelper;
import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.MapViewTrackingUtilities;
@ -161,7 +162,9 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
toolbarController.setOnBackButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
quit(false);
if (quit(false)) {
MapMarkersDialogFragment.showInstance(mapActivity);
}
}
});
mapActivity.showTopToolbar(toolbarController);
@ -201,7 +204,14 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
toPosition = holder.getAdapterPosition();
if (toPosition >= 0 && fromPosition >= 0 && toPosition != fromPosition) {
mapActivity.getMyApplication().getMapMarkersHelper().checkAndFixActiveMarkersOrderIfNeeded();
adapter.notifyDataSetChanged();
mapActivity.getMyApplication().getSettings().MAP_MARKERS_ORDER_BY_MODE.set(OsmandSettings.MapMarkersOrderByMode.CUSTOM);
mapActivity.refreshMap();
try {
adapter.notifyDataSetChanged();
} catch (Exception e) {
// to avoid crash because of:
// java.lang.IllegalStateException: Cannot call this method while RecyclerView is computing a layout or scrolling
}
}
}
});

199
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
View file

@ -22,11 +22,15 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemViewHolder>
public class MapMarkersListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
implements MapMarkersItemTouchHelperCallback.ItemTouchHelperAdapter {
private static final int USE_LOCATION_CARD_TYPE = 1;
private static final int MARKER_ITEM_TYPE = 2;
private MapActivity mapActivity;
private List<MapMarker> markers;
private boolean locationCardDisplayed = true;
private MapMarkersListAdapterListener listener;
private LatLon location;
@ -50,107 +54,121 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
}
@Override
public MapMarkerItemViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.map_marker_item_new, viewGroup, false);
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
listener.onItemClick(view);
}
});
return new MapMarkerItemViewHolder(view);
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
if (viewType == USE_LOCATION_CARD_TYPE) {
View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.use_location_card, viewGroup, false);
return new UseLocationCardViewHolder(view);
} else if (viewType == MARKER_ITEM_TYPE) {
View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.map_marker_item_new, viewGroup, false);
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
listener.onItemClick(view);
}
});
return new MapMarkerItemViewHolder(view);
} else {
throw new IllegalArgumentException("Unsupported view type");
}
}
@Override
public void onBindViewHolder(final MapMarkerItemViewHolder holder, int pos) {
public int getItemViewType(int position) {
if (locationCardDisplayed && position == 0) {
return USE_LOCATION_CARD_TYPE;
}
return MARKER_ITEM_TYPE;
}
@Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int pos) {
boolean night = !mapActivity.getMyApplication().getSettings().isLightContent();
IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
MapMarker marker = markers.get(pos);
holder.icon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_flag_dark, MapMarker.getColorId(marker.colorIndex)));
holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_reorder));
holder.iconDirection.setVisibility(View.GONE);
holder.mainLayout.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.bg_color_dark : R.color.bg_color_light));
holder.title.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.color_white : R.color.color_black));
holder.divider.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.actionbar_dark_color : R.color.dashboard_divider_light));
holder.optionsBtn.setVisibility(View.GONE);
holder.description.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.dash_search_icon_dark : R.color.icon_color));
holder.checkBox.setVisibility(View.VISIBLE);
holder.checkBox.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
listener.onItemClick(holder.itemView);
}
});
holder.checkBox.setChecked(marker.selected);
if (holder instanceof UseLocationCardViewHolder) {
final UseLocationCardViewHolder locationCardHolder = (UseLocationCardViewHolder) holder;
} else if (holder instanceof MapMarkerItemViewHolder) {
MapMarker marker = getItem(pos);
final MapMarkerItemViewHolder itemHolder = (MapMarkerItemViewHolder) holder;
if (pos == 0 || pos == getItemCount() - 1) {
holder.firstDescription.setVisibility(View.VISIBLE);
if (pos == 0) {
holder.topDivider.setVisibility(View.VISIBLE);
holder.firstDescription.setText(mapActivity.getString(R.string.shared_string_control_start) + " • ");
} else {
holder.firstDescription.setText(mapActivity.getString(R.string.shared_string_finish) + " • ");
}
} else {
holder.firstDescription.setVisibility(View.GONE);
holder.topDivider.setVisibility(View.GONE);
}
if (pos == getItemCount() - 1) {
holder.bottomShadow.setVisibility(View.VISIBLE);
holder.divider.setVisibility(View.GONE);
} else {
holder.bottomShadow.setVisibility(View.GONE);
holder.divider.setVisibility(View.VISIBLE);
}
holder.point.setVisibility(View.VISIBLE);
holder.iconReorder.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent event) {
if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
listener.onDragStarted(holder);
itemHolder.icon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_flag_dark, MapMarker.getColorId(marker.colorIndex)));
itemHolder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_reorder));
itemHolder.iconDirection.setVisibility(View.GONE);
itemHolder.mainLayout.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.bg_color_dark : R.color.bg_color_light));
itemHolder.title.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.color_white : R.color.color_black));
itemHolder.divider.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.actionbar_dark_color : R.color.dashboard_divider_light));
itemHolder.optionsBtn.setVisibility(View.GONE);
itemHolder.description.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.dash_search_icon_dark : R.color.icon_color));
itemHolder.checkBox.setVisibility(View.VISIBLE);
itemHolder.checkBox.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
listener.onItemClick(itemHolder.itemView);
}
return false;
}
});
});
itemHolder.checkBox.setChecked(marker.selected);
holder.title.setText(marker.getName(mapActivity));
int firstMarkerPos = locationCardDisplayed ? 1 : 0;
int lastMarkerPos = getItemCount() - 1;
String descr;
if ((descr = marker.groupName) != null) {
if (descr.equals("")) {
descr = mapActivity.getString(R.string.shared_string_favorites);
itemHolder.topDivider.setVisibility(pos == firstMarkerPos ? View.VISIBLE : View.GONE);
itemHolder.firstDescription.setVisibility((pos == firstMarkerPos || pos == lastMarkerPos) ? View.VISIBLE : View.GONE);
itemHolder.bottomShadow.setVisibility(pos == lastMarkerPos ? View.VISIBLE : View.GONE);
itemHolder.divider.setVisibility(pos == lastMarkerPos ? View.GONE : View.VISIBLE);
if (pos == firstMarkerPos) {
itemHolder.firstDescription.setText(mapActivity.getString(R.string.shared_string_control_start) + " • ");
} else if (pos == lastMarkerPos) {
itemHolder.firstDescription.setText(mapActivity.getString(R.string.shared_string_finish) + " • ");
}
} else {
Date date = new Date(marker.creationDate);
String month = new SimpleDateFormat("MMM", Locale.getDefault()).format(date);
if (month.length() > 1) {
month = Character.toUpperCase(month.charAt(0)) + month.substring(1);
}
String day = new SimpleDateFormat("dd", Locale.getDefault()).format(date);
descr = month + " " + day;
}
holder.description.setText(descr);
if (location != null) {
holder.distance.setTextColor(ContextCompat.getColor(mapActivity, useCenter
? R.color.color_distance : R.color.color_myloc_distance));
float dist = (float) MapUtils.getDistance(location.getLatitude(), location.getLongitude(),
marker.getLatitude(), marker.getLongitude());
holder.distance.setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
itemHolder.point.setVisibility(View.VISIBLE);
itemHolder.iconReorder.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent event) {
if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
listener.onDragStarted(itemHolder);
}
return false;
}
});
itemHolder.title.setText(marker.getName(mapActivity));
String descr;
if ((descr = marker.groupName) != null) {
if (descr.equals("")) {
descr = mapActivity.getString(R.string.shared_string_favorites);
}
} else {
Date date = new Date(marker.creationDate);
String month = new SimpleDateFormat("MMM", Locale.getDefault()).format(date);
if (month.length() > 1) {
month = Character.toUpperCase(month.charAt(0)) + month.substring(1);
}
String day = new SimpleDateFormat("dd", Locale.getDefault()).format(date);
descr = month + " " + day;
}
itemHolder.description.setText(descr);
if (location != null) {
itemHolder.distance.setTextColor(ContextCompat.getColor(mapActivity, useCenter
? R.color.color_distance : R.color.color_myloc_distance));
float dist = (float) MapUtils.getDistance(location.getLatitude(), location.getLongitude(),
marker.getLatitude(), marker.getLongitude());
itemHolder.distance.setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
}
}
}
@Override
public int getItemCount() {
return markers.size();
return locationCardDisplayed ? markers.size() + 1 : markers.size();
}
public MapMarker getItem(int position) {
return markers.get(position);
return markers.get(locationCardDisplayed ? position - 1 : position);
}
@Override
@ -160,7 +178,10 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
@Override
public boolean onItemMove(int from, int to) {
Collections.swap(markers, from, to);
if (locationCardDisplayed && to == 0) {
return false;
}
Collections.swap(markers, locationCardDisplayed ? from - 1 : from, locationCardDisplayed ? to - 1 : to);
notifyItemMoved(from, to);
return true;
}
@ -183,4 +204,16 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
void onDragEnded(RecyclerView.ViewHolder holder);
}
private class UseLocationCardViewHolder extends RecyclerView.ViewHolder {
final View useLocationBtn;
final View doNotUseLocationBtn;
UseLocationCardViewHolder(View view) {
super(view);
useLocationBtn = view.findViewById(R.id.use_location_button);
doNotUseLocationBtn = view.findViewById(R.id.do_not_use_location_button);
}
}
}