new plugin for showing AIS positions of vessels

OsmAnd-java/build.gradle

@@ -6,6 +6,10 @@ configurations {
 	android
 }
 
+test {
+    exclude '**/*'
+}
+
 tasks.withType(JavaCompile).configureEach {
 	sourceCompatibility = "17"
 	targetCompatibility = "17"

OsmAnd/build.gradle

@@ -39,18 +39,13 @@ android {
 	compileOptions {
 		sourceCompatibility = JavaVersion.VERSION_17
 		targetCompatibility = JavaVersion.VERSION_17
-		coreLibraryDesugaringEnabled true
-	}
-
-	kotlinOptions {
-		jvmTarget = "17"
 	}
 
 	defaultConfig {
 		minSdkVersion 24
-		versionCode 5000
+		versionCode 4900
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
-		versionName "5.0.0"
+		versionName "4.9.0"
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
 		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
 	}
@@ -268,5 +263,6 @@ dependencies {
 
 	amazonFreeImplementation "com.amazon:in-app-purchasing:2.0.76@jar"
 	amazonFullImplementation "com.amazon:in-app-purchasing:2.0.76@jar"
-	coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
+
+	implementation 'net.sf.marineapi:marineapi:0.12.0'
 }

OsmAnd/res/layout/fragment_colors_palette.xml

@@ -0,0 +1,37 @@
+<?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/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<include layout="@layout/global_preference_toolbar" />
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:fillViewport="true">
+
+		<net.osmand.plus.widgets.FlowLayout
+			android:id="@+id/colors_palette"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginVertical="@dimen/content_padding"
+			android:layout_marginHorizontal="@dimen/content_padding_round_medium"
+			app:horizontalItemsSpacing="@dimen/content_padding_medium"
+			app:verticalItemsSpacing="@dimen/content_padding_small" />
+
+	</ScrollView>
+
+</LinearLayout>

OsmAnd/res/layout/fragment_tripltek_promo.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:clickable="true"
+	android:focusable="true"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/list_background_color">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/toolbar_height" />
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<FrameLayout
+		android:id="@+id/container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<ScrollView
+			android:id="@+id/scroll_view"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:overScrollMode="never"
+			android:scrollbars="none">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?attr/list_background_color"
+				android:orientation="vertical">
+
+				<androidx.appcompat.widget.AppCompatImageView
+					android:layout_width="@dimen/setting_list_item_large_height"
+					android:layout_height="@dimen/setting_list_item_large_height"
+					android:layout_gravity="center_horizontal"
+					android:layout_marginBottom="@dimen/horizontal_divider_height"
+					android:src="@drawable/ic_action_gift_colored" />
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/title"
+					style="@style/TitleStyle.Medium"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_margin="@dimen/content_padding"
+					android:gravity="center"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/default_title_line_height"
+					tools:text="@string/tripltek_promo" />
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/description"
+					style="@style/TitleStyle"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginHorizontal="@dimen/content_padding"
+					android:layout_marginBottom="@dimen/content_padding"
+					android:gravity="center"
+					android:textColor="?android:textColorPrimary"
+					tools:text="@string/tripltek_promo_description" />
+
+				<LinearLayout
+					android:id="@+id/items_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical"
+					android:paddingBottom="@dimen/content_padding_extra_large"
+					tools:listitem="@layout/purchase_dialog_list_item" />
+
+			</LinearLayout>
+
+		</ScrollView>
+
+		<include layout="@layout/control_bottom_buttons" />
+
+	</FrameLayout>
+
+</LinearLayout>

OsmAnd/res/layout/list_item_keybinding_action.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/list_background_color"
+	android:gravity="center_vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:id="@+id/selectable_list_item"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="1"
+			android:paddingHorizontal="@dimen/content_padding"
+			android:orientation="horizontal">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
+				style="@style/TitleStyle"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginEnd="@dimen/content_padding"
+				android:layout_weight="1"
+				android:ellipsize="end"
+				android:textColor="?android:textColorPrimary"
+				tools:text="Example of title" />
+
+			<include layout="@layout/item_key_assignment_button" />
+
+		</LinearLayout>
+
+		<View
+			android:id="@+id/bottom_divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginStart="@dimen/content_padding"
+			android:background="?attr/divider_color_basic" />
+
+	</LinearLayout>
+
+</FrameLayout>

OsmAnd/res/values/fonts.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="font_roboto_regular">ui-fonts/Roboto-Regular.ttf</string>
+	<string name="font_roboto_medium">ui-fonts/Roboto-Medium.ttf</string>
+</resources>

OsmAnd/res/values/strings.xml

@@ -274,7 +274,6 @@ You will be able to pair this scanner again at any time.</string>
 	<string name="quick_action_routes_summary">A toggle to show or hide %1$s on the map.</string>
 	<string name="hugerock_promo">Hugerock Promo for %1$s months</string>
 	<string name="hugerock_promo_description">Free access to features including unlimited map downloads, 3D relief etc. for %1$s month</string>
-	<string name="driving_region_uk">UK and similar</string>
 	<string name="driving_region_india">India</string>
 	<string name="auto_25_chars_route_kl">Keep left</string>
 	<string name="auto_25_chars_route_kr">Keep right</string>
@@ -302,7 +301,6 @@ You will be able to pair this scanner again at any time.</string>
     <string name="quick_action_terrain_color_scheme">Terrain color scheme</string>
     <string name="quick_action_directions_from">Start point</string>
     <string name="quick_action_destination">Destination</string>
-    <string name="quick_action_remove_next_destination">Next destination point</string>
     <string name="quick_action_to_my_location">To My Location</string>
     <string name="quick_action_move_map_left">Map to the left</string>
     <string name="quick_action_move_map_right">Map to the right</string>
@@ -318,9 +316,6 @@ You will be able to pair this scanner again at any time.</string>
     <string name="shared_string_simulate">Simulate</string>
     <string name="quick_action_display_position_in_center">Display position always in center</string>
     <string name="quick_action_terrain">Terrain colorization type</string>
-    <string name="quick_action_map_underlay">Underlay</string>
-    <string name="quick_action_map_overlay">Overlay</string>
-    <string name="quick_action_map_style">Map style</string>
     <string name="quick_action_first_intermediate">First intermediate</string>
     <string name="quick_action_audio_note">Audio note</string>
     <string name="quick_action_video_note">Video note</string>
@@ -1130,6 +1125,28 @@ You need to activate the sensor so OsmAnd can find it.</string>
     <string name="map_settings_weather_cloud">Cloud</string>
     <string name="map_settings_weather_precip">Precipitation</string>
     <string name="measurement_units">Measurement units</string>
+    <string name="ais_address_settings">IP address settings</string>
+    <string name="ais_address_settings_description">Choose NMEA protocol (UDP/TCP) and define addresses</string>
+    <string name="ais_nmea_protocol">Protocol for NMEA data reception</string>
+    <string name="ais_nmea_protocol_description">Choose protocol for NMEA data reception</string>
+    <string name="ais_address_nmea_server">IP address of NMEA data source</string>
+    <string name="ais_address_nmea_server_description">Define IP address of the NMEA data source (if TCP is used)</string>
+    <string name="ais_port_nmea_server">TCP port of NMEA data source</string>
+    <string name="ais_port_nmea_server_description">Define TCP port number of the NMEA data source</string>
+    <string name="ais_port_nmea_local">UDP port of local NMEA data receiver</string>
+    <string name="ais_port_nmea_local_description">Define UPD port where OsmAnd receives NMEA data</string>
+    <string name="ais_object_lost_timeouts">Timeout settings for AIS signal reception</string>
+    <string name="ais_object_lost_timeouts_description">Set timeout values to identify lost AIS objects if no signal was received for a specific time.</string>
+    <string name="ais_object_lost_timeout">Timeout for visibility when object is lost</string>
+    <string name="ais_object_lost_timeout_description">Set Timeout for visibility of AIS objects: After this time without signal reception, the AIS object will be removed from screen.</string>
+    <string name="ais_ship_lost_timeout">Timeout for ship visibility when no signal received</string>
+    <string name="ais_ship_lost_timeout_description">Set timeout for ship visibility: After this time without signal reception, the ship symbol will change its state on screen: It will be crossed out.</string>
+    <string name="ais_cpa_settings">Settings related to CPA</string>
+    <string name="ais_cpa_settings_description">These values define the presentation of AIS objects that may come too close to the own position.</string>
+    <string name="ais_cpa_warning_time">Warning time to reach the Closest Point of Approach (CPA)</string>
+    <string name="ais_cpa_warning_time_description">If the TCPA (time to reach the CPA with another vessel) is less than this value, the vessel is marked with red color.</string>
+    <string name="ais_cpa_warning_distance">Warning distance for the Closes Point of Approach (CPA)</string>
+    <string name="ais_cpa_warning_distance_description">Vessels are marked with red color if the CPA is less than this value and the CPA is reached in the near future (see setting "Warning time to reach the CPA").</string>
     <string name="shared_string_weather">Weather</string>
     <string name="explore_weather_forecast">Explore Weather forecast.</string>
     <string name="shared_string_contours">Contours</string>
@@ -2214,6 +2231,7 @@ You need to activate the sensor so OsmAnd can find it.</string>
     <string name="follow_track">Follow track</string>
     <string name="marker_save_as_track">Save as track file</string>
     <string name="map_widget_monitoring">Trip recording</string>
+    <string name="quick_action_add_gpx">Add track waypoint</string>
     <string name="context_menu_item_add_waypoint">Add track waypoint</string>
     <string name="empty_state_my_tracks_desc">Import or record track files</string>
     <string name="empty_state_my_tracks">Add track files</string>
@@ -2268,6 +2286,7 @@ You need to activate the sensor so OsmAnd can find it.</string>
     <string name="please_provide_point_name_error">Please provide a name for the point</string>
     <string name="use_volume_buttons_as_zoom">Volume buttons as zoom</string>
     <string name="use_volume_buttons_as_zoom_descr">Control the map-zoom level using the volume buttons on the device.</string>
+    <string name="quick_action_remove_next_destination">Delete next destination point</string>
     <string name="app_mode_inline_skates">Inline skates</string>
     <string name="speed_cameras_removed_descr">This device doesn\'t have speed cameras.</string>
     <string name="shared_string_uninstall_and_restart">Uninstall and Restart</string>
@@ -3474,6 +3493,9 @@ You need to activate the sensor so OsmAnd can find it.</string>
     <string name="quick_action_auto_zoom_desc">Button to turn speed-controlled auto-zooming on or off.</string>
     <string name="quick_action_auto_zoom_on">Turn on auto-zooming</string>
     <string name="quick_action_auto_zoom_off">Turn off auto-zooming</string>
+    <string name="quick_action_add_destination">Set destination</string>
+    <string name="quick_action_replace_destination">Replace destination</string>
+    <string name="quick_action_add_first_intermediate">Add first intermediate</string>
     <string name="quick_action_add_destination_desc">A button to make the screen center the route destination, a previously selected destination would become the last intermediate destination.</string>
     <string name="quick_action_directions_from_desc">A button to make the screen center the point of departure. Will then ask to set destination or trigger the route calculation.</string>
     <string name="quick_action_replace_destination_desc">A button to make the screen center the new route destination, replacing the previously selected destination (if any).</string>
@@ -4223,6 +4245,9 @@ Download tile maps directly, or copy them as SQLite database files to OsmAnd\'s
     <string name="osmand_parking_plugin_description">Mark where your car is parked, and notify your calendar when the parking meter will expire. To place the marker, choose a place on the map, go to \"Actions\", and tap \"Add parking\".</string>
     <string name="osmand_distance_planning_plugin_name">Distance calculator and planning tool</string>
     <string name="osmand_distance_planning_plugin_description">Create paths by tapping the map, or by using or modifying existing GPX files, to plan a trip and measure the distance between points. The result can be saved as a GPX file to use later for guidance.</string>
+    <string name="plugin_aistracker_name">AIS vessel tracker</string>
+    <string name="plugin_aistracker_description">Display AIS positions and information about surrounding vessels. The AIS data is received via network from an external AIS receiver.</string>
+    <string name="plugin_aistracker_disclaimer">DISCLAIMER\n\nThis plugin is a hobby project and not designed for reliability and correctness. DO NOT rely upon this software in any way including for navigation and/or safety of life.</string>
     <string name="shared_string_accessibility">Accessibility</string>
     <string name="osmand_accessibility_description">Makes the device\'s accessibility features directly available in OsmAnd. This facilitates e.g. adjusting the speech rate for text-to-speech voices, configuring D-pad navigation, using a trackball for zoom control, or text-to-speech feedback, for example to auto-announce your position.</string>
     <string name="osm_editing_plugin_name">OpenStreetMap editing</string>
@@ -4616,6 +4641,7 @@ Download tile maps directly, or copy them as SQLite database files to OsmAnd\'s
     <string name="driving_region_us">United States</string>
     <string name="driving_region_canada">Canada</string>
     <string name="driving_region_europe_asia">Europe, Asia, Latin America, and similar</string>
+    <string name="driving_region_uk">UK, India, and similar</string>
     <string name="driving_region_australia">Australia</string>
     <string name="speak_title">Announce…</string>
     <string name="speak_descr">Set up announcement of street names, traffic warnings (forced stops, speed bumps), speed camera warnings, and speed limits.</string>
@@ -5859,12 +5885,21 @@ Download tile maps directly, or copy them as SQLite database files to OsmAnd\'s
     <string name="configure_screen_quick_action">Quick action</string>
     <string name="quick_action_item_action">Action %d</string>
     <string name="quick_action_item_screen">Screen %d</string>
+    <string name="quick_action_add_marker">Add map marker</string>
+    <string name="quick_action_add_poi">Add POI</string>
+    <string name="quick_action_map_style">Change map style</string>
     <string name="quick_action_map_style_switch">Map style changed to \"%s\".</string>
+    <string name="quick_action_take_audio_note">New audio note</string>
+    <string name="quick_action_take_video_note">New video note</string>
+    <string name="quick_action_take_photo_note">New photo note</string>
+    <string name="quick_action_add_osm_bug">Add OSM Note</string>
     <string name="quick_action_navigation_voice">Voice on/off</string>
     <string name="quick_action_navigation_voice_off">Unmute Voice</string>
     <string name="quick_action_navigation_voice_on">Mute Voice</string>
+    <string name="quick_action_add_parking">Add parking place</string>
     <string name="quick_action_new_action">Add action</string>
     <string name="quick_action_edit_action">Edit action</string>
+    <string name="quick_action_add_favorite">Add Favorite</string>
     <string name="dialog_add_action_title">Add action</string>
     <string name="quick_actions_delete">Delete action</string>
     <string name="quick_actions_delete_text">Delete the \"%s\" action?</string>
@@ -5906,12 +5941,15 @@ Download tile maps directly, or copy them as SQLite database files to OsmAnd\'s
     <string name="quick_action_map_style_action">Add a map style</string>
     <string name="quick_action_empty_param_error">Fill out all parameters</string>
     <string name="quick_action_map_styles">Map styles</string>
+    <string name="quick_action_map_overlay">Change map overlay</string>
     <string name="quick_action_map_overlay_title">Map overlays</string>
     <string name="quick_action_map_overlay_action">Add overlay</string>
     <string name="quick_action_map_overlay_switch">Map overlay changed to \"%s\".</string>
     <string name="quick_action_map_underlay_switch">Map underlay changed to \"%s\".</string>
+    <string name="quick_action_map_underlay">Change map underlay</string>
     <string name="quick_action_map_underlay_title">Map underlays</string>
     <string name="quick_action_map_underlay_action">Add underlay</string>
+    <string name="quick_action_map_source">Change map source</string>
     <string name="quick_action_map_source_title">Map sources</string>
     <string name="quick_action_map_source_action">Add map source</string>
     <string name="quick_action_map_source_switch">Map source changed to \"%s\".</string>