Skip to content

Fixed the space or rebound issue #4146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaustuvpokharel wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fixed the space or rebound issue #4146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3771a85
fixed the space or rebound issue
kaustuvpokharel Oct 10, 2025
9967724
rebound bug fix for the top scroll without forcing the last feature o…
kaustuvpokharel Oct 10, 2025
ebd8386
removing explicitly mentioned property from suggestion
kaustuvpokharel Oct 18, 2025
dde96fa
Fixed flicking up really fast rebound issue
gabriel-bolbotina Dec 19, 2025
6edddee
Removed unneeded line
gabriel-bolbotina Dec 19, 2025
4a8a42c
Fix version update script
Withalion Dec 18, 2025
cc09ca9
Update versions
Withalion Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .zenodo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>",
"license": "GPLv3",
"title": "Mergin Maps mobile app",
"version": "2025.8.0",
"version": "2026.1.0",
"upload_type": "software",
"publication_date": "2022-02-24",
"creators": [
Expand Down Expand Up @@ -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"
},
{
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*")
Expand Down
1 change: 1 addition & 0 deletions app/inpututils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <QApplication>
#include <QCoreApplication>
#include <QPermissions>
#include "mmconfig.h"

#include "ios/iosutils.h"

Expand Down
16 changes: 9 additions & 7 deletions app/qml/components/MMListView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
7 changes: 5 additions & 2 deletions scripts/update_all_versions.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_supported_formats.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
Loading