[StatusQ] Move StyledTextField to StatusQ

- and rename it and its usages to StatusTextField - remove a couple of related and unused components Fixes #16296
status-im · Sep 11, 2024 · e3cba88 · e3cba88
1 parent 77fd4e7
commit e3cba88
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 417 deletions.
diff --git a/test/e2e/gui/objects_map/communities_names.py b/test/e2e/gui/objects_map/communities_names.py
@@ -170,7 +170,7 @@
 editPermissionView_In_StatusItemSelector = {"container": mainWindow_editPermissionView_EditPermissionView, "id": "inSelector", "type": "StatusItemSelector", "unnamed": 1, "visible": True}
 editPermissionView_whoHoldsSwitch_StatusSwitch = {"checkable": True, "container": mainWindow_editPermissionView_EditPermissionView, "id": "whoHoldsSwitch", "type": "StatusSwitch", "unnamed": 1, "visible": True}
 edit_TextEdit = {"container": statusDesktop_mainWindow_overlay, "type": "TextEdit", "unnamed": 1, "visible": True}
-inputValue_StyledTextField = {"container": statusDesktop_mainWindow_overlay, "id": "inputValue", "type": "StyledTextField", "unnamed": 1, "visible": True}
+inputValue_StyledTextField = {"container": statusDesktop_mainWindow_overlay, "id": "inputValue", "type": "StatusTextField", "unnamed": 1, "visible": True}
 o_TokenItem = {"container": statusDesktop_mainWindow_overlay, "index": 0, "type": "TokenItem", "unnamed": 1, "visible": True}
 add_StatusButton = {"checkable": False, "container": statusDesktop_mainWindow_overlay, "objectName": "addButton", "type": "StatusButton", "visible": True}
 add_update_statusButton = {"checkable": False, "container": statusDesktop_mainWindow_overlay, "id": "addOrUpdateButton", "type": "StatusButton", "unnamed": 1, "visible": True}

diff --git a/test/e2e/gui/objects_map/names.py b/test/e2e/gui/objects_map/names.py
@@ -507,7 +507,7 @@
 tab_Status_template = {"container": o_StatusTabBar, "type": "StatusBaseText", "unnamed": 1, "visible": True}
 o_TokenBalancePerChainDelegate_template = {"container": statusDesktop_mainWindow_overlay, "objectName": "tokenBalancePerChainDelegate", "type": "TokenBalancePerChainDelegate", "visible": True}
 o_CollectibleNestedDelegate_template = {"container": statusDesktop_mainWindow_overlay, "type": "CollectibleNestedDelegate", "unnamed": 1, "visible": True}
-amountInput_TextEdit = {"container": statusDesktop_mainWindow_overlay, "objectName": "amountToSend_textField", "type": "StyledTextField", "visible": True}
+amountInput_TextEdit = {"container": statusDesktop_mainWindow_overlay, "objectName": "amountToSend_textField", "type": "StatusTextField", "visible": True}
 paste_StatusButton = {"checkable": False, "container": statusDesktop_mainWindow_overlay, "type": "StatusButton", "unnamed": 1, "visible": True}
 ens_or_address_TextEdit = {"container": statusDesktop_mainWindow_overlay, "id": "edit", "type": "TextEdit", "unnamed": 1, "visible": True}
 accountSelectionTabBar_StatusTabBar = {"container": statusDesktop_mainWindow_overlay, "id": "accountSelectionTabBar", "type": "StatusTabBar", "unnamed": 1, "visible": True}

diff --git a/test/e2e/gui/objects_map/onboarding_names.py b/test/e2e/gui/objects_map/onboarding_names.py
@@ -103,7 +103,7 @@
 # Login View
 mainWindow_LoginView = {"container": statusDesktop_mainWindow, "type": "LoginView", "unnamed": 1, "visible": True}
 loginView_submitBtn = {"container": mainWindow_LoginView, "type": "StatusRoundButton", "visible": True}
-loginView_passwordInput = {"container": mainWindow_LoginView, "objectName": "loginPasswordInput", "type": "StyledTextField"}
+loginView_passwordInput = {"container": mainWindow_LoginView, "objectName": "loginPasswordInput", "type": "StatusTextField"}
 loginView_currentUserNameLabel = {"container": mainWindow_LoginView, "objectName": "currentUserNameLabel", "type": "StatusBaseText"}
 loginView_changeAccountBtn = {"container": mainWindow_LoginView, "objectName": "loginChangeAccountButton", "type": "StatusFlatRoundButton"}
 accountsView_accountListPanel = {"container": statusDesktop_mainWindow, "objectName": "LoginView_AccountsRepeater", "type": "Repeater", "visible": True}

diff --git a/test/e2e/gui/objects_map/settings_names.py b/test/e2e/gui/objects_map/settings_names.py
@@ -164,7 +164,7 @@
 mainWindow_EnsWelcomeView = {"container": statusDesktop_mainWindow, "type": "EnsWelcomeView", "unnamed": 1, "visible": True}
 mainWindow_Start_StatusButton = {"checkable": False, "container": statusDesktop_mainWindow, "objectName": "ensStartButton", "type": "StatusButton", "visible": True}
 mainWindow_EnsSearchView = {"container": statusDesktop_mainWindow, "type": "EnsSearchView", "unnamed": 1, "visible": True}
-mainWindow_ensUsernameInput_StyledTextField = {"container": statusDesktop_mainWindow, "objectName": "ensUsernameInput", "type": "StyledTextField", "visible": True}
+mainWindow_ensUsernameInput_StyledTextField = {"container": statusDesktop_mainWindow, "objectName": "ensUsernameInput", "type": "StatusTextField", "visible": True}
 mainWindow_ensNextButton_StatusRoundButton = {"container": statusDesktop_mainWindow, "objectName": "ensNextButton", "type": "StatusRoundButton", "visible": True}
 ens_StatusBaseText = {"container": mainWindow_EnsSearchView, "type": "StatusBaseText", "unnamed": 1, "visible": True}
 mainWindow_EnsTermsAndConditionsView = {"container": statusDesktop_mainWindow, "type": "EnsTermsAndConditionsView", "unnamed": 1, "visible": True}

diff --git a/test/ui-test/testSuites/global_shared/scripts/login_names.py b/test/ui-test/testSuites/global_shared/scripts/login_names.py
@@ -1,7 +1,7 @@
 from scripts.global_names import *
 
 # Main:
-loginView_passwordInput = {"container": statusDesktop_mainWindow, "objectName": "loginPasswordInput", "type": "StyledTextField"}
+loginView_passwordInput = {"container": statusDesktop_mainWindow, "objectName": "loginPasswordInput", "type": "StatusTextField"}
 loginView_changeAccountBtn = {"container": statusDesktop_mainWindow, "objectName": "loginChangeAccountButton", "type": "StatusFlatRoundButton"}
 loginView_currentUserNameLabel = {"container": statusDesktop_mainWindow, "objectName": "currentUserNameLabel", "type": "StatusBaseText"}
 loginView_submitBtn = {"container": statusDesktop_mainWindow, "type": "StatusRoundButton", "visible": True}

diff --git a/test/ui-test/testSuites/global_shared/scripts/settings_names.py b/test/ui-test/testSuites/global_shared/scripts/settings_names.py
@@ -41,12 +41,12 @@ class SettingsSubsection(Enum):
 
 # ENS view;
 settings_ENS_Start_Button = {"container": statusDesktop_mainWindow, "objectName": "ensStartButton", "type": "StatusButton"}
-settings_ENS_Search_Input = {"container": statusDesktop_mainWindow, "objectName": "ensUsernameInput", "type": "StyledTextField"}
+settings_ENS_Search_Input = {"container": statusDesktop_mainWindow, "objectName": "ensUsernameInput", "type": "StatusTextField"}
 settings_ENS_Search_Next_Button = {"container": statusDesktop_mainWindow, "objectName": "ensNextButton", "type": "StatusRoundButton"}
 settings_ENS_Terms_Agree = {"container": statusDesktop_mainWindow, "objectName": "ensAgreeTerms", "type": "StatusCheckBox"}
 settings_ENS_Terms_Open_Transaction = {"container": statusDesktop_mainWindow, "objectName": "ensStartTransaction", "type": "StatusButton"}
 settings_ENS_Terms_Transaction_Next_Button = {"container": statusDesktop_mainWindow, "objectName": "sendNextButton", "type": "StatusButton"}
-settings_ENS_Terms_Transaction_Password_Input = {"container": statusDesktop_mainWindow, "objectName": "transactionSignerPasswordInput", "type": "StyledTextField"}
+settings_ENS_Terms_Transaction_Password_Input = {"container": statusDesktop_mainWindow, "objectName": "transactionSignerPasswordInput", "type": "StatusTextField"}
 
 # Side bar items (Secondary navigation):
 wallet_StatusNavigationListItem = {"container": mainWindow_ScrollView, "objectName": SettingsSubsection.WALLET.value, "type": "StatusNavigationListItem", "visible": True}

diff --git a/test/ui-test/testSuites/global_shared/scripts/wallet_names.py b/test/ui-test/testSuites/global_shared/scripts/wallet_names.py
@@ -71,7 +71,7 @@
 mainWallet_Send_Popup_Send_Button = {"container": statusDesktop_mainWindow, "objectName": "transactionModalFooterButton", "type": "StatusButton"}
 mainWallet_Send_Popup_Asset_Selector = {"container": statusDesktop_mainWindow, "objectName": "assetSelectorButton", "type": "StatusComboBox"}
 mainWallet_Send_Popup_Asset_List = {"container": statusDesktop_mainWindow, "objectName": "assetSelectorList", "type": "StatusListView"}
-mainWallet_Send_Popup_GasPrice_Input = {"container": statusDesktop_mainWindow, "objectName": "gasPriceSelectorInput", "type": "StyledTextField"}
+mainWallet_Send_Popup_GasPrice_Input = {"container": statusDesktop_mainWindow, "objectName": "gasPriceSelectorInput", "type": "StatusTextField"}
 
 # Add/Edit account popup:
 grid_Grid = {"container": statusDesktop_mainWindow_overlay, "id": "grid", "type": "Grid", "unnamed": 1, "visible": True}

diff --git a/test/ui-test/testSuites/suite_communities/shared/scripts/community_names.py b/test/ui-test/testSuites/suite_communities/shared/scripts/community_names.py
@@ -105,7 +105,7 @@
 editPermissionView_In_StatusItemSelector = {"container": mainWindow_editPermissionView_EditPermissionView_2, "id": "inSelector", "type": "StatusItemSelector", "unnamed": 1, "visible": True}
 editPermissionView_whoHoldsSwitch_StatusSwitch = {"checkable": True, "container": mainWindow_editPermissionView_EditPermissionView, "id": "whoHoldsSwitch", "type": "StatusSwitch", "unnamed": 1, "visible": True}
 edit_TextEdit = {"container": statusDesktop_mainWindow_overlay, "type": "TextEdit", "unnamed": 1, "visible": True}
-inputValue_StyledTextField = {"container": statusDesktop_mainWindow_overlay, "echoMode": 0, "id": "inputValue", "type": "StyledTextField", "unnamed": 1, "visible": True}
+inputValue_StyledTextField = {"container": statusDesktop_mainWindow_overlay, "echoMode": 0, "id": "inputValue", "type": "StatusTextField", "unnamed": 1, "visible": True}
 o_TokenItem = {"container": statusDesktop_mainWindow_overlay, "index": 0, "type": "TokenItem", "unnamed": 1, "visible": True}
 add_StatusButton = {"checkable": False, "container": statusDesktop_mainWindow_overlay, "type": "StatusButton", "unnamed": 1, "visible": True}
 CustomPermissionListItem = {"container": statusDesktop_mainWindow_overlay, "objectName": "becomeAdmin", "type": "CustomPermissionListItem", "visible": True}

diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusPasswordInput.qml b/ui/StatusQ/src/StatusQ/Controls/StatusPasswordInput.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.14
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.15
 
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
@@ -9,7 +9,7 @@ import StatusQ.Components 0.1
 
 /*!
    \qmltype StatusPasswordInput
-   \inherits Item
+   \inherits StatusTextField
    \inqmlmodule StatusQ.Controls
    \since StatusQ.Controls 0.1
    \brief The StatusPasswordInput control provides a generic user password input with an option to display signing phrase
@@ -26,7 +26,7 @@ import StatusQ.Components 0.1
    For a list of available components see StatusQ.
 */
 
-TextField {
+StatusTextField {
     id: root
 
     /*!
@@ -39,7 +39,6 @@ TextField {
         id: d
 
         readonly property int inputTextPadding: 16
-        readonly property int pixelSize: 15
         readonly property int radius: 8
         readonly property int signingPhrasePadding: 8
         readonly property int signingPhraseWordPadding: 8
@@ -57,30 +56,14 @@ TextField {
     implicitHeight: 44
     selectByMouse: true
 
-    placeholderTextColor: Theme.palette.baseColor1
     echoMode: TextInput.Password
-    font.pixelSize: d.pixelSize
-    font.family: Theme.palette.baseFont.name
     color: Theme.palette.directColor1
-    selectionColor: Theme.palette.primaryColor2
-    selectedTextColor: Theme.palette.directColor1
 
     background: Rectangle {
-        id: inputRectangle
-        anchors.fill: parent
         color: Theme.palette.baseColor2
         radius: d.radius
         border.width: root.focus ? 1 : 0
-        border.color: {
-            if (root.focus) {
-                return Theme.palette.primaryColor1
-            }
-            return "transparent"
-        }
-    }
-
-    cursorDelegate: StatusCursorDelegate {
-        cursorVisible: root.cursorVisible
+        border.color: Theme.palette.primaryColor1
     }
 
     RowLayout {

diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusTextField.qml b/ui/StatusQ/src/StatusQ/Controls/StatusTextField.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+import StatusQ.Components 0.1
+import StatusQ.Core.Theme 0.1
+
+TextField {
+    id: root
+
+    font.family: Theme.palette.baseFont.name
+    font.pixelSize: Theme.primaryTextFontSize
+    color: readOnly ? Theme.palette.baseColor1 : Theme.palette.directColor1
+    selectByMouse: true
+    selectedTextColor: Theme.palette.directColor1
+    selectionColor: Theme.palette.primaryColor2
+    placeholderTextColor: Theme.palette.baseColor1
+
+    opacity: enabled ? 1 : 0.3
+
+    cursorDelegate: StatusCursorDelegate {
+        cursorVisible: root.cursorVisible
+    }
+}
diff --git a/ui/StatusQ/src/StatusQ/Controls/qmldir b/ui/StatusQ/src/StatusQ/Controls/qmldir
@@ -53,6 +53,7 @@ StatusScrollBar 0.1 StatusScrollBar.qml
 StatusComboBox 0.1 StatusComboBox.qml
 StatusItemDelegate 0.1 StatusItemDelegate.qml
 StatusTextArea 0.1 StatusTextArea.qml
+StatusTextField 0.1 StatusTextField.qml
 StatusBackButton 0.1 StatusBackButton.qml
 StatusPasswordInput 0.1 StatusPasswordInput.qml
 StatusTextWithLoadingState 0.1 StatusTextWithLoadingState.qml

diff --git a/ui/StatusQ/src/statusq.qrc b/ui/StatusQ/src/statusq.qrc
@@ -146,6 +146,7 @@
         <file>StatusQ/Controls/StatusTabButton.qml</file>
         <file>StatusQ/Controls/StatusTagItem.qml</file>
         <file>StatusQ/Controls/StatusTextArea.qml</file>
+        <file>StatusQ/Controls/StatusTextField.qml</file>
         <file>StatusQ/Controls/StatusTextWithLoadingState.qml</file>
         <file>StatusQ/Controls/StatusTokenInlineSelector.qml</file>
         <file>StatusQ/Controls/StatusToolTip.qml</file>

diff --git a/ui/app/AppLayouts/Node/NodeLayout.qml b/ui/app/AppLayouts/Node/NodeLayout.qml
@@ -72,15 +72,14 @@ StatusSectionLayout {
                 font.weight: Font.Medium
                 font.pixelSize: 20
             }
-            // TODO: replace with StatusTextArea once it lives in StatusQ.
-            StyledTextArea {
+            StatusTextArea {
                 id: mailserverLogTxt
                 Layout.rightMargin: Style.current.padding
                 Layout.leftMargin: Style.current.padding
                 Layout.fillWidth: true
+                Layout.preferredHeight: 200
                 text: ""
-                customHeight: 200
-                textField.readOnly: true
+                readOnly: true
             }
         }
 
@@ -97,15 +96,14 @@ StatusSectionLayout {
                 font.weight: Font.Medium
                 font.pixelSize: 20
             }
-            // TODO: replace with StatusTextArea once it lives in StatusQ.
-            StyledTextArea {
+            StatusTextArea {
                 id: logsTxt
                 Layout.rightMargin: Style.current.padding
                 Layout.leftMargin: Style.current.padding
                 Layout.fillWidth: true
+                Layout.preferredHeight: 200
                 text: ""
-                customHeight: 200
-                textField.readOnly: true
+                readOnly: true
             }
         }
 
@@ -201,25 +199,20 @@ StatusSectionLayout {
                         }
                     }
 
-                    StyledTextField {
+                    StatusTextField {
                         id: txtData
                         text: ""
                         leftPadding: 0
                         padding: 0
                         font.pixelSize: 14
-                        selectByMouse: true
                         placeholderText: qsTr("Type json-rpc message... e.g {\"method\": \"eth_accounts\"}")
                         anchors.right: rpcSendBtn.left
                         anchors.rightMargin: 16
                         anchors.top: parent.top
                         anchors.topMargin: 24
                         anchors.left: parent.left
                         anchors.leftMargin: 24
-                        Keys.onEnterPressed: {
-                            root.store.onSend(txtData.text)
-                            txtData.text = ""
-                        }
-                        Keys.onReturnPressed: {
+                        onAccepted: {
                             root.store.onSend(txtData.text)
                             txtData.text = ""
                         }

diff --git a/ui/imports/shared/controls/CurrencyAmountInput.qml b/ui/imports/shared/controls/CurrencyAmountInput.qml
@@ -11,15 +11,15 @@ import utils 1.0
 
 /*!
    \qmltype CurrencyAmountInput
-   \inherits TextField
+   \inherits StatusTextField
    \brief Provides a text input field that accepts a numeric value, with optional (currency) symbol (defaults to "USD").
           Utilizes a builtin DoubleValidator to validate the user's input.
           It accepts both the native decimal separator and optionally a period (`.`) for locales that don't use this.
    \inqmlmodule shared.controls 1.0
 
    Internally it uses FormattedDoubleProperty object that keeps track of the value.
   */
-TextField {
+StatusTextField {
     id: root
 
     property alias value: internalProp.value // accepts double/float or string representation, rejects NaN
@@ -62,24 +62,14 @@ TextField {
     Component.onCompleted: text = internalProp.asLocaleString(decimals)
     onTextEdited: value = text
 
-    font.family: Style.current.baseFont.name
-    font.pixelSize: Style.current.primaryTextFontSize
-
     leftPadding: Style.current.padding
     rightPadding: currencySymbol !== "" ?
                       currencySymbolText.width + currencySymbolText.anchors.leftMargin + currencySymbolText.anchors.rightMargin :
                       Style.current.padding
     topPadding: 10
     bottomPadding: 10
 
-    opacity: enabled ? 1 : 0.3
-    color: readOnly ? Theme.palette.baseColor1 : Theme.palette.directColor1
-    selectionColor: Theme.palette.primaryColor2
-    selectedTextColor: Theme.palette.directColor1
-    placeholderTextColor: Theme.palette.baseColor1
-
     hoverEnabled: !readOnly
-    selectByMouse: true
     inputMethodHints: Qt.ImhFormattedNumbersOnly
 
     validator: DoubleValidator {
@@ -106,10 +96,6 @@ TextField {
         Behavior on border.color { ColorAnimation {} }
     }
 
-    cursorDelegate: StatusCursorDelegate {
-        cursorVisible: root.cursorVisible
-    }
-
     StatusBaseText {
         id: currencySymbolText
         anchors.right: parent.right

diff --git a/ui/imports/shared/controls/Input.qml b/ui/imports/shared/controls/Input.qml
@@ -79,7 +79,7 @@ Item {
         height: customHeight
         anchors.top: inputBox.hasLabel ? inputLabel.bottom : parent.top
         anchors.topMargin: inputBox.hasLabel ? inputBox.labelMargin : 0
-        StyledTextField {
+        StatusTextField {
             id: inputValue
             visible: !inputBox.isTextArea && !inputBox.isSelect
             placeholderText: inputBox.placeholderText
@@ -88,7 +88,6 @@ Item {
             anchors.right: clipboardButtonLoader.active ? clipboardButtonLoader.left : parent.right
             anchors.rightMargin: clipboardButtonLoader.active ? Style.current.padding : 0
             leftPadding: inputBox.hasIcon ? iconWidth + 20 : Style.current.padding
-            selectByMouse: true
             font.pixelSize: fontPixelSize
             readOnly: inputBox.readOnly
             background: Rectangle {
@@ -159,7 +158,7 @@ Item {
                            if (inputBox.copyToClipboard) {
                                ClipboardUtils.setText(inputBox.textToCopy ? inputBox.textToCopy : inputValue.text)
                            } else {
-                                inputValue.paste()
+                               inputValue.paste()
                            }
 
                            copyBtn.copied = true
@@ -188,9 +187,3 @@ Item {
         wrapMode: TextEdit.Wrap
     }
 }
-
-/*##^##
-Designer {
-    D{i:0;formeditorColor:"#c0c0c0";formeditorZoom:1.25}
-}
-##^##*/
diff --git a/ui/imports/shared/controls/StyledButton.qml b/ui/imports/shared/controls/StyledButton.qml