Merge branch 'master' into master_changelog

MerginMaps · Nov 13, 2023 · 2fc28ca · 2fc28ca
2 parents 898ddf5 + 7c27b43
commit 2fc28ca
Show file tree

Hide file tree

Showing 177 changed files with 6,271 additions and 8,357 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -20,10 +20,10 @@ concurrency:
 
 jobs:
   android_build:
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-12
     env:
-      QT_VERSION: '6.5.2'
+      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
       NDK_VERSION: r25
       NDK_VERSION_FULL: r25b
       JDK_VERSION: 11
@@ -33,7 +33,7 @@ jobs:
       INPUT_SDK_VERSION_ARM64: arm64-android-20230824-200
       CCACHE_DIR: /Users/runner/work/ccache
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
-      CACHE_VERSION: 2
+      CACHE_VERSION: 0
       QT_ANDROID_KEYSTORE_ALIAS: input
       QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}
@@ -161,11 +161,11 @@ jobs:
           # download
           wget -O \
             input-sdk-arm-android.tar.gz \
-            https://github.com/MerginMaps/input-sdk/releases/download/${{ env.INPUT_SDK_VERSION_ARM }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION_ARM }}.tar.gz
+            https://github.com/MerginMaps/mobile-sdk/releases/download/${{ env.INPUT_SDK_VERSION_ARM }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION_ARM }}.tar.gz
           
           wget -O \
             input-sdk-arm64-android.tar.gz \
-            https://github.com/MerginMaps/input-sdk/releases/download/${{ env.INPUT_SDK_VERSION_ARM64 }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION_ARM64 }}.tar.gz
+            https://github.com/MerginMaps/mobile-sdk/releases/download/${{ env.INPUT_SDK_VERSION_ARM64 }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION_ARM64 }}.tar.gz
              
           # unpack
           mkdir -p ${{ github.workspace }}/input-sdk/arm-android

diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
@@ -18,17 +18,18 @@ on:
       - published
 
 env:
-  QT_VERSION: '6.5.2'
+  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
   CACHE_VERSION: 0
 
 jobs:
   code_style_cpp:
     name: C++ code convention check
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-latest
     steps:
       - name: Install astyle
         run: |
+          brew update
           brew install astyle
 
       - name: Checkout input
@@ -42,7 +43,7 @@ jobs:
 
   code_style_cmake:
     name: CMake code convention check
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: ubuntu-latest
     steps:
       - name: Install cmake-format
@@ -60,14 +61,15 @@ jobs:
 
   cppcheck:
     name: Cppcheck
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Install Requirements
         run: |
+          brew update
           brew install cppcheck
 
       - name: Run cppcheck test

diff --git a/.github/workflows/gallery.yml b/.github/workflows/gallery.yml
@@ -17,14 +17,14 @@ concurrency:
 
 jobs:
   gallery_build:
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     strategy:
       fail-fast: false
       matrix:
           os: [ubuntu-latest, macos-latest, windows-2019]
     runs-on: ${{ matrix.os }}
     env:
-      QT_VERSION: '6.5.2'
+      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
       CACHE_VERSION: 0
       XC_VERSION: ${{ '14.2' }} # macos-only

diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
@@ -8,10 +8,10 @@ on:
 
 jobs:
   check_translation_files:
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: ubuntu-latest
     env:
-      QT_VERSION: '6.5.2'
+      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
     steps:
 
       - uses: actions/checkout@v3

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -16,22 +16,22 @@ on:
       - published
 
 env:   
-  QT_VERSION: '6.5.2'
+  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
   XC_VERSION: ${{ '14.2' }}
   IOS_CMAKE_TOOLCHAIN_VERSION: "4.4.0" 
   INPUT_SDK_VERSION: arm64-ios-20230824-157
   IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
   KEYCHAIN: ${{ 'inputapp.keychain' }}
   CCACHE_DIR: /Users/runner/work/ccache
-  CACHE_VERSION: 2
+  CACHE_VERSION: 0
 
 concurrency:
   group: ci-${{github.ref}}-ios
   cancel-in-progress: true
 
 jobs:
   ios_build:
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-12
     steps:
       - name: Select latest Xcode
@@ -135,7 +135,7 @@ jobs:
         run: |
           wget -O \
             ${{ github.workspace }}/input-sdk.tar.gz \
-            https://github.com/MerginMaps/input-sdk/releases/download/${{ env.INPUT_SDK_VERSION }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION }}.tar.gz
+            https://github.com/MerginMaps/mobile-sdk/releases/download/${{ env.INPUT_SDK_VERSION }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION }}.tar.gz
           mkdir -p ${{ github.workspace }}/input-sdk/arm64-ios
           cd ${{ github.workspace }}/input-sdk/arm64-ios
           tar -xvzf ${{ github.workspace }}/input-sdk.tar.gz
@@ -231,5 +231,5 @@ jobs:
           xcrun altool --upload-app -t ios -f build-INPUT/Input.ipa -u "$INPUTAPP_BOT_APPLEID_USER" -p "$INPUTAPP_BOT_APPLEID_PASS" --verbose
 
           # Add comment to GitHub
-          GITHUB_API=https://api.github.com/repos/MerginMaps/input/commits/${GITHUB_SHA}/comments
+          GITHUB_API=https://api.github.com/repos/MerginMaps/mobile/commits/${GITHUB_SHA}/comments
           curl -u inputapp-bot:${INPUTAPP_BOT_GITHUB_TOKEN} -X POST --data '{"body": "iOS - version '${CF_BUNDLE_VERSION}' just submitted!"}' ${GITHUB_API}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -18,16 +18,16 @@ on:
 env:
   CCACHE_DIR: ~/.ccache
   INPUT_SDK_VERSION: x64-linux-20230824-162
-  QT_VERSION: '6.5.2'
-  CACHE_VERSION: 1
+  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
+  CACHE_VERSION: 0
 
 concurrency:
   group: ci-${{github.ref}}-linux
   cancel-in-progress: true
 
 jobs:
   linux_build:
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout Input
@@ -112,7 +112,7 @@ jobs:
         run: |
           wget -O \
             ${{ github.workspace }}/input-sdk.tar.gz \
-            https://github.com/MerginMaps/input-sdk/releases/download/${{ env.INPUT_SDK_VERSION }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION }}.tar.gz
+            https://github.com/MerginMaps/mobile-sdk/releases/download/${{ env.INPUT_SDK_VERSION }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION }}.tar.gz
           mkdir -p ${{ github.workspace }}/input-sdk/x64-linux
           cd ${{ github.workspace }}/input-sdk/x64-linux
           tar -xvzf ${{ github.workspace }}/input-sdk.tar.gz
@@ -149,6 +149,8 @@ jobs:
       - name: run tests
         env:
           TEST_MERGIN_URL: https://test.dev.merginmaps.com/
+          TEST_API_USERNAME: test_mobileapp
+          TEST_API_PASSWORD: ${{ secrets.TEST_API_PASSWORD }}
           QT_QPA_PLATFORM: "offscreen"
         run: |
           cd build-Input-db/

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -16,10 +16,10 @@ on:
       - published
 
 env:
-  QT_VERSION: '6.5.2'
+  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
   INPUT_SDK_VERSION: x64-osx-20230824-181
   CCACHE_DIR: /Users/runner/work/ccache
-  CACHE_VERSION: 2
+  CACHE_VERSION: 0
   XC_VERSION: ${{ '14.2' }}
 
 concurrency:
@@ -28,7 +28,7 @@ concurrency:
 
 jobs:
   macos_build:
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-12
     steps:
       - name: Checkout Input
@@ -113,7 +113,7 @@ jobs:
         run: |
           wget -O \
             ${{ github.workspace }}/input-sdk.tar.gz \
-            https://github.com/MerginMaps/input-sdk/releases/download/${{ env.INPUT_SDK_VERSION }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION }}.tar.gz
+            https://github.com/MerginMaps/mobile-sdk/releases/download/${{ env.INPUT_SDK_VERSION }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION }}.tar.gz
           mkdir -p ${{ github.workspace }}/input-sdk/x64-osx
           cd ${{ github.workspace }}/input-sdk/x64-osx
           tar -xvzf ${{ github.workspace }}/input-sdk.tar.gz
@@ -148,6 +148,8 @@ jobs:
       - name: run tests
         env:
           TEST_MERGIN_URL: https://test.dev.merginmaps.com/
+          TEST_API_USERNAME: test_mobileapp2
+          TEST_API_PASSWORD: ${{ secrets.TEST_API_PASSWORD }}
         run: |
           cd build-Input-db/
           ctest --output-on-failure

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -21,14 +21,14 @@ concurrency:
 
 jobs:
   win64_build:
-    if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
+    if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: windows-2019
 
     env:
-      QT_VERSION: '6.5.2'
+      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
       INPUT_SDK_VERSION: x64-windows-20230824-209
       CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache
-      CACHE_VERSION: 3
+      CACHE_VERSION: 0
       VS_VERSION: "2019"
       QT_ARCH: "win64_msvc2019_64"
 
@@ -111,7 +111,7 @@ jobs:
         shell: bash
         if: steps.cache-input-sdk.outputs.cache-hit != 'true'
         run: |
-          URL="https://github.com/MerginMaps/input-sdk/releases/download/${{ env.INPUT_SDK_VERSION }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION }}.zip"
+          URL="https://github.com/MerginMaps/mobile-sdk/releases/download/${{ env.INPUT_SDK_VERSION }}/mergin-maps-input-sdk-qt-${{ env.QT_VERSION }}-${{ env.INPUT_SDK_VERSION }}.zip"
           echo "downloading: $URL"
           curl -fsSL --connect-timeout 60 -o \
             input-sdk.tar.gz \

diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,6 @@ app/android/AndroidManifest.xml
 *.gpkg-shm
 Input_keystore.keystore
 CMakeLists.txt.user
+app/android/build.gradle
 app/android/.gradle/*
 app/android/.gradle
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,8 +1,8 @@
 {
-    "description": "<p>Mergin Maps Input app is a QGIS based mobile app for Android and iOS devices.</p>", 
+    "description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>", 
     "license": "GPLv3", 
-    "title": "Mergin Maps Input: QGIS in your pocket", 
-    "version": "2.3.1",
+    "title": "Mergin Maps mobile app", 
+    "version": "2.5.0",
     "upload_type": "software", 
     "publication_date": "2022-02-24", 
     "creators": [
@@ -21,11 +21,7 @@
         {
             "affiliation": "Lutra Consulting", 
             "name": "Saber Razmjooei"
-        }, 
-        {
-            "affiliation": "@lutraconsulting", 
-            "name": "Nedjima Belgacem"
-        }, 
+        },
         {
             "affiliation": "@lutraconsulting", 
             "name": "Martin Varga"
@@ -43,7 +39,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/MerginMaps/input/tree/2.3.1", 
+            "identifier": "https://github.com/MerginMaps/mobile/tree/2.5.0", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/CITATION.cff b/CITATION.cff
@@ -1,4 +1,4 @@
-cff-version: 2.3.1
+cff-version: 2.5.0
 message: "If you use this software, please cite it as below."
 authors:
 - family-names: "Martin"
@@ -7,7 +7,7 @@ authors:
   given-names: "Petrik"
 - family-names: "Tomas"
   given-names: "Mizera"
-title: "Mergin Maps Input app"
+title: "Mergin Maps mobile app"
 doi: 10.5281/zenodo.6375198
 date-released: 2017-12-18
-url: "https://github.com/MerginMaps/input"
+url: "https://github.com/MerginMaps/mobile"