relation reference editor (#3060)

relation reference editor
MerginMaps · Feb 19, 2024 · 6359509 · 6359509 · inputapp-bot · Feb 19, 2024
1 parent 31cac95
commit 6359509
Show file tree

Hide file tree

Showing 18 changed files with 189 additions and 155 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -21,7 +21,7 @@ concurrency:
 jobs:
   android_build:
     if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
-    runs-on: macos-12
+    runs-on: macos-13
     env:
       QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
       NDK_VERSION: r25
@@ -33,11 +33,11 @@ jobs:
       INPUT_SDK_VERSION_ARM64: arm64-android-20240215-206
       CCACHE_DIR: /Users/runner/work/ccache
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
-      CACHE_VERSION: 2
+      CACHE_VERSION: 3
       QT_ANDROID_KEYSTORE_ALIAS: input
       QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}
-      XC_VERSION: ${{ '14.2' }}
+      XC_VERSION: ${{ '15.2' }}
 
     steps:
       - uses: actions/checkout@v3
@@ -107,7 +107,7 @@ jobs:
         uses: pat-s/always-upload-cache@v3.0.11
         with:
           path: ${{ github.workspace }}/Qt
-          key: ${{ runner.os }}-QtCache-v2-${{ env.QT_VERSION }}-android
+          key: ${{ runner.os }}-QtCache-v3-${{ env.QT_VERSION }}-android
 
       - name: Install Qt
         if: steps.cache-qt.outputs.cache-hit != 'true'

diff --git a/app/icons/Link.svg b/app/icons/Link.svg
diff --git a/app/icons/icons.qrc b/app/icons/icons.qrc
@@ -36,6 +36,7 @@
         <file>HomeFilled.svg</file>
         <file>Info.svg</file>
         <file>Layers.svg</file>
+        <file>Link.svg</file>
         <file>Linkedin.svg</file>
         <file>LocalChanges.svg</file>
         <file>MapThemes.svg</file>

diff --git a/app/inpututils.cpp b/app/inpututils.cpp
@@ -1117,9 +1117,10 @@ const QUrl InputUtils::getFormEditorType( const QString &widgetNameIn, const QVa
       return QUrl( path.arg( QLatin1String( "MMFormRelationEditor" ) ) );
     }
   }
-
-  // TODO == Missing editors:
-  // - QStringLiteral( "relationreference" )
+  else if ( widgetName == QStringLiteral( "relationreference" ) )
+  {
+    return QUrl( path.arg( QLatin1String( "MMFormRelationReferenceEditor" ) ) );
+  }
 
   return QUrl( path.arg( QLatin1String( "MMFormTextEditor" ) ) );
 }

diff --git a/app/mmstyle.h b/app/mmstyle.h
@@ -81,6 +81,7 @@ class MMStyle: public QObject
     Q_PROPERTY( QColor shadowColor READ shadowColor CONSTANT )
 
     // Icons
+    Q_PROPERTY( QUrl linkIcon READ linkIcon CONSTANT )
     Q_PROPERTY( QUrl closeAccountIcon READ closeAccountIcon CONSTANT )
     Q_PROPERTY( QUrl signOutIcon READ signOutIcon CONSTANT )
     Q_PROPERTY( QUrl workspacesIcon READ workspacesIcon CONSTANT )
@@ -262,6 +263,7 @@ class MMStyle: public QObject
     QColor errorBgInputColor() {return QColor::fromString( "#FEFAF9" );}
     QColor shadowColor() {return QColor::fromString( "#66777777" );}
 
+    QUrl linkIcon() {return QUrl( "qrc:/Link.svg" );}
     QUrl closeAccountIcon() {return QUrl( "qrc:/CloseAccount.svg" );}
     QUrl signOutIcon() {return QUrl( "qrc:/SignOut.svg" );}
     QUrl workspacesIcon() {return QUrl( "qrc:/Workspaces.svg" );}

diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
@@ -100,7 +100,6 @@ set(MM_QML
     dialogs/NoPermissionsDialog.qml
     dialogs/SplittingFailedDialog.qml
     dialogs/SyncFailedDialog.qml
-    editor/inputrelationreference.qml
     inputs/MMBaseInput.qml
     inputs/MMPasswordInput.qml
     inputs/MMTextInput.qml
@@ -118,6 +117,7 @@ set(MM_QML
     form/editors/MMFormPhotoEditor.qml
     form/editors/MMFormPhotoViewer.qml
     form/editors/MMFormRelationEditor.qml
+    form/editors/MMFormRelationReferenceEditor.qml
     form/editors/MMFormScannerEditor.qml
     form/editors/MMFormSliderEditor.qml
     form/editors/MMFormSwitchEditor.qml

diff --git a/app/qml/components/MMFeaturesListDrawer.qml b/app/qml/components/MMFeaturesListDrawer.qml
@@ -18,11 +18,13 @@ Drawer {
   property alias title: header.title
   property alias model: listView.model
   property bool withSearch: false
+  property alias buttonText: primaryButton.text
+  property alias buttonVisible: primaryButton.visible
 
   padding: 20 * __dp
 
   signal featureClicked( var selectedFeatures )
-  signal createLinkedFeature()
+  signal buttonClicked()
 
   width: ApplicationWindow.window.width
   height: ApplicationWindow.window.height
@@ -147,7 +149,7 @@ Drawer {
       text: qsTr("Add feature")
 
       onClicked: {
-        root.createLinkedFeature()
+        root.buttonClicked()
       }
     }
   }

diff --git a/app/qml/editor/inputrelationreference.qml b/app/qml/editor/inputrelationreference.qml
diff --git a/app/qml/form/editors/MMFormGalleryEditor.qml b/app/qml/form/editors/MMFormGalleryEditor.qml
@@ -136,7 +136,7 @@ Item {
             anchors.centerIn: parent
             source: __style.addImageIcon
             color: root.errorMsg.length > 0 ? __style.grapeColor : root.warningMsg.length > 0 ? __style.earthColor : __style.forestColor
-            size: __style.icon40
+            size: __style.icon32
           }
 
           MouseArea {

diff --git a/app/qml/form/editors/MMFormPhotoViewer.qml b/app/qml/form/editors/MMFormPhotoViewer.qml
@@ -74,26 +74,19 @@ MMBaseInput {
       onClicked: root.contentClicked()
     }
 
-    MMCircleIcon {
+    MMRoundButton {
       anchors {
         right: parent.right
         bottom: parent.bottom
         rightMargin: 10 * __dp
         bottomMargin: 10 * __dp
       }
 
-      size: __style.icon40
-      type: MMCircleIcon.Type.Delete
-      color: __style.negativeColor
+      bgndColor: __style.negativeColor
+      iconSource: __style.deleteIcon
       iconColor: __style.grapeColor
       visible: true//enabled && ( photo.status === Image.Ready || photo.status === Image.Error )
-
-      MouseArea {
-        anchors.centerIn: parent
-        width: parent.width + 20 * __dp
-        height: width
-        onClicked: root.trashClicked()
-      }
+      onClicked: root.trashClicked()
     }
   }
 }
diff --git a/app/qml/form/editors/MMFormRelationEditor.qml b/app/qml/form/editors/MMFormRelationEditor.qml
@@ -188,7 +188,8 @@ MMBaseInput {
       onFeatureClicked: function(selectedFeatures) {
         root.openLinkedFeature( selectedFeatures )
       }
-      onCreateLinkedFeature: root.createLinkedFeature( root._fieldFeatureLayerPair, root._fieldAssociatedRelation )
+
+      onButtonClicked: root.createLinkedFeature( root._fieldFeatureLayerPair, root._fieldAssociatedRelation )
     }
   }