Upgrade of inputs and form editors

app/qml/CMakeLists.txt

@@ -113,12 +113,10 @@ set(MM_QML
     gps/MMPositionProviderPage.qml
     gps/MMStakeoutDrawer.qml
     gps/components/MMGpsDataText.qml
-    inputs/MMBaseInput.qml
     inputs/MMComboboxInput.qml
     inputs/MMPasswordInput.qml
     inputs/MMSearchInput.qml
     inputs/MMTextInput.qml
-    inputs/MMTextWithButtonInput.qml
     inputs/MMSwitchInput.qml
     layers/MMFeaturesListPage.qml
     layers/MMLayerDetailPage.qml

gallery/qml.qrc

@@ -86,13 +86,11 @@
         <file>../app/qml/account/MMLoginPage.qml</file>
         <file>../app/qml/account/MMSignUpPage.qml</file>
         <file>../app/qml/account/MMWhichIndustryPage.qml</file>
-        <file>../app/qml/inputs/MMBaseInput.qml</file>
         <file>../app/qml/inputs/MMComboboxInput.qml</file>
         <file>../app/qml/inputs/MMPasswordInput.qml</file>
         <file>../app/qml/inputs/MMTextInput.qml</file>
         <file>../app/qml/inputs/MMSearchInput.qml</file>
         <file>../app/qml/inputs/MMSwitchInput.qml</file>
-        <file>../app/qml/inputs/MMTextWithButtonInput.qml</file>
         <file>../app/qml/form/components/MMFormTabBar.qml</file>
         <file>../app/qml/form/components/MMCalendarDrawer.qml</file>
         <file>../app/qml/form/components/MMFeaturesListPageDrawer.qml</file>

gallery/qml/pages/InputsPage.qml

@@ -90,15 +90,6 @@ ScrollView {
           warningMsg: text.length > 0 ? "" : "Write something"
         }
 
-        MMInputs.MMTextWithButtonInput {
-          title: "MMTextWithButtonInput"
-          placeholderText: "Write something"
-          buttonText: "Copy"
-          width: parent.width
-          onButtonClicked: console.log("Copy pressed")
-          buttonEnabled: text.length > 0
-        }
-
         MMInputs.MMPasswordInput {
           title: "MMPasswordInput"
           text: "Password"

gallery/qml/pages/NotificationPage.qml

@@ -12,63 +12,69 @@ import QtQuick.Controls
 import QtQuick.Controls.Basic
 
 import "../../app/qml/components"
+import "../../app/qml/components/private" as MMPrivateComponents
 import "../../app/qml/inputs"
+
 import mm 1.0 as MM
 
 Page {
   id: pane
 
-  Rectangle {
-    anchors.fill: parent
-    color: "white"
+  background: Rectangle {
+    color: __style.lightGreenColor
   }
 
-  Column {
-    width: parent.width - 60
-    spacing: 20
-    anchors.centerIn: parent
+  contentItem: Item {
+    width: ( ApplicationWindow.window?.width ?? 0 )
 
-    MMTextWithButtonInput {
-      buttonText: "Send"
-      anchors.horizontalCenter: parent.horizontalCenter
-      text: "Write an informative message"
+    Column {
+      width: parent.width * 2/3
+      spacing: 20
+      x: parent.width / 2 - width / 2
 
-      onButtonClicked: { __notificationModel.addInfo(text) }
-    }
-    MMTextWithButtonInput {
-      buttonText: "Send"
-      anchors.horizontalCenter: parent.horizontalCenter
-      text: "Write a success message"
+      MMPrivateComponents.MMBaseSingleLineInput {
+        width: parent.width
+        text: "Write an informative message"
 
-      onButtonClicked: { __notificationModel.addSuccess(text) }
-    }
-    MMTextWithButtonInput {
-      buttonText: "Send"
-      anchors.horizontalCenter: parent.horizontalCenter
-      text: "Write a warning message"
+        rightContent: MMIcon { source: __style.checkmarkIcon }
+        onRightContentClicked: { __notificationModel.addInfo(text) }
+      }
 
-      onButtonClicked: { __notificationModel.addWarning(text) }
-    }
-    MMTextWithButtonInput {
-      buttonText: "Send"
-      anchors.horizontalCenter: parent.horizontalCenter
-      text: "Write an error message"
+      MMPrivateComponents.MMBaseSingleLineInput {
+        width: parent.width
+        text: "Write a success message"
 
-      onButtonClicked: { __notificationModel.addError(text) }
-    }
-    MMTextWithButtonInput {
-      buttonText: "Send"
-      anchors.horizontalCenter: parent.horizontalCenter
-      text: "Stojí, stojí mohyla, Na mohyle zlá chvíľa, Na mohyle tŕnie chrastie A v tom tŕní, chrastí rastie, Rastie, kvety rozvíja Jedna žltá ľalia. Tá ľalia smutno vzdychá: „Hlávku moju tŕnie pichá A nožičky oheň páli – Pomôžte mi v mojom žiali!“ "
+        rightContent: MMIcon { source: __style.checkmarkIcon }
+        onRightContentClicked: { __notificationModel.addSuccess(text) }
+      }
+      MMPrivateComponents.MMBaseSingleLineInput {
+        width: parent.width
+        text: "Write a warning message"
 
-      onButtonClicked: { __notificationModel.addInfo(text) }
-    }
-    MMTextWithButtonInput {
-      buttonText: "Send"
-      anchors.horizontalCenter: parent.horizontalCenter
-      text: "Click on notification to invoke action"
+        rightContent: MMIcon { source: __style.checkmarkIcon }
+        onRightContentClicked: { __notificationModel.addWarning(text) }
+      }
+      MMPrivateComponents.MMBaseSingleLineInput {
+        width: parent.width
+        text: "Write an error message"
+
+        rightContent: MMIcon { source: __style.checkmarkIcon }
+        onRightContentClicked: { __notificationModel.addError(text) }
+      }
+      MMPrivateComponents.MMBaseSingleLineInput {
+        width: parent.width
+        text: "Stojí, stojí mohyla, Na mohyle zlá chvíľa, Na mohyle tŕnie chrastie A v tom tŕní, chrastí rastie, Rastie, kvety rozvíja Jedna žltá ľalia. Tá ľalia smutno vzdychá: „Hlávku moju tŕnie pichá A nožičky oheň páli – Pomôžte mi v mojom žiali!“ "
+
+        rightContent: MMIcon { source: __style.checkmarkIcon }
+        onRightContentClicked: { __notificationModel.addInfo(text) }
+      }
+      MMPrivateComponents.MMBaseSingleLineInput {
+        width: parent.width
+        text: "Click on notification to invoke action"
 
-      onButtonClicked: { __notificationModel.addWarning(text, MM.NotificationType.ShowProjectIssuesAction) }
+        rightContent: MMIcon { source: __style.checkmarkIcon }
+        onRightContentClicked: { __notificationModel.addWarning(text, MM.NotificationType.ShowProjectIssuesAction) }
+      }
     }
   }