Merge remote-tracking branch 'origin/master'

OsmAnd/res/layout/markers_group_view_holder.xml

@@ -3,6 +3,7 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="@dimen/bottom_sheet_list_item_height"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:background="?attr/selectableItemBackground"
               android:minHeight="@dimen/bottom_sheet_list_item_height"
               android:paddingEnd="@dimen/content_padding"
@@ -29,13 +30,16 @@
         tools:text="Berlin trip"
         android:textAppearance="@style/TextAppearance.ListItemTitle"/>
 
-    <TextView
-        android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-        android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+    <net.osmand.plus.widgets.TextViewEx
         android:id="@+id/number_count_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+        android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+        android:ellipsize="end"
         android:maxLines="1"
-        tools:text="25"
-        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+        android:textColor="?attr/color_dialog_buttons"
+        android:textSize="@dimen/default_list_text_size"
+        osmand:typeface="@string/font_roboto_medium"
+        tools:text="25"/>
 </LinearLayout>

OsmAnd/res/values-ru/phrases.xml

@@ -3741,4 +3741,6 @@
 
 	<string name="poi_whitewater_rapid_name">Название речного порога</string>
 
+	<string name="poi_outpost">Пункт выдачи заказов</string>
+
 	</resources>

OsmAnd/res/values/phrases.xml

@@ -3761,4 +3761,6 @@
 
 	<string name="poi_whitewater_rapid_name">Name of the river rapids</string>
 
+	<string name="poi_outpost">Shop's delivery point</string>
+
 </resources>