From e170af51154460bfd1e7a5f6c3871b535a4e4c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Tue, 25 Apr 2023 12:32:57 +0200 Subject: [PATCH] chore: use the "next" icon consistently instead of variations of "chevron-*" and rotation --- .../StatusContactRequestsIndicatorListItem.qml | 5 +---- .../Components/StatusSyncDeviceDelegate.qml | 3 +-- .../Profile/controls/WalletNetworkDelegate.qml | 3 +-- ui/app/AppLayouts/Profile/views/EnsListView.qml | 3 +-- ui/app/AppLayouts/Profile/views/MessagingView.qml | 6 ++---- .../AppLayouts/Profile/views/keycard/MainView.qml | 12 ++++++------ .../AppLayouts/Profile/views/wallet/MainView.qml | 12 ++++++------ .../Wallet/popups/CryptoServicesModal.qml | 3 +-- .../shared/status/StatusSettingsLineButton.qml | 14 ++++---------- 9 files changed, 23 insertions(+), 38 deletions(-) diff --git a/ui/StatusQ/src/StatusQ/Components/StatusContactRequestsIndicatorListItem.qml b/ui/StatusQ/src/StatusQ/Components/StatusContactRequestsIndicatorListItem.qml index fea1c02e61..bf811d03fe 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusContactRequestsIndicatorListItem.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusContactRequestsIndicatorListItem.qml @@ -21,11 +21,8 @@ StatusListItem { border.color: color }, StatusIcon { - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] } - - diff --git a/ui/StatusQ/src/StatusQ/Components/StatusSyncDeviceDelegate.qml b/ui/StatusQ/src/StatusQ/Components/StatusSyncDeviceDelegate.qml index ff2c3b3291..3f6646a9e9 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusSyncDeviceDelegate.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusSyncDeviceDelegate.qml @@ -68,8 +68,7 @@ StatusListItem { StatusIcon { anchors.verticalCenter: parent.verticalCenter visible: root.enabled - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] diff --git a/ui/app/AppLayouts/Profile/controls/WalletNetworkDelegate.qml b/ui/app/AppLayouts/Profile/controls/WalletNetworkDelegate.qml index 4aca0653dd..a08f3f44ec 100644 --- a/ui/app/AppLayouts/Profile/controls/WalletNetworkDelegate.qml +++ b/ui/app/AppLayouts/Profile/controls/WalletNetworkDelegate.qml @@ -14,8 +14,7 @@ StatusListItem { rightPadding: Style.current.padding components: [ StatusIcon { - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] diff --git a/ui/app/AppLayouts/Profile/views/EnsListView.qml b/ui/app/AppLayouts/Profile/views/EnsListView.qml index 3aa6797d62..2b4f1a6b38 100644 --- a/ui/app/AppLayouts/Profile/views/EnsListView.qml +++ b/ui/app/AppLayouts/Profile/views/EnsListView.qml @@ -143,8 +143,7 @@ Item { components: [ StatusIcon { - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] diff --git a/ui/app/AppLayouts/Profile/views/MessagingView.qml b/ui/app/AppLayouts/Profile/views/MessagingView.qml index 62b975a66b..1bc4953b37 100644 --- a/ui/app/AppLayouts/Profile/views/MessagingView.qml +++ b/ui/app/AppLayouts/Profile/views/MessagingView.qml @@ -341,8 +341,7 @@ SettingsContentBase { label: root.messagingStore.getMailserverNameForNodeAddress(root.messagingStore.activeMailserver) components: [ StatusIcon { - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] @@ -363,8 +362,7 @@ SettingsContentBase { visible: root.advancedStore.isWakuV2 components: [ StatusIcon { - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] diff --git a/ui/app/AppLayouts/Profile/views/keycard/MainView.qml b/ui/app/AppLayouts/Profile/views/keycard/MainView.qml index 4ac2c24cb8..1bc2e5e635 100644 --- a/ui/app/AppLayouts/Profile/views/keycard/MainView.qml +++ b/ui/app/AppLayouts/Profile/views/keycard/MainView.qml @@ -99,7 +99,7 @@ ColumnLayout { : qsTr("Migrate an existing account from Status Desktop to Keycard") components: [ StatusIcon { - icon: "tiny/chevron-right" + icon: "next" color: Theme.palette.baseColor1 } ] @@ -120,7 +120,7 @@ ColumnLayout { title: qsTr("Create a new Keycard account with a new seed phrase") components: [ StatusIcon { - icon: "tiny/chevron-right" + icon: "next" color: Theme.palette.baseColor1 } ] @@ -134,7 +134,7 @@ ColumnLayout { title: qsTr("Import or restore via a seed phrase") components: [ StatusIcon { - icon: "tiny/chevron-right" + icon: "next" color: Theme.palette.baseColor1 } ] @@ -148,7 +148,7 @@ ColumnLayout { title: qsTr("Import from Keycard to Status Desktop") components: [ StatusIcon { - icon: "tiny/chevron-right" + icon: "next" color: Theme.palette.baseColor1 } ] @@ -169,7 +169,7 @@ ColumnLayout { title: qsTr("Check what’s on a Keycard") components: [ StatusIcon { - icon: "tiny/chevron-right" + icon: "next" color: Theme.palette.baseColor1 } ] @@ -183,7 +183,7 @@ ColumnLayout { title: qsTr("Factory reset a Keycard") components: [ StatusIcon { - icon: "tiny/chevron-right" + icon: "next" color: Theme.palette.baseColor1 } ] diff --git a/ui/app/AppLayouts/Profile/views/wallet/MainView.qml b/ui/app/AppLayouts/Profile/views/wallet/MainView.qml index efdb5ccab1..750b97f408 100644 --- a/ui/app/AppLayouts/Profile/views/wallet/MainView.qml +++ b/ui/app/AppLayouts/Profile/views/wallet/MainView.qml @@ -39,8 +39,7 @@ Column { label: qsTr("%n DApp(s) connected", "", root.walletStore.dappList.count) components: [ StatusIcon { - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] @@ -58,8 +57,7 @@ Column { onClicked: goToNetworksView() components: [ StatusIcon { - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] @@ -121,9 +119,10 @@ Column { } Repeater { + width: parent.width model: importedAccounts delegate: WalletAccountDelegate { - width: ListView.view.width + width: parent.width account: model onGoToAccountView: { root.goToAccountView(model) @@ -149,9 +148,10 @@ Column { } Repeater { + width: parent.width model: watchOnlyAccounts delegate: WalletAccountDelegate { - width: ListView.view.width + width: parent.width account: model onGoToAccountView: { root.goToAccountView(model) diff --git a/ui/app/AppLayouts/Wallet/popups/CryptoServicesModal.qml b/ui/app/AppLayouts/Wallet/popups/CryptoServicesModal.qml index 2b7c3c55cf..09050a9b97 100644 --- a/ui/app/AppLayouts/Wallet/popups/CryptoServicesModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/CryptoServicesModal.qml @@ -60,8 +60,7 @@ StatusModal { statusListItemSubTitle.maximumLineCount: 1 components: [ StatusIcon { - icon: "chevron-down" - rotation: 270 + icon: "next" color: Theme.palette.baseColor1 } ] diff --git a/ui/imports/shared/status/StatusSettingsLineButton.qml b/ui/imports/shared/status/StatusSettingsLineButton.qml index 7caa84cf29..b3ba646c07 100644 --- a/ui/imports/shared/status/StatusSettingsLineButton.qml +++ b/ui/imports/shared/status/StatusSettingsLineButton.qml @@ -6,6 +6,7 @@ import ".." import "../panels" import StatusQ.Controls 0.1 as StatusQControls +import StatusQ.Core 0.1 as StatusQCore Rectangle { property string text @@ -100,21 +101,14 @@ Rectangle { } } - SVGImage { + StatusQCore.StatusIcon { id: caret visible: !root.isSwitch anchors.right: parent.right anchors.rightMargin: Style.current.padding anchors.verticalCenter: textItem.verticalCenter - source: Style.svg("caret") - width: 13 - height: 7 - rotation: -90 - ColorOverlay { - anchors.fill: caret - source: caret - color: Style.current.secondaryText - } + icon: "next" + color: Style.current.secondaryText } MouseArea {