Merge branch 'master' into master_styleV2

.github/workflows/android.yml

@@ -20,7 +20,7 @@ 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' # use scripts/update_qt_version.bash to change
@@ -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

.github/workflows/code_style.yml

@@ -24,7 +24,7 @@ env:
 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
@@ -43,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
@@ -61,7 +61,7 @@ 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

.github/workflows/gallery.yml

@@ -17,7 +17,7 @@ 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:

.github/workflows/i18n.yml

@@ -8,7 +8,7 @@ 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' # use scripts/update_qt_version.bash to change

.github/workflows/ios.yml

@@ -31,7 +31,7 @@ concurrency:
 
 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}

.github/workflows/linux.yml

@@ -27,7 +27,7 @@ concurrency:
 
 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

.github/workflows/macos.yml

@@ -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

.github/workflows/win.yml

@@ -21,7 +21,7 @@ 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:
@@ -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 \

.zenodo.json

@@ -1,7 +1,7 @@
 {
-    "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", 
+    "title": "Mergin Maps mobile app", 
     "version": "2.5.0",
     "upload_type": "software", 
     "publication_date": "2022-02-24", 
@@ -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.5.0", 
+            "identifier": "https://github.com/MerginMaps/mobile/tree/2.5.0", 
             "relation": "isSupplementTo"
         }, 
         {

CITATION.cff

@@ -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"

INSTALL.md

@@ -8,6 +8,7 @@ Building Mergin Maps mobile app from source - step by step
 * [2. Overview](#2-overview)
    * [2.1 Secrets](#21-secrets)
    * [2.2 Code formatting](#22-code-formatting)
+   * [2.3 Required Qt packages](#23-required-qt-packages)
 * [3. Building GNU/Ubuntu](#3-building-gnuubuntu)
 * [4. Building Android (on Ubuntu/macOS/Windows)](#4-building-android-on-ubuntumacoswindows)
    * [4.1. Android on Ubuntu](#41-android-on-ubuntu)
@@ -48,13 +49,13 @@ uses [CMake](https://www.cmake.org) for building from source.
 It is C++ application build on top of [Qt](https://www.qt.io), [QGIS](https://www.qgis.org/en/site/)
 and many other FOSS libraries. 
 
-All required libraries (in release configuration) are packaged in the [Input-SDK](https://github.com/MerginMaps/input-sdk).
+All required libraries (in release configuration) are packaged in the [Mobile-SDK](https://github.com/MerginMaps/mobile-sdk).
 If you need to debug some error in the library, you need to compile Input-SDK in debug yourself locally. Otherwise
-it is suggested to download required libraries from [Input-SDK tags](https://github.com/MerginMaps/input-sdk/tags)
-Input-SDK uses vcpkg packaging system, so if the SDK for your target system/architecture you can build it yourself.
+it is suggested to download required libraries from [Mobile-SDK tags](https://github.com/MerginMaps/mobile-sdk/tags)
+Mobile-SDK uses vcpkg packaging system, so if the SDK for your target system/architecture you can build it yourself.
 
 Generally, for building setup, you need the same versions of libraries/SDKs/NDKs/compilers as used in the official 
-[GitHub Actions](https://github.com/MerginMaps/input/tree/master/.github/workflows).
+[GitHub Actions](https://github.com/MerginMaps/mobile/tree/master/.github/workflows).
 Open workflow file for your platform/target and see the version of libraries used and replicate it in your setup.
 
 ## 2.1 Secrets
@@ -100,6 +101,20 @@ To manually run the style check, run `pre-commit run --all-files` or optionally
 
 In case you want to skip execution of pre-commit hooks, add additional flag `--no-verify` to your commit command, e.g.: `git commit -m "nit" --no-verify`
 
+## 2.3 Required Qt packages
+
+Mergin Maps is built with Qt. If you are using Qt's `Maintenance tool`, make sure to install these packages:
+ - `Android` -> when building for Andoroid
+ - `iOS` -> when building for iOS
+ - `macOS` -> or other desktop platform based on your host machine
+ - `Qt 5 Compatibility Module`
+ - `Qt Shader Tools`
+ - `Additional libraries:`
+   - `Qt Connectivity` -> used for Bluetooth
+   - `Qt Multimedia`
+   - `Qt Positioning`
+   - `Qt Sensors`
+
 # 3. Building GNU/Ubuntu
 
 This guide is tested with Ubuntu 22.04, on other distros some steps may need some adjustments.
@@ -388,4 +403,4 @@ TEST_API_PASSWORD=<your_password>
 ```
 
 Build binary and you can run tests either with `ctest` or you can run individual tests by adding `--test<TestName>`
-e.g. ` ./input --testMerginApi`
+e.g. ` ./input --testMerginApi`