From 75c37479016bd2cf6caa4050dc1e8a5fe9383592 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Mon, 6 Oct 2025 16:44:52 +0200 Subject: [PATCH 1/4] Update version --- .zenodo.json | 4 ++-- CITATION.cff | 2 +- CMakeLists.txt | 2 +- vcpkg.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 22d39916a..26f272ee5 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.7.0", + "version": "2025.8.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.7.0", + "identifier": "https://github.com/MerginMaps/mobile/tree/2025.8.0", "relation": "isSupplementTo" }, { diff --git a/CITATION.cff b/CITATION.cff index 9b3fedd36..9c7aa026f 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,4 +1,4 @@ -cff-version: 2025.7.0 +cff-version: 2025.8.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 e6a8d5cb0..dd912c033 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ 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 "7") +set(MM_VERSION_MINOR "8") set(MM_VERSION_PATCH "0") if (VCPKG_TARGET_TRIPLET MATCHES ".*ios.*") diff --git a/vcpkg.json b/vcpkg.json index f5411a67d..7bb869413 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,7 +9,7 @@ }, "name": "merginmaps-mobile-app", "description": "Collect. Share. Publish.", - "version": "2025.7.0", + "version": "2025.8.0", "homepage": "https://github.com/merginmaps/mobile", "dependencies": [ { From be54e2f00cbb596a55be027e8dfc3f9ecfeb3813 Mon Sep 17 00:00:00 2001 From: Kaustuv Pokharel Date: Fri, 10 Oct 2025 16:42:22 -0400 Subject: [PATCH 2/4] 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 952894924..8a40f064c 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 a10b732ec106d4b6b71820be35c906a199545654 Mon Sep 17 00:00:00 2001 From: Kaustuv Pokharel Date: Fri, 10 Oct 2025 18:02:05 -0400 Subject: [PATCH 3/4] 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 8a40f064c..171f57b81 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 @@ -78,6 +79,7 @@ MMComponents.MMPage { } footer: MMComponents.MMListSpacer { + id: spacer height: __style.margin20 + ( root.hasToolbar ? 0 : __style.safeAreaBottom ) + ( addButton.visible ? addButton.height : 0 ) } } From 941a670f566f08746316a4e6ffef378543fdbf77 Mon Sep 17 00:00:00 2001 From: Kaustuv Pokharel Date: Sat, 18 Oct 2025 12:53:52 -0400 Subject: [PATCH 4/4] 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 171f57b81..595441050 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 {