diff --git a/src/qml/components/Separator.qml b/src/qml/components/Separator.qml index 8e14bb9ff..fcd6f9d21 100644 --- a/src/qml/components/Separator.qml +++ b/src/qml/components/Separator.qml @@ -8,7 +8,7 @@ import "../controls" Rectangle { height: 1 - color: enabled ? Theme.color.neutral5 : Theme.color.neutral4 + color: enabled ? Theme.color.neutral4 : Theme.color.neutral3 Behavior on color { ColorAnimation { duration: 150 } diff --git a/src/qml/controls/Icon.qml b/src/qml/controls/Icon.qml index aa6544404..1d20baa25 100644 --- a/src/qml/controls/Icon.qml +++ b/src/qml/controls/Icon.qml @@ -8,8 +8,8 @@ import org.bitcoincore.qt 1.0 Button { id: root - width: icon.width - height: icon.height + width: root.size + height: root.size required property color color required property url source property int size: 32 diff --git a/src/qml/controls/NavigationTab.qml b/src/qml/controls/NavigationTab.qml index 27f95ea41..7f7cff422 100644 --- a/src/qml/controls/NavigationTab.qml +++ b/src/qml/controls/NavigationTab.qml @@ -50,7 +50,9 @@ Button { background: Item { Rectangle { id: bg - height: parent.height - 5 + anchors.top: parent.top + anchors.topMargin: 12 + height: parent.height - 26 width: parent.width radius: 5 color: Theme.color.neutral3 diff --git a/src/qml/pages/wallet/Activity.qml b/src/qml/pages/wallet/Activity.qml index a4b3744b7..5d18c7bb7 100644 --- a/src/qml/pages/wallet/Activity.qml +++ b/src/qml/pages/wallet/Activity.qml @@ -5,6 +5,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.0 import org.bitcoincore.qt 1.0 import "../../controls" @@ -101,6 +102,11 @@ PageStack { required property int status; required property int type; + leftPadding: 0 + rightPadding: 0 + topPadding: 10 + bottomPadding: 10 + HoverHandler { cursorShape: Qt.PointingHandCursor } @@ -117,9 +123,7 @@ PageStack { } contentItem: RowLayout { - Icon { - Layout.alignment: Qt.AlignCenter - Layout.margins: 6 + Image { source: { if (delegate.type == Transaction.RecvWithAddress || delegate.type == Transaction.RecvFromOther) { @@ -130,20 +134,25 @@ PageStack { "qrc:/icons/triangle-up" } } - color: { - if (delegate.status == Transaction.Confirmed) { - if (delegate.type == Transaction.RecvWithAddress || - delegate.type == Transaction.RecvFromOther || - delegate.type == Transaction.Generated) { - Theme.color.green + Layout.preferredWidth: 14 + Layout.preferredHeight: 14 + fillMode: Image.PreserveAspectFit + layer.enabled: true + layer.effect: ColorOverlay { + color: { + if (delegate.status == Transaction.Confirmed) { + if (delegate.type == Transaction.RecvWithAddress || + delegate.type == Transaction.RecvFromOther || + delegate.type == Transaction.Generated) { + Theme.color.green + } else { + Theme.color.orange + } } else { - Theme.color.orange + Theme.color.blue } - } else { - Theme.color.blue } } - size: 14 } CoreText { Layout.alignment: Qt.AlignCenter diff --git a/src/qml/pages/wallet/ActivityDetails.qml b/src/qml/pages/wallet/ActivityDetails.qml index e04e567ae..9f59859e1 100644 --- a/src/qml/pages/wallet/ActivityDetails.qml +++ b/src/qml/pages/wallet/ActivityDetails.qml @@ -114,6 +114,7 @@ Page { text: root.amount color: amountColor font.pixelSize: 28 + bold: true } CoreText { @@ -160,7 +161,15 @@ Page { anchors.left: parent.left anchors.top: parent.top color: Theme.color.neutral7 - text: qsTr("Address") + text: { + if (delegate.type == Transaction.RecvWithAddress || + delegate.type == Transaction.RecvFromOther || + delegate.type == Transaction.Generated) { + qsTr("From") + } else { + qsTr("To") + } + } font.pixelSize: 15 }