Merge pull request KomodoPlatform#2426 from KomodoPlatform/dev

v0.7.1 rc
cipig · Apr 10, 2024 · 1952847 · 1952847
2 parents 28dddc4 + 3f25b37
commit 1952847
Show file tree

Hide file tree

Showing 69 changed files with 1,916 additions and 2,038 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -8,6 +8,7 @@ on:
       - master
   schedule:
     - cron: '0 0 * * 1'
+  workflow_dispatch:
 
 env:
   DEX_API: "mm2_kmd"

diff --git a/.github/workflows/sync_mirror.yml b/.github/workflows/sync_mirror.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/atomic_defi_design/Dex/Components/DexGradientAppButton.qml b/atomic_defi_design/Dex/Components/DexGradientAppButton.qml
@@ -22,7 +22,6 @@ DexRectangle
 
     property bool text_left_align: false
 
-    property int minWidth: 90
 
     property real textScale: 1
 

diff --git a/atomic_defi_design/Dex/Components/PairItemBadge.qml b/atomic_defi_design/Dex/Components/PairItemBadge.qml
@@ -24,11 +24,21 @@ DexRectangle
     property int padding: 0
     property alias middle_text: middle_line.text_value
     property alias bottom_text: bottom_line.text_value
+    property bool is_left: false
     Layout.fillHeight: true
     Layout.fillWidth: true
     Layout.leftMargin: 10
     Layout.rightMargin: 20
 
+    Dex.Text{
+        anchors.bottom: parent.top
+        anchors.bottomMargin: 5
+        anchors.horizontalCenter: parent.horizontalCenter
+        text: is_left ? "Outgoing" : "Incoming"
+        font: Dex.DexTypo.italic12
+        color: Dex.CurrentTheme.foregroundColor2
+    }
+
     RowLayout
     {
         anchors.fill: parent

diff --git a/atomic_defi_design/Dex/Constants/DexTypo.qml b/atomic_defi_design/Dex/Constants/DexTypo.qml
@@ -154,6 +154,13 @@ QtObject {
         family: "Courier",
         weight: Font.Normal
     })
+    property font italic12: Qt.font({
+        pixelSize: 12 * fontDensity,
+        letterSpacing: 0.2,
+        family: fontFamily,
+        weight: Font.Normal,
+        italic: true
+    })
     property font inputFieldFont: Qt.font({
         pixelSize: (16 * DexTypo.fontDensity) * (Screen.pixelDensity / 160),
         letterSpacing: 0.5,

diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml
@@ -88,6 +88,11 @@ QtObject {
         return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_faucet_coin
     }
 
+    function isVoteCoin(ticker)
+    {
+        return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_vote_coin
+    }
+
     function isCoinWithMemo(ticker)
     {
         return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).has_memos

diff --git a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml
@@ -70,6 +70,7 @@ Item
                         transform: scale(${Math.min(scale_x, scale_y)});
                         transform-origin: top left;
                     }
+                    a { pointer-events: none; }
                 </style>
                 <script defer src="https://www.livecoinwatch.com/static/lcw-widget.js"></script>
                 <div class="livecoinwatch-widget-1" lcw-coin="${rel_ticker}" lcw-base="${base_ticker}" lcw-secondary="USDC" lcw-period="w" lcw-color-tx="${Dex.CurrentTheme.foregroundColor}" lcw-color-pr="#58c7c5" lcw-color-bg="${Dex.CurrentTheme.comboBoxBackgroundColor}" lcw-border-w="0" lcw-digits="8" ></div>
@@ -226,6 +227,16 @@ Item
         }
     }
 
+    MouseArea {
+        id: chart_mousearea
+        anchors.fill: webEngineViewPlaceHolder
+        onClicked: {
+            if (webEngineView.visible) {
+                Qt.openUrlExternally("https://www.livecoinwatch.com")
+            }
+        }
+    }
+
     Connections
     {
         target: app

diff --git a/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml b/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml
@@ -78,7 +78,7 @@ RowLayout
                 Layout.preferredWidth: parent.width - 15
 
                 text_value: !details ? "" :
-                            `<font color="${root.color}"><b>${details.ticker}</b></font>&nbsp;&nbsp;&nbsp;<font color="${Dex.CurrentTheme.foregroundColor}">${details.name}</font>`
+                            `<font color="${root.color}"><b>${details.ticker}</b></font><br /><font color="${Dex.CurrentTheme.foregroundColor2}">${details.name}</font>`
                 font.pixelSize: Style.textSizeSmall3
                 elide: Text.ElideRight
                 wrapMode: Text.NoWrap
@@ -96,7 +96,7 @@ RowLayout
                 font: DexTypo.body2
                 wrapMode: Label.NoWrap
                 ToolTip.text: coin_value
-                Component.onCompleted: font.pixelSize = 11.5
+                Component.onCompleted: font.pixelSize = 11
             }
 
             Dex.Text
@@ -112,7 +112,7 @@ RowLayout
                 font: DexTypo.body2
                 wrapMode: Label.NoWrap
                 ToolTip.text: fiat_value
-                Component.onCompleted: font.pixelSize = 11.5
+                Component.onCompleted: font.pixelSize = 11
             }
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,7 +22,6 @@ DexRectangle

		property bool text_left_align: false

		property int minWidth: 90

		property real textScale: 1

Expand Down