Skip to content

Activity visual polish #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Activity visual polish #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa84b33
Activity screen visual tweaks
GBKS Jul 4, 2025
ff681b6
Reversing icon color change
GBKS Jul 4, 2025
040cf7a
Undo addition of greenRGB theme color
GBKS Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/qml/components/Separator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions src/qml/controls/Icon.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/qml/controls/NavigationTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 22 additions & 13 deletions src/qml/pages/wallet/Activity.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand All @@ -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) {
Expand All @@ -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
Expand Down
11 changes: 10 additions & 1 deletion src/qml/pages/wallet/ActivityDetails.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ Page {
text: root.amount
color: amountColor
font.pixelSize: 28
bold: true
}

CoreText {
Expand Down Expand Up @@ -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
}

Expand Down
Loading