Harmonize pressed state legend items by using a ripple element

src/qml/FeatureForm.qml

@@ -475,7 +475,6 @@ Page {
             Loader {
               id: attributeEditorLoader
 
-              height: childrenRect.height
               anchors { left: parent.left; right: parent.right }
 
               //disable widget if it's:

src/qml/Legend.qml

@@ -1,7 +1,8 @@
 import QtQuick 2.14
 import QtQuick.Controls 2.14
+import QtQuick.Controls.Material 2.14
+import QtQuick.Controls.Material.impl 2.14
 import QtQuick.Layouts 1.14
-import QtQml.Models 2.14
 
 import org.qgis 1.0
 import org.qfield 1.0
@@ -28,22 +29,22 @@ ListView {
     property string itemType: Type
     property string layerType: LayerType
     property bool isSelectedLayer: ( itemType === "layer" && vectorLayer != null && vectorLayer == currentLayer )
+    property bool isPressed: false
 
     id: rectangle
     width: parent ? parent.width : undefined
     height: line.height + 7
-    state: "default"
+    color: isSelectedLayer ? Theme.mainColor : "transparent"
 
-    states: [
-      State {
-        name: "default"
-        PropertyChanges { target: rectangle; color: isSelectedLayer ? Theme.mainColor : "transparent" }
-      },
-      State {
-        name: "pressed"
-        PropertyChanges { target: rectangle; color: Theme.controlBorderColor }
-      }
-    ]
+    Ripple {
+      clip: true
+      width: parent.width
+      height: parent.height
+      pressed: parent.isPressed
+      anchor: parent
+      active: parent.isPressed
+      color: Material.rippleColor
+    }
 
     Row {
       id: line
@@ -196,7 +197,7 @@ ListView {
       }
 
       Rectangle {
-          visible: Type == 'layer' && !IsValid
+          visible: Type === 'layer' && !IsValid
           height: 24
           width: 24
           anchors.verticalCenter: parent.verticalCenter
@@ -217,7 +218,7 @@ ListView {
 
       property Item pressedItem
 
-      onClicked: {
+      onClicked: (mouse) => {
           var item = legend.itemAt(legend.contentX + mouse.x, legend.contentY + mouse.y)
           if (!item) return;
 
@@ -236,14 +237,14 @@ ListView {
               }
           }
       }
-      onPressed: {
+      onPressed: (mouse) => {
           var item = legend.itemAt(legend.contentX + mouse.x, legend.contentY + mouse.y)
           if (item && item.itemType) {
               pressedItem = item;
-              pressedItem.state = "pressed"
+              pressedItem.isPressed = true
           }
       }
-      onDoubleClicked: {
+      onDoubleClicked: (mouse) => {
           var item = legend.itemAt(legend.contentX + mouse.x, legend.contentY + mouse.y)
           if (item) {
             var itemIndex = legend.model.index(item.itemRow, 0)
@@ -262,17 +263,17 @@ ListView {
       }
       onCanceled: {
           if (pressedItem) {
-              pressedItem.state = "default"
+              pressedItem.isPressed = false
               pressedItem = null
           }
       }
-      onReleased: {
+      onReleased: (mouse) => {
           if (pressedItem) {
-              if (mouse.button == Qt.RightButton) {
+              if (mouse.button === Qt.RightButton) {
                 pressAndHold(mouse)
               }
 
-              pressedItem.state = "default"
+              pressedItem.isPressed = false
               pressedItem = null
           }
       }

src/qml/QFieldCloudScreen.qml

@@ -418,7 +418,7 @@ Page {
             MouseArea {
               property Item pressedItem
               anchors.fill: parent
-              onClicked: {
+              onClicked: (mouse) => {
                 var item = table.itemAt(
                   table.contentX + mouse.x,
                   table.contentY + mouse.y
@@ -434,7 +434,7 @@ Page {
                   }
                 }
               }
-              onPressed: {
+              onPressed: (mouse) => {
                 var item = table.itemAt(
                   table.contentX + mouse.x,
                   table.contentY + mouse.y
@@ -457,7 +457,7 @@ Page {
                 }
               }
 
-              onPressAndHold: {
+              onPressAndHold: (mouse) => {
                   var item = table.itemAt(
                     table.contentX + mouse.x,
                     table.contentY + mouse.y

src/qml/WelcomeScreen.qml

@@ -535,7 +535,7 @@ Page {
               MouseArea {
                 property Item pressedItem
                 anchors.fill: parent
-                onClicked: {
+                onClicked: (mouse) => {
                   var item = table.itemAt(mouse.x, mouse.y)
                   if (item) {
                     if ( item.type == 1 && cloudConnection.hasToken && cloudConnection.status !== QFieldCloudConnection.LoggedIn ) {
@@ -544,7 +544,7 @@ Page {
                     iface.loadFile(item.path,item.title)
                   }
                 }
-                onPressed: {
+                onPressed: (mouse) => {
                   var item = table.itemAt(mouse.x, mouse.y)
                   if (item) {
                     pressedItem = item.children[0].children[1].children[0];
@@ -563,7 +563,7 @@ Page {
                     pressedItem = null
                   }
                 }
-                onPressAndHold: {
+                onPressAndHold: (mouse) => {
                   var item = table.itemAt(mouse.x, mouse.y)
                   if (item) {
                     recentProjectActions.recentProjectPath = item.path;
@@ -724,15 +724,15 @@ Page {
       onReleased: mouse.accepted = false
       onDoubleClicked: mouse.accepted = false
       onPressAndHold: mouse.accepted = false
-      onClicked:  {
+      onClicked:  (mouse) => {
         burstSomeSparkles(mouse.x, mouse.y)
         mouse.accepted = false
       }
-      onPressed:  {
+      onPressed:  (mouse) => {
         burstSomeSparkles(mouse.x, mouse.y)
         mouse.accepted = false
       }
-      onPositionChanged: {
+      onPositionChanged: (mouse) => {
         burstSomeSparkles(mouse.x, mouse.y)
         mouse.accepted = false
       }

src/qml/qgismobileapp.qml

@@ -1830,7 +1830,6 @@ ApplicationWindow {
           overlayFeatureFormDrawer.featureModel.resetAttributes()
           overlayFeatureFormDrawer.open()
           overlayFeatureFormDrawer.state = "Add"
-          overlayFeatureFormDrawer.featureForm.reset()
         }
         else
         {
@@ -2914,7 +2913,7 @@ ApplicationWindow {
       enabled: !parent.activeFocus
 
       //onPressed because onClicked shall be handled in underlying MouseArea
-      onPressed: {
+      onPressed: (mouse) => {
         parent.focus=true
         mouse.accepted=false
       }
@@ -3445,7 +3444,7 @@ ApplicationWindow {
     anchors.fill: parent
     enabled: barcodeReader.visible
 
-    onClicked: {
+    onClicked: (mouse) => {
       // Needed to avoid people interacting with the UI while the barcode reader is visible
       // (e.g. close the feature form while scanning a code to fill an attribute)
       return;