Merge pull request #10994 from osmandapp/master

update test branch

OsmAnd/.gitignore

@@ -39,11 +39,7 @@ mx_*
 valgrind/
 bin/
 dist/
-assets/specialphrases/*
+
-assets/voice/*
-assets/fonts/*
-assets/feature_articles/*
-assets/World_basemap_mini*
 gen/
 local.properties
 raw/
@@ -56,6 +52,11 @@ out/
 use/
 osmand.properties
 osmand.xml
+assets/specialphrases/*
+assets/voice/*
+assets/fonts/*
+assets/feature_articles/*
+assets/*.obf
 assets/style.css
 assets/poi_categories.json
 assets/help/*.html

OsmAnd/res/layout/track_groups_card.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/bottom_sheet_list_item_height"
+	android:orientation="vertical">
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recycler_view"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/bottom_sheet_list_item_height"
+		android:background="?attr/bg_color"
+		android:orientation="horizontal"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:clipToPadding="false"
+		android:scrollbars="none" />
+
+</LinearLayout>

OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java

@@ -673,7 +673,10 @@ public class ImportHelper {
 	public static List<FavouritePoint> asFavourites(OsmandApplication app, List<WptPt> wptPts, String fileName, boolean forceImportFavourites) {
 		List<FavouritePoint> favourites = new ArrayList<>();
 		for (WptPt p : wptPts) {
-			if (p.name != null) {
+			if (Algorithms.isEmpty(p.name)) {
+				p.name = app.getResources().getString(R.string.shared_string_waypoint);
+			}
+			if (!Algorithms.isEmpty(p.name)) {
 				final String fpCat;
 				if (p.category == null) {
 					if (forceImportFavourites) {

OsmAnd/src/net/osmand/plus/track/PointsGroupsCard.java

@@ -0,0 +1,79 @@
+package net.osmand.plus.track;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter;
+import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionAdapterListener;
+import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionItem;
+import net.osmand.plus.routepreparationmenu.cards.BaseCard;
+import net.osmand.util.Algorithms;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PointsGroupsCard extends BaseCard {
+
+	public static final int SELECT_GROUP_INDEX = 0;
+
+	private GpxDisplayGroup selectedGroup;
+	private final List<GpxDisplayGroup> displayGroups = new ArrayList<>();
+
+	public PointsGroupsCard(@NonNull MapActivity mapActivity, @NonNull List<GpxDisplayGroup> groups) {
+		super(mapActivity);
+		displayGroups.addAll(groups);
+	}
+
+	@Override
+	public int getCardLayoutId() {
+		return R.layout.track_groups_card;
+	}
+
+	public GpxDisplayGroup getSelectedGroup() {
+		return selectedGroup;
+	}
+
+	@Override
+	protected void updateContent() {
+		ArrayList<HorizontalSelectionItem> items = new ArrayList<>();
+		items.add(new HorizontalSelectionItem(app.getString(R.string.shared_string_all), null));
+		for (GpxDisplayGroup group : displayGroups) {
+			String categoryName = group.getName();
+			if (Algorithms.isEmpty(categoryName)) {
+				categoryName = app.getString(R.string.shared_string_gpx_points);
+			}
+			items.add(new HorizontalSelectionItem(categoryName, group));
+		}
+		final HorizontalSelectionAdapter selectionAdapter = new HorizontalSelectionAdapter(app, nightMode);
+		selectionAdapter.setItems(items);
+		selectionAdapter.setListener(new HorizontalSelectionAdapterListener() {
+			@Override
+			public void onItemSelected(HorizontalSelectionItem item) {
+				selectedGroup = (GpxDisplayGroup) item.getObject();
+				CardListener listener = getListener();
+				if (listener != null) {
+					listener.onCardButtonPressed(PointsGroupsCard.this, SELECT_GROUP_INDEX);
+				}
+				selectionAdapter.notifyDataSetChanged();
+			}
+		});
+		if (selectedGroup != null) {
+			String categoryName = selectedGroup.getName();
+			if (Algorithms.isEmpty(categoryName)) {
+				categoryName = app.getString(R.string.shared_string_gpx_points);
+			}
+			selectionAdapter.setSelectedItemByTitle(categoryName);
+		} else {
+			selectionAdapter.setSelectedItemByTitle(app.getString(R.string.shared_string_all));
+		}
+
+		RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
+		recyclerView.setAdapter(selectionAdapter);
+		recyclerView.setLayoutManager(new LinearLayoutManager(app, RecyclerView.HORIZONTAL, false));
+		selectionAdapter.notifyDataSetChanged();
+	}
+}

OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java

@@ -136,6 +136,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 	private DescriptionCard descriptionCard;
 	private OverviewCard overviewCard;
 	private TrackPointsCard pointsCard;
+	private PointsGroupsCard groupsCard;
 
 	private TextView headerTitle;
 	private ImageView headerIcon;
@@ -373,6 +374,21 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 				blocksBuilder.runUpdatingStatBlocksIfNeeded();
 			}
 		} else {
+			if (menuType == TrackMenuType.POINTS && !Algorithms.isEmpty(pointsCard.getGroups())) {
+				if (groupsCard != null && groupsCard.getView() != null) {
+					ViewGroup parent = ((ViewGroup) groupsCard.getView().getParent());
+					if (parent != null) {
+						parent.removeView(groupsCard.getView());
+					}
+					headerContainer.addView(groupsCard.getView());
+				} else {
+					groupsCard = new PointsGroupsCard(getMapActivity(), pointsCard.getGroups());
+					groupsCard.setListener(this);
+					headerContainer.addView(groupsCard.build(getMapActivity()));
+				}
+			} else if (groupsCard != null && groupsCard.getView() != null) {
+				headerContainer.removeView(groupsCard.getView());
+			}
 			if (overviewCard != null && overviewCard.getView() != null) {
 				overviewCard.getBlockStatisticsBuilder().stopUpdatingStatBlocks();
 				headerContainer.removeView(overviewCard.getView());
@@ -869,6 +885,13 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 			} else if (buttonIndex == OPEN_WAYPOINT_INDEX) {
 				dismiss();
 			}
+		} else if (card instanceof PointsGroupsCard) {
+			PointsGroupsCard groupsCard = (PointsGroupsCard) card;
+			GpxDisplayGroup group = groupsCard.getSelectedGroup();
+			if (pointsCard != null) {
+				pointsCard.setSelectedGroup(group);
+				pointsCard.updateContent();
+			}
 		}
 	}
 

OsmAnd/src/net/osmand/plus/track/TrackPointsCard.java

@@ -64,6 +64,7 @@ public class TrackPointsCard extends BaseCard implements OnChildClickListener, O
 	private final TrackDisplayHelper displayHelper;
 	private final GpxDisplayItemType[] filterTypes = new GpxDisplayItemType[] {GpxDisplayItemType.TRACK_POINTS, GpxDisplayItemType.TRACK_ROUTE_POINTS};
 
+	private GpxDisplayGroup selectedGroup;
 	private final Set<Integer> selectedGroups = new LinkedHashSet<>();
 	private final LinkedHashMap<GpxDisplayItemType, Set<GpxDisplayItem>> selectedItems = new LinkedHashMap<>();
 	private boolean selectionMode;
@@ -97,7 +98,7 @@ public class TrackPointsCard extends BaseCard implements OnChildClickListener, O
 		listView.setOnChildClickListener(this);
 
 		adapter.setFilterResults(null);
-		adapter.synchronizeGroups(getOriginalGroups());
+		adapter.synchronizeGroups(getDisplayGroups());
 		if (listView.getAdapter() == null) {
 			listView.setAdapter(adapter);
 		}
@@ -109,6 +110,14 @@ public class TrackPointsCard extends BaseCard implements OnChildClickListener, O
 		expandAllGroups();
 	}
 
+	public void setSelectedGroup(GpxDisplayGroup selectedGroup) {
+		this.selectedGroup = selectedGroup;
+	}
+
+	public List<GpxDisplayGroup> getGroups() {
+		return adapter.groups;
+	}
+
 	private void addActions(LayoutInflater inflater) {
 		View view = inflater.inflate(R.layout.preference_category_with_descr, listView, false);
 		TextView title = view.findViewById(android.R.id.title);
@@ -174,6 +183,10 @@ public class TrackPointsCard extends BaseCard implements OnChildClickListener, O
 		return displayHelper.getOriginalGroups(filterTypes);
 	}
 
+	private List<GpxDisplayGroup> getDisplayGroups() {
+		return selectedGroup != null ? Collections.singletonList(selectedGroup) : getOriginalGroups();
+	}
+
 	@Override
 	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
 		GpxDisplayItem item = adapter.getChild(groupPosition, childPosition);
@@ -246,7 +259,7 @@ public class TrackPointsCard extends BaseCard implements OnChildClickListener, O
 	public void onPointsDeleted() {
 		selectedItems.clear();
 		selectedGroups.clear();
-		adapter.synchronizeGroups(getOriginalGroups());
+		adapter.synchronizeGroups(getDisplayGroups());
 	}
 
 	public void filter(String text) {
@@ -618,16 +631,13 @@ public class TrackPointsCard extends BaseCard implements OnChildClickListener, O
 			} else {
 				Set<Object> filter = new HashSet<>();
 				String cs = constraint.toString().toLowerCase();
-				List<GpxDisplayGroup> groups = getOriginalGroups();
+				for (GpxDisplayGroup g : getDisplayGroups()) {
-				if (groups != null) {
+					for (GpxDisplayItem i : g.getModifiableList()) {
-					for (GpxDisplayGroup g : groups) {
+						if (i.name.toLowerCase().contains(cs)) {
-						for (GpxDisplayItem i : g.getModifiableList()) {
+							filter.add(i);
-							if (i.name.toLowerCase().contains(cs)) {
+						} else if (i.locationStart != null && !TextUtils.isEmpty(i.locationStart.category)
-								filter.add(i);
+								&& i.locationStart.category.toLowerCase().contains(cs)) {
-							} else if (i.locationStart != null && !TextUtils.isEmpty(i.locationStart.category)
+							filter.add(i.locationStart.category);
-									&& i.locationStart.category.toLowerCase().contains(cs)) {
-								filter.add(i.locationStart.category);
-							}
 						}
 					}
 				}
@@ -641,10 +651,7 @@ public class TrackPointsCard extends BaseCard implements OnChildClickListener, O
 		protected void publishResults(CharSequence constraint, FilterResults results) {
 			synchronized (adapter) {
 				adapter.setFilterResults((Set<?>) results.values);
-				List<GpxDisplayGroup> groups = getOriginalGroups();
+				adapter.synchronizeGroups(getDisplayGroups());
-				if (groups != null) {
-					adapter.synchronizeGroups(groups);
-				}
 			}
 			adapter.notifyDataSetChanged();
 			expandAllGroups();

OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleHelper.java

@@ -300,8 +300,9 @@ public class WikiArticleHelper {
 		if (firstParagraphStart != -1 && firstParagraphEnd != -1
 				&& firstParagraphEnd >= firstParagraphStart) {
 			firstParagraphHtml = content.substring(firstParagraphStart, firstParagraphEnd + P_CLOSED.length());
-			while (firstParagraphHtml.substring(P_OPENED.length(), firstParagraphHtml.length() - P_CLOSED.length()).trim().isEmpty()
+			while ((firstParagraphHtml.substring(P_OPENED.length(), firstParagraphHtml.length() - P_CLOSED.length()).trim().isEmpty()
-					&& (firstParagraphEnd + P_CLOSED.length()) < content.length()) {
+					&& (firstParagraphEnd + P_CLOSED.length()) < content.length())
+					|| Html.fromHtml(firstParagraphHtml.replaceAll("(<a.+?/a>)|(<div.+?/div>)", "")).toString().trim().length() == 0) {
 				firstParagraphStart = content.indexOf(P_OPENED, firstParagraphEnd);
 				firstParagraphEnd = firstParagraphStart == -1 ? -1 : content.indexOf(P_CLOSED, firstParagraphStart);
 				if (firstParagraphStart != -1 && firstParagraphEnd != -1) {

OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelArticle.java

@@ -159,7 +159,8 @@ public class TravelArticle {
 			System.err.println(e.getMessage());
 		}
 		String prefix = thumbnail ? THUMB_PREFIX : REGULAR_PREFIX;
-		return IMAGE_ROOT_URL + "thumb/" + hash[0] + "/" + hash[1] + "/" + imageTitle + "/" + prefix + imageTitle;
+		String suffix = imageTitle.endsWith(".svg") ? ".png" : "";
+		return IMAGE_ROOT_URL + "thumb/" + hash[0] + "/" + hash[1] + "/" + imageTitle + "/" + prefix + imageTitle + suffix;
 	}
 
 	@Size(2)

OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java

@@ -948,6 +948,7 @@ public class TravelObfHelper implements TravelHelper {
 			}
 			if (!Algorithms.isEmpty(amenities)) {
 				article = cacheTravelArticles(reader.getFile(), amenities.get(0), lang, readGpx, callback);
+				break;
 			}
 		}
 		return article;

OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java

@@ -49,7 +49,6 @@ import java.util.List;
 
 import static net.osmand.plus.download.DownloadResources.WIKIVOYAGE_FILE_FILTER;
 import static net.osmand.plus.resources.ResourceManager.DEFAULT_WIKIVOYAGE_TRAVEL_OBF;
-import static net.osmand.plus.wikivoyage.explore.WikivoyageExploreActivity.*;
 
 public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadEvents, TravelLocalDataHelper.Listener {
 
@@ -95,10 +94,6 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadEv
 		if (app != null) {
 			app.getTravelHelper().getBookmarksHelper().addListener(this);
 		}
-		WikivoyageExploreActivity exploreActivity = getExploreActivity();
-		if (exploreActivity != null) {
-			exploreActivity.onTabFragmentResume(this);
-		}
 	}
 
 	@Override
@@ -141,7 +136,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadEv
 				app.getTravelHelper().initializeDataOnAppStartup();
 				WikivoyageExploreActivity exploreActivity = getExploreActivity();
 				if (exploreActivity != null) {
-					exploreActivity.populateData();
+					exploreActivity.populateData(true);
 				}
 			} else {
 				removeRedundantCards();
@@ -194,8 +189,9 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadEv
 				travelButtonCard.setListener(new TravelNeededMapsCard.CardListener() {
 					@Override
 					public void onPrimaryButtonClick() {
-						if (activity instanceof WikivoyageExploreActivity) {
+						WikivoyageExploreActivity exploreActivity = getExploreActivity();
-							new LoadWikivoyageData((WikivoyageExploreActivity) activity, false).execute();
+						if (exploreActivity != null) {
+							exploreActivity.populateData(false);
 						}
 					}
 

OsmAnd/src/net/osmand/plus/wikivoyage/explore/SavedArticlesTabFragment.java

@@ -1,6 +1,5 @@
 package net.osmand.plus.wikivoyage.explore;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -80,10 +79,6 @@ public class SavedArticlesTabFragment extends BaseOsmAndFragment implements Trav
 		if (dataHelper != null) {
 			dataHelper.addListener(this);
 		}
-		WikivoyageExploreActivity exploreActivity = getExploreActivity();
-		if (exploreActivity != null) {
-			exploreActivity.onTabFragmentResume(this);
-		}
 	}
 
 	@Override
@@ -105,16 +100,6 @@ public class SavedArticlesTabFragment extends BaseOsmAndFragment implements Trav
 		}
 	}
 
-	@Nullable
-	private WikivoyageExploreActivity getExploreActivity() {
-		Activity activity = getActivity();
-		if (activity != null && activity instanceof WikivoyageExploreActivity) {
-			return (WikivoyageExploreActivity) activity;
-		} else {
-			return null;
-		}
-	}
-
 	public void invalidateAdapter() {
 		if (adapter != null) {
 			adapter.notifyDataSetChanged();

OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageExploreActivity.java

@@ -156,7 +156,7 @@ public class WikivoyageExploreActivity extends TabActivity implements DownloadEv
 		});
 
 		updateSearchBarVisibility();
-		populateData();
+		populateData(true);
 	}
 
 	@Override
@@ -249,7 +249,7 @@ public class WikivoyageExploreActivity extends TabActivity implements DownloadEv
 					invalidateTabAdapters();
 					break;
 				case WikivoyageOptionsBottomSheetDialogFragment.TRAVEL_BOOK_CHANGED:
-					populateData();
+					populateData(true);
 					break;
 			}
 		}
@@ -313,7 +313,7 @@ public class WikivoyageExploreActivity extends TabActivity implements DownloadEv
 		return ContextCompat.getColor(app, colorId);
 	}
 
-	public void populateData() {
+	public void populateData(final boolean resetData) {
 		switchProgressBarVisibility(true);
 		if (app.isApplicationInitializing()) {
 			final WeakReference<WikivoyageExploreActivity> activityRef = new WeakReference<>(this);
@@ -326,12 +326,12 @@ public class WikivoyageExploreActivity extends TabActivity implements DownloadEv
 				public void onFinish(AppInitializer init) {
 					WikivoyageExploreActivity activity = activityRef.get();
 					if (AndroidUtils.isActivityNotDestroyed(activity)) {
-						new LoadWikivoyageData(activity,true).execute();
+						new LoadWikivoyageData(activity, resetData).execute();
 					}
 				}
 			});
 		} else {
-			new LoadWikivoyageData(this,true).execute();
+			new LoadWikivoyageData(this, resetData).execute();
 		}
 	}
 
@@ -371,10 +371,6 @@ public class WikivoyageExploreActivity extends TabActivity implements DownloadEv
 		}
 	}
 
-	public void onTabFragmentResume(Fragment fragment) {
-		updateFragments();
-	}
-
 	@Override
 	public void savedArticlesUpdated() {
 		updateFragments();