[Android] Use ExtendedFab, download icon for download maps screen fab

Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz>
[ci] Use self-hosted runner for DCO
2026-01-08 13:27:57 +00:00 · 2025-08-22 20:06:49 +01:00 · 2025-08-22 15:58:45 +02:00 · 2025-08-22 19:24:41 +07:00 · 2025-08-22 19:23:45 +07:00 · 2025-08-22 19:22:06 +07:00
474 changed files with 829 additions and 798 deletions
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -3,6 +3,6 @@ on: [pull_request]

 jobs:
  check:
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-latest
    steps:
      - uses: https://github.com/KineticCafe/actions-dco@v1
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ Makefile.Release
 object_script.*.Debug
 object_script.*.Release
 compile_commands.json
-*.local.*

 stxxl.errlog
 stxxl.log
--- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
@@ -17,12 +17,12 @@ import app.organicmaps.sdk.downloader.UpdateInfo;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;

 class BottomPanel
 {
  private final DownloaderFragment mFragment;
-  private final FloatingActionButton mFab;
+  private final ExtendedFloatingActionButton mFab;
  private final MaterialButton mButton;

  private final View.OnClickListener mDownloadListener = new View.OnClickListener() {
--- a/android/app/src/main/res/layout/fragment_downloader.xml
+++ b/android/app/src/main/res/layout/fragment_downloader.xml
@@ -24,7 +24,7 @@
    android:layout_below="@id/toolbar"
    android:layout_above="@id/action"/>

-  <com.google.android.material.floatingactionbutton.FloatingActionButton
+  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
    android:id="@+id/fab"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
@@ -33,8 +33,10 @@
    android:layout_alignParentEnd="true"
    android:layout_marginEnd="@dimen/margin_base"
    android:layout_marginBottom="@dimen/margin_base"
-    app:tint="?android:textColorPrimaryInverse"
-    app:srcCompat="@drawable/ic_plus"/>
+    android:text="@string/download_maps"
+    android:textColor="?accentButtonTextColor"
+    app:iconTint="?android:textColorPrimaryInverse"
+    app:icon="@drawable/ic_download"/>

  <app.organicmaps.widget.PlaceholderView
    android:id="@+id/placeholder"
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
@@ -29,7 +29,7 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeInitFramework(
 {
  if (!g_framework)
  {
-    g_framework = std::make_unique<android::Framework>([onComplete = jni::make_global_ref(onComplete)]()
+    g_framework = std::make_unique<android::Framework>([onComplete = jni::make_global_ref_safe(onComplete)]()
    {
      JNIEnv * env = jni::GetEnv();
      jmethodID const methodId = jni::GetMethodID(env, *onComplete, "run", "()V");
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
@@ -98,18 +98,26 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *, void *)

 namespace jni
 {
-JNIEnv * GetEnv()
+JNIEnv * GetEnvSafe()
 {
  JNIEnv * env;
  auto const res = g_jvm->GetEnv((void **)&env, JNI_VERSION_1_6);
  if (res != JNI_OK)
  {
    LOG(LERROR, ("Can't get JNIEnv. Is the thread attached to JVM?", res));
-    MYTHROW(RootException, ("Can't get JNIEnv. Is the thread attached to JVM?", res));
+    env = nullptr;
  }
  return env;
 }

+JNIEnv * GetEnv()
+{
+  JNIEnv * env = GetEnvSafe();
+  if (env == nullptr)
+    MYTHROW(RootException, ("Can't get JNIEnv. Is the thread attached to JVM?"));
+  return env;
+}
+
 JavaVM * GetJVM()
 {
  ASSERT(g_jvm, ("JVM is not initialized"));
@@ -218,6 +226,20 @@ std::shared_ptr<jobject> make_global_ref(jobject obj)
  });
 }

+// https://github.com/organicmaps/organicmaps/issues/9397
+/// @todo There are no other ideas, let's try a safe version with a forever global ref ..
+std::shared_ptr<jobject> make_global_ref_safe(jobject obj)
+{
+  jobject * ref = new jobject(GetEnv()->NewGlobalRef(obj));
+  return std::shared_ptr<jobject>(ref, [](jobject * ref)
+  {
+    JNIEnv * env = GetEnvSafe();
+    if (env)
+      env->DeleteGlobalRef(*ref);
+    delete ref;
+  });
+}
+
 std::string ToNativeString(JNIEnv * env, jthrowable const & e)
 {
  jni::TScopedLocalClassRef logClassRef(env, env->FindClass("android/util/Log"));
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
@@ -66,6 +66,8 @@ bool HandleJavaException(JNIEnv * env);
 base::LogLevel GetLogLevelForException(JNIEnv * env, jthrowable const & e);

 std::shared_ptr<jobject> make_global_ref(jobject obj);
+std::shared_ptr<jobject> make_global_ref_safe(jobject obj);
+
 using TScopedLocalRef = ScopedLocalRef<jobject>;
 using TScopedLocalClassRef = ScopedLocalRef<jclass>;
 using TScopedLocalObjectArrayRef = ScopedLocalRef<jobjectArray>;
--- a/data/styles/default/dark/6plus/coloredmark-bg-l.png
+++ b/data/styles/default/dark/6plus/coloredmark-bg-l.png
--- a/data/styles/default/dark/6plus/coloredmark-bg-s.png
+++ b/data/styles/default/dark/6plus/coloredmark-bg-s.png
--- a/data/styles/default/dark/6plus/coloredmark-default-l.png
+++ b/data/styles/default/dark/6plus/coloredmark-default-l.png
--- a/data/styles/default/dark/6plus/coloredmark-default-s.png
+++ b/data/styles/default/dark/6plus/coloredmark-default-s.png
--- a/data/styles/default/dark/6plus/compass-image.png
+++ b/data/styles/default/dark/6plus/compass-image.png
--- a/data/styles/default/dark/6plus/cross_geoposition.png
+++ b/data/styles/default/dark/6plus/cross_geoposition.png
--- a/data/styles/default/dark/6plus/current-position.png
+++ b/data/styles/default/dark/6plus/current-position.png
--- a/data/styles/default/dark/6plus/ferry.png
+++ b/data/styles/default/dark/6plus/ferry.png
--- a/data/styles/default/dark/6plus/infosign.png
+++ b/data/styles/default/dark/6plus/infosign.png
--- a/data/styles/default/dark/6plus/non-found-search-result.png
+++ b/data/styles/default/dark/6plus/non-found-search-result.png
--- a/data/styles/default/dark/6plus/paid_road.png
+++ b/data/styles/default/dark/6plus/paid_road.png
--- a/data/styles/default/dark/6plus/route-arrow.png
+++ b/data/styles/default/dark/6plus/route-arrow.png
--- a/data/styles/default/dark/6plus/route-point-finish.png
+++ b/data/styles/default/dark/6plus/route-point-finish.png
--- a/data/styles/default/dark/6plus/route-point-start.png
+++ b/data/styles/default/dark/6plus/route-point-start.png
--- a/data/styles/default/dark/6plus/search-result.png
+++ b/data/styles/default/dark/6plus/search-result.png
--- a/data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png
+++ b/data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png
--- a/data/styles/default/dark/6plus/shield-us-hw-thin.png
+++ b/data/styles/default/dark/6plus/shield-us-hw-thin.png
--- a/data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png
+++ b/data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png
--- a/data/styles/default/dark/6plus/shield-us-hw-wide.png
+++ b/data/styles/default/dark/6plus/shield-us-hw-wide.png
--- a/data/styles/default/dark/6plus/shield-us-i-thin-scaled.png
+++ b/data/styles/default/dark/6plus/shield-us-i-thin-scaled.png
--- a/data/styles/default/dark/6plus/shield-us-i-thin.png
+++ b/data/styles/default/dark/6plus/shield-us-i-thin.png
--- a/data/styles/default/dark/6plus/shield-us-i-wide-scaled.png
+++ b/data/styles/default/dark/6plus/shield-us-i-wide-scaled.png
--- a/data/styles/default/dark/6plus/shield-us-i-wide.png
+++ b/data/styles/default/dark/6plus/shield-us-i-wide.png
--- a/data/styles/default/dark/6plus/track_marker_deselected.png
+++ b/data/styles/default/dark/6plus/track_marker_deselected.png
--- a/data/styles/default/dark/6plus/track_marker_selected.png
+++ b/data/styles/default/dark/6plus/track_marker_selected.png
--- a/data/styles/default/dark/6plus/unpaved_road.png
+++ b/data/styles/default/dark/6plus/unpaved_road.png
--- a/data/styles/default/dark/hdpi-ad/keep.png
+++ b/data/styles/default/dark/hdpi-ad/keep.png
--- a/data/styles/default/dark/hdpi/coloredmark-bg-l.png
+++ b/data/styles/default/dark/hdpi/coloredmark-bg-l.png
--- a/data/styles/default/dark/hdpi/coloredmark-bg-s.png
+++ b/data/styles/default/dark/hdpi/coloredmark-bg-s.png
--- a/data/styles/default/dark/hdpi/coloredmark-default-l.png
+++ b/data/styles/default/dark/hdpi/coloredmark-default-l.png
--- a/data/styles/default/dark/hdpi/coloredmark-default-s.png
+++ b/data/styles/default/dark/hdpi/coloredmark-default-s.png
--- a/data/styles/default/dark/hdpi/compass-image.png
+++ b/data/styles/default/dark/hdpi/compass-image.png
--- a/data/styles/default/dark/hdpi/cross_geoposition.png
+++ b/data/styles/default/dark/hdpi/cross_geoposition.png
--- a/data/styles/default/dark/hdpi/current-position.png
+++ b/data/styles/default/dark/hdpi/current-position.png
--- a/data/styles/default/dark/hdpi/ferry.png
+++ b/data/styles/default/dark/hdpi/ferry.png
--- a/data/styles/default/dark/hdpi/infosign.png
+++ b/data/styles/default/dark/hdpi/infosign.png
--- a/data/styles/default/dark/hdpi/non-found-search-result.png
+++ b/data/styles/default/dark/hdpi/non-found-search-result.png
--- a/data/styles/default/dark/hdpi/paid_road.png
+++ b/data/styles/default/dark/hdpi/paid_road.png
--- a/data/styles/default/dark/hdpi/route-arrow.png
+++ b/data/styles/default/dark/hdpi/route-arrow.png
--- a/data/styles/default/dark/hdpi/route-point-finish.png
+++ b/data/styles/default/dark/hdpi/route-point-finish.png
--- a/data/styles/default/dark/hdpi/route-point-start.png
+++ b/data/styles/default/dark/hdpi/route-point-start.png
--- a/data/styles/default/dark/hdpi/search-result.png
+++ b/data/styles/default/dark/hdpi/search-result.png
--- a/data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png
+++ b/data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png
--- a/data/styles/default/dark/hdpi/shield-us-hw-thin.png
+++ b/data/styles/default/dark/hdpi/shield-us-hw-thin.png
--- a/data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png
+++ b/data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png
--- a/data/styles/default/dark/hdpi/shield-us-hw-wide.png
+++ b/data/styles/default/dark/hdpi/shield-us-hw-wide.png
--- a/data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png
+++ b/data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png
--- a/data/styles/default/dark/hdpi/shield-us-i-thin.png
+++ b/data/styles/default/dark/hdpi/shield-us-i-thin.png
--- a/data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png
+++ b/data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png
--- a/data/styles/default/dark/hdpi/shield-us-i-wide.png
+++ b/data/styles/default/dark/hdpi/shield-us-i-wide.png
--- a/data/styles/default/dark/hdpi/track_marker_deselected.png
+++ b/data/styles/default/dark/hdpi/track_marker_deselected.png
--- a/data/styles/default/dark/hdpi/track_marker_selected.png
+++ b/data/styles/default/dark/hdpi/track_marker_selected.png
--- a/data/styles/default/dark/hdpi/unpaved_road.png
+++ b/data/styles/default/dark/hdpi/unpaved_road.png
--- a/data/styles/default/dark/mdpi-ad/keep.png
+++ b/data/styles/default/dark/mdpi-ad/keep.png
--- a/data/styles/default/dark/mdpi/coloredmark-bg-l.png
+++ b/data/styles/default/dark/mdpi/coloredmark-bg-l.png
--- a/data/styles/default/dark/mdpi/coloredmark-bg-s.png
+++ b/data/styles/default/dark/mdpi/coloredmark-bg-s.png
--- a/data/styles/default/dark/mdpi/coloredmark-default-l.png
+++ b/data/styles/default/dark/mdpi/coloredmark-default-l.png
--- a/data/styles/default/dark/mdpi/coloredmark-default-s.png
+++ b/data/styles/default/dark/mdpi/coloredmark-default-s.png
--- a/data/styles/default/dark/mdpi/compass-image.png
+++ b/data/styles/default/dark/mdpi/compass-image.png
--- a/data/styles/default/dark/mdpi/cross_geoposition.png
+++ b/data/styles/default/dark/mdpi/cross_geoposition.png
--- a/data/styles/default/dark/mdpi/current-position.png
+++ b/data/styles/default/dark/mdpi/current-position.png
--- a/data/styles/default/dark/mdpi/ferry.png
+++ b/data/styles/default/dark/mdpi/ferry.png
--- a/data/styles/default/dark/mdpi/infosign.png
+++ b/data/styles/default/dark/mdpi/infosign.png
--- a/data/styles/default/dark/mdpi/non-found-search-result.png
+++ b/data/styles/default/dark/mdpi/non-found-search-result.png
--- a/data/styles/default/dark/mdpi/paid_road.png
+++ b/data/styles/default/dark/mdpi/paid_road.png
--- a/data/styles/default/dark/mdpi/route-arrow.png
+++ b/data/styles/default/dark/mdpi/route-arrow.png
--- a/data/styles/default/dark/mdpi/route-point-finish.png
+++ b/data/styles/default/dark/mdpi/route-point-finish.png
--- a/data/styles/default/dark/mdpi/route-point-start.png
+++ b/data/styles/default/dark/mdpi/route-point-start.png
--- a/data/styles/default/dark/mdpi/search-result.png
+++ b/data/styles/default/dark/mdpi/search-result.png
--- a/data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png
+++ b/data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png
--- a/data/styles/default/dark/mdpi/shield-us-hw-thin.png
+++ b/data/styles/default/dark/mdpi/shield-us-hw-thin.png
--- a/data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png
+++ b/data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png
--- a/data/styles/default/dark/mdpi/shield-us-hw-wide.png
+++ b/data/styles/default/dark/mdpi/shield-us-hw-wide.png
--- a/data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png
+++ b/data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png
--- a/data/styles/default/dark/mdpi/shield-us-i-thin.png
+++ b/data/styles/default/dark/mdpi/shield-us-i-thin.png
--- a/data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png
+++ b/data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png
--- a/data/styles/default/dark/mdpi/shield-us-i-wide.png
+++ b/data/styles/default/dark/mdpi/shield-us-i-wide.png
--- a/data/styles/default/dark/mdpi/track_marker_deselected.png
+++ b/data/styles/default/dark/mdpi/track_marker_deselected.png
--- a/data/styles/default/dark/mdpi/track_marker_selected.png
+++ b/data/styles/default/dark/mdpi/track_marker_selected.png
--- a/data/styles/default/dark/mdpi/unpaved_road.png
+++ b/data/styles/default/dark/mdpi/unpaved_road.png
--- a/data/styles/default/dark/symbols/coloredmark-bg-l.svg
+++ b/data/styles/default/dark/symbols/coloredmark-bg-l.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="28" version="1.1" viewBox="0 0 40 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="19.98" cy="13.98" r="12" fill="#d8d8d8"/>
+</svg>
--- a/data/styles/default/dark/symbols/coloredmark-bg-s.svg
+++ b/data/styles/default/dark/symbols/coloredmark-bg-s.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31" height="15" version="1.1" viewBox="0 0 31 15" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="15.5" cy="7.5" r="5.5" fill="#fff"/>
+</svg>
--- a/data/styles/default/dark/symbols/coloredmark-default-l.svg
+++ b/data/styles/default/dark/symbols/coloredmark-default-l.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="28" version="1.1" viewBox="0 0 40 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="20" cy="14" r="13" fill="none" stroke="#fff" stroke-width="2"/>
+</svg>
--- a/data/styles/default/dark/symbols/coloredmark-default-s.svg
+++ b/data/styles/default/dark/symbols/coloredmark-default-s.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31" height="15" version="1.1" viewBox="0 0 31 15" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="15.5" cy="7.5" r="6.5" fill="none" stroke="#fff" stroke-width="2"/>
+</svg>
--- a/data/styles/default/dark/symbols/compass.svg
+++ b/data/styles/default/dark/symbols/compass.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="40" version="1.1" viewBox="0 0 40 40" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20 1.9866a18.013 18.013 0 0 0-18.013 18.013 18.013 18.013 0 0 0 18.013 18.013 18.013 18.013 0 0 0 18.013-18.013 18.013 18.013 0 0 0-18.013-18.013zm-5.0402 18.013h3.0653c-1.42e-4 1.0908 0.88413 1.975 1.9749 1.9749 1.0908 1.41e-4 1.975-0.88413 1.9749-1.9749h3.0653l-5.0402 13.727z" fill="#3c3f44" opacity=".8"/>
+ <path d="m20 6.2729-5.0402 13.727h3.0653c-1.42e-4 -1.0908 0.88413-1.975 1.9749-1.9749 1.0908-1.42e-4 1.975 0.88413 1.9749 1.9749h3.0653z" fill="#c2352b"/>
+ <path d="m14.96 20 5.0402 13.727 5.0402-13.727m-3.0653 0c1.41e-4 1.0908-0.88413 1.975-1.9749 1.9749-1.0908 1.41e-4 -1.975-0.88413-1.9749-1.9749" fill="#7f8085" opacity=".69"/>
+</svg>
--- a/data/styles/default/dark/symbols/cross_geoposition.svg
+++ b/data/styles/default/dark/symbols/cross_geoposition.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="38" version="1.1" viewBox="0 0 38 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19 0a2 2 0 0 0-2 2v15h-15a2 2 0 0 0-2 2 2 2 0 0 0 2 2h15v15a2 2 0 0 0 2 2 2 2 0 0 0 2-2v-15h15a2 2 0 0 0 2-2 2 2 0 0 0-2-2h-15v-15a2 2 0 0 0-2-2z" fill="#000" opacity=".35"/>
+ <path d="m19 2v34" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m2 19h34" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
--- a/data/styles/default/dark/symbols/current-position.svg
+++ b/data/styles/default/dark/symbols/current-position.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="20" version="1.1" viewBox="0 0 20 20" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="10" cy="10" r="9.5" fill="#4bb9e6" stroke="#398cae"/>
+</svg>
--- a/data/styles/default/dark/symbols/infosign.svg
+++ b/data/styles/default/dark/symbols/infosign.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m21.328 26.672h-10.656l5.3281 5.3281z" fill="#fff"/>
+ <circle cx="16" cy="14.678" r="12.9" fill="#4bb9e6" stroke="#fff" stroke-width="1.8"/>
+ <circle cx="17.044" cy="9.4531" r="2" fill="#fff"/>
+ <path d="m13.2 21.639c-0.74683-1.2936 0.69865-4.3137 0.73895-4.5659 0.05859-0.36648 0.19758-0.78092 0.03175-1.1129-0.08142-0.16302-0.1064-0.28119-0.44623-0.31578s-0.72948-0.37292-0.57448-0.69542 0.9925-0.85746 1.9-1.025 2.1216-0.35165 2.7616 0.14826 0.12674 2.4886-0.14606 3.601-0.31324 1.2519-0.40097 1.5782c-0.08772 0.32637-0.1317 0.69472-0.0267 0.80472 0.17476 0.18308 1.2421 0.20553 1.2421 0.68774 0 0.94-3.0351 1.4781-3.6715 1.4818-0.63634 0.0037-0.9794 0.02192-1.4085-0.58683z" fill="#fff"/>
+</svg>
--- a/data/styles/default/dark/symbols/route-arrow.svg
+++ b/data/styles/default/dark/symbols/route-arrow.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="74" height="44" version="1.1" viewBox="0 0 74 44" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m43 42v-9h-42v-22h42v-9l29 20z" fill="#fff" stroke="#055fcd" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8"/>
+</svg>
--- a/data/styles/default/dark/symbols/route-point-finish.svg
+++ b/data/styles/default/dark/symbols/route-point-finish.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="38" version="1.1" viewBox="0 0 40 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.051392" y="-.045028" width="1.1028" height="1.0901" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.63706076"/>
+  </filter>
+ </defs>
+ <path d="m35.164 1.5803c-0.12292-0.00508-0.23005-0.00103-0.30664 0.00391-0.52686 0.033944-1.0338 0.21302-1.4648 0.51367-1.6134 1.1222-2.5018 1.4234-3.0742 1.4687-0.58405 0.046261-1.2411-0.10396-2.627-0.78321-1.1869-0.58171-2.4576-0.94149-3.748-1.0938-3.4378-0.40561-7.077 0.66202-9.9277 3.0215-0.47681-0.29919-1.0435-0.45995-1.6367-0.43945-0.25278 0.00861-0.50333 0.050314-0.74805 0.125l-1.4082 0.43164c-1.5254 0.46958-2.3784 2.0801-1.9121 3.6055 0.22846 0.74879 0.73886 1.3472 1.3906 1.6992l6.3477 17.65v8e-3c-0.0014 0.0078-0.0036 0.01738-0.0059 0.02734-0.03322 0.14953-0.19798 0.51965-0.41602 0.87109-0.42552 0.68591-0.67383 1.4882-0.67383 2.3535 0 2.4688 2.0214 4.4902 4.4902 4.4902s4.4902-2.0214 4.4902-4.4902c0-0.94666-0.29762-1.8391-0.80469-2.5742-0.19103-0.27695-0.91926-1.179-1.0547-1.3633-0.18057-0.24571-0.28418-0.45506-0.2793-0.44141-0.43149-1.2081-0.86514-2.4155-1.2988-3.623 0.40711-0.13286 0.79581-0.36187 1.1328-0.69336 0.86369-0.84844 1.7346-1.4668 2.4844-1.7422 0.39507-0.14509 0.74245-0.21491 1.1289-0.2168 0.38646-0.0019 0.82419 0.06463 1.3887 0.26953 3.0509 1.1075 6.372 1.1013 9.6992-0.56055 0.98315-0.48904 1.6047-1.4918 1.6035-2.5879v-13.035c0.003127-1.5646-1.2189-2.8305-2.7695-2.8945z" filter="url(#filter1)" opacity=".3"/>
+ <path d="m19.603 19.688-4.5433-12.62c3.1385-3.1728 7.8503-4.0076 11.358-2.2882 3.1372 1.5376 4.9933 1.6163 8.6237-0.90889l1e-6 13.041c-2.6179 1.3076-5.0292 1.3024-7.4253 0.43256-3.3809-1.2273-5.9472 0.31419-8.0134 2.3439z" fill="#fff"/>
+ <path d="m35.164 0.98047c-0.12292-0.005075-0.23005-0.001032-0.30664 0.003906-0.52686 0.033944-1.0338 0.21302-1.4648 0.51367-1.6134 1.1222-2.5018 1.4234-3.0742 1.4688-0.58405 0.046265-1.2411-0.10395-2.627-0.7832-1.1869-0.58171-2.4576-0.94149-3.748-1.0938-3.4378-0.40561-7.077 0.66202-9.9277 3.0215-0.47681-0.29919-1.0435-0.45995-1.6367-0.43945-0.25278 0.00861-0.50333 0.050314-0.74805 0.125l-1.4082 0.43164c-1.5254 0.46958-2.3784 2.0801-1.9121 3.6055 0.22846 0.74879 0.73886 1.3472 1.3906 1.6992l6.3477 17.65v8e-3c-0.0014 0.0078-0.0036 0.01738-0.0059 0.02734-0.03322 0.14953-0.19798 0.51965-0.41602 0.87109-0.42552 0.68591-0.67383 1.4882-0.67383 2.3535 0 2.4688 2.0214 4.4902 4.4902 4.4902s4.4902-2.0214 4.4902-4.4902c0-0.94666-0.29762-1.8391-0.80469-2.5742-0.19103-0.27695-0.91926-1.179-1.0547-1.3633-0.18057-0.24571-0.28418-0.45506-0.2793-0.44141-0.43149-1.2081-0.86514-2.4155-1.2988-3.623 0.40711-0.13286 0.79581-0.36187 1.1328-0.69336 0.86369-0.84844 1.7346-1.4668 2.4844-1.7422 0.39507-0.14509 0.74245-0.21491 1.1289-0.2168 0.38646-0.0019 0.82419 0.06463 1.3887 0.26953 3.0509 1.1075 6.372 1.1013 9.6992-0.56055 0.98315-0.48904 1.6047-1.4918 1.6035-2.5879v-13.035c0.003127-1.5646-1.2189-2.8305-2.7695-2.8945z" fill="#fff"/>
+ <path d="m12.443 5.5605c-0.08745 0.00298-0.17412 0.017429-0.25781 0.042969l-1.4062 0.43164c-0.5271 0.16226-0.82332 0.72063-0.66211 1.248 0.13692 0.44876 0.56742 0.742 1.0352 0.70508l6.7007 18.631c0.28934 0.80452-0.17658 1.7496-0.62087 2.4657-0.24593 0.39641-0.38843 0.86215-0.38843 1.3582 0 1.4241 1.1755 2.5996 2.5996 2.5996s2.5996-1.1755 2.5996-2.5996c0-0.5518-0.1733-1.0725-0.4693-1.5016-0.44089-0.63918-1.2934-1.5013-1.5579-2.2418-2.3038-6.4506-4.6403-12.878-6.9572-19.327 0.35026-0.25 0.5013-0.69605 0.375-1.1074-0.13295-0.4317-0.5388-0.72068-0.99024-0.70508zm22.535-2.6895a1.0001 1.0001 0 0 0-0.50781 0.17773c-1.7456 1.2142-2.9475 1.7191-4.0039 1.8027s-2.1028-0.23324-3.6074-0.9707c-0.98516-0.48285-2.0471-0.78551-3.1367-0.91406-3.2688-0.38567-6.8015 0.79683-9.373 3.3965a1.0001 1.0001 0 0 0-0.23047 1.043l4.543 12.619a1.0001 1.0001 0 0 0 1.6426 0.375c0.97573-0.95849 2.0287-1.7539 3.1562-2.168 1.1275-0.41408 2.3265-0.48934 3.8145 0.05078 2.5972 0.94278 5.3745 0.94118 8.2129-0.47656a1.0001 1.0001 0 0 0 0.55469-0.89648v-13.039a1.0001 1.0001 0 0 0-1.0645-1zm-12.424 2.041c0.31284-8.35e-4 0.62442 0.016044 0.93164 0.050781 0.12021 0.013592 0.24054 0.030022 0.35938 0.048828l0.85547 3.1836c0.65528 0.11347 1.33 0.33096 2.0234 0.68164 0.51761 0.26175 0.99506 0.47158 1.4395 0.63477l-0.73047-3.1953c1.0749 0.40441 2.1062 0.61526 3.1914 0.5293 0.30778-0.02438 0.61787-0.079449 0.93164-0.16211l0.26758 3.1445c0.78262-0.20575 1.4801-0.58403 2.2188-1.0039v4.1621c-0.60903 0.2756-1.2143 0.51379-1.8945 0.6543l0.25977 3.0703c-0.87307 0.2015-1.7194 0.24895-2.5645 0.15039l-0.75-3.2793c-0.48346-0.10035-1.0075-0.24278-1.582-0.43555-0.55238-0.18534-1.0808-0.31354-1.5859-0.39258l0.89258 3.3242c-1.355-0.28515-2.6292-0.18587-3.7695 0.18164l-1.1836-3.0918c-1.2554 0.48142-2.2225 1.2107-2.8984 1.7969l-1.6406-4.5586c0.86856-0.51588 1.834-1.0983 2.8867-1.5488l-1.2207-3.1895c1.1568-0.49526 2.374-0.75269 3.5625-0.75586zm6.5391 8.6699c1.2347 0.25629 2.2035 0.23441 3.0547 0.05859l-0.32422-3.8125c-0.99625 0.26191-2.1303 0.24535-3.6602-0.31641zm-4.3926-5.3867c-1.6252-0.28142-3.1297 0.080632-4.4883 0.66211l1.6504 4.3105h2e-3c1.1214-0.42976 2.4749-0.66218 4.0605-0.41406z"/>
+</svg>
--- a/data/styles/default/dark/symbols/route-point-start.svg
+++ b/data/styles/default/dark/symbols/route-point-start.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28" height="28" version="1.1" viewBox="0 0 28 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.17373" y="-.17373" width="1.3475" height="1.3475" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="1.5925"/>
+  </filter>
+ </defs>
+ <circle cx="14" cy="14" r="11" filter="url(#filter1)" opacity=".35"/>
+ <circle cx="14" cy="13" r="11" fill="#1e96f0" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
--- a/data/styles/default/dark/symbols/search-result-non-found.svg
+++ b/data/styles/default/dark/symbols/search-result-non-found.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="8" cy="8" r="6.5" fill="#f01e1e" stroke="#fff"/>
+</svg>
--- a/data/styles/default/dark/symbols/search-result.svg
+++ b/data/styles/default/dark/symbols/search-result.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="8" cy="8" r="6.5" fill="#4bb9e6" stroke="#fff"/>
+</svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harry Bond	6020ae0c7d	[Android] Use ExtendedFab, download icon for download maps screen fab Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz>	2025-08-22 20:06:49 +01:00
x7z4w	b26deb3bb2	[ci] Use self-hosted runner for DCO Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-08-22 15:58:45 +02:00
Viktor Govako	e8e94744f0	[map] Fixed invalid route saving. Signed-off-by: Viktor Govako <viktor.govako@gmail.com>	2025-08-22 19:24:41 +07:00
Viktor Govako	98689fbbf8	[android] Hack to suppress most frequent crash on startup. Signed-off-by: Viktor Govako <viktor.govako@gmail.com>	2025-08-22 19:23:45 +07:00
Kiryl Kaveryn	6cccd32166	[ios] Fix place page memory leaks Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 19:22:06 +07:00
David Martinez	1b04524d68	[routing] Log all turn notifications TTS Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>	2025-08-22 19:19:00 +07:00
Viktor Govako	1a6bbd756a	[routing] Simplify notifications on roundabout. Signed-off-by: Viktor Govako <viktor.govako@gmail.com>	2025-08-22 19:18:39 +07:00
Alexander Borsuk	836c39ff64	math::iround Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 19:03:38 +07:00
Alexander Borsuk	7781528263	Fixed C++20 deprecation warning for std::rel_ops::operator<= Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 19:03:16 +07:00
Alexander Borsuk	2aaf37e9ee	C++ warning fixes Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 19:03:04 +07:00
Alexander Borsuk	a28d5d15ce	[drape] Fixed signed/unsigned comparison warning by changing Resize interface to uint32_t Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 19:01:09 +07:00
Alexander Borsuk	55dc1e17e6	Correct is_space fix for Windows compatibility Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 18:59:37 +07:00
Andrei Shkrob	826b56cabc	[drape] Fix gui text alignment Signed-off-by: Andrei Shkrob <github@shkrob.dev>	2025-08-22 18:56:26 +07:00
Osyotr	9aa86fc703	Remove android include from public interface of VulkanContextFactory Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>	2025-08-22 18:44:08 +07:00
Yannik Bloscheck	4fe21ec6eb	[styles] Move light animal shelter icon to the correct location Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-08-22 12:36:42 +02:00
David Martinez	cb2181a80e	[styles] Convert remaining PNG icons to SVG Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>	2025-08-22 12:22:44 +02:00
David Martinez	eeb53eb0c4	[styles] Convert PNG US road shield icons to SVG Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>	2025-08-22 12:22:44 +02:00
David Martinez	887bc2c755	[styles] Convert PNG road warning icons to SVG Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>	2025-08-22 12:22:44 +02:00
Alexander Borsuk	29d60c9af0	[ios] Fix opening websites with percent encoding characters Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	e0c579634b	[ios] Fix track recording points updates subscribe/unsubscribe Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	266d62831f	[ios] Skip elevation info current point updates when the data is nil Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	d94351a8f1	[ios] Skip excessive elevation point updates When the user drags the elevation chart it runs chart's `selected point` update mechanism by calling the `onSelectedPointChanged` inside the `ChartView`'s ` func chartPreviewView(_ view: ChartPreviewView, didChangeMinX minX: Int, maxX: Int)`. This updates may be quite often (tens/hundreds per sec) and may cause the `on point update` callback recursion and overloads the `layoutSubviews` method on the _short track_ because the ChartView doesnt have mechanism to skip excessive updates when the parameters the same. This situation produces fail with internal error `(null) in -[NSISEngine _flushPendingRemovals] ().` The fix include: 1. skip updates when the current point isn't changed 2. remove layoutSubviews overloading (this method should recalc the layout immediately and should not be called too frequent, the `setNeedsLayout` allows to batch the layout updates and redraw the view on the next runtime cycle) Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	31970c87c4	[ios] Remove all activities on track recording start and stop Closes https://github.com/organicmaps/organicmaps/issues/11045 1. Remove all activities on track recording start and stop 2. Store the latest activity id in the UD to retrieve on launch after the app termination Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Alexander Borsuk	8e9dbe0248	[ios] Removed unused variables Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 11:58:01 +02:00
Alexander Borsuk	3b1551be52	[ios] Fixed wrong ObjC function name that caused warnings Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 11:58:01 +02:00
Alexander Borsuk	9d8e84ae5a	[mac][ios] Was: Silenced annoying deprecation warnings pastk: removed silencing, left only minor style etc changes Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	c4d5109d5b	[ios] Log the error when the exclude from icloud fails Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	59499333ff	[ios] Disable chartView user interaction for TR and when the chartData is nil Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	b5e0d10cb1	[ios] Set track recrording elevation chart min points to draw to 2 Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	55b85183d5	[map] Limit the track recording length to 2 points min Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	38406b149a	[ios] Skip zoom/pinch gesture when the lower/upper is out of bounds The previous check `if upper - lower < chartData.labels.count / 10 return` produces invalid state for drawing and fails when the upper == lower. Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	ef2dea20fe	[ios] Log error during the track editing instead of failing The bug is quite rare and happens when the user taps on the edit (pencil) button on the PlacePage. It seems like the tap happens during the PP data object reloading the and the object type has changed. It is better to avoid failing in such cases because we cannot prevent user interaction during the pp reloading. Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	aac80606f2	[ios] Disable user interaction on PP vc close Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	7765d97cda	[ios] Fix track recording indicator image Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Alexander Borsuk	3aa74bc427	[ios] Fixed ATM translation in the PlacePage Signed-off-by: Alexander Borsuk <me@alex.bio>	2025-08-22 11:58:01 +02:00
Konstantin Pastbin	902e7f6453	Revert "[ios] Fixing ATM translation on place page" This reverts commit `211e3fb4f0`.	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	cecca729db	[ios] Check that pp data exists before update the TR PP screen Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
Kiryl Kaveryn	2b2518b0b4	[ios] Disable track recording live activity widget for apps running on macos Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2025-08-22 11:58:01 +02:00
x7z4w	3c34765595	[core] nits Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-08-22 11:02:44 +02:00