KomodoPlatform · smk762 · Nov 27, 2024 · Nov 27, 2024 · Nov 27, 2024 · Nov 27, 2024
diff --git a/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml b/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml
@@ -134,7 +134,7 @@ Dex.Rectangle
                     Layout.fillHeight: true
                     Layout.leftMargin: 4
                 }
-                Dex.DefaultText {
+                Dex.DexLabel {
                     Layout.minimumWidth: 120
                     Layout.maximumWidth: 120
                     text: qsTr("Use standard network address")

diff --git a/atomic_defi_design/Dex/Components/Blank.qml b/atomic_defi_design/Dex/Components/Blank.qml
@@ -66,7 +66,7 @@ Item {
                         anchors.fill: bBox2
                         source: bBox2
                         radius: 32
-                        DefaultText {
+                        DexLabel {
                             anchors.centerIn: parent
                             text: "Jemm"
                         }

diff --git a/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml b/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml
@@ -13,7 +13,7 @@ MultipageModal
     MultipageModalContent
     {
         titleText: qsTr("Failed to enable %1").arg(coin_to_enable_ticker)
-        DefaultText
+        DexLabel
         {
             Layout.fillWidth: true
             text: qsTr("Enabling %1 did not succeed. Limit of enabled coins might have been reached.")

diff --git a/atomic_defi_design/Dex/Components/CexInfoModal.qml b/atomic_defi_design/Dex/Components/CexInfoModal.qml
@@ -13,7 +13,7 @@ MultipageModal {
     MultipageModalContent {
         titleText: General.cex_icon + " " + qsTr("Market Data")
 
-        DefaultText {
+        DexLabel {
             Layout.preferredHeight: 200
             Layout.fillWidth: true
 

diff --git a/atomic_defi_design/Dex/Components/CheckEye.qml b/atomic_defi_design/Dex/Components/CheckEye.qml
@@ -32,7 +32,7 @@ Item
             iconSize: 17
         }
 
-        DefaultText
+        DexLabel
         {
             id: _label
             font.pixelSize: 15

diff --git a/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml b/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml
@@ -96,7 +96,7 @@ ComboBox
         width: control.width
         highlighted: control.highlightedIndex === index
 
-        contentItem: DefaultText
+        contentItem: DexLabel
         {
             width: control.width
             font: DexTypo.subtitle2

diff --git a/atomic_defi_design/Dex/Components/DatePicker.qml b/atomic_defi_design/Dex/Components/DatePicker.qml
@@ -27,7 +27,7 @@ DefaultMouseArea
         id: column
         width: parent.width
 
-        DefaultText
+        DexLabel
         {
             id: title
             text: qsTr("Date")
@@ -39,7 +39,7 @@ DefaultMouseArea
         {
             width: parent.width
 
-            DefaultText
+            DexLabel
             {
                 id: label
                 text: selectedDate.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd")

diff --git a/atomic_defi_design/Dex/Components/DefaultCalendar.qml b/atomic_defi_design/Dex/Components/DefaultCalendar.qml
@@ -51,7 +51,7 @@ Calendar
                 onClicked: control.showPreviousMonth()
             }
 
-            DefaultText
+            DexLabel
             {
                 id: dateText
                 text: styleData.title
@@ -113,7 +113,7 @@ Calendar
             readonly property color selectedDateTextColor: Dex.CurrentTheme.foregroundColor
             readonly property color differentMonthDateTextColor: Dex.CurrentTheme.foregroundColor3
             readonly property color invalidDateColor: Dex.CurrentTheme.textDisabledColor
-            DefaultText
+            DexLabel
             {
                 id: dayDelegateText
                 text: styleData.hasOwnProperty('date') ? styleData.date.getDate() : ""

diff --git a/atomic_defi_design/Dex/Components/DefaultRangeSlider.qml b/atomic_defi_design/Dex/Components/DefaultRangeSlider.qml
@@ -99,15 +99,15 @@ RangeSlider
         }
     }
 
-    DefaultText
+    DexLabel
     {
         id: _left_item
         anchors.left: parent.left
         anchors.top: parent.bottom
         text_value: qsTr("Min")
     }
 
-    DefaultText
+    DexLabel
     {
         id: _right_item
         anchors.right: parent.right

diff --git a/atomic_defi_design/Dex/Components/DefaultSwitch.qml b/atomic_defi_design/Dex/Components/DefaultSwitch.qml
diff --git a/atomic_defi_design/Dex/Components/DefaultText.qml b/atomic_defi_design/Dex/Components/DefaultText.qml
diff --git a/atomic_defi_design/Dex/Components/DefaultTextArea.qml b/atomic_defi_design/Dex/Components/DefaultTextArea.qml
diff --git a/atomic_defi_design/Dex/Components/DexCheckBox.qml b/atomic_defi_design/Dex/Components/DexCheckBox.qml
@@ -74,7 +74,7 @@ CheckBox
         height: _label.height
         spacing: 0
 
-        DefaultText
+        DexLabel
         {
             id: _label
             text: control.text

diff --git a/atomic_defi_design/Dex/Components/DexComboBox.qml b/atomic_defi_design/Dex/Components/DexComboBox.qml
@@ -30,7 +30,7 @@ ComboBox
     // Main, selected text
     contentItem: Item
     {
-        DefaultText
+        DexLabel
         {
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
@@ -108,7 +108,7 @@ ComboBox
         width: control.width
         highlighted: control.highlightedIndex === index
 
-        contentItem: DefaultText
+        contentItem: DexLabel
         {
             width: control.width
             font: DexTypo.subtitle2

diff --git a/atomic_defi_design/Dex/Components/DexItemBox.qml b/atomic_defi_design/Dex/Components/DexItemBox.qml
@@ -145,7 +145,7 @@ InnerBackground {
                 anchors.fill: parent
                 Layout.rightMargin: 10
                 Layout.leftMargin: 10
-                DefaultText {
+                DexLabel {
                     id: _texto
                     leftPadding: 10
                     Layout.alignment: Qt.AlignVCenter
@@ -239,7 +239,7 @@ InnerBackground {
             radius: parent.parent.height < 41 ? parent.parent.radius : 0
             color: DexTheme.backgroundDarkColor6
             visible: !isVertical && hidden
-            DefaultText {
+            DexLabel {
                 id: _texto2
                 leftPadding: 10
                 Layout.alignment: Qt.AlignVCenter

diff --git a/atomic_defi_design/Dex/Components/DexLabel.qml b/atomic_defi_design/Dex/Components/DexLabel.qml
@@ -20,10 +20,14 @@ Text
         }
     }
 
-    text: privacy && Dex.General.privacy_mode ? Dex.General.privacy_text : text_value
-    font: monospace ? Dex.DexTypo.monoSmall : Dex.DexTypo.body2
     color: enabled ? Dex.CurrentTheme.foregroundColor : Dex.CurrentTheme.textDisabledColor
+    font: monospace ? Dex.DexTypo.monoSmall : Dex.DexTypo.body2
+    text: privacy && Dex.General.privacy_mode ? Dex.General.privacy_text : text_value
     wrapMode: Text.WordWrap
+
     onLinkActivated: Qt.openUrlExternally(link)
     linkColor: color
 }
+
+// 90% similar to DexText.qml
+// This could be refactored down.
diff --git a/atomic_defi_design/Dex/Components/DexRangeSlider.qml b/atomic_defi_design/Dex/Components/DexRangeSlider.qml
@@ -83,7 +83,7 @@ RangeSlider {
         //border.color: "#bdbebf"
     }
 
-    DefaultText {
+    DexLabel {
         id: secondTooltip
         visible: parent.second.pressed
         anchors.horizontalCenter: parent.second.handle.horizontalCenter
@@ -92,7 +92,7 @@ RangeSlider {
         text_value: parent.second.value
         font.pixelSize: Constants.Style.textSizeSmall1
     }
-    DefaultText {
+    DexLabel {
         id: firstTooltip
         visible: parent.first.pressed
         anchors.horizontalCenter: parent.first.handle.horizontalCenter
@@ -101,21 +101,21 @@ RangeSlider {
         text_value: parent.first.value
         font.pixelSize: Constants.Style.textSizeSmall1
     }
-    DefaultText {
+    DexLabel {
         id: _left_item
         anchors.left: parent.left
         anchors.top: parent.bottom
 
         text_value: qsTr("Min")
     }
-    DefaultText {
+    DexLabel {
         id: _half_item
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: parent.bottom
 
         text_value: qsTr("Half")
     }
-    DefaultText {
+    DexLabel {
         id: _right_item
         anchors.right: parent.right
         anchors.top: parent.bottom

diff --git a/atomic_defi_design/Dex/Components/DexSweetComboBox.qml b/atomic_defi_design/Dex/Components/DexSweetComboBox.qml
@@ -172,7 +172,7 @@ ComboBox
                     {
                         width: control.width + 50
                         highlighted: control.highlightedIndex === index
-                        contentItem: DefaultText
+                        contentItem: DexLabel
                         {
                             text_value: "<b><font color='" + Style.getCoinColor(ticker) + "'>" + ticker + "</font></b>" + "    %1".arg(General.coinName(ticker)) 
                         }

diff --git a/atomic_defi_design/Dex/Components/DexSwitch.qml b/atomic_defi_design/Dex/Components/DexSwitch.qml
@@ -29,9 +29,9 @@ Switch
     indicator: DefaultRectangle
     {
         id: _indicator
-        width: 52
-        height: 28
-        radius: 13
+        width: 42
+        height: 24
+        radius: 12
         anchors.verticalCenter: control.verticalCenter
 
         gradient: Gradient
@@ -108,7 +108,7 @@ Switch
 
         visible: _label.text != ''
 
-        DefaultText
+        DexLabel
         {
             id: _label
             Layout.fillHeight: true
@@ -122,7 +122,7 @@ Switch
             wrapMode: Label.Wrap
         }
 
-        DefaultText
+        DexLabel
         {
             id: _label2
             Layout.fillHeight: true

diff --git a/atomic_defi_design/Dex/Components/DexText.qml b/atomic_defi_design/Dex/Components/DexText.qml
@@ -1,20 +1,28 @@
+//! Qt Imports.
 import QtQuick 2.15
-import "../Constants"
+
+//! Project Imports
 import App 1.0
+import "../Constants" as Dex
+import Dex.Themes 1.0 as Dex
 
 Text {
     property string text_value
     property bool privacy: false
+    property bool monospace: false
 
-    Behavior on color {
-        ColorAnimation {
+    Behavior on color
+    {
+        ColorAnimation
+        {
             duration: Style.animationDuration
         }
     }
 
-    font: DexTypo.body1
+
     color: DexTheme.foregroundColor
-    text: privacy && General.privacy_mode ? General.privacy_text : text_value
+    font: DexTypo.body1
+    text: privacy && Dex.General.privacy_mode ? Dex.General.privacy_text : text_value
     wrapMode: Text.WordWrap
 
     onLinkActivated: Qt.openUrlExternally(link)
@@ -25,4 +33,7 @@ Text {
         cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
         acceptedButtons: Qt.NoButton
     }
-}
+}
+
+// 90% similar to DexLabel.qml
+// This could be refactored down.
diff --git a/atomic_defi_design/Dex/Components/DexTextArea.qml b/atomic_defi_design/Dex/Components/DexTextArea.qml
@@ -52,9 +52,7 @@ TextArea {
     selectByMouse: true
     persistentSelection: true
 
-    background: InnerBackground {
-        auto_set_size: false
-    }
+    background: InnerBackground {}
 
     RightClickMenu {}
 }
diff --git a/atomic_defi_design/Dex/Components/DexTradeBox.qml b/atomic_defi_design/Dex/Components/DexTradeBox.qml
@@ -272,7 +272,7 @@ Rectangle {
             height: parent.height
             anchors.right: parent.right
             visible: !isVertical && hidden
-            DefaultText
+            DexLabel
             {
                 id: _texto2
                 leftPadding: 10

diff --git a/atomic_defi_design/Dex/Components/ElidableText.qml b/atomic_defi_design/Dex/Components/ElidableText.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.12
 
-DefaultText
+DexLabel
 {
     elide: Text.ElideRight
 }