Merge pull request #1684 from KomodoPlatform/dev

0.5.5
KomodoPlatform · Mar 17, 2022 · 08445f0 · 08445f0
2 parents 65bc51d + e7be0aa
commit 08445f0
Show file tree

Hide file tree

Showing 71 changed files with 2,265 additions and 1,730 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "ci_tools_atomic_dex/vcpkg-custom-ports"]
 	path = ci_tools_atomic_dex/vcpkg-custom-ports
 	url = https://github.com/KomodoPlatform/vcpkg-custom-ports
-[submodule "atomic_defi_design/bignumberjs/bignumber.js"]
-	path = atomic_defi_design/bignumberjs/bignumber.js
+[submodule "atomic_defi_design/imports/bignumberjs/bignumber.js"]
+	path = atomic_defi_design/imports/bignumberjs/bignumber.js
 	url = https://github.com/KomodoPlatform/bignumber.js.git
diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json
@@ -6729,10 +6729,16 @@
     "nomics_id": "SPACE7",
     "electrum": [
       {
-        "url": "electrum1.spaceworks.co:50001"
+        "url": "electrum3.cipig.net:10011",
+        "ws_url": "electrum3.cipig.net:30011"
       },
       {
-        "url": "electrum2.spaceworks.co:50001"
+        "url": "electrum2.cipig.net:10011",
+        "ws_url": "electrum2.cipig.net:30011"
+      },
+      {
+        "url": "electrum1.cipig.net:10011",
+        "ws_url": "electrum1.cipig.net:30011"
       }
     ],
     "explorer_url": [
@@ -7403,6 +7409,7 @@
     "active": false,
     "coinpaprika_id": "xrg-ergon",
     "coingecko_id": "test-coin",
+    "nomics_id": "XRG",
     "currently_enabled": false,
     "electrum": [
       {

diff --git a/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml b/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml
@@ -2,17 +2,17 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.15
 
-BasicModal
+MultipageModal
 {
     property string coin_to_enable_ticker           // The coin you tried to enable.
     property var    settings_modal: setting_modal   // A reference to a SettingModal object. Open when "Increase limit in settings" button is clicked.
 
     id: root
     width: 600
 
-    ModalContent
+    MultipageModalContent
     {
-        title: qsTr("Failed to enable %1").arg(coin_to_enable_ticker)
+        titleText: qsTr("Failed to enable %1").arg(coin_to_enable_ticker)
         DefaultText
         {
             Layout.fillWidth: true

diff --git a/atomic_defi_design/Dex/Components/CexInfoModal.qml b/atomic_defi_design/Dex/Components/CexInfoModal.qml
@@ -6,12 +6,12 @@ import QtQuick.Layouts 1.15
 import "../Constants"
 import App 1.0
 
-BasicModal {
+MultipageModal {
     id: root
 
     // Inside modal
-    ModalContent {
-        title: General.cex_icon + " " + qsTr("Market Data")
+    MultipageModalContent {
+        titleText: General.cex_icon + " " + qsTr("Market Data")
 
         DefaultText {
             Layout.preferredHeight: 200

diff --git a/atomic_defi_design/Dex/Components/ComponentWithTitle.qml b/atomic_defi_design/Dex/Components/ComponentWithTitle.qml
@@ -1,36 +1,47 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
+
 import App 1.0
+import "../Constants"
+import Dex.Themes 1.0 as Dex
 
-ColumnLayout {
-    property alias title: title.text
-    property bool expandable: false
-    property bool expanded: false
-    readonly property bool show_content: !expandable || expanded
+ColumnLayout
+{
+    property alias          title: title.text
+    property bool           expandable: false
+    property bool           expanded: false
+    readonly property bool  show_content: !expandable || expanded
 
-    RowLayout {
-        id: row_layout
+    RowLayout
+    {
+        id: rowLayout
         Layout.fillWidth: true
 
-        Arrow {
-            id: arrow_icon
+        Arrow
+        {
+            id: arrowIco
+
             visible: expandable
-            up: expanded
-            color: mouse_area.containsMouse ? Style.colorOrange : expanded ? DexTheme.redColor : DexTheme.greenColor
+
             Layout.alignment: Qt.AlignVCenter
+
+            up: expanded
+            color: mouseArea.containsMouse ? Dex.CurrentTheme.foregroundColor3 : Dex.CurrentTheme.foregroundColor2
         }
 
-        TitleText {
+        TitleText
+        {
             id: title
             Layout.fillWidth: true
-            color: !expandable ? DexTheme.foregroundColorDarkColor4 : DexTheme.foregroundColorLightColor2
-            font: DexTypo.body2
-            opacity: .6
-            DefaultMouseArea {
-                id: mouse_area
+
+            color: Dex.CurrentTheme.foregroundColor2
+
+            DefaultMouseArea
+            {
+                id: mouseArea
                 enabled: expandable
                 anchors.fill: parent
-                anchors.leftMargin: -arrow_icon.width - row_layout.spacing
+                anchors.leftMargin: -arrowIco.width - rowLayout.spacing
                 hoverEnabled: true
                 onClicked: expanded = !expanded
             }

diff --git a/atomic_defi_design/Dex/Components/DefaultListView.qml b/atomic_defi_design/Dex/Components/DefaultListView.qml
@@ -32,4 +32,4 @@ ListView
             duration: Style.animationDuration * 0.5;velocity: -1
         }
     }
-}
+}
diff --git a/atomic_defi_design/Dex/Components/DefaultModal.qml b/atomic_defi_design/Dex/Components/DefaultModal.qml
@@ -12,35 +12,34 @@ Popup
     property int radius: 18
 
     anchors.centerIn: Overlay.overlay
+    horizontalPadding: 88
+    verticalPadding: 52
+
     modal: true
     focus: true
+
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
 
-    Overlay.modal: Rectangle
-    {
-        color: "#AA000000"
-    }
+    background: DefaultRectangle { radius: root.radius; color: Dex.CurrentTheme.floatingBackgroundColor }
+
+    Overlay.modal: Rectangle { color: "#AA000000" }
 
     // Fade in animation
     onVisibleChanged:
     {
         if (visible)
         {
             opacity = 0
-            fade_animation.start()
+            fadeAnimation.start()
         }
     }
 
     NumberAnimation
     {
-        id: fade_animation
+        id: fadeAnimation
         target: root
         property: "opacity"
         duration: Style.animationDuration
         to: 1
     }
-
-    background: DexRectangle {
-        radius: 18
-    }
 }
diff --git a/atomic_defi_design/Dex/Components/DefaultScrollView.qml b/atomic_defi_design/Dex/Components/DefaultScrollView.qml
@@ -0,0 +1,29 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+import Dex.Themes 1.0 as Dex
+
+ScrollView
+{
+    id: control
+
+    clip: true
+    ScrollBar.vertical.background: Rectangle { color: Dex.CurrentTheme.scrollBarBackgroundColor; radius: 8 }
+    ScrollBar.vertical.contentItem: Rectangle
+    {
+        implicitWidth: 10
+        implicitHeight: 20
+        color: Dex.CurrentTheme.scrollBarIndicatorColor
+        radius: 8
+    }
+    ScrollBar.vertical.policy: contentHeight > height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
+    ScrollBar.horizontal.background: Rectangle { color: Dex.CurrentTheme.scrollBarBackgroundColor; radius: 8 }
+    ScrollBar.horizontal.contentItem: Rectangle
+    {
+        implicitWidth: 20
+        implicitHeight: 10
+        color: Dex.CurrentTheme.scrollBarIndicatorColor
+        radius: 8
+    }
+    ScrollBar.horizontal.policy: contentHeight > height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
+}
diff --git a/atomic_defi_design/Dex/Components/DexScrollBar.qml b/atomic_defi_design/Dex/Components/DexScrollBar.qml
@@ -22,7 +22,7 @@ ScrollBar
             height: parent.height
             anchors.verticalCenter: parent.verticalCenter
 
-            color: Dex.CurrentTheme.scrollBarBackgroundColor
+            color: Dex.CurrentTheme.scrollBarIndicatorColor
         }
     }
 
@@ -36,7 +36,7 @@ ScrollBar
             width: parent.width
             height: parent.height
             anchors.verticalCenter: parent.verticalCenter
-            color: Dex.CurrentTheme.scrollBarIndicatorColor
+            color: Dex.CurrentTheme.scrollBarBackgroundColor
         }
     }
-}
+}
diff --git a/atomic_defi_design/Dex/Components/EulaModal.qml b/atomic_defi_design/Dex/Components/EulaModal.qml
@@ -6,7 +6,7 @@ import QtQuick.Layouts 1.15
 import "../Constants"
 import App 1.0 //> API.app_name
 
-BasicModal
+MultipageModal
 {
     id: root
 
@@ -21,9 +21,9 @@ BasicModal
     {}
     property bool close_only: false
 
-    ModalContent
+    MultipageModalContent
     {
-        title: qsTr("Disclaimer & Terms of Service")
+        titleText: qsTr("Disclaimer & Terms of Service")
 
         InnerBackground
         {
@@ -144,4 +144,4 @@ BasicModal
 <p><b>This document was last updated on January 31st, 2020</b></p>"
             .arg(API.app_name)
     }
-}
+}
diff --git a/atomic_defi_design/Dex/Components/HelpModal.qml b/atomic_defi_design/Dex/Components/HelpModal.qml
@@ -1,11 +1,11 @@
 import QtQuick 2.12
 
-BasicModal
+MultipageModal
 {
     property string helpSentence
-    property alias  title: _content.title
+    property alias  title: _content.titleText
 
     width: 500
 
-    ModalContent { id: _content; DexLabel { text: helpSentence } }
+    MultipageModalContent { id: _content; DexLabel { text: helpSentence } }
 }
diff --git a/atomic_defi_design/Dex/Components/LogModal.qml b/atomic_defi_design/Dex/Components/LogModal.qml
@@ -1,13 +1,13 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 
-BasicModal {
+MultipageModal {
     id: root
 
-    property alias header: modal_content.title
+    property alias header: modal_content.titleText
     property alias field: text_area.field
 
-    ModalContent {
+    MultipageModalContent {
         id: modal_content
 
         TextAreaWithTitle {

diff --git a/atomic_defi_design/Dex/Components/MinTradeModal.qml b/atomic_defi_design/Dex/Components/MinTradeModal.qml
@@ -6,12 +6,12 @@ import QtQuick.Layouts 1.15
 import "../Constants"
 import App 1.0
 
-BasicModal {
+MultipageModal {
     id: root
 
     // Inside modal
-    ModalContent {
-        title: General.cex_icon + " " + qsTr("Minimum Trading Amount")
+    MultipageModalContent {
+        titleText: General.cex_icon + " " + qsTr("Minimum Trading Amount")
 
         DefaultText {
             //Layout.preferredHeight: 200

diff --git a/atomic_defi_design/Dex/Components/ModalContent.qml b/atomic_defi_design/Dex/Components/ModalContent.qml