Skip to content

Commit 08445f0

Browse files
ca333ca333
authored
Merge pull request KomodoPlatform#1684 from KomodoPlatform/dev
0.5.5
2 parents 65bc51d + e7be0aa commit 08445f0

File tree

71 files changed

+2265
-1730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+2265
-1730
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
[submodule "ci_tools_atomic_dex/vcpkg-custom-ports"]
55
path = ci_tools_atomic_dex/vcpkg-custom-ports
66
url = https://github.com/KomodoPlatform/vcpkg-custom-ports
7-
[submodule "atomic_defi_design/bignumberjs/bignumber.js"]
8-
path = atomic_defi_design/bignumberjs/bignumber.js
7+
[submodule "atomic_defi_design/imports/bignumberjs/bignumber.js"]
8+
path = atomic_defi_design/imports/bignumberjs/bignumber.js
99
url = https://github.com/KomodoPlatform/bignumber.js.git

‎assets/config/0.5.5-coins.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6729,10 +6729,16 @@
67296729
"nomics_id": "SPACE7",
67306730
"electrum": [
67316731
{
6732-
"url": "electrum1.spaceworks.co:50001"
6732+
"url": "electrum3.cipig.net:10011",
6733+
"ws_url": "electrum3.cipig.net:30011"
67336734
},
67346735
{
6735-
"url": "electrum2.spaceworks.co:50001"
6736+
"url": "electrum2.cipig.net:10011",
6737+
"ws_url": "electrum2.cipig.net:30011"
6738+
},
6739+
{
6740+
"url": "electrum1.cipig.net:10011",
6741+
"ws_url": "electrum1.cipig.net:30011"
67366742
}
67376743
],
67386744
"explorer_url": [
@@ -7403,6 +7409,7 @@
74037409
"active": false,
74047410
"coinpaprika_id": "xrg-ergon",
74057411
"coingecko_id": "test-coin",
7412+
"nomics_id": "XRG",
74067413
"currently_enabled": false,
74077414
"electrum": [
74087415
{

‎atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
import QtQuick 2.12
33
import QtQuick.Layouts 1.15
44

5-
BasicModal
5+
MultipageModal
66
{
77
property string coin_to_enable_ticker // The coin you tried to enable.
88
property var settings_modal: setting_modal // A reference to a SettingModal object. Open when "Increase limit in settings" button is clicked.
99

1010
id: root
1111
width: 600
1212

13-
ModalContent
13+
MultipageModalContent
1414
{
15-
title: qsTr("Failed to enable %1").arg(coin_to_enable_ticker)
15+
titleText: qsTr("Failed to enable %1").arg(coin_to_enable_ticker)
1616
DefaultText
1717
{
1818
Layout.fillWidth: true

‎atomic_defi_design/Dex/Components/CexInfoModal.qml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import QtQuick.Layouts 1.15
66
import "../Constants"
77
import App 1.0
88

9-
BasicModal {
9+
MultipageModal {
1010
id: root
1111

1212
// Inside modal
13-
ModalContent {
14-
title: General.cex_icon + " " + qsTr("Market Data")
13+
MultipageModalContent {
14+
titleText: General.cex_icon + " " + qsTr("Market Data")
1515

1616
DefaultText {
1717
Layout.preferredHeight: 200

‎atomic_defi_design/Dex/Components/ComponentWithTitle.qml‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,47 @@
11
import QtQuick 2.15
22
import QtQuick.Layouts 1.15
3+
34
import App 1.0
5+
import "../Constants"
6+
import Dex.Themes 1.0 as Dex
47

5-
ColumnLayout {
6-
property alias title: title.text
7-
property bool expandable: false
8-
property bool expanded: false
9-
readonly property bool show_content: !expandable || expanded
8+
ColumnLayout
9+
{
10+
property alias title: title.text
11+
property bool expandable: false
12+
property bool expanded: false
13+
readonly property bool show_content: !expandable || expanded
1014

11-
RowLayout {
12-
id: row_layout
15+
RowLayout
16+
{
17+
id: rowLayout
1318
Layout.fillWidth: true
1419

15-
Arrow {
16-
id: arrow_icon
20+
Arrow
21+
{
22+
id: arrowIco
23+
1724
visible: expandable
18-
up: expanded
19-
color: mouse_area.containsMouse ? Style.colorOrange : expanded ? DexTheme.redColor : DexTheme.greenColor
25+
2026
Layout.alignment: Qt.AlignVCenter
27+
28+
up: expanded
29+
color: mouseArea.containsMouse ? Dex.CurrentTheme.foregroundColor3 : Dex.CurrentTheme.foregroundColor2
2130
}
2231

23-
TitleText {
32+
TitleText
33+
{
2434
id: title
2535
Layout.fillWidth: true
26-
color: !expandable ? DexTheme.foregroundColorDarkColor4 : DexTheme.foregroundColorLightColor2
27-
font: DexTypo.body2
28-
opacity: .6
29-
DefaultMouseArea {
30-
id: mouse_area
36+
37+
color: Dex.CurrentTheme.foregroundColor2
38+
39+
DefaultMouseArea
40+
{
41+
id: mouseArea
3142
enabled: expandable
3243
anchors.fill: parent
33-
anchors.leftMargin: -arrow_icon.width - row_layout.spacing
44+
anchors.leftMargin: -arrowIco.width - rowLayout.spacing
3445
hoverEnabled: true
3546
onClicked: expanded = !expanded
3647
}

‎atomic_defi_design/Dex/Components/DefaultListView.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ ListView
3232
duration: Style.animationDuration * 0.5;velocity: -1
3333
}
3434
}
35-
}
35+
}

‎atomic_defi_design/Dex/Components/DefaultModal.qml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,34 @@ Popup
1212
property int radius: 18
1313

1414
anchors.centerIn: Overlay.overlay
15+
horizontalPadding: 88
16+
verticalPadding: 52
17+
1518
modal: true
1619
focus: true
20+
1721
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
1822

19-
Overlay.modal: Rectangle
20-
{
21-
color: "#AA000000"
22-
}
23+
background: DefaultRectangle { radius: root.radius; color: Dex.CurrentTheme.floatingBackgroundColor }
24+
25+
Overlay.modal: Rectangle { color: "#AA000000" }
2326

2427
// Fade in animation
2528
onVisibleChanged:
2629
{
2730
if (visible)
2831
{
2932
opacity = 0
30-
fade_animation.start()
33+
fadeAnimation.start()
3134
}
3235
}
3336

3437
NumberAnimation
3538
{
36-
id: fade_animation
39+
id: fadeAnimation
3740
target: root
3841
property: "opacity"
3942
duration: Style.animationDuration
4043
to: 1
4144
}
42-
43-
background: DexRectangle {
44-
radius: 18
45-
}
4645
}

‎atomic_defi_design/Dex/Components/DefaultScrollView.qml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import QtQuick 2.15
2+
import QtQuick.Controls 2.15
3+
4+
import Dex.Themes 1.0 as Dex
5+
6+
ScrollView
7+
{
8+
id: control
9+
10+
clip: true
11+
ScrollBar.vertical.background: Rectangle { color: Dex.CurrentTheme.scrollBarBackgroundColor; radius: 8 }
12+
ScrollBar.vertical.contentItem: Rectangle
13+
{
14+
implicitWidth: 10
15+
implicitHeight: 20
16+
color: Dex.CurrentTheme.scrollBarIndicatorColor
17+
radius: 8
18+
}
19+
ScrollBar.vertical.policy: contentHeight > height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
20+
ScrollBar.horizontal.background: Rectangle { color: Dex.CurrentTheme.scrollBarBackgroundColor; radius: 8 }
21+
ScrollBar.horizontal.contentItem: Rectangle
22+
{
23+
implicitWidth: 20
24+
implicitHeight: 10
25+
color: Dex.CurrentTheme.scrollBarIndicatorColor
26+
radius: 8
27+
}
28+
ScrollBar.horizontal.policy: contentHeight > height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
29+
}

‎atomic_defi_design/Dex/Components/DexScrollBar.qml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ScrollBar
2222
height: parent.height
2323
anchors.verticalCenter: parent.verticalCenter
2424

25-
color: Dex.CurrentTheme.scrollBarBackgroundColor
25+
color: Dex.CurrentTheme.scrollBarIndicatorColor
2626
}
2727
}
2828

@@ -36,7 +36,7 @@ ScrollBar
3636
width: parent.width
3737
height: parent.height
3838
anchors.verticalCenter: parent.verticalCenter
39-
color: Dex.CurrentTheme.scrollBarIndicatorColor
39+
color: Dex.CurrentTheme.scrollBarBackgroundColor
4040
}
4141
}
42-
}
42+
}

‎atomic_defi_design/Dex/Components/EulaModal.qml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import QtQuick.Layouts 1.15
66
import "../Constants"
77
import App 1.0 //> API.app_name
88

9-
BasicModal
9+
MultipageModal
1010
{
1111
id: root
1212

@@ -21,9 +21,9 @@ BasicModal
2121
{}
2222
property bool close_only: false
2323

24-
ModalContent
24+
MultipageModalContent
2525
{
26-
title: qsTr("Disclaimer & Terms of Service")
26+
titleText: qsTr("Disclaimer & Terms of Service")
2727

2828
InnerBackground
2929
{
@@ -144,4 +144,4 @@ BasicModal
144144
<p><b>This document was last updated on January 31st, 2020</b></p>"
145145
.arg(API.app_name)
146146
}
147-
}
147+
}

0 commit comments

Comments
 (0)