[fdroid] Release version 2025.08.13-8

Signed-off-by: Harry Bond <me@hbond.xyz>

.clang-format

@@ -1,48 +1,59 @@
 # Configuration file for clang-format, based on docs/CPP_STYLE.md.
-
----
 BasedOnStyle: Google
 
 AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: Right
+AlignConsecutiveMacros: AcrossEmptyLinesAndComments
+AlignEscapedNewlines: LeftWithLastLine
 AlignOperands: AlignAfterOperator
 AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: true
 BraceWrapping:
   AfterCaseLabel: true
   AfterClass: true
   AfterControlStatement: Always
   AfterEnum: true
+  AfterExternBlock: true
   AfterFunction: true
   AfterNamespace: true
   AfterObjCDeclaration: true
   AfterStruct: true
   AfterUnion: true
-  AfterExternBlock: true
   BeforeCatch: true
   BeforeElse: true
   BeforeLambdaBody: true
   BeforeWhile: true
-  IndentBraces: false
   SplitEmptyFunction: false
-  SplitEmptyRecord: false
   SplitEmptyNamespace: false
+  SplitEmptyRecord: false
+BinPackArguments: true
+BinPackParameters: true
+BreakAfterJavaFieldAnnotations: true
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 ColumnLimit: 120
 ConstructorInitializerIndentWidth: 2
-ContinuationIndentWidth: 2
+ContinuationIndentWidth: 4
 DerivePointerAlignment: false
 IncludeBlocks: Preserve
-IndentCaseLabels: false
+IndentAccessModifiers: false
 IndentExternBlock: NoIndent
+InsertBraces: false
 InsertNewlineAtEOF: true
-PackConstructorInitializers: Never
+LambdaBodyIndentation: OuterScope
+PackConstructorInitializers: CurrentLine
 PointerAlignment: Middle
+RemoveBracesLLVM: true
 QualifierAlignment: Right
 SpacesInContainerLiterals: false
 Standard: Latest
 TabWidth: 2
-UseTab: Never
+
+---
+Language: Java
+AllowShortFunctionsOnASingleLine: Empty

.forgejo/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,6 +1,5 @@
 name: 🐞 Bug Report
 description: Report a problem you've encountered
-title: "bug: "
 labels:
   - bug
 body:

.forgejo/ISSUE_TEMPLATE/feature-request.yaml

@@ -1,6 +1,5 @@
 name: "💡 Feature Request"
 description: "Suggest an idea or improvement for CoMaps"
-title: "feat: "
 labels:
   - "enhancement"
 body:

.forgejo/workflows/android-beta.yaml

@@ -32,9 +32,6 @@ on:
       - track_generator/**
       - xcode/**
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   android-google-beta:
     name: Android Google Beta
@@ -71,10 +68,6 @@ jobs:
           SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
           RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Compile
         shell: bash
         working-directory: android

.forgejo/workflows/android-check.yaml

@@ -34,9 +34,6 @@ on:
       - track_generator/**
       - xcode/**
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   lint:
     name: Android Lint
@@ -51,10 +48,6 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Lint
         shell: bash
         working-directory: android
@@ -93,10 +86,6 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.forgejo/workflows/android-monkey.yaml

@@ -4,9 +4,6 @@ on:
   schedule:
     - cron:  '0 5 * * 0' # Once per week at 05:00 UTC
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   precondition:
     runs-on: ubuntu-latest
@@ -73,10 +70,6 @@ jobs:
           SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
           RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Compile
         shell: bash
         working-directory: android

.forgejo/workflows/android-release-metadata.yaml

@@ -2,9 +2,6 @@ name: Android Release Metadata
 on:
   workflow_dispatch: # Manual trigger
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   android-release-metadata:
     name: Upload Google Play metadata

.forgejo/workflows/android-release.yaml

@@ -5,7 +5,6 @@ on:
 env:
   RELEASE_NOTES: android/app/src/google/play/release-notes/en-US/default.txt
   FDROID_VERSION: android/app/src/fdroid/play/version.yaml
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
 
 jobs:
   tag:
@@ -117,10 +116,6 @@ jobs:
           SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
           RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Set up SDK
         shell: bash
         run: echo "sdk.dir=$ANDROID_SDK_ROOT" > android/local.properties

.forgejo/workflows/appstream-check.yaml

@@ -3,20 +3,20 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - packaging/app.organicmaps.desktop.metainfo.xml
+      - packaging/app.comaps.comaps.metainfo.xml
       - .forgejo/workflows/appstream-check.yaml # Run check on self change
 
 jobs:
   validate-appstream:
     name: Validate appstream metadata xml
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           sparse-checkout: |
-            packaging/app.organicmaps.desktop.metainfo.xml
+            packaging/app.comaps.comaps.metainfo.xml
 
       - name: Install appstream validator and flatpak Builder
         shell: bash
@@ -29,8 +29,8 @@ jobs:
 
       - name: Lint appstream data with flatpak Builder
         shell: bash
-        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.organicmaps.desktop.metainfo.xml
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.comaps.metainfo.xml
 
       - name: Run appstreamcli in pedantic mode
         shell: bash
-        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.organicmaps.desktop.metainfo.xml
+        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.comaps.metainfo.xml

.forgejo/workflows/coverage-check.yaml

@@ -33,7 +33,7 @@ concurrency:
 jobs:
   should-run-check:
     name: Should run coverage
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     outputs:
       run-from-pr: ${{ steps.run-from-pr.outputs.run-from-pr }}
       manually-triggered: ${{ steps.manually-triggered.outputs.manually-triggered }}
@@ -59,14 +59,9 @@ jobs:
   coverage:
     needs: should-run-check
     name: Generate coverage report
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     if: ${{ needs.should-run-check.outputs.run-from-pr == 'true' || needs.should-run-check.outputs.manually-triggered == 'true'}}
     steps:
-      - name: Free disk space by removing .NET, Android and Haskell
-        shell: bash
-        run: |
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
@@ -94,10 +89,6 @@ jobs:
               llvm \
               gcovr
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.forgejo/workflows/desktop-file-check.yaml

@@ -3,20 +3,20 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - qt/res/app.organicmaps.desktop.desktop
+      - qt/res/app.comaps.comaps.desktop
       - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
 
 jobs:
   validate-desktop-file:
     name: Validate .desktop file
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           sparse-checkout: |
-            qt/res/app.organicmaps.desktop.desktop
+            qt/res/app.comaps.comaps.desktop
 
       - name: Install desktop-file-validate tool
         shell: bash
@@ -27,4 +27,4 @@ jobs:
 
       - name: Validate desktop file
         shell: bash
-        run: desktop-file-validate qt/res/app.organicmaps.desktop.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"

.forgejo/workflows/linux-check.yaml

@@ -31,18 +31,13 @@ on:
 jobs:
   linux-no-unity:
     name: Linux no unity build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     # Cancels previous jobs if the same branch or PR was updated again.
     concurrency:
       group: ${{ github.workflow }}-no-unity-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
 
     steps:
-      - name: Free disk space by removing .NET, Android and Haskell
-        shell: bash
-        run: |
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
@@ -71,10 +66,6 @@ jobs:
               libqt6positioning6-plugins \
               libqt6positioning6
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
@@ -99,7 +90,7 @@ jobs:
 
   linux-matrix:
     name: Linux builds and tests
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -111,11 +102,6 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - name: Free disk space by removing .NET, Android and Haskell
-        shell: bash
-        run: |
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-
       - name: Checkout sources
         uses: actions/checkout@v4
 
@@ -142,10 +128,6 @@ jobs:
               libqt6positioning6-plugins \
               libqt6positioning6
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.forgejo/workflows/macos-check.yaml

@@ -57,10 +57,6 @@ jobs:
         run: |
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ninja qt@6
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.github/workflows/android-check.yaml

@@ -7,6 +7,7 @@ on:
 
 env:
   JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+  SKIP_MAP_DOWNLOAD: true
 
 jobs:
   lint:
@@ -22,10 +23,6 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name:  Init boost, generate textures
-        shell: bash
-        run: ./configure.sh --skip-map-download
-
       - name: Lint
         shell: bash
         working-directory: android
@@ -76,10 +73,6 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name:  Init boost, generate textures
-        shell: bash
-        run: ./configure.sh --skip-map-download
-
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.github/workflows/clang-format.yaml

@@ -0,0 +1,43 @@
+name: clang-format
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'android/app/src/**.java'
+      - '.clang-format'
+      - '.github/workflows/clang-format.yml'
+  pull_request:
+    branches: [ master ]
+    paths:
+      - 'android/app/src/**.java'
+      - '.clang-format'
+      - '.github/workflows/clang-format.yml'
+
+jobs:
+  check-formatting:
+    runs-on: ubuntu-latest
+    continue-on-error: true  # TODO(AB): Remove this line when ready to enforce formatting.
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install clang-format
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang-format-19
+          clang-format-19 --version
+
+      - name: Check Java formatting
+        run: |
+          JAVA_FILES=($(find android/app/src -name '*.java'))
+
+          FORMATTING_ISSUES=$(clang-format-19 --dry-run --Werror $JAVA_FILES 2>&1 || true)
+
+          if [ -n "$FORMATTING_ISSUES" ]; then
+            echo "$FORMATTING_ISSUES"
+            echo ""
+            echo "To fix formatting, please run:"
+            echo "  clang-format -i <file>"
+            exit 1
+          fi

.github/workflows/ios-check.yaml

@@ -37,7 +37,7 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
 
-      - name:  Init boost, download World map, generate textures
+      - name:  Configure repository
         shell: bash
         run: ./configure.sh
 

.gitignore

@@ -14,18 +14,24 @@ stxxl.errlog
 stxxl.log
 screenlog.0
 
-data/styles/*/*/out/*
+data/symbols/*/design/
-data/resources-*_design/*
 # symbols png/sdf are now generated at build
-data/resources-*_*/symbols.png
+data/symbols/**/symbols.png
-data/resources-*_*/symbols.sdf
+data/symbols/**/symbols.sdf
-data/drules_proto_default_design.bin
 data/colors_design.txt
 data/patterns_design.txt
 data/bookmarks
 data/edits.xml
 data/World.mwm
 data/WorldCoasts.mwm
+data/world_mwm/*
+data/*_hash
+data/drules_proto*
+data/classificator.txt
+data/types.txt
+data/visibility.txt
+data/colors.txt
+data/patterns.txt
 
 # Compiled Python
 *.pyc
@@ -46,8 +52,7 @@ omim.sdf
 *.rc
 !qt/res/windows.rc
 *.pdb
-out/*
+out/
-qt/mapswithme.log
 
 # XCode
 xcode/keys/*

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.22.1)
+
 project(omim C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -48,6 +49,8 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
   set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()
 
+execute_process(COMMAND "./configure.sh" WORKING_DIRECTORY ${OMIM_ROOT})
+
 message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
 if (CMAKE_UNITY_BUILD)
@@ -103,12 +106,29 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
   add_definitions(-DRELEASE)
   if (NOT MSVC)
-    add_compile_options(-Ofast)  # Also enables -ffast-math
+    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
   endif()
 else()
   message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
 endif()
 
+if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+  add_compile_options(-fno-omit-frame-pointer)
+endif()
+
+# Linux GCC LTO plugin fix.
+if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_TYPE MATCHES "^Rel"))
+  # To force errors if LTO was not enabled.
+  add_compile_options(-fno-fat-lto-objects)
+  # To fix ar and ranlib "plugin needed to handle lto object".
+  string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
+  set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
+  set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
+  set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
+  set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
+endif()
+
 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
 
 if (PLATFORM_LINUX OR PLATFORM_ANDROID)
@@ -242,11 +262,15 @@ if (PLATFORM_DESKTOP)
     add_subdirectory(qt)
     omim_add_tool_subdirectory(skin_generator)
   endif()
+  if (GENERATOR_TOOL)
+    add_compile_options(-march=native -mtune=native)
+    message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU")
+  endif()
   add_subdirectory(dev_sandbox)
 endif()
 
 omim_add_test_subdirectory(qt_tstfrm)
 
 if (PLATFORM_ANDROID)
-  add_subdirectory(android/app/src/main/cpp)
+  add_subdirectory(android/sdk/src/main/cpp)
 endif()

README.md

@@ -53,6 +53,9 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
   <a href="https://f-droid.org/en/packages/app.comaps.fdroid/">
     <img src="docs/badges/fdroid.png" alt="F-Droid" width="160"/>
   </a>
+  <a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/comaps/comaps">
+    <img src="docs/badges/obtainium.png" alt="Obtainium" width="160"/>
+  </a>
   <a href="https://codeberg.org/comaps/comaps/releases">
     <img src="docs/badges/codeberg.png" alt="Codeberg" width="160"/>
   </a>
@@ -122,10 +125,8 @@ You can help by donating, contributing code, translating, or by telling others a
 
 - Build instructions: [docs/INSTALL.md](docs/INSTALL.md)  
 - Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
-> [!NOTE]  
-> Some docs might be outdated, contain broken links or old references to Organic Maps, etc. Its a work in progress and help is much appreciated!
 
-There is a dedicated Zulip chat for active contributors: [Zulip](https://comaps.zulipchat.com)
+There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md#3-team-messaging) chat for active contributors.
 
 ---
 

android/Dockerfile

@@ -18,5 +18,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libxi-dev \
   optipng
 WORKDIR /root/comaps
-RUN ./configure.sh
 CMD ./gradlew -Parm64 assembleFdroidDebug

android/app/build.gradle

@@ -15,43 +15,17 @@ buildscript {
   }
 }
 
-repositories {
-  google()
-  mavenCentral()
-  maven { url 'https://www.jitpack.io' } // MPAndroidChart
-}
-
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish-gradle-plugin'
 
-def run(cmd) {
-  def stdout = new ByteArrayOutputStream()
-  exec {
-    commandLine = cmd
-    standardOutput = stdout
-  }
-  return stdout.toString()
-}
-
 
 import com.github.triplet.gradle.androidpublisher.ReleaseStatus
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
-
-def getVersion() {
-  def isWindows = DefaultNativePlatform.getCurrentOperatingSystem().isWindows()
-  def bash = isWindows ? 'C:\\Program Files\\Git\\bin\\bash.exe' : 'bash'
-  def versionCode = Integer.parseInt(run([bash, '../../tools/unix/version.sh', 'android_code']).trim())
-  def versionName = run([bash, '../../tools/unix/version.sh', 'android_name']).trim()
-  return new Tuple2(versionCode, versionName)
-}
 
 def getCommitMessage() {
   return run(['git', '--no-pager', 'show', '-s', '--format=%s%n%n%b', 'HEAD']).trim()
 }
 
-def osName = System.properties['os.name'].toLowerCase()
-
 project.ext.appId = 'app.comaps'
 project.ext.appName = 'CoMaps'
 
@@ -63,7 +37,10 @@ project.ext.appName = 'CoMaps'
 //}
 
 android {
-  namespace 'app.organicmaps'
+  namespace = 'app.organicmaps'
+
+  // TODO: it should not be here, but in sdk/build.gradle. But for some reason it should be specified here as well.
+  ndkVersion = '28.2.13676358'
 
   dependenciesInfo {
     // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
@@ -76,80 +53,32 @@ android {
     dataBinding = true
     buildConfig = true
   }
-  // All properties are read from gradle.properties file
-  compileSdk propCompileSdkVersion.toInteger()
 
-  ndkVersion '27.2.12479018'
+  // Users are complaining that the app should be re-downloaded from the Play Store after changing the language.
+  bundle {
+    language {
+      enableSplit = false
+    }
+  }
+
+  // All properties are read from gradle.properties file
+  compileSdk = propCompileSdkVersion.toInteger()
 
   defaultConfig {
-    // Default package name is taken from the manifest and should be app.comaps
+    versionCode = rootProject.ext.versionCode
-    def ver = getVersion()
+    versionName = rootProject.ext.versionName
-    versionCode = ver.V1
-    versionName = ver.V2
     println('Version: ' + versionName)
     println('VersionCode: ' + versionCode)
-    minSdk propMinSdkVersion.toInteger()
+    minSdk = propMinSdkVersion.toInteger()
-    targetSdk propTargetSdkVersion.toInteger()
+    targetSdk = propTargetSdkVersion.toInteger()
     applicationId project.ext.appId
     buildConfigField 'String', 'SUPPORT_MAIL', '"android@comaps.app"'
     // Should be customized in flavors.
     buildConfigField 'String', 'REVIEW_URL', '""'
 
-    externalNativeBuild {
+    base.archivesName = appName.replaceAll('\\s','') + '-' + defaultConfig.versionCode
-      def pchFlag = 'OFF'
-      if (project.hasProperty('pch')) pchFlag = 'ON'
 
-      def njobs = ''
+    ndk.debugSymbolLevel = 'full'
-      if (project.hasProperty('njobs')) njobs = project.getProperty('njobs')
-
-      def enableVulkanDiagnostics = 'OFF'
-      if (project.hasProperty('enableVulkanDiagnostics')) {
-        enableVulkanDiagnostics = project.getProperty('enableVulkanDiagnostics')
-      }
-
-      def enableTrace = 'OFF'
-      if (project.hasProperty('enableTrace')) {
-        enableTrace = project.getProperty('enableTrace')
-      }
-
-      cmake {
-        cppFlags '-fexceptions', '-frtti'
-        // There is no sense to enable sections without gcc's --gc-sections flag.
-        cFlags '-fno-function-sections', '-fno-data-sections',
-               '-Wno-extern-c-compat'
-        arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static',
-                  "-DOS=$osName", '-DSKIP_TESTS=ON', '-DSKIP_TOOLS=ON', "-DUSE_PCH=$pchFlag",
-                  "-DNJOBS=$njobs", "-DENABLE_VULKAN_DIAGNOSTICS=$enableVulkanDiagnostics",
-                  "-DENABLE_TRACE=$enableTrace"
-        targets 'organicmaps'
-      }
-    }
-
-    // Use, for example, -Parm32 gradle parameter to build only for armeabi-v7a.
-    ndk {
-      abiFilters = new HashSet<>()
-      if (project.hasProperty('arm32') || project.hasProperty('armeabi-v7a')) {
-        abiFilters.add('armeabi-v7a')
-      }
-      if (project.hasProperty('arm64') || project.hasProperty('arm64-v8a')) {
-        abiFilters.add('arm64-v8a')
-      }
-      if (project.hasProperty('x86')) {
-        abiFilters.add('x86')
-      }
-      if (project.hasProperty('x86_64') || project.hasProperty('x64')) {
-        abiFilters.add('x86_64')
-      }
-      if (abiFilters.isEmpty()) {
-        abiFilters.add('armeabi-v7a')
-        abiFilters.add('arm64-v8a')
-        // For the emulator, chromebooks and some Intel Atom devices.
-        abiFilters.add('x86_64')
-      }
-      println('Building for ' + abiFilters + ' archs.')
-    }
-
-    setProperty('archivesBaseName', appName.replaceAll('\\s','') + '-' + defaultConfig.versionCode)
   }
 
   flavorDimensions += 'default'
@@ -199,10 +128,10 @@ android {
   splits.abi {
     boolean enabled = project.hasProperty('splitApk')
     println ('Create separate apks: ' + enabled)
-    enable enabled
+    enable = enabled
     reset()
     include 'x86', 'armeabi-v7a', 'arm64-v8a', 'x86_64'
-    universalApk true
+    universalApk = true
   }
 
   lint {
@@ -215,7 +144,7 @@ android {
     disable 'CustomSplashScreen'
     // https://github.com/organicmaps/organicmaps/issues/3610
     disable 'InsecureBaseConfiguration'
-    abortOnError true
+    abortOnError = true
   }
 
   gradle.projectsEvaluated {
@@ -274,33 +203,29 @@ android {
     debug {
       applicationIdSuffix '.debug'   // Allows to install debug and release builds together
       versionNameSuffix '-debug'
-      jniDebuggable true           // Enable jni debug build
       zipAlignEnabled true
-      signingConfig signingConfigs.debug
+      signingConfig = signingConfigs.debug
       resValue 'string', 'app_name', 'CoMaps Debug'
-      // Do not generate separate debug symbols for debug apps, because we don't distribute them.
-      ndk.debugSymbolLevel = 'none'
     }
 
     release {
       if (taskName.contains('release')) {
         if (secureReleasePropertiesFileExists) {
           println('Using RELEASE signing keys from secure.properties.release')
-          signingConfig signingConfigs.release
+          signingConfig = signingConfigs.release
         } else {
           println('NO RELEASE signing keys found')
           println('Using DEBUG signing keys')
-          signingConfig signingConfigs.debug
+          signingConfig = signingConfigs.debug
         }
       }
+
       minifyEnabled true
-      shrinkResources true
+      shrinkResources = true
       // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin.
       // To learn more, go to the documentation section about R8 configuration files.
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       resValue 'string', 'app_name', project.ext.appName
-      // Full size symbols are too big for Google, 217mb aab vs 95mb.
-      ndk.debugSymbolLevel = 'symbol_table'
     }
 
     beta {
@@ -309,37 +234,27 @@ android {
       if (taskName.contains('beta')) {
         if (secureTestPropertiesFileExists) {
           println('Using TEST signing keys from secure.properties.test')
-          signingConfig signingConfigs.test
+          signingConfig = signingConfigs.test
         } else {
           println('NO TEST signing keys found')
           println('Using DEBUG signing keys')
-          signingConfig signingConfigs.debug
+          signingConfig = signingConfigs.debug
         }
       }
       minifyEnabled true
-      shrinkResources true
+      shrinkResources = true
       // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin.
       // To learn more, go to the documentation section about R8 configuration files.
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       matchingFallbacks = ['release'] // use dependencies of "release" build type
       resValue 'string', 'app_name', 'CoMaps Test'
-      // Full size symbols are too big for Google, 217mb aab vs 95mb.
-      ndk.debugSymbolLevel = 'symbol_table'
-    }
-  }
-
-  externalNativeBuild {
-    cmake {
-      version '3.22.1+'
-      buildStagingDirectory './nativeOutputs'
-      path '../../CMakeLists.txt'
     }
   }
 
   // We don't compress these extensions in assets/ because our random FileReader can't read zip-compressed files from apk.
   // TODO: Load all minor files via separate call to ReadAsString which can correctly handle compressed files in zip containers.
   androidResources {
-    ignoreAssetsPattern '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
+    ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
     noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
     localeFilters += [
             "af",
@@ -396,7 +311,7 @@ android {
   }
 
   compileOptions {
-    coreLibraryDesugaringEnabled true
+    coreLibraryDesugaringEnabled = true
 
     sourceCompatibility JavaVersion.VERSION_17
     targetCompatibility JavaVersion.VERSION_17
@@ -404,6 +319,8 @@ android {
 }
 
 dependencies {
+  implementation project(':sdk')
+
   coreLibraryDesugaring libs.android.tools.desugar
 
   // Google Play Location Services
@@ -449,10 +366,6 @@ dependencies {
   testImplementation libs.mockito.core
 }
 
-tasks.withType(JavaCompile) {
-  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
-}
-
 android.applicationVariants.all { variant ->
   def authorityValue = variant.applicationId + ".provider"
   def authority = "\"" + authorityValue + "\""
@@ -500,3 +413,7 @@ huaweiPublish {
     }
   }
 }
+
+tasks.withType(JavaCompile).configureEach {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}

android/app/src/fdroid/java/app/organicmaps/location

@@ -1 +0,0 @@
-../../../../google/java/app/organicmaps/location

android/app/src/fdroid/java/app/organicmaps/sdk/location

@@ -0,0 +1 @@
+../../../../../google/java/app/organicmaps/sdk/location

android/app/src/fdroid/play/listings/bn/short-description.txt

@@ -0,0 +1 @@
+সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত

android/app/src/fdroid/play/listings/bn/title.txt

@@ -0,0 +1 @@
+কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ

android/app/src/fdroid/play/listings/ca/short-description.txt

@@ -0,0 +1 @@
+Navegació intuïtiva - Descobreix el teu camí - El poder de la comunitat

android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt

@@ -0,0 +1,7 @@
+• Data OpenStreetMap k 4. 8.
+• vylepšené barvy mapy pro vodu, lesy, křoviny, různé vybavení, pěší zóny atd.
+• přidány stanice lesní stráže, krytých parkovišť pro jízdní kola, únikových her, úschoven zavazadel, partnerských pošt
+• vylepšeny výškové vrstevnice na 20 m pro některé oblíbené turistické oblasti
+• podpora více zkratek a aliasů pro vyhledávání
+• přidání ikon pro vyhledávání a záložky pro rychlé občerstvení, jízdní kola a dobíjecí stanice
+• plynulejší pohyb šipky pro určení polohy

android/app/src/fdroid/play/listings/de-DE/release-notes.txt

@@ -1,9 +1,7 @@
-Wir stellen vor: Das neue CoMaps-Logo!
+• OpenStreetMap-Daten vom 4. August
-• Verbesserte Höhenlinien in vielen Regionen (Stufen von 20/50 m)
+• Verbesserte Farben für Wasser, Wälder, Gestrüpp, verschiedene Einrichtungen, Fussgängerbereiche etc.
-• Links zu Panoramax-Bildern für ausgewählte POIs
+• Besucherstationen, überdachte Fahrradparkplätze, Escaperooms, Gepäckschließfächer, und Postpartner hinzugefügt
-• OpenStreetMap-Daten vom 13. Juli
+• Konturhöhenlinien aktualisiert, bis zu 20m für beliebte Wanderregionen
-• Neue Farben für viele Objekte und Farben werden früher angezeigt
+• Unterstützung für mehr Such-Abkürzungen und Synonyme
-• Öffnungszeiten werden beim Antippen eines POI angezeigt
+• Such- und Lesezeichen-Symbole für Fast Food, Rad- und Lade-Stationen
-• Verschiedene Arten von Feuchtgebieten
+• Der Positionspfeil bewegt sich gleichmässiger
-• Neue Farben für Vegetation und andere Features; einige neue Icons
-• Wandern: bessere Darstellung der Höhenlinien

android/app/src/fdroid/play/listings/en-US/release-notes.txt

@@ -1,10 +1,7 @@
-Introducing CoMaps logo!
+• OpenStreetMap data as of August 4
-
+• improve map colors for water, forests, scrubs, various amenities, pedestrian areas etc.
-• upgrade altitude contour lines for many regions to 20 or 50 meters step
+• add ranger stations, covered bicycle parkings, escape games, luggage lockers, post office partners
-• add Panoramax Picture links to selected POIs
+• upgrade altitude contour lines to 20m step for some popular hiking regions
-• OpenStreetMap data as of July 13
+• support more search abbreviations and aliases
-• add color fills to many features and display fills earlier for existing features
+• add search and bookmark icons for fast food, bicycle and charging stations
-• display opening hours state when selecting a POI
+• more smooth position arrow movements
-• split all wetlands into several distinct types
-• update vegetation and other map colors, update some map icons
-• outdoors: bolder altitude contour lines

android/app/src/fdroid/play/listings/es-ES/full-description.txt

@@ -0,0 +1,65 @@
+Una aplicación de mapas gratuita y de código abierto liderada por la comunidad, basada en los datos de OpenStreetMap y reforzada con un compromiso con la transparencia, la privacidad y la ausencia de fines de lucro. CoMaps es un fork o derivado de Organic Maps, que a su vez es un fork de Maps.ME.
+
+<br><br>
+
+Lee más sobre los motivos del proyecto y su dirección en <b><i>codeberg.org/comaps</i></b>.
+
+<br><br>
+
+Únete allí a la comunidad y ayuda a crear la mejor app de mapas
+
+• Usa la aplicación y corre la voz sobre ella
+
+• Envía comentarios y reporta problemas
+
+• Actualiza los datos del mapa en la app o en el sitio web de OpenStreetMap
+
+<br><br>
+
+‣ <b>Enfocada en el uso sin conexión</b>: Planifica y navega tus viajes sin necesidad de conexión móvil, busca puntos de paso en rutas remotas, etc. Todas las funciones están diseñadas para funcionar sin conexión.
+
+‣ <b>Respeta tu Privacidad</b>: La app está diseñada pensando en tu privacidad: no identifica personas, no rastrea y no recoge datos personales. Sin publicidad.
+
+‣ <b>Sencilla y Pulida</b>: funciones esenciales fáciles de usar que simplemente funcionan.
+
+‣ <b>Ahorra Batería y Espacio</b>: No consume la batería como otras apps de navegación. Los mapas compactos ahorran espacio valioso en tu teléfono.
+
+‣ <b>Gratuita y Creada por la Comunidad</b>: Personas como tú ayudaron a construir la app añadiendo lugares a OpenStreetMap, probando funciones, dando opiniones y contribuyendo con desarrollo o financiación.
+
+‣ <b>Toma de decisiones y finanzas abiertas y transparentes, sin ánimo de lucro y completamente de código abierto.</b>
+
+<br><br>
+
+<b>Funciones Principales</b>:
+
+• Mapas detallados descargables con lugares que no aparecen en Google Maps
+
+• Modo exterior con rutas de senderismo destacadas, campings, fuentes de agua, picos, curvas de nivel, etc.
+
+• Caminos peatonales y carriles bici
+
+• Puntos de interés como restaurantes, gasolineras, hoteles, tiendas, lugares turísticos y muchos más
+
+• Búsqueda por nombre, dirección o categoría de punto de interés
+
+• Navegación con indicaciones por voz para caminar, ir en bici o conducir
+
+• Guarda tus lugares favoritos con un solo toque
+
+• Artículos de Wikipedia sin conexión
+
+• Capa de transporte subterráneo y rutas
+
+• Grabación de rutas
+
+• Exporta e importa favoritos y rutas en formatos KML, KMZ y GPX
+
+• Modo oscuro para usar de noche
+
+• Mejora los datos del mapa para todos usando un editor básico integrado
+
+<br><br>
+
+<b>La Libertad Está Aquí</b>
+
+Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -1,9 +1,7 @@
-¡Presentamos el logo de CoMaps!
+• Datos de OpenStreetMap a fecha 2025.08.04
-• mejora de isolíneas con más detalle para muchas regiones
+• Mejora de colores del mapa para agua, bosques, matorrales, servicios, zonas peatonales, etc.
-• añade enlaces de imágenes de Panoramax a POIs seleccionados
+• Añadidas estaciones de guardabosques, aparcamientos cubiertos de bicis, juegos de escape, consignas y oficinas de correo
-• datos de OpenStreetMap a 13 de julio
+• Nuevas curvas de nivel (20 m) en regiones populares para senderismo
-• añadidos rellenos de color a muchas características
+• Más abreviaturas y alias de búsqueda
-• se muestra el estado de horarios de apertura al seleccionar un POI
+• Iconos de búsqueda y marcadores para comida rápida, bicicletas y estaciones de recarga
-• se dividen los humedales en tipos distintos
+• Más fluidez de la flecha de posición
-• se actualiza la vegetación y otros colores del mapa, así como otros iconos
-• exteriores: líneas de contorno de altitud más gruesas

android/app/src/fdroid/play/listings/es-ES/short-description.txt

@@ -0,0 +1 @@
+Navegación de mapa fácil - Descubre más en tu camino - Creado por la comunidad

android/app/src/fdroid/play/listings/es-ES/title.txt

@@ -0,0 +1 @@
+CoMaps - Senderismo, ciclismo y conducción offline

android/app/src/fdroid/play/listings/fa-IR/short-description.txt

@@ -0,0 +1 @@
+ناوبری آسان نقشه - کشف بیشتر از سفر شما - توسط جامعه

android/app/src/fdroid/play/listings/fa-IR/title.txt

@@ -0,0 +1 @@
+CoMaps - کوه نوردی، دوچرخه سواری و رانندگی افلاین و خصوصی

android/app/src/fdroid/play/listings/fr-FR/release-notes.txt

@@ -1,7 +0,0 @@
-Présentation du logo CoMaps !
-• Amélioration des courbes d’altitude à une précision de 20 ou 50 mètres pour de nombreuses régions
-• Ajout d'un lien vers les images Panoramax des POI
-• Données OpenStreetMap du 13 juillet
-• Affichage de l’état des heures d’ouverture lors de la sélection d’un POI
-• Mise à jour du style(végétation et zones humides), mise à jour de certaines icônes de la carte
-• Outdoors: Améliorations de la visibilité des courbes d'altitude

android/app/src/fdroid/play/listings/fr-FR/short-description.txt

@@ -1 +1 @@
-Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté
+Navigation de cartes facile - Découvrez le monde - Propulsé par la communauté

android/app/src/fdroid/play/listings/hu-HU/short-description.txt

@@ -0,0 +1 @@
+Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével

android/app/src/fdroid/play/listings/ia/short-description.txt

@@ -0,0 +1 @@
+Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate

android/app/src/fdroid/play/listings/it-IT/release-notes.txt

@@ -0,0 +1,7 @@
+• Dati di OpenStreetMap aggiornati al 4 Agosto
+• Migliorati i colori per acqua, foreste, servizi etc
+• Aggiunte le stazioni delle guardie forestali, i parcheggi coperti per bici, gli escape games e altri servizi
+• Aggiornato l'intervallo delle isolinee a 20 m per le zone escursionistiche più popolari
+• Aggiunto il supporto per un maggior numero di alias
+• Aggiunte le icone per i fast food, i punti di ricarica e le biciclette
+• Resi più fluidi i movimenti della freccia di posizione

android/app/src/fdroid/play/listings/pl-PL/release-notes.txt

@@ -1,9 +0,0 @@
-Wprowadzamy logo CoMaps!
-• zwiększenie dokładności izolinii w wielu regionach w krokach 20 do 50 metrów
-• dodanie linków do zdjęć z Panoramax do wybranych POI
-• aktualizacja danych OpenStreetMap z 13 lipca
-• dodanie wypełnienia kolorem dla wielu typów obiektów
-• wyświetlanie stanu godzin otwarcia przy wyborze POI
-• podział mokradeł na kilka typów
-• aktualizacja koloru roślinności i innych kolorów, aktualizacja części ikon na mapie
-• tryb outdoorowy: pogrubione warstwice wysokości

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -1,9 +1,7 @@
-Apresentamos o logo do CoMaps!
+• Dados OSM de 4/08
-• Curvas de nível mais detalhadas em muitas regiões
+• Melhoria nas cores para água, florestas, matagais, serviços, áreas de pedestres, etc.
-• Adicionados links de imagens do Panoramax para pontos de interesse selecionados
+• Adição de guarda-florestais, estacionamentos cobertos para bicicletas, jogos de fuga, armários para bagagem e parceiros postais
-• Dados OSM de 13/07
+• Melhoria na precisão de curvas de nível para 20 m em algumas regiões populares
-• Adicionados preenchimentos de cor a muitos elementos
+• Suporte a mais abreviações para busca
-• Exibição de horário de funcionamento ao selecionar um ponto de interesse
+• Adição de ícones de pesquisa e favoritos para fast food, bicicletas e estações de recarga
-• Divididas áreas úmidas em vários tipos distintos
+• Movimentos mais suaves para seta de posição
-• Atualizada cores/ícones para vegetação e outros elementos
-• Ar livre: curvas de nível de altitude mais destacadas

android/app/src/fdroid/play/listings/pt-BR/title.txt

@@ -1 +1 @@
-CoMaps - Mapas com Privacidade
+CoMaps - Mapas e Navegação Offline com Privacidade

android/app/src/fdroid/play/listings/pt-PT/short-description.txt

@@ -0,0 +1 @@
+Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos

android/app/src/fdroid/play/listings/pt-PT/title.txt

@@ -0,0 +1 @@
+CoMaps - Mapas e Navegação - Offline e Privada

android/app/src/fdroid/play/listings/ru-RU/release-notes.txt

@@ -1,9 +1,7 @@
-Представляем логотип CoMaps!
+• Карты OpenStreetMap от 4 августа
-• Линии высот для многих регионов с шагом 20м или 50м
+• Улучшен цвет воды, леса, кустарников, различных объектов инфраструктуры, пешеходных зон и т.д.
-• Ссылки на изображения Panoramax к выбранным POI
+• Добавлены лесничества, крытые велопарковки, квесты, камеры хранения
-• Карты OpenStreetMap от 13 июля
+• Для некоторых популярных туристических регионов добавлены линии высот 20м
-• Заливки цветом ко многим объектам и более ранняя заливка для существующих объектов
+• Поддержка дополнительных поисковых сокращений и синонимов
-• Показ часов работы при выборе POI
+• Добавлены иконки меток и результатов поиска для фастфуда, велопарковок и зарядных станций
-• Разные водно-болотные угодья отличаются цветом
+• Более плавное движение стрелки местоположения
-• Обновлены цвета растительности и другие цвета на карте, изменены некоторые иконки
-• В стиле "Активный отдых" более четкие линии высот

android/app/src/fdroid/play/listings/sr/release-notes.txt

@@ -1,9 +1,7 @@
-Представљамо CoMaps лого!
+• подаци из OpenStreetMap-а од 4. августа
-• ажуриране изохипсе за многе регионе на кораке од 20 или 50 метара
+• побољшане боје на мапи за воду, шуме, жбуње, разне објекте, пешачке зоне итд.
-• додате везе ка Panoramax сликама за изабране тачке интересовања (POI)
+• додате станице ренџера, наткривена паркинг места за бицикле, escape room-ови, ормарићи за пртљаг
-• подаци са OpenStreetMap-а од 13. јула
+• унапређене изохипсе на кораке од 20 м за популарне планинарске регионе
-• додате боје за многе елементе и раније приказивање постојећих површина
+• подршка за више скраћеница и алтернативних назива у претрази
-• приказ стања радног времена при избору POI-ја
+• додате иконе за претрагу и обележавање за брзу храну, бицикле и станице за пуњење
-• мочваре подељене на неколико различитих типова
+• равномерније кретање стрелице која приказује позицију
-• ажуриране боје вегетације и других елемената на мапи, ажуриране поједине иконе
-• на отвореном: наглашеније изохипсе

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.08.13-8-FDroid+25081308

android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java

@@ -1,148 +0,0 @@
-package app.organicmaps.location;
-
-import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
-import static android.Manifest.permission.ACCESS_FINE_LOCATION;
-import static app.organicmaps.util.concurrency.UiThread.runLater;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.location.Location;
-import android.os.Looper;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresPermission;
-
-import com.google.android.gms.common.api.ApiException;
-import com.google.android.gms.common.api.ResolvableApiException;
-import com.google.android.gms.location.FusedLocationProviderClient;
-import com.google.android.gms.location.Granularity;
-import com.google.android.gms.location.LocationAvailability;
-import com.google.android.gms.location.LocationCallback;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationResult;
-import com.google.android.gms.location.LocationServices;
-import com.google.android.gms.location.LocationSettingsRequest;
-import com.google.android.gms.location.LocationSettingsStatusCodes;
-import com.google.android.gms.location.Priority;
-import com.google.android.gms.location.SettingsClient;
-
-import app.organicmaps.util.LocationUtils;
-import app.organicmaps.util.log.Logger;
-
-class GoogleFusedLocationProvider extends BaseLocationProvider
-{
-  private static final String TAG = GoogleFusedLocationProvider.class.getSimpleName();
-  @NonNull
-  private final FusedLocationProviderClient mFusedLocationClient;
-  @NonNull
-  private final SettingsClient mSettingsClient;
-  @NonNull
-  private final Context mContext;
-
-  private class GoogleLocationCallback extends LocationCallback
-  {
-    @Override
-    public void onLocationResult(@NonNull LocationResult result)
-    {
-      final Location location = result.getLastLocation();
-      if (location != null)
-        mListener.onLocationChanged(location);
-    }
-
-    @Override
-    public void onLocationAvailability(@NonNull LocationAvailability availability)
-    {
-      Logger.w(TAG, "isLocationAvailable = " + availability.isLocationAvailable());
-    }
-  }
-
-  private final GoogleLocationCallback mCallback = new GoogleLocationCallback();
-
-  GoogleFusedLocationProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
-  {
-    super(listener);
-    mFusedLocationClient = LocationServices.getFusedLocationProviderClient(context);
-    mSettingsClient = LocationServices.getSettingsClient(context);
-    mContext = context;
-  }
-
-  @Override
-  @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
-  public void start(long interval)
-  {
-    Logger.d(TAG);
-
-    final LocationRequest locationRequest = new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, interval)
-        // Wait a few seconds for accurate locations initially, when accurate locations could not be computed on the device immediately.
-        // https://github.com/organicmaps/organicmaps/issues/2149
-        .setWaitForAccurateLocation(true)
-        // The desired location granularity should correspond to the client permission level. The client will be
-        // delivered fine locations while it has the Manifest.permission.ACCESS_FINE_LOCATION permission, coarse
-        // locations while it has only the Manifest.permission.ACCESS_COARSE_LOCATION permission, and no location
-        // if it lacks either.
-        .setGranularity(Granularity.GRANULARITY_PERMISSION_LEVEL)
-        // Sets the maximum age of an initial historical location delivered for this request.
-        .setMaxUpdateAgeMillis(60 * 60 * 1000L) // 1 hour
-        .build();
-
-    LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder();
-    builder.addLocationRequest(locationRequest);
-    builder.setAlwaysShow(true); // improves the wording/appearance of the dialog
-    final LocationSettingsRequest locationSettingsRequest = builder.build();
-
-    mSettingsClient.checkLocationSettings(locationSettingsRequest).addOnSuccessListener(locationSettingsResponse -> {
-      Logger.d(TAG, "Service is available");
-      mFusedLocationClient.requestLocationUpdates(locationRequest, mCallback, Looper.myLooper());
-    }).addOnFailureListener(e -> {
-      try
-      {
-        int statusCode = ((ApiException) e).getStatusCode();
-        if (statusCode == LocationSettingsStatusCodes.RESOLUTION_REQUIRED)
-        {
-          // This case happens if at least one of the following system settings is off:
-          // 1. Location Services a.k.a GPS;
-          // 2. Google Location Accuracy a.k.a High Accuracy;
-          // 3. Both Wi-Fi && Mobile Data together (needed for 2).
-          //
-          // PendingIntent below will show a special Google "For better experience... enable (1) and/or (2) and/or (3)"
-          // dialog. This system dialog can change system settings if "Yes" is pressed. We can't do it from our app.
-          // However, we don't want to annoy a user who disabled (2) or (3) intentionally. GPS (1) is mandatory to
-          // continue, while (2) and (3) are not dealbreakers here.
-          //
-          // See https://github.com/organicmaps/organicmaps/issues/3846
-          //
-          if (LocationUtils.areLocationServicesTurnedOn(mContext))
-          {
-            Logger.d(TAG, "Don't show 'location resolution' dialog because location services are already on");
-            mFusedLocationClient.requestLocationUpdates(locationRequest, mCallback, Looper.myLooper());
-            return;
-          }
-          Logger.d(TAG, "Requesting 'location resolution' dialog");
-          final ResolvableApiException resolvable = (ResolvableApiException) e;
-          final PendingIntent pendingIntent = resolvable.getResolution();
-          // Call this callback in the next event loop to allow LocationHelper::start() to finish.
-          runLater(() -> mListener.onLocationResolutionRequired(pendingIntent));
-          return;
-        }
-      }
-      catch (ClassCastException ex)
-      {
-        // Ignore, should be an impossible error.
-        // https://developers.google.com/android/reference/com/google/android/gms/location/SettingsClient
-        Logger.e(TAG, "An error that should be impossible: " + ex);
-      }
-      // Location settings are not satisfied. However, we have no way to fix the
-      // settings so we won't show the dialog.
-      Logger.e(TAG, "Service is not available: " + e);
-      // Call this callback in the next event loop to allow LocationHelper::start() to finish.
-      runLater(mListener::onFusedLocationUnsupported);
-    });
-  }
-
-  @Override
-  protected void stop()
-  {
-    Logger.d(TAG);
-    mFusedLocationClient.removeLocationUpdates(mCallback);
-  }
-}

android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java

@@ -0,0 +1,149 @@
+package app.organicmaps.sdk.location;
+
+import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static app.organicmaps.sdk.util.concurrency.UiThread.runLater;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.location.Location;
+import android.os.Looper;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
+import app.organicmaps.sdk.util.LocationUtils;
+import app.organicmaps.sdk.util.log.Logger;
+import com.google.android.gms.common.api.ApiException;
+import com.google.android.gms.common.api.ResolvableApiException;
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.Granularity;
+import com.google.android.gms.location.LocationAvailability;
+import com.google.android.gms.location.LocationCallback;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationResult;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.LocationSettingsRequest;
+import com.google.android.gms.location.LocationSettingsStatusCodes;
+import com.google.android.gms.location.Priority;
+import com.google.android.gms.location.SettingsClient;
+
+class GoogleFusedLocationProvider extends BaseLocationProvider
+{
+  private static final String TAG = GoogleFusedLocationProvider.class.getSimpleName();
+  @NonNull
+  private final FusedLocationProviderClient mFusedLocationClient;
+  @NonNull
+  private final SettingsClient mSettingsClient;
+  @NonNull
+  private final Context mContext;
+
+  private class GoogleLocationCallback extends LocationCallback
+  {
+    @Override
+    public void onLocationResult(@NonNull LocationResult result)
+    {
+      final Location location = result.getLastLocation();
+      if (location != null)
+        mListener.onLocationChanged(location);
+    }
+
+    @Override
+    public void onLocationAvailability(@NonNull LocationAvailability availability)
+    {
+      Logger.w(TAG, "isLocationAvailable = " + availability.isLocationAvailable());
+    }
+  }
+
+  private final GoogleLocationCallback mCallback = new GoogleLocationCallback();
+
+  GoogleFusedLocationProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
+  {
+    super(listener);
+    mFusedLocationClient = LocationServices.getFusedLocationProviderClient(context);
+    mSettingsClient = LocationServices.getSettingsClient(context);
+    mContext = context;
+  }
+
+  @Override
+  @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
+  public void start(long interval)
+  {
+    Logger.d(TAG);
+
+    final LocationRequest locationRequest =
+        new LocationRequest
+            .Builder(Priority.PRIORITY_HIGH_ACCURACY, interval)
+            // Wait a few seconds for accurate locations initially, when accurate locations could not be computed on the
+            // device immediately. https://github.com/organicmaps/organicmaps/issues/2149
+            .setWaitForAccurateLocation(true)
+            // The desired location granularity should correspond to the client permission level. The client will be
+            // delivered fine locations while it has the Manifest.permission.ACCESS_FINE_LOCATION permission, coarse
+            // locations while it has only the Manifest.permission.ACCESS_COARSE_LOCATION permission, and no location
+            // if it lacks either.
+            .setGranularity(Granularity.GRANULARITY_PERMISSION_LEVEL)
+            // Sets the maximum age of an initial historical location delivered for this request.
+            .setMaxUpdateAgeMillis(60 * 60 * 1000L) // 1 hour
+            .build();
+
+    LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder();
+    builder.addLocationRequest(locationRequest);
+    builder.setAlwaysShow(true); // improves the wording/appearance of the dialog
+    final LocationSettingsRequest locationSettingsRequest = builder.build();
+
+    mSettingsClient.checkLocationSettings(locationSettingsRequest)
+        .addOnSuccessListener(locationSettingsResponse -> {
+          Logger.d(TAG, "Service is available");
+          mFusedLocationClient.requestLocationUpdates(locationRequest, mCallback, Looper.myLooper());
+        })
+        .addOnFailureListener(e -> {
+          try
+          {
+            int statusCode = ((ApiException) e).getStatusCode();
+            if (statusCode == LocationSettingsStatusCodes.RESOLUTION_REQUIRED)
+            {
+              // This case happens if at least one of the following system settings is off:
+              // 1. Location Services a.k.a GPS;
+              // 2. Google Location Accuracy a.k.a High Accuracy;
+              // 3. Both Wi-Fi && Mobile Data together (needed for 2).
+              //
+              // PendingIntent below will show a special Google "For better experience... enable (1) and/or (2) and/or
+              // (3)" dialog. This system dialog can change system settings if "Yes" is pressed. We can't do it from our
+              // app. However, we don't want to annoy a user who disabled (2) or (3) intentionally. GPS (1) is mandatory
+              // to continue, while (2) and (3) are not dealbreakers here.
+              //
+              // See https://github.com/organicmaps/organicmaps/issues/3846
+              //
+              if (LocationUtils.areLocationServicesTurnedOn(mContext))
+              {
+                Logger.d(TAG, "Don't show 'location resolution' dialog because location services are already on");
+                mFusedLocationClient.requestLocationUpdates(locationRequest, mCallback, Looper.myLooper());
+                return;
+              }
+              Logger.d(TAG, "Requesting 'location resolution' dialog");
+              final ResolvableApiException resolvable = (ResolvableApiException) e;
+              final PendingIntent pendingIntent = resolvable.getResolution();
+              // Call this callback in the next event loop to allow LocationHelper::start() to finish.
+              runLater(() -> mListener.onLocationResolutionRequired(pendingIntent));
+              return;
+            }
+          }
+          catch (ClassCastException ex)
+          {
+            // Ignore, should be an impossible error.
+            // https://developers.google.com/android/reference/com/google/android/gms/location/SettingsClient
+            Logger.e(TAG, "An error that should be impossible: " + ex);
+          }
+          // Location settings are not satisfied. However, we have no way to fix the
+          // settings so we won't show the dialog.
+          Logger.e(TAG, "Service is not available: " + e);
+          // Call this callback in the next event loop to allow LocationHelper::start() to finish.
+          runLater(mListener::onFusedLocationUnsupported);
+        });
+  }
+
+  @Override
+  protected void stop()
+  {
+    Logger.d(TAG);
+    mFusedLocationClient.removeLocationUpdates(mCallback);
+  }
+}

android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java

@@ -1,12 +1,11 @@
-package app.organicmaps.location;
+package app.organicmaps.sdk.location;
 
 import android.content.Context;
-
 import androidx.annotation.NonNull;
+import app.organicmaps.sdk.util.Config;
+import app.organicmaps.sdk.util.log.Logger;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
-import app.organicmaps.util.Config;
-import app.organicmaps.util.log.Logger;
 
 public class LocationProviderFactory
 {
@@ -17,7 +16,8 @@ public class LocationProviderFactory
     return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS;
   }
 
-  public static BaseLocationProvider getProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
+  public static BaseLocationProvider getProvider(@NonNull Context context,
+                                                 @NonNull BaseLocationProvider.Listener listener)
   {
     if (isGoogleLocationAvailable(context) && Config.useGoogleServices())
     {

android/app/src/google/play/listings/bn/short-description.txt

@@ -0,0 +1 @@
+সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত

android/app/src/google/play/listings/bn/title.txt

@@ -0,0 +1 @@
+CoMaps - গোপনীয়তা সহ যাতায়াত

android/app/src/google/play/listings/ca/full-description.txt

@@ -0,0 +1,36 @@
+CoMaps és una aplicació de mapes lliure i de codi obert a càrrec de la comunitat que es basa en les dades OpenStreetMap i es fonamenta en el compromís amb la transparència i la privadesa sense ànim de lucre.
+
+Uneix-te a la comunitat i ajuda a crear la millor aplicació de mapes.
+• Fes servir l'aplicació i recomana-la.
+• Dona la teva opinió i comunica qualsevol problema.
+• Actualitza les dades de mapes a l'aplicació o al web d'OpenStreetMap.
+
+<i>Els teus comentaris i les valoracions de 5 estrelles són el que més ens ajuda.</i>
+
+‣ <b>Disseny senzill i polit</b>: funcions bàsiques i fàcils de fer servir que funcionen i punt.
+‣ <b>Centrada en l'ús sense connexió</b>: planifica viatges a l'estranger i navega sense haver d'accedir a les dades mòbils o cerca punts d'interès durant rutes d'excursionisme llargues. Totes les funcions de l'aplicació s'han dissenyat perquè funcionin sense connexió.
+‣ <b>Respecte per la privadesa</b>: el disseny de l'aplicació prioritza la privadesa. No t'identifica, no fa cap seguiment i no recull dades personals. A més, no té anuncis.
+‣ <b>Ús eficient de la bateria i l'espai</b>: consumeix menys bateria que altres aplicacions de navegació. Els mapes compactes ocupen molt poc espai al telèfon.
+‣ <b>Lliure gràcies a la comunitat</b>: aquesta aplicació s'ha desenvolupat gràcies a persones com tu que han afegit llocs a OpenStreetMap, han provat funcions, n'han aportat comentaris i hi han contribuït amb diners i esforç.
+‣ <b>És un projecte obert i transparent en les seves decisions i finances. No té cap ànim de lucre i és completament de codi obert.</b>
+
+<b>Funcions principals</b>:
+• Mapes detallats que es poden baixar i inclouen llocs que no apareixen a Google Maps
+• Mode exterior en què es ressalten les rutes d'excursionisme, els llocs d'acampada, les fonts d'aigua, els pics i les línies de contorn, entre altres coses
+• Zones per a vianants i carrils bici
+• Punts d'interès, com ara restaurants, benzineres, hotels, botigues, atraccions turístiques i molt més
+• Cerques per nom, adreça o categoria de punt d'interès
+• Navegació amb indicacions per veu mentre camines, vas amb bicicleta o condueixes
+• Adreces d'interès perquè desis els teus llocs preferits amb un toc
+• Articles de Wikipedia sense connexió
+• Capa de línies de metro amb direccions
+• Enregistrament d'itineraris
+• Exportació i importació d'adreces d'interès i itineraris en els formats KML, KMZ i GPX
+• Mode fosc per fer servir l'aplicació a la nit
+• Millora de les dades de mapes per a tothom amb un editor integrat bàsic
+• Compatibilitat amb Android Auto
+
+Pots informar de problemes a l'aplicació, suggerir idees i unir-te a la comunitat al web <b><i>comaps.app</i></b>.
+
+<b>La llibertat ha arribat</b>
+Descobreix el teu camí i explora el món amb la privadesa i la comunitat com a eix central!

android/app/src/google/play/listings/ca/short-description.txt

@@ -0,0 +1 @@
+Navegació intuïtiva - Descobreix el teu camí - El poder de la comunitat

android/app/src/google/play/listings/ca/title.txt

@@ -0,0 +1 @@
+CoMaps – Navega amb privadesa

android/app/src/google/play/listings/da-DK/full-description.txt

@@ -0,0 +1,36 @@
+En fællesskabsdrevet gratis og open source-kortapp baseret på OpenStreetMap-data og forstærket med en forpligtelse til gennemsigtighed, privatliv og non-profit.
+
+Bliv en del af fællesskabet og vær med til at skabe den bedste kortapp
+• Brug appen og fortæl andre om den
+• Giv feedback og rapporter problemer
+• Opdater kortdata i appen eller på OpenStreetMap-webstedet
+
+<i>Din feedback og 5-stjernede anmeldelser er den bedste støtte for os!</i>
+
+‣ <b>Enkel og poleret</b>: væsentlige, brugervenlige funktioner, der bare virker.
+‣ <b>Offline-focused</b>: Planlæg og naviger på din rejse i udlandet uden behov for mobilfordbindelse, søg efter rutepunkter, mens du er på en lang vandretur osv. Alle app-funktioner er designet til at fungere offline..
+‣ <b>Respekt for privatlivets fred</b>: Appen er designet med fokus på privatlivets fred – den identificerer ikke personer, sporer ikke og indsamler ikke personlige oplysninger. Annoncefri.
+‣ <b>Sparer på batteriet og plads</b>: Dræner ikke dit batteri som andre navigationsapps. Kompakte kort sparer værdifuld plads på din telefon.
+‣ <b>Gratis og udviklet af fællesskabet</b>: Folk som dig har været med til at udvikle appen ved at tilføje steder til OpenStreetMap, teste og give feedback på funktioner samt bidrage med deres udviklingskompetencer og penge.
+‣ <b>Åben og gennemsigtig beslutningstagning og økonomi, non-profit og fuldstændig open source.</b>
+
+<b>Vigtigste funktioner</b>:
+• Detaljerede kort med steder, der ikke er tilgængelige på Google Maps, kan downloades.
+• Udendørstilstand med fremhævede vandreruter, campingpladser, vandkilder, bjergtoppe, højdekurver osv.
+• Gang- og cykelstier
+• Interessepunkter som restauranter, tankstationer, hoteller, butikker, seværdigheder og meget mere
+• Søg efter navn, adresse eller efter interessepunkt-kategori
+• Navigation med stemmevejledning til gående, cyklende eller kørende
+• Bogmærk dine yndlingssteder med ét enkelt tryk
+• Offline Wikipedia-artikler
+• Lag med metrolinjer og rutevejledning
+• Sporoptagelse
+• Eksportér og importér bogmærker og ruter i KML, KMZ, GPX-formater
+• En mørk tilstand til brug om natten
+• Forbedr kortdata for alle ved hjælp af en simpel, indbygget redigeringsfunktion
+• Android Auto-understøttelse
+
+Rapportér app-problemer, kom med forslag og bliv en del af vores fællesskab på <b><i>comaps.app</i></b> webstedet.
+
+<b>Nu med frihed</b>
+Udforsk din rejse, og navigér i verden med fokus på privatliv og fællesskab!

android/app/src/google/play/listings/da-DK/title.txt

@@ -0,0 +1 @@
+CoMaps - Naviger med privatliv

android/app/src/google/play/listings/es-ES/full-description.txt

@@ -0,0 +1,71 @@
+Una aplicación de mapas gratuita y de código abierto liderada por la comunidad, basada en los datos de OpenStreetMap y reforzada con un compromiso con la transparencia, la privacidad y la ausencia de fines de lucro.
+
+<br><br>
+
+Únete a la comunidad y ayuda a crear la mejor app de mapas
+
+• Usa la aplicación y corre la voz sobre ella
+
+• Envía comentarios y reporta problemas
+
+• Actualiza los datos del mapa en la app o en el sitio web de OpenStreetMap
+
+<br><br>
+
+<i>¡Tus comentarios y valoraciones de 5 estrellas son el mejor apoyo para nosotros!</i>
+
+<br><br>
+
+‣ <b>Sencilla y Pulida</b>: funciones esenciales fáciles de usar que simplemente funcionan.
+
+‣ <b>Enfocada en el uso sin conexión</b>: Planifica y navega tus viajes sin necesidad de conexión móvil, busca puntos de paso en rutas remotas, etc. Todas las funciones están diseñadas para funcionar sin conexión.
+
+‣ <b>Respeta tu Privacidad</b>: La app está diseñada pensando en tu privacidad: no identifica personas, no rastrea y no recoge datos personales. Sin publicidad.
+
+‣ <b>Ahorra Batería y Espacio</b>: No consume la batería como otras apps de navegación. Los mapas compactos ahorran espacio valioso en tu teléfono.
+
+‣ <b>Gratuita y Creada por la Comunidad</b>: Personas como tú ayudaron a construir la app añadiendo lugares a OpenStreetMap, probando funciones, dando opiniones y contribuyendo con desarrollo o financiación.
+
+‣ <b>Toma de decisiones y finanzas abiertas y transparentes, sin ánimo de lucro y completamente de código abierto.</b>
+
+<br><br>
+
+<b>Funciones Principales</b>:
+
+• Mapas detallados descargables con lugares que no aparecen en Google Maps
+
+• Modo exterior con rutas de senderismo destacadas, campings, fuentes de agua, picos, curvas de nivel, etc.
+
+• Caminos peatonales y carriles bici
+
+• Puntos de interés como restaurantes, gasolineras, hoteles, tiendas, lugares turísticos y muchos más
+
+• Búsqueda por nombre, dirección o categoría de punto de interés
+
+• Navegación con indicaciones por voz para caminar, ir en bici o conducir
+
+• Guarda tus lugares favoritos con un solo toque
+
+• Artículos de Wikipedia sin conexión
+
+• Capa de transporte subterráneo y rutas
+
+• Grabación de rutas
+
+• Exporta e importa favoritos y rutas en formatos KML, KMZ y GPX
+
+• Modo oscuro para usar de noche
+
+• Mejora los datos del mapa para todos usando un editor básico integrado
+
+• Compatibilidad con Android Auto
+
+<br><br>
+
+Por favor, informa de errores, sugiere ideas y únete a nuestra comunidad en el sitio web <b><i>comaps.app</i></b>.
+
+<br><br>
+
+<b>La Libertad Está Aquí</b>
+
+Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.

android/app/src/google/play/listings/es-ES/short-description.txt

@@ -0,0 +1 @@
+Navegación de mapa fácil - Descubre más en tu camino - Creado por la comunidad

android/app/src/google/play/listings/es-ES/title.txt

@@ -0,0 +1 @@
+CoMaps - Navega con Privacidad

android/app/src/google/play/listings/eu-ES/full-description.txt

@@ -0,0 +1,35 @@
+Komunitateak gidatutako doako eta kode irekiko aplikazioa OpenStreetMap datuetan oinarrituta, gardentasuna, pribatutasuna eta irabazi asmorik gabeko konpromisoarekin indartua.
+
+Sartu komunitatean eta lagundu mapa aplikaziorik onena egiten
+• Erabili aplikazioa eta horri buruzko iritsia zabaldu
+• Eman feedbacka eta txostenetako gaiak
+• Eguneratu maparen datuak aplikazioan edo OpenStreetMap webgunean
+<i> Zure iritzia eta 5 izarreko berrikuspenak dira guretzako laguntza onena! </ i>
+
+‣ <b>Sinplea</b>: oso erraza da ondo funtzionatzen duten funtzioak erabiltzea.
+‣ <b> Lineaz kanpo erabiltzeko prest </ b> Planifikatu eta nabigatu atzerrira bidaiatzea, konexio beharrik gabe, bilatu bideak urruneko ibilaldi batean, etab. Aplikazioaren funtzio guztiak lineaz kanpo lan egiteko diseinatuta daude.
+‣ <b> Pribatutasuna errespetatzea </ b>: aplikazioa pribatutasunarekin diseinatuta dago, ez du pertsonak identifikatzen, ez du jarraipena egiten, eta ez du informazio pertsonala biltzen. Iragarkirik gabe.
+‣ <b> Zure bateria eta espazioa gordetzen ditu </ b>: ez du bateria xukatu beste nabigazio aplikazioak bezala. Mapa trinkoek espazioa aurrezten dute zure telefonoan.
+‣ <b> Libre eta komunitateak eraikitakoa: Zu bezalako jendeak aplikazioa eraikitzen lagundu du tokiak gehituz OpenStreetMapen, probatuz eta funtzioei buruzko iritzia emanez eta iritsiz eta diruz lagunduz.
+‣ <b> Erabakiak hartzea eta finantza gardenak, irabazi asmorik gabekoa eta guztiz iturburu irekikoa. </ B>
+
+<b> Ezaugarri nagusiak </ b>:
+• Deskargatu mapa zehatzak Google Maps-ekin eskuragarri ez dauden lekuekin
+• Landa eremua moduan nabarmendutako mendi ibilbideak, kanpinak, ur iturriak, gailurrak, sestra-lerroak, etab
+• Bideak eta bidegorriak
+• Jatetxe, gasolindegiak, hotelak, dendak, bisitak eta bestelako interesguneak
+• Bilatu izenaren edo helbide baten arabera, edo kategoriaren arabera
+• Oinez, txirrindularitzarako edo gidatzeko ahots-oharrak dituen nabigazioa
+• Markatu zure gogoko lekuak ikutu bakarrarekin
+• Lineaz kanpoko Wikipedia artikuluak
+• Metroaren garraio geruza eta jarraibideak
+• Arrastoen grabazioa
+• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Gauean erabiltzeko modu iluna
+• Hobetu mapako datuak oinarrizko editore integratua erabiliz
+• Android Auto laguntza
+
+Mesedez, jakinarazi aplikazioaren gorabeherak, ideiak proposatu eta sartu gure komunitatean <b> <i> comaps.app </ i> </ b> webgunean.
+
+<b> Askatasuna hemen </ b> da
+Ezagutu zure bidaia, nabigatu munduan pribatutasunarekin eta komunitatearen abangoardian!

android/app/src/google/play/listings/eu-ES/title.txt

@@ -0,0 +1 @@
+Comaps - Pribatuki nabigatu

android/app/src/google/play/listings/fr-FR/short-description.txt

@@ -1 +1 @@
-Navigation cartographique facile - Propulsé par la communauté
+Navigation cartographique facile - Vivez de grands voyages - Propulsé par la communauté

android/app/src/google/play/listings/hu-HU/short-description.txt

@@ -0,0 +1 @@
+Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével

android/app/src/google/play/listings/hu-HU/title.txt

@@ -0,0 +1 @@
+CoMaps - Az adatvédő navigáció

android/app/src/google/play/listings/ia/short-description.txt

@@ -0,0 +1 @@
+Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate

android/app/src/google/play/listings/ia/title.txt

@@ -0,0 +1 @@
+CoMaps – Naviga private

android/app/src/google/play/listings/ml-IN/title.txt

@@ -0,0 +1 @@
+കോമാപ്പ്സ് - സ്വകാര്യതയോടെ സഞ്ചരിക്കൂ

android/app/src/google/play/listings/pl-PL/title.txt

@@ -0,0 +1 @@
+CoMaps - Nawigacja szanująca prywatność

android/app/src/google/play/listings/pt-BR/title.txt

@@ -1 +1 @@
-CoMaps - Navegue privadamente
+CoMaps - Navegue Privadamente

android/app/src/google/play/listings/ru-RU/title.txt

@@ -1 +1 @@
-CoMaps - Оффлайн навигация
+CoMaps - Приватная навигация

android/app/src/google/play/listings/tr-TR/full-description.txt

@@ -7,12 +7,12 @@ Topluluğa katılın ve en iyi harita uygulamasını oluşturmamıza yardım edi
 
 <i>Geri bildirimleriniz ve 5 yıldızlı yorumlarınız bizim için en iyi destektir!</i>
 
-‣ <b>Basit ve Temiz</b>: Sadece temel, kullanımı basit, işe yarayan özellikler.
+‣ <b>Basit ve Temiz</b>: Sadece temel, kullanımı basit ve işe yarayan özellikler.
-‣ <b>Çevrimdışı Odaklı</b>: Mobil veriye ihtiyaç duymadan yurt dışı seyahatinizi planlayın ve gezin, uzun bir yürüyüş sırasında rotanızdaki noktaları bulun ve daha fazlası . Tüm özellikler çevrimdışı çalışmak üzere tasarlanmıştır.
+‣ <b>Çevrimdışı Odaklı</b>: Mobil veriye ihtiyaç duymadan yurt dışı seyahatinizi planlayın ve gezin, uzun bir yürüyüş sırasında rotanızdaki noktaları bulun ve daha fazlası. Tüm özellikler çevrimdışı çalışmak üzere tasarlanmıştır.
 ‣ <b>Gizliliğe Saygılı</b>: Uygulama gizliliğe saygılı olarak tasarlanmıştır. Kullanıcı profilinizi çıkarmaz, sizi takip etmez ve kişisel bilgi toplamaz. Üstelik tamamen reklamsızdır.
-‣ <b>Pil ve Depolamanızdan Tasarruf Eder</b>: Diğer navigasyon uygulamaları gibi pilinizi sömürmez. Compact maps değerli depolama alanınızdan tasarruf eder.
+‣ <b>Pil ve Depolamanızdan Tasarruf Eder</b>: Diğer navigasyon uygulamaları gibi pilinizi sömürmez. Kompakt harita dosyaları, değerli depolama alanınızdan tasarruf eder.
-‣ <b>Ücretsizdir ve Gücünü Topluluktan Alır</b>: Sizin gibi insanlar OpenStreetMap'e yer ekleyerek, yeni özellikleri test ederek, geri bildirimde bulunarak, program geliştirme becerileri ve bağışlarla katkıda bulunarak uygulamanın oluşturulmasına yardımcı oldu.
+‣ <b>Ücretsizdir ve Gücünü Topluluktan Alır</b>: Sizin gibi insanlar OpenStreetMap'e yer ekleyerek, yeni özellikleri test ederek, geri bildirimde bulunarak, program geliştirme becerileri ve bağışlarla katkıda bulunarak bu uygulamanın oluşturulmasına yardımcı oldular.
-‣ <b>Açık ve Şeffaf Şekilde Yürütülen Karar Alma ve Fonlama Süreçleri, Kâr Amacı Gütmez ve Tamamen Açık Kaynaklı.</b>
+‣ <b>Açık ve Şeffaf Bir Şekilde Yürütülen Karar Alma ve Fonlama Süreçlerine Sahip, Kâr Amacı Gütmeyen ve Tamamen Açık Kaynaklı Bir Uygulama.</b>
 
 <b>Ana Özellikler</b>:
 • Google Haritalar'da bulunmayan yerleri içeren, çevrimdışı detaylı haritalar

android/app/src/huawei/java/app/organicmaps/location

@@ -1 +0,0 @@
-../../../../google/java/app/organicmaps/location

android/app/src/huawei/java/app/organicmaps/sdk/location

@@ -0,0 +1 @@
+../../../../../google/java/app/organicmaps/sdk/location

android/app/src/main/AndroidManifest.xml

@@ -75,6 +75,7 @@
       android:backupInForeground="true"
       android:fullBackupContent="@xml/backup_content"
       android:dataExtractionRules="@xml/backup_content_v31"
+      android:enableOnBackInvokedCallback="false"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
       android:localeConfig="@xml/locales_config"
@@ -376,6 +377,7 @@
 
     <activity
         android:name="app.organicmaps.downloader.DownloaderActivity"
+        android:enableOnBackInvokedCallback="true"
         android:configChanges="orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/download_maps"

android/app/src/main/assets/resources-6plus_dark

@@ -1 +0,0 @@
-../../../../../data/resources-6plus_dark

android/app/src/main/assets/resources-6plus_light

@@ -1 +0,0 @@
-../../../../../data/resources-6plus_light

android/app/src/main/assets/resources-default

@@ -1 +0,0 @@
-../../../../../data/resources-default

android/app/src/main/assets/resources-hdpi_dark

@@ -1 +0,0 @@
-../../../../../data/resources-hdpi_dark