diff --git a/.zenodo.json b/.zenodo.json index 26f272ee5..7987e221e 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -2,7 +2,7 @@ "description": "

Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.

", "license": "GPLv3", "title": "Mergin Maps mobile app", - "version": "2025.8.0", + "version": "2026.1.0", "upload_type": "software", "publication_date": "2022-02-24", "creators": [ @@ -39,7 +39,7 @@ "related_identifiers": [ { "scheme": "url", - "identifier": "https://github.com/MerginMaps/mobile/tree/2025.8.0", + "identifier": "https://github.com/MerginMaps/mobile/tree/2026.1.0", "relation": "isSupplementTo" }, { diff --git a/CITATION.cff b/CITATION.cff index 9c7aa026f..864343f58 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,4 +1,4 @@ -cff-version: 2025.8.0 +cff-version: 2026.1.0 message: "If you use this software, please cite it as below." authors: - family-names: "Martin" diff --git a/CMakeLists.txt b/CMakeLists.txt index 5605ce6bb..652a7a031 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,8 @@ cmake_minimum_required(VERSION 3.22) # ######################################################################################## # Note: To update version use script/update_all_versions.bash -set(MM_VERSION_MAJOR "2025") -set(MM_VERSION_MINOR "8") +set(MM_VERSION_MAJOR "2026") +set(MM_VERSION_MINOR "1") set(MM_VERSION_PATCH "0") if (VCPKG_TARGET_TRIPLET MATCHES ".*ios.*") diff --git a/app/inpututils.cpp b/app/inpututils.cpp index 1c499d5ae..47b37b021 100644 --- a/app/inpututils.cpp +++ b/app/inpututils.cpp @@ -15,6 +15,7 @@ #include #include #include +#include "mmconfig.h" #include "ios/iosutils.h" diff --git a/app/qml/components/MMListView.qml b/app/qml/components/MMListView.qml index e28f8459a..5dd543439 100644 --- a/app/qml/components/MMListView.qml +++ b/app/qml/components/MMListView.qml @@ -9,12 +9,14 @@ import QtQuick -// -// Hot-fix for hotfix https://github.com/MerginMaps/mobile/issues/3417 -// Seems like there is some issue with cache in ListView -// - ListView { - cacheBuffer: 0 -} + id: root + // when flicking up really fast, we should go back to the first item + onVerticalOvershootChanged: { + if (verticalOvershoot < -200) { + root.contentY= -root.topMargin + root.returnToBounds(); + } + } +} \ No newline at end of file diff --git a/scripts/update_all_versions.bash b/scripts/update_all_versions.bash index 373a7c617..30f65ac6a 100755 --- a/scripts/update_all_versions.bash +++ b/scripts/update_all_versions.bash @@ -2,7 +2,10 @@ set -e -echo "update_all_versions.bash MAJOR.MINOR.BUILD" +if [ -z "$1" ]; then + echo "Error => Supply version in format: MAJOR.MINOR.BUILD" + exit 1 +fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" VERSION=$1 @@ -37,7 +40,7 @@ rm -f $CITATION_FILE.orig # vcpkg.json VCPKG_FILE=$DIR/../vcpkg.json echo "patching $VCPKG_FILE" -sed -i.orig -E "s|\"version\": \"[0-9]+\.[0-9]+\.[0-9]+\"|\"version\": \"$MAJOR\.$MINOR\.$BUILD\"|g" $VCPKG_FILE +sed -i.orig -E "0,/\"version\": \"[0-9]+\.[0-9]+\.[0-9]+\"/{s|\"version\": \"[0-9]+\.[0-9]+\.[0-9]+\"|\"version\": \"$MAJOR\.$MINOR\.$BUILD\"|}" $VCPKG_FILE rm -f $VCPKG_FILE.orig echo "patching done" diff --git a/scripts/update_supported_formats.bash b/scripts/update_supported_formats.bash index f87ce89ab..1bc23539a 100755 --- a/scripts/update_supported_formats.bash +++ b/scripts/update_supported_formats.bash @@ -40,6 +40,6 @@ check_command "$OGRINFO" "$OGRINFO" --formats } > "$OUTPUT_FILE" -$PROJECT_DIR/build/app/Input --generate_QGIS_formats +$PROJECT_DIR/build/app/MerginMaps --generate_QGIS_formats echo "Formats info saved to $OUTPUT_FILE" diff --git a/vcpkg.json b/vcpkg.json index 768315dc2..d1891d209 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,7 +9,7 @@ }, "name": "merginmaps-mobile-app", "description": "Collect. Share. Publish.", - "version": "2025.8.0", + "version": "2026.1.0", "homepage": "https://github.com/merginmaps/mobile", "dependencies": [ {