Merge pull request #11117 from osmandapp/master

update test branch

OsmAnd/res/drawable/ic_action_purchases.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,5C8,3.8954 8.8954,3 10,3H14C15.1046,3 16,3.8954 16,5V8H20V19C20,20.1046 19.1046,21 18,21H6C4.8954,21 4,20.1046 4,19V8H8V5ZM14,5V8H10V5H14ZM10,18V11L15.5,14L10,18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_purchases_outlined.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,3C8.8954,3 8,3.8954 8,5V8H4V19C4,20.1046 4.8954,21 6,21H18C19.1046,21 20,20.1046 20,19V8H16V5C16,3.8954 15.1046,3 14,3H10ZM14,8V5H10V8H14ZM6,10H18V19H6V10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/layout/add_new_favorite_category.xml

@@ -21,7 +21,10 @@
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingEnd="@dimen/content_padding"
 		android:paddingRight="@dimen/content_padding"
-		app:startIconDrawable="@drawable/ic_action_folder">
+		app:startIconDrawable="@drawable/ic_action_folder"
+		app:boxBackgroundColor="?attr/text_input_background"
+		app:boxStrokeColor="@color/osmand_orange"
+		app:hintTextColor="@color/text_color_secondary_light">
 
 		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/name_edit_text"

OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="@dimen/bottom_sheet_large_list_item_height"
@@ -8,8 +7,8 @@
 	android:orientation="vertical">
 
 	<LinearLayout
-		android:layout_width="match_parent"
 		android:id="@+id/descriptionContainer"
+		android:layout_width="match_parent"
 		android:layout_height="@dimen/bottom_sheet_large_list_item_height"
 		android:gravity="center_vertical"
 		android:orientation="horizontal"

OsmAnd/res/layout/enough_space_warning_card.xml

@@ -20,7 +20,7 @@
 			android:layout_marginLeft="@dimen/content_padding"
 			android:layout_marginTop="@dimen/content_padding"
 			android:layout_marginRight="@dimen/content_padding"
-			android:src="@drawable/ic_action_sdcard_warning_colored" />
+			app:srcCompat="@drawable/ic_action_sdcard_warning_colored" />
 
 		<LinearLayout
 			android:layout_width="match_parent"

OsmAnd/res/layout/favorite_categories_dialog.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/scroll_container"
-            android:layout_width="fill_parent"
+	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/dialog_content_bottom_margin"
-            android:paddingLeft="@dimen/dialog_content_margin"
-            android:paddingRight="@dimen/dialog_content_margin"
-            android:paddingTop="@dimen/dialog_content_bottom_margin"
 	android:paddingStart="@dimen/dialog_content_margin"
-	android:paddingEnd="@dimen/dialog_content_margin">
+	android:paddingLeft="@dimen/dialog_content_margin"
+	android:paddingTop="@dimen/dialog_content_bottom_margin"
+	android:paddingEnd="@dimen/dialog_content_margin"
+	android:paddingRight="@dimen/dialog_content_margin"
+	android:paddingBottom="@dimen/dialog_content_bottom_margin">
 
 	<LinearLayout
 		android:id="@+id/list_container"

OsmAnd/res/layout/select_folder_row.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="@dimen/card_row_min_height"
 	android:background="?attr/list_background_color"
@@ -27,9 +27,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
-		android:drawableRight="@drawable/ic_action_markers_list"
 		android:drawablePadding="@dimen/content_padding_small_half"
-		android:drawableTint="?attr/active_color_basic"
 		android:ellipsize="end"
 		android:gravity="center_vertical"
 		android:maxLines="1"
@@ -39,6 +37,8 @@
 		android:paddingRight="@dimen/content_padding_half"
 		android:text="@string/shared_string_list"
 		android:textColor="?attr/color_dialog_buttons"
+		app:drawableEndCompat="@drawable/ic_action_markers_list"
+		app:drawableTint="?attr/active_color_basic"
 		osmand:typeface="@string/font_roboto_medium" />
 
 </LinearLayout>

OsmAnd/src/net/osmand/plus/dialogs/MapLayerMenuListener.java

@@ -193,7 +193,8 @@ final class MapLayerMenuListener extends OnRowItemClick {
 						adapter.notifyDataSetChanged();
 					}
 				};
-		if (poiFiltersHelper.isShowingAnyPoi(wiki)) {
+		boolean isMultichoose = poiFiltersHelper.getSelectedPoiFilters(wiki).size() > 1;
+		if (isMultichoose) {
 			mapActivity.getMapLayers().showMultichoicePoiFilterDialog(mapActivity.getMapView(),
 					dismissListener);
 		} else {

OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java

@@ -57,8 +57,10 @@ public class SearchHistoryHelper {
 	}
 
 	public void addNewItemToHistory(GPXInfo gpxInfo) {
+		if(gpxInfo != null) {
 			addNewItemToHistory(new HistoryEntry(0, 0, createPointDescription(gpxInfo)));
 		}
+	}
 
 	public List<HistoryEntry> getHistoryEntries(boolean onlyPoints) {
 		if (loadedEntries == null) {

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/AddNewFavoriteCategoryBottomSheet.java

@@ -169,7 +169,6 @@ public class AddNewFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFrag
 
 		view = UiUtilities.getInflater(app, nightMode).inflate(R.layout.add_new_favorite_category, null);
 		nameTextBox = view.findViewById(R.id.name_text_box);
-		nameTextBox.setBoxBackgroundColorResource(nightMode ? R.color.list_background_color_dark : R.color.activity_background_color_light);
 		nameTextBox.setHint(app.getResources().getString(R.string.favorite_category_name));
 		ColorStateList colorStateList = ColorStateList.valueOf(ContextCompat
 				.getColor(app, nightMode ? R.color.text_color_secondary_dark : R.color.text_color_secondary_light));
@@ -179,7 +178,6 @@ public class AddNewFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFrag
 		editText.requestFocus();
 		AndroidUtils.softKeyboardDelayed(getActivity(), editText);
 		nameTextBox.setStartIconTintList(ColorStateList.valueOf(selectedColor));
-		nameTextBox.setBoxStrokeColorStateList(ColorStateList.valueOf(selectedColor));
 
 		BaseBottomSheetItem editFolderName = new BaseBottomSheetItem.Builder()
 				.setCustomView(view)
@@ -200,7 +198,6 @@ public class AddNewFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFrag
 		((TextView) view.findViewById(R.id.color_name)).setText(ColorDialogs.getColorName(color));
 		selectedColor = color;
 		nameTextBox.setStartIconTintList(ColorStateList.valueOf(selectedColor));
-		nameTextBox.setBoxStrokeColorStateList(ColorStateList.valueOf(selectedColor));
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java

@@ -32,7 +32,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
-import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.widgets.AutoCompleteTextViewEx;
 import net.osmand.util.Algorithms;
 
@@ -182,7 +181,7 @@ public abstract class PointEditorFragment extends BaseOsmAndFragment {
 	protected DialogFragment createSelectCategoryDialog() {
 		PointEditor editor = getEditor();
 		if (editor != null) {
-			return SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag());
+			return SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag(), "");
 		} else {
 			return null;
 		}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java

@@ -739,12 +739,19 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 	protected DialogFragment createSelectCategoryDialog() {
 		PointEditor editor = getEditor();
 		if (editor != null) {
-			return SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag());
+			return SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag(), getSelectedCategory());
 		} else {
 			return null;
 		}
 	}
 
+	public String getSelectedCategory() {
+		if (groupListAdapter != null && groupListAdapter.getSelectedItem() != null) {
+			return groupListAdapter.getSelectedItem();
+		}
+		return getCategoryInitValue();
+	}
+
 	@Nullable
 	protected AddNewFavoriteCategoryBottomSheet createAddCategoryDialog() {
 		PointEditor editor = getEditor();

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditorFragment.java

@@ -23,7 +23,7 @@ public class RtePtEditorFragment extends WptPtEditorFragment {
 	@Override
 	protected DialogFragment createSelectCategoryDialog() {
 		PointEditor editor = getEditor();
-		return editor != null ? SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag()) : null;
+		return editor != null ? SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag(), "") : null;
 	}
 
 	public static void showInstance(final MapActivity mapActivity) {

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectFavoriteCategoryBottomSheet.java

@@ -42,8 +42,10 @@ import java.util.Set;
 public class SelectFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFragment {
 
 	public static final String TAG = SelectFavoriteCategoryBottomSheet.class.getSimpleName();
-	private static final String KEY_CTX_SEL_CAT_EDITOR_TAG = "key_ctx_sel_cat_editor_tag";
+	private static final String SELECT_CATEGORY_EDITOR_TAG = "select_category_editor_tag";
+	private static final String SELECT_CURRENT_CATEGORY_EDITOR_TAG = "select_current_category_editor_tag";
 	private static String editorTag;
+	private static String selectedCategory;
 	private OsmandApplication app;
 	private GPXUtilities.GPXFile gpxFile;
 	private Map<String, Integer> gpxCategories;
@@ -60,10 +62,11 @@ public class SelectFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFrag
 		return drawable;
 	}
 
-	public static SelectFavoriteCategoryBottomSheet createInstance(String editorTag) {
+	public static SelectFavoriteCategoryBottomSheet createInstance(String editorTag, String selectedCategory) {
 		SelectFavoriteCategoryBottomSheet fragment = new SelectFavoriteCategoryBottomSheet();
 		Bundle bundle = new Bundle();
-		bundle.putString(KEY_CTX_SEL_CAT_EDITOR_TAG, editorTag);
+		bundle.putString(SELECT_CATEGORY_EDITOR_TAG, editorTag);
+		bundle.putString(SELECT_CURRENT_CATEGORY_EDITOR_TAG, selectedCategory);
 		fragment.setArguments(bundle);
 		fragment.setRetainInstance(true);
 		return fragment;
@@ -136,17 +139,21 @@ public class SelectFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFrag
 
 		View favoriteCategoryList = UiUtilities.getInflater(app, nightMode).inflate(R.layout.favorite_categories_dialog, null);
 		ScrollView scrollContainer = favoriteCategoryList.findViewById(R.id.scroll_container);
-		final int dp16 = AndroidUtils.dpToPx(app, 16f);
+		scrollContainer.setPadding(0, 0, 0, 0);
-		scrollContainer.setPadding(dp16,0, dp16,0);
 		LinearLayout favoriteCategoryContainer = favoriteCategoryList.findViewById(R.id.list_container);
 
 		final FavouritesDbHelper favoritesHelper = app.getFavorites();
 		if (gpxFile != null) {
 			if (gpxCategories != null) {
+				Map<String, List<GPXUtilities.WptPt>> pointsCategories = gpxFile.getPointsByCategories();
 				for (Map.Entry<String, Integer> e : gpxCategories.entrySet()) {
-					String categoryName = e.getKey();
+					String favoriteCategoryCount;
-					String favoriteCategoryCount = String.valueOf(e.getKey().length());
+					if (Algorithms.isEmpty(pointsCategories.get(e.getKey()))) {
-					favoriteCategoryContainer.addView(createCategoryItem(activity, nightMode, categoryName, e.getValue(), favoriteCategoryCount, false));
+						favoriteCategoryCount = app.getString(R.string.shared_string_empty);
+					} else {
+						favoriteCategoryCount = String.valueOf(pointsCategories.get(e.getKey()).size());
+					}
+					favoriteCategoryContainer.addView(createCategoryItem(activity, nightMode, e.getKey(), e.getValue(), favoriteCategoryCount, false));
 				}
 			}
 		} else {
@@ -171,19 +178,15 @@ public class SelectFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFrag
 		View itemView = UiUtilities.getInflater(activity, nightMode).inflate(R.layout.bottom_sheet_item_with_descr_and_radio_btn, null);
 		final AppCompatImageView button = (AppCompatImageView) itemView.findViewById(R.id.icon);
 		final int dp8 = AndroidUtils.dpToPx(app, 8f);
+		final int dp16 = AndroidUtils.dpToPx(app, 16f);
 		button.setPadding(0, 0, dp8, 0);
 		LinearLayout descriptionContainer = itemView.findViewById(R.id.descriptionContainer);
-		descriptionContainer.setPadding(0, 0, 0, 0);
+		descriptionContainer.setPadding(dp16, 0, dp16, 0);
 		View divider = itemView.findViewById(R.id.divider_bottom);
 		divider.setVisibility(View.GONE);
 		itemView.setPadding(0, 0, 0, 0);
-		final RadioButton compoundButton = itemView.findViewById(R.id.compound_button);
 		int activeColorId = nightMode ?
 				R.color.active_color_primary_dark : R.color.active_color_primary_light;
-		int disableColorId = nightMode ?
-				R.color.icon_color_default_dark : R.color.icon_color_default_light;
-		UiUtilities.setupCompoundButton(nightMode, ContextCompat.getColor(app,
-				nightMode ? activeColorId : disableColorId), compoundButton);
 
 		if (isHidden) {
 			button.setImageResource(R.drawable.ic_action_hide);
@@ -195,16 +198,19 @@ public class SelectFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFrag
 						gpxFile != null ? R.color.gpx_color_point : R.color.color_favorite)));
 			}
 		}
+		RadioButton compoundButton = itemView.findViewById(R.id.compound_button);
+		compoundButton.setChecked(Algorithms.stringsEqual(selectedCategory, categoryName));
+		UiUtilities.setupCompoundButton(nightMode, ContextCompat.getColor(app,
+				activeColorId), compoundButton);
 		String name = categoryName.length() == 0 ? getString(R.string.shared_string_favorites) : categoryName;
 		TextView text = itemView.findViewById(R.id.title);
 		TextView description = itemView.findViewById(R.id.description);
 		text.setText(name);
 		description.setText(String.valueOf(categoryPointCount));
-		descriptionContainer.setOnClickListener(new View.OnClickListener() {
+		itemView.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				FragmentActivity a = getActivity();
-				compoundButton.setSelected(true);
 				if (a instanceof MapActivity) {
 					PointEditor pointEditor = ((MapActivity) a).getContextMenu().getPointEditor(editorTag);
 					if (pointEditor != null) {
@@ -221,7 +227,8 @@ public class SelectFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFrag
 	}
 
 	public void restoreState(Bundle bundle) {
-		editorTag = bundle.getString(KEY_CTX_SEL_CAT_EDITOR_TAG);
+		editorTag = bundle.getString(SELECT_CATEGORY_EDITOR_TAG);
+		selectedCategory = bundle.getString(SELECT_CURRENT_CATEGORY_EDITOR_TAG);
 	}
 
 	public interface CategorySelectionListener {

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java

@@ -67,7 +67,7 @@ public class WptPtEditorFragment extends PointEditorFragment {
 	protected DialogFragment createSelectCategoryDialog() {
 		WptPtEditor editor = getWptPtEditor();
 		if (editor != null) {
-			SelectFavoriteCategoryBottomSheet selectCategoryDialogFragment = SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag());
+			SelectFavoriteCategoryBottomSheet selectCategoryDialogFragment = SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag(), "");
 			GPXFile gpx = editor.getGpxFile();
 			if (gpx != null) {
 				selectCategoryDialogFragment.setGpxFile(gpx);

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java

@@ -81,7 +81,7 @@ public class WptPtEditorFragmentNew extends PointEditorFragmentNew {
 	protected DialogFragment createSelectCategoryDialog() {
 		WptPtEditor editor = getWptPtEditor();
 		if (editor != null) {
-			SelectFavoriteCategoryBottomSheet selectCategoryDialogFragment = SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag());
+			SelectFavoriteCategoryBottomSheet selectCategoryDialogFragment = SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag(), getSelectedCategory());
 			GPXFile gpx = editor.getGpxFile();
 			if (gpx != null) {
 				selectCategoryDialogFragment.setGpxFile(gpx);

OsmAnd/src/net/osmand/plus/quickaction/actions/FavoriteAction.java

@@ -176,7 +176,7 @@ public class FavoriteAction extends QuickAction {
 			@Override
 			public void onClick(final View view) {
 
-				SelectFavoriteCategoryBottomSheet dialogFragment = SelectFavoriteCategoryBottomSheet.createInstance("");
+				SelectFavoriteCategoryBottomSheet dialogFragment = SelectFavoriteCategoryBottomSheet.createInstance("", "");
 
 				dialogFragment.show(
 						activity.getSupportFragmentManager(),

OsmAnd/src/net/osmand/plus/quickaction/actions/GPXAction.java

@@ -120,7 +120,7 @@ public class GPXAction extends QuickAction {
 			@Override
 			public void onClick(final View view) {
 
-				SelectFavoriteCategoryBottomSheet dialogFragment = SelectFavoriteCategoryBottomSheet.createInstance("");
+				SelectFavoriteCategoryBottomSheet dialogFragment = SelectFavoriteCategoryBottomSheet.createInstance("", "");
 
 				dialogFragment.show(
 						activity.getSupportFragmentManager(),