Merge pull request #21803 from osmandapp/legend_route_wip

Legend route wip
osmandapp · Jan 27, 2025 · 43cfbfd · 43cfbfd
2 parents e4a2a1b + 4ec56e6
commit 43cfbfd
Show file tree

Hide file tree

Showing 69 changed files with 1,087 additions and 1,250 deletions.
diff --git a/OsmAnd/res/layout/alpine_hiking_scale_card.xml b/OsmAnd/res/layout/alpine_hiking_scale_card.xml
@@ -0,0 +1,24 @@
+<?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"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/list_background_color"
+	android:orientation="vertical">
+
+	<net.osmand.plus.widgets.TextViewEx
+		style="@style/DescStyle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:text="@string/rendering_attr_alpineHiking_description"
+		android:textColor="?android:textColorSecondary" />
+
+	<LinearLayout
+		android:id="@+id/classification_properties"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/cycle_route_types_card.xml b/OsmAnd/res/layout/cycle_route_types_card.xml
@@ -0,0 +1,29 @@
+<?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"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/list_background_color"
+	android:orientation="vertical">
+
+	<include
+		android:id="@+id/header_container"
+		layout="@layout/bottom_sheet_item_with_two_text" />
+
+	<include layout="@layout/custom_radio_buttons" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/description"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:letterSpacing="@dimen/text_button_letter_spacing"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/content_padding_small"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/content_padding_small"
+		android:text="@string/rendering_attr_showCycleNodeNetworkRoutes_name"
+		android:textColor="?android:textColorSecondary"
+		android:textSize="@dimen/default_desc_text_size"
+		android:textStyle="normal" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/fragment_alpine_difficult_classification.xml b/OsmAnd/res/layout/fragment_alpine_difficult_classification.xml
diff --git a/OsmAnd/res/layout/fragment_configure_map.xml b/OsmAnd/res/layout/fragment_configure_map.xml
@@ -5,12 +5,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/shadow_on_map"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:scaleType="fitXY"
-		app:srcCompat="@drawable/bg_shadow_onmap" />
+	<include layout="@layout/shadow_on_map" />
 
 	<LinearLayout
 		android:id="@+id/list"

diff --git a/OsmAnd/res/layout/fragment_mapillary_filters.xml b/OsmAnd/res/layout/fragment_mapillary_filters.xml
@@ -3,17 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+	android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/shadow_on_map"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scaleType="fitXY"
-        app:srcCompat="@drawable/bg_shadow_onmap" />
+	<include layout="@layout/shadow_on_map" />
 
-    <LinearLayout
-        android:id="@+id/mapillary_filters_linear_layout"
+	<LinearLayout
+		android:id="@+id/mapillary_filters_linear_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">

diff --git a/OsmAnd/res/layout/fragment_mtb_routes.xml b/OsmAnd/res/layout/fragment_mtb_routes.xml
diff --git a/OsmAnd/res/layout/fragment_nautical_depth_contours.xml b/OsmAnd/res/layout/fragment_nautical_depth_contours.xml
@@ -5,12 +5,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/shadow_on_map"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:scaleType="fitXY"
-		app:srcCompat="@drawable/bg_shadow_onmap" />
+	<include layout="@layout/shadow_on_map" />
 
 	<LinearLayout
 		android:layout_width="match_parent"

diff --git a/OsmAnd/res/layout/fragment_relief_3d.xml b/OsmAnd/res/layout/fragment_relief_3d.xml
@@ -12,12 +12,7 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical">
 
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/shadow_on_map"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:scaleType="fitXY"
-			app:srcCompat="@drawable/bg_shadow_onmap" />
+		<include layout="@layout/shadow_on_map" />
 
 		<LinearLayout
 			android:layout_width="match_parent"

diff --git a/OsmAnd/res/layout/fragment_terrain.xml b/OsmAnd/res/layout/fragment_terrain.xml
@@ -12,12 +12,7 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical">
 
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/shadow_on_map"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:scaleType="fitXY"
-			app:srcCompat="@drawable/bg_shadow_onmap" />
+		<include layout="@layout/shadow_on_map" />
 
 		<LinearLayout
 			android:layout_width="match_parent"
@@ -89,8 +84,8 @@
 								android:layout_height="wrap_content"
 								android:layout_gravity="center_vertical"
 								android:layout_marginStart="@dimen/content_padding"
-								app:tint="?attr/secondary_icon_color"
-								app:srcCompat="@drawable/ic_action_arrow_down" />
+								app:srcCompat="@drawable/ic_action_arrow_down"
+								app:tint="?attr/secondary_icon_color" />
 
 						</LinearLayout>
 

diff --git a/OsmAnd/res/layout/fragment_transport_lines.xml b/OsmAnd/res/layout/fragment_transport_lines.xml
@@ -5,12 +5,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/shadow_on_map"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:scaleType="fitXY"
-		app:srcCompat="@drawable/bg_shadow_onmap" />
+	<include layout="@layout/shadow_on_map" />
 
 	<LinearLayout
 		android:layout_width="match_parent"

diff --git a/OsmAnd/res/layout/fragment_weather_contours.xml b/OsmAnd/res/layout/fragment_weather_contours.xml
@@ -6,12 +6,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/shadow_on_map"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:scaleType="fitXY"
-		app:srcCompat="@drawable/bg_shadow_onmap" />
+	<include layout="@layout/shadow_on_map" />
 
 	<LinearLayout
 		android:layout_width="match_parent"

diff --git a/OsmAnd/res/layout/fragment_weather_layer.xml b/OsmAnd/res/layout/fragment_weather_layer.xml
@@ -6,12 +6,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/shadow_on_map"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:scaleType="fitXY"
-		app:srcCompat="@drawable/bg_shadow_onmap" />
+	<include layout="@layout/shadow_on_map" />
 
 	<LinearLayout
 		android:layout_width="match_parent"

diff --git a/OsmAnd/res/layout/fragment_weather_main.xml b/OsmAnd/res/layout/fragment_weather_main.xml
@@ -5,12 +5,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/shadow_on_map"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:scaleType="fitXY"
-		app:srcCompat="@drawable/bg_shadow_onmap" />
+	<include layout="@layout/shadow_on_map" />
 
 	<LinearLayout
 		android:layout_width="match_parent"

diff --git a/OsmAnd/res/layout/list_item_icon_and_menu.xml b/OsmAnd/res/layout/list_item_icon_and_menu.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"