From 3771a856ca5f63eec784dd9cc2f96d52764993d6 Mon Sep 17 00:00:00 2001 From: Kaustuv Pokharel Date: Fri, 10 Oct 2025 16:42:22 -0400 Subject: [PATCH 1/7] fixed the space or rebound issue --- app/qml/layers/MMFeaturesListPage.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml index 822d45de5..a1c39a3b7 100644 --- a/app/qml/layers/MMFeaturesListPage.qml +++ b/app/qml/layers/MMFeaturesListPage.qml @@ -50,6 +50,11 @@ MMComponents.MMPage { width: parent.width + onFlickEnded: positionViewAtEnd() + onMovementEnded: positionViewAtEnd() + highlightMoveDuration: 120 + cacheBuffer: height + anchors { top: searchBar.bottom bottom: parent.bottom From 9967724ca67b7545d7f4f949b38aef7206261ef1 Mon Sep 17 00:00:00 2001 From: Kaustuv Pokharel Date: Fri, 10 Oct 2025 18:02:05 -0400 Subject: [PATCH 2/7] rebound bug fix for the top scroll without forcing the last feature on the view --- app/qml/layers/MMFeaturesListPage.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml index a1c39a3b7..662cbd36e 100644 --- a/app/qml/layers/MMFeaturesListPage.qml +++ b/app/qml/layers/MMFeaturesListPage.qml @@ -50,10 +50,11 @@ MMComponents.MMPage { width: parent.width - onFlickEnded: positionViewAtEnd() - onMovementEnded: positionViewAtEnd() highlightMoveDuration: 120 cacheBuffer: height + footerPositioning: ListView.InlineFooter + bottomMargin: spacer.height + snapMode: ListView.SnapToItem anchors { top: searchBar.bottom @@ -79,6 +80,7 @@ MMComponents.MMPage { } footer: MMComponents.MMListSpacer { + id: spacer height: __style.margin20 + ( root.hasToolbar ? 0 : __style.safeAreaBottom ) + ( addButton.visible ? addButton.height : 0 ) } } From ebd83867d2ab74a4a00d97b2e26e56af32a63f58 Mon Sep 17 00:00:00 2001 From: Kaustuv Pokharel Date: Sat, 18 Oct 2025 12:53:52 -0400 Subject: [PATCH 3/7] removing explicitly mentioned property from suggestion --- app/qml/layers/MMFeaturesListPage.qml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml index 662cbd36e..60ff3acff 100644 --- a/app/qml/layers/MMFeaturesListPage.qml +++ b/app/qml/layers/MMFeaturesListPage.qml @@ -50,10 +50,7 @@ MMComponents.MMPage { width: parent.width - highlightMoveDuration: 120 cacheBuffer: height - footerPositioning: ListView.InlineFooter - bottomMargin: spacer.height snapMode: ListView.SnapToItem anchors { From dde96fad52eeef57b0274a988fde154651677ea1 Mon Sep 17 00:00:00 2001 From: Gabriel Bolbotina Date: Fri, 19 Dec 2025 13:17:20 +0200 Subject: [PATCH 4/7] Fixed flicking up really fast rebound issue Deleted cacheBuffer --- app/qml/components/MMListView.qml | 16 +++++++++------- app/qml/layers/MMFeaturesListPage.qml | 3 --- 2 files changed, 9 insertions(+), 10 deletions(-) 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/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml index 60ff3acff..7d2ea5099 100644 --- a/app/qml/layers/MMFeaturesListPage.qml +++ b/app/qml/layers/MMFeaturesListPage.qml @@ -50,8 +50,6 @@ MMComponents.MMPage { width: parent.width - cacheBuffer: height - snapMode: ListView.SnapToItem anchors { top: searchBar.bottom @@ -77,7 +75,6 @@ MMComponents.MMPage { } footer: MMComponents.MMListSpacer { - id: spacer height: __style.margin20 + ( root.hasToolbar ? 0 : __style.safeAreaBottom ) + ( addButton.visible ? addButton.height : 0 ) } } From 6edddee7f5a385961f1dc9c0ed3bed8970fcd2eb Mon Sep 17 00:00:00 2001 From: Gabriel Bolbotina Date: Fri, 19 Dec 2025 14:13:16 +0200 Subject: [PATCH 5/7] Removed unneeded line --- app/qml/layers/MMFeaturesListPage.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml index 7d2ea5099..822d45de5 100644 --- a/app/qml/layers/MMFeaturesListPage.qml +++ b/app/qml/layers/MMFeaturesListPage.qml @@ -50,7 +50,6 @@ MMComponents.MMPage { width: parent.width - anchors { top: searchBar.bottom bottom: parent.bottom From 4a8a42c36a4f60a1f57c87cb1d42a2e6e666a7ad Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 18 Dec 2025 12:03:58 +0100 Subject: [PATCH 6/7] Fix version update script --- app/inpututils.cpp | 1 + scripts/update_all_versions.bash | 7 +++++-- scripts/update_supported_formats.bash | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) 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/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" From cc09ca9b2d851ae51605c7c42fcc0fa86127278b Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 18 Dec 2025 12:04:27 +0100 Subject: [PATCH 7/7] Update versions --- .zenodo.json | 4 ++-- CITATION.cff | 2 +- CMakeLists.txt | 4 ++-- vcpkg.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) 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/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": [ {