Applied review comments

MerginMaps · Dec 19, 2023 · e4bb84e · e4bb84e · inputapp-bot · Dec 19, 2023
1 parent 4349dec
commit e4bb84e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 25 deletions.
diff --git a/app/qml/components/MMSwitch.qml b/app/qml/components/MMSwitch.qml
@@ -9,43 +9,29 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Basic
 
 Switch {
   id: control
 
-  property string textOn
-  property string textOff
-  property bool visibleText: true
-
   contentItem: Text {
-    text: {
-      if(control.visibleText) {
-        if(control.textOn.length > 0 && control.textOff.length > 0) {
-          if(control.checked)
-            return control.textOn
-          return control.textOff
-        }
-        return control.text
-      }
-    }
+    text: control.text
     font: __style.p5
     color: control.enabled ? __style.forestColor : __style.mediumGreenColor
     verticalAlignment: Text.AlignVCenter
     leftPadding: control.indicator.width + control.spacing
   }
 
   indicator: Rectangle {
-    implicitWidth: 48
-    implicitHeight: 28
+    implicitWidth: 48 * __dp
+    implicitHeight: 28 * __dp
     x: control.leftPadding
     y: parent.height / 2 - height / 2
     radius: implicitHeight / 2
     color: control.checked ? __style.grassColor : __style.whiteColor
 
     Rectangle {
       x: control.checked ? parent.width - width - radius/2 : radius/2
-      width: 20
+      width: 20 * __dp
       height: width
       radius: width / 2
       color: control.enabled ? __style.forestColor : __style.mediumGreenColor

diff --git a/app/qml/inputs/MMSwitchEditor.qml b/app/qml/inputs/MMSwitchEditor.qml
@@ -10,8 +10,6 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.Basic
-import QtQuick.Layouts
-import Qt5Compat.GraphicalEffects
 import "../components"
 
 MMAbstractEditor {
@@ -49,9 +47,6 @@ MMAbstractEditor {
     x: -30 * __dp
 
     checked: root.checked
-    textOn: root.textOn
-    textOff: root.textOff
-    visibleText: false
 
     onCheckedChanged: focus = true
   }

diff --git a/gallery/qml/pages/ChecksPage.qml b/gallery/qml/pages/ChecksPage.qml
@@ -175,9 +175,8 @@ Column {
       spacing: 20
       anchors.fill: parent
       MMSwitch {
-        textOn: "ON"
-        textOff: "OFF"
         checked: false
+        text: checked ? "ON" : "OFF"
       }
       MMSwitch {
         text: "static"