Merge branch 'osmandapp:master' into hardy_Afa

sonora · Nov 14, 2024 · 2ba0416 · 2ba0416
2 parents 0a36b27 + 8f66e29
commit 2ba0416
Show file tree

Hide file tree

Showing 25 changed files with 807 additions and 119 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1-support-request.md b/.github/ISSUE_TEMPLATE/1-support-request.md
@@ -3,14 +3,4 @@ name: "❓ Support request"
 about: Questions and requests for support
 ---
 
-🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
-
 Please do not file questions or support requests on the GitHub issues tracker.
-
-In case you aren't sure whether to open an issue or not, please send your request to [email protected].
-
-You can get your questions answered using the [Google group](https://groups.google.com/forum/#!forum/osmand) or chat in real-time via our Telegram instances: [English](https://t.me/OsmAndMaps), [German](https://t.me/deosmand), [French](https://t.me/frosmand), [Ukrainian](https://t.me/uaosmand), [Italian](https://t.me/itosmand), [Russian](https://t.me/ruosmand).
-
-Thank you!
-
-🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
@@ -73,9 +73,9 @@ object GpxUtilities {
 	const val TRAVEL_GPX_CONVERT_MULT_1 = 2
 	const val TRAVEL_GPX_CONVERT_MULT_2 = 5
 
+	private var oneOffLogParseTimeErrors = true
 	private const val GPX_TIME_FORMATTER = "yyyy-MM-dd'T'HH:mm:ss'Z'"
 
-
 	class TimePatterns {
 		companion object {
 			val formats = mutableListOf<DateTimeFormat<DateTimeComponents>>()
@@ -929,8 +929,11 @@ object GpxUtilities {
 				// Continue to the next format
 			}
 		}
-		val errorMessage = "Failed to parse date: '$iso8601text'"
-		log.error(errorMessage)
+
+		if (oneOffLogParseTimeErrors) {
+			oneOffLogParseTimeErrors = false
+			log.error("Failed to parse date: '$iso8601text'")
+		}
 		return 0
 	}
 
@@ -996,6 +999,7 @@ object GpxUtilities {
 		extensionsReader: GpxExtensionsReader?,
 		addGeneralTrack: Boolean
 	): GpxFile {
+		oneOffLogParseTimeErrors = true
 		val gpxFile = GpxFile(null)
 		gpxFile.metadata.time = 0
 		var parser: XmlPullParser? = null

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDCommand.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDCommand.kt
@@ -39,5 +39,14 @@ enum class OBDCommand(
 			}
 			return null
 		}
+
+		fun getCommand(name: String): OBDCommand? {
+			for (type in entries) {
+				if (type.name.equals(name, true)) {
+					return type
+				}
+			}
+			return null
+		}
 	}
 }
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
@@ -158,24 +158,24 @@ object OBDDataComputer {
 			false,
 			OBD_FUEL_LEVEL_COMMAND,
 			"obd_fuel_left_percent",
-			OBDComputerWidgetFormatter("%.2f")),
+			OBDComputerWidgetFormatter("%.1f")),
 		FUEL_LEFT_LITER(
 			false,
 			OBD_FUEL_LEVEL_COMMAND,
 			"obd_fuel_left_liter",
-			OBDComputerWidgetFormatter("%.2f")),
+			OBDComputerWidgetFormatter("%.1f")),
 		FUEL_CONSUMPTION_RATE_PERCENT_HOUR(
 			false,
 			OBD_FUEL_LEVEL_COMMAND,
-			"obd_fuel_consumption_rate_percent_hour", OBDComputerWidgetFormatter("%.0f")),
+			"obd_fuel_consumption_rate_percent_hour", OBDComputerWidgetFormatter("%.1f")),
 		FUEL_CONSUMPTION_RATE_LITER_KM(
 			true,
 			OBD_FUEL_LEVEL_COMMAND,
-			"obd_fuel_consumption_rate_l_km", OBDComputerWidgetFormatter("%.0f")),
+			"obd_fuel_consumption_rate_l_km", OBDComputerWidgetFormatter("%.1f")),
 		FUEL_CONSUMPTION_RATE_LITER_HOUR(
 			false,
 			OBD_FUEL_LEVEL_COMMAND,
-			"obd_fuel_consumption_rate_liter_hour", OBDComputerWidgetFormatter("%.0f")),
+			"obd_fuel_consumption_rate_liter_hour", OBDComputerWidgetFormatter("%.1f")),
 		FUEL_CONSUMPTION_RATE_SENSOR(
 			false,
 			OBD_FUEL_CONSUMPTION_RATE_COMMAND,

diff --git a/OsmAnd/res/layout/vehicle_metrics_recording_fragment.xml b/OsmAnd/res/layout/vehicle_metrics_recording_fragment.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:clickable="true"
+	android:focusable="true"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/app_bar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<include layout="@layout/profile_preference_toolbar" />
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recycler_view"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1" />
+
+	<include layout="@layout/bottom_buttons" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
@@ -4365,7 +4365,7 @@
     <string name="track_does_not_contain_data_to_save">Трасето не съдържа информация, която да бъде запазена.</string>
     <string name="quick_action_finish_trip_recording_summary">Бутон за запзване на трасето в GPX и приключване на записа на пътуването.</string>
     <string name="new_segment_started_m">Започнат запис на нов сегмент от трасето.</string>
-    <string name="lock_screen_description">Включва или изключва сензорния екран, за да предотврати случайни докосвания</string>
+    <string name="lock_screen_description">Включване или изключване на екрана, за да бъдат предотвратени нежелани докосвания</string>
     <string name="quick_action_save_recorded_trip_and_continue_summary">Бутон за запазване на текущото записано пътуване като GPX файл и продължаване на записа на нова следа без прекъсване.</string>
     <string name="obd_fuel_type_methanol">Метанол</string>
     <string name="obd_fuel_type_gasoline">Бензин</string>
@@ -4459,4 +4459,11 @@
     <string name="obd_battery_voltage_desc">Показва напрежението в акумулатора</string>
     <string name="obd_air_intake_temp_desc">Показва температурата на постъпвщия през въздушната клапа въздух.</string>
     <string name="preview_next_turn">Преглед следващ завой</string>
+    <string name="connect_new_scanner">Свързване на нов скенер</string>
+    <string name="av_audio_sample_rate">Честота на аудио дискретизация</string>
+    <string name="av_audio_sample_rate_descr">Избор на честота на аудио дискретизация.</string>
+    <string name="auto_zoom_3d_angle">Ъгъл при триизмерно увеличаване</string>
+    <string name="lock_screen">Заключване на екрана</string>
+    <string name="screen_is_locked_by_action_button">Екранът е заключен. Докоснете бутона, за да го отключите.</string>
+    <string name="screen_is_unlocked">Екранът е отключен.</string>
 </resources>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
@@ -5750,14 +5750,19 @@
     <string name="connect_obd_instructions_title">OsmAnd ebligas konekti per Bludento al skaniloj OBD-II.</string>
     <string name="obd_vehicle_info">Informoj pri veturilo</string>
     <string name="shared_string_bluetooth">Bludento</string>
-    <string name="connect_obd_instructions_step4">4. Frapetu “Konekti” kaj elektu vian skanilon el la listo.</string>
+    <string name="connect_obd_instructions_step4">Premu la butonon “%1$s” kaj elektu vian skanilon el la listo.</string>
     <string name="liter_per_hour">l/h</string>
     <string name="obd_fuel_left_liters">Resta brulaĵo (litroj)</string>
     <string name="connect_obd_instructions_step">1. Konektu la skanilon al konektilo OBD-II de via veturilo.\n\n2. Ekfunkciu motoron.\n\n3. Aktivigu Bludenton ĉe via aparato.\n\n4. Frapetu “%1$s” kaj elektu vian skanilon el la listo.</string>
     <string name="quick_action_showhide_osm_edits_descr">Butono por montri/kaŝi lokajn OSM-redaktojn sur la mapo.</string>
-    <string name="connect_obd_instructions_step1">1. Konektu la skanilon al konektilo OBD-II de via veturilo.</string>
+    <string name="connect_obd_instructions_step1">Konektu la skanilon al konektilo OBD-II de via veturilo.</string>
     <string name="obd_how_to_connect">Kiel konekti:</string>
-    <string name="connect_obd_instructions_step2">2. Ekfunkciu motoron.</string>
-    <string name="connect_obd_instructions_step3">3. Aktivigu Bludenton ĉe via aparato.</string>
+    <string name="connect_obd_instructions_step2">Ekfunkciu motoron.</string>
+    <string name="connect_obd_instructions_step3">Aktivigu Bludenton ĉe via aparato.</string>
     <string name="obd_throttle_position_desc">Montras malfermecon de brulaĵ-valvo en la korpo de brulaĵ-valvo.</string>
+    <string name="auto_zoom_3d_angle">Angulo de aŭtomata skalado</string>
+    <string name="av_audio_sample_rate">Sona specimenrapido</string>
+    <string name="av_audio_sample_rate_descr">Elekti specimen-rapidon (samplorapidon) de sondosiero.</string>
+    <string name="preview_next_turn">Antaŭvidi sekvan kurbiĝon</string>
+    <string name="connect_new_scanner">Konekti novan skanilon</string>
 </resources>