Merge pull request #2246 from KomodoPlatform/dev

0.5.7.2 Release Candidate
KomodoPlatform · Apr 14, 2023 · bea819c · bea819c
2 parents 4af2a8a + 8d5ac29
commit bea819c
Show file tree

Hide file tree

Showing 140 changed files with 3,277 additions and 3,092 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,7 +26,7 @@ Please describe what you expected to happen.
 **Operating Environment(s):**
  - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
  - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
- - AtomicDEX Version: [e.g. 0.5.7.1]
+ - AtomicDEX Version: [e.g. 0.5.7.2]
  - Build branch: [e.g. master/dev] 
 
 

diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -17,6 +17,10 @@ env:
   DEX_DISPLAY_NAME: "AtomicDex Desktop"
   DEX_COMPANY: "KomodoPlatform"
   DEX_WEBSITE: "https://atomicdex.io/"
+  VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
+  VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
+  RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo
+  VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo
 
 jobs:
 
@@ -79,6 +83,9 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           submodules: 'true'
 
+      - name: Expose GitHub Runtime Env
+        uses: crazy-max/ghaction-github-runtime@v2
+
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -181,13 +188,11 @@ jobs:
           echo "CC=clang-12" >> $GITHUB_ENV
 
       - name: vcpkg deps (All)
-        uses: lukka/run-vcpkg@v10
+        uses: lukka/run-vcpkg@v11
         with:
           vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo'
-          appendedCacheKey: ${{ hashFiles('vcpkg.json') }}
           vcpkgJsonGlob: 'vcpkg.json'
 
-
       - name: import code signing certificates (macos)
         if: runner.os == 'macOS'  && 'KomodoPlatform/atomicDEX-Desktop' == github.repository
         uses: Apple-Actions/import-codesign-certs@v1
@@ -256,6 +261,7 @@ jobs:
         shell: powershell
         run: |
           $Env:QT_VERSION = "${{ matrix.qt }}"
+          $Env:CMAKE_BUILD_TYPE = "${{ matrix.type }}"
           .\ci_tools_atomic_dex\ci_scripts\windows_script.ps1
 
       - name: Upload env variable for artifacts (Linux)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.1)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.2)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)
@@ -95,10 +95,11 @@ else ()
     configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config.json ${CMAKE_BINARY_DIR}/bin/assets/config/${PROJECT_VERSION}-coins.json COPYONLY)
     configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/coins COPYONLY)
     configure_file(${mm2_SOURCE_DIR}/mm2.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/${DEX_API}.exe COPYONLY)
-    configure_file(${mm2_SOURCE_DIR}/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY)
-    configure_file(${mm2_SOURCE_DIR}/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY)
 endif ()
 
+
 add_subdirectory(vendor/antara-gaming_sdk/modules)
 
 ##! Osx bundle icon

diff --git a/assets/themes/Binance - Dark/colors.json b/assets/themes/Binance - Dark/colors.json
@@ -1,81 +1,139 @@
 {
-  "accentColor": "#0A0A0AFF",
-  "foregroundColor": "#ffffffFF",
-  "backgroundColor": "#161515FF",
-  "backgroundColorDeep": "#0A0A0AFF",
-
-  "busyIndicatorColor": "#cb9800FF",
-
-  "buttonColorDisabled": "#8B6900FF",
-  "buttonColorEnabled": "#cb9800FF",
-  "buttonColorHovered": "#EBB514FF",
-  "buttonColorPressed": "#EBB514FF",
-  "buttonTextDisabledColor": "#3B3B3BFF",
-  "buttonTextEnabledColor": "#fafffaFF",
+  "accentColor": "#F0B90BFF",
+  "foregroundColor": "#FFFFFFFF",
+  "foregroundColor2": "#8790B2FF",
+  "foregroundColor3": "#ABC0D3FF",
+  "backgroundColor": "#000000FF",
+  "secondBackgroundColor": "#0E111AFF",
+  "backgroundColorDeep": "#060A10FF",
+
+  "busyIndicatorColor": "#F0B90BFF",
+
+  "buttonColorDisabled": "#745804FF",
+  "buttonColorEnabled": "#F0B90BFF",
+  "buttonColorHovered": "#FFC200FF",
+  "buttonColorPressed": "#F0B90B6C",
+
+  "buttonTextDisabledColor": "#444444FF",
+  "buttonTextEnabledColor": "#FFFFFF",
   "buttonTextHoveredColor": "#000000FF",
   "buttonTextPressedColor": "#000000FF",
-
-  "gradientButtonStartColor": "#cb9800FF",
-  "gradientButtonEndColor": "#cb9800FF",
-  "gradientButtonDisabledStartColor": "#8B6900FF",
-  "gradientButtonDisabledEndColor": "#8B6900FF",
-  "gradientButtonHoveredStartColor": "#EBB514FF",
-  "gradientButtonHoveredEndColor": "#EBB514FF",
-  "gradientButtonPressedStartColor": "#EBB514FF",
-  "gradientButtonPressedEndColor": "#EBB514FF",
-  "gradientButtonTextEnabledColor": "#080707FF",
-  "gradientButtonTextDisabledColor": "#3B3B3BFF",
+
+  "buttonSecondaryColorDisabled": "#745804",
+  "buttonSecondaryColorEnabled": "#CFA00B",
+  "buttonSecondaryColorHovered": "#FFC200FF",
+  "buttonSecondaryColorPressed": "#F0B90B6C",
+
+  "buttonCancelColorDisabled": "#2C3D66FF",
+  "buttonCancelColorEnabled": "#5B4606FF",
+  "buttonCancelColorHovered": "#FFC200FF",
+  "buttonCancelColorPressed": "#F0B90B6C",
+
+  "gradientButtonStartColor": "#F0B90BAD",
+  "gradientButtonEndColor": "#F0B90BFF",
+  "gradientButtonDisabledStartColor": "#F0B90B4D",
+  "gradientButtonDisabledEndColor": "#F0B90B34",
+  "gradientButtonHoveredStartColor": "#FFC200FF",
+  "gradientButtonHoveredEndColor": "#FFD346FF",
+  "gradientButtonPressedStartColor": "#F0B90BFF",
+  "gradientButtonPressedEndColor": "#F0B90BFF",
+  "gradientButtonTextEnabledColor": "#000000FF",
+  "gradientButtonTextDisabledColor": "#000000FF",
   "gradientButtonTextHoveredColor": "#000000FF",
   "gradientButtonTextPressedColor": "#000000FF",
 
-  "checkBoxTickColor": "#FFFFFFFF",
-  "checkBoxGradientStartColor": "#cb9800FF",
-  "checkBoxGradientEndColor": "#EBB514FF",
-
-  "switchGradientStartColor": "#cb9800FF",
-  "switchGradientEndColor": "#EBB514FF",
-  "switchGradientStartColor2": "#FFFFFFFF",
-  "switchGradientEndColor2": "#FFFFFFFF",
-
-  "modalPageCounterGradientStartColor": "#cb9800FF",
-  "modalPageCounterGradientEndColor": "#EBB514FF",
-
-  "tabSelectedColor": "#EBB514FF",
-
-  "textDisabledColor": "#444444FF",
-  "textSelectionColor": "#4986EAFF",
-  "textPlaceholderColor": "#8B6900FF",
-  "textSelectedColor": "#0e1021FF",
-
-  "textFieldBackgroundColor": "#0e0e0eFF",
-  "textFieldActiveBackgroundColor": "#0c0c0cFF",
-  "textFieldPrefixColor": "#8790B2FF",
-  "textFieldSuffixColor": "#456078FF",
+  "checkBoxTickColor": "#000000",
+  "checkBoxGradientStartColor": "#F0B90BFF",
+  "checkBoxGradientEndColor": "#F0B90BFF",
 
-  "comboBoxBackgroundColor": "#0A0A0AFF",
+  "switchGradientStartColor": "#F0B90BFF",
+  "switchGradientEndColor": "#F0B90BFF",
+  "switchGradientStartColor2": "#000000",
+  "switchGradientEndColor2": "#000000",
+
+  "comboBoxBackgroundColor": "#1D232FFF",
   "comboBoxArrowsColor": "#FFFFFFFF",
-  "comboBoxDropdownItemHighlightedColor": "#111111FF",
-
-  "chartTradingLineBackgroundColor": "#24283dFF",
-  "chartTradingLineColor": "#74fbeeFF",
-
-  "innerBackgroundColor": "#111111FF",
-
-  "floatingBackgroundColor": "#222222FF",
-
-  "sidebarBgColor": "#161515FF",
-  "sidebarVersionTextColor": "#BBBBBBFF",
-  "sidebarCursorStartColor": "#cb9800FF",
-  "sidebarCursorEndColor": "#EBB51400",
-  "sidebarLineTextHovered": "#8B6900FF",
-
-  "okColor": "#74fbeeFF",
-  "noColor": "#d13990FF",
-
-  "senderColorStart": "#F85757FF",
-  "receiverColorStart": "#845FEFFF",
-  "arrowUpColor": "#F85757FF",
-  "arrowDownColor": "#845FEFFF",
-
-  "lineSeparatorColor": "#222222FF"
+  "comboBoxDropdownItemHighlightedColor": "#F0B90BFF",
+
+  "modalPageCounterGradientStartColor": "#F0B90BFF",
+  "modalPageCounterGradientEndColor": "#F0B90BFF",
+
+  "notifPopupBackgroundColor": "#0E111AFF",
+  "notifPopupTextColor": "#FFFFFFFF",
+  "notifPopupTimerColor": "#8790B2FF",
+  "notifPopupTimerBackgroundColor": "#94A3B11F",
+  "notifPopupIconStartColor": "#FFFFFFFF",
+  "notifPopupIconEndColor": "#FFFFFFFF",
+
+  "scrollBarIndicatorColor": "#8790B2",
+  "scrollBarBackgroundColor": "#94A3B1",
+
+  "tabSelectedColor": "#F0B90B",
+
+  "textDisabledColor": "#707070",
+  "textSelectionColor": "#F0B90B",
+  "textPlaceholderColor": "#5A4400",
+  "textSelectedColor": "#211D0E",
+
+  "textFieldBackgroundColor": "#262424",
+  "textFieldActiveBackgroundColor": "#262424",
+  "textFieldPrefixColor": "#F0B90B",
+  "textFieldSuffixColor": "#F0B90B",
+
+  "tickerBadgeBackgroundColor": "#161515",
+
+  "chartTradingLineBackgroundColor": "#161515",
+  "chartTradingLineColor": "#F0B90B",
+
+  "innerBackgroundColor": "#161515",
+
+  "floatingBackgroundColor": "#161515",
+
+  "rangeSliderBackgroundColor": "#F0B90B",
+  "rangeSliderDistanceColor": "#F0B90B33",
+  "rangeSliderIndicatorBackgroundStartColor": "#F0B90B",
+  "rangeSliderIndicatorBackgroundEndColor": "#F0B90B",
+
+  "userIconColorStart": "#F0B90B",
+  "userIconColorEnd": "#F0B90B33",
+
+  "sidebarBgColor": "#000000",
+  "sidebarVersionTextColor": "#F0B90B",
+  "sidebarCursorStartColor": "#F0B90B",
+  "sidebarCursorEndColor": "#16151500",
+  "sidebarLineTextHovered": "#F0B90B",
+  "sidebarLineTextSelected": "#FFFFFF",
+
+  "tradeSellModeSelectorBackgroundColorStart": "#E52167",
+  "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53",
+  "tradeBuyModeSelectorBackgroundColorStart": "#0BC05F",
+  "tradeBuyModeSelectorBackgroundColorEnd": "#037B3A",
+
+  "inputModifierBackgroundColor": "#F0B90B21",
+  "inputFieldBackgroundColor": "#161515",
+
+  "inputFieldBorderColor": "#F0B90B",
+  "inputPlaceholderTextColor": "#FF00FF",
+  "inputRightIconColor": "#FFFFFF",
+  "inputLeftIconColor": "#FFFFFF",
+  "inputLeftIconBackgroundColor": "#161515",
+
+  "listItemOddBackground": "#000000",
+  "listItemEvenBackground": "#161515",
+  "listItemHoveredBackground": "#5B4704",
+
+  "addressBookTagColors": ["#627EEA", "#FFD87A", "#F7931A"],
+
+  "okColor": "#00C058",
+  "warningColor": "#E52167",
+  "swapIconColor": "#005FBE",
+
+  "senderColorStart": "#F85757",
+  "receiverColorStart": "#845FEF",
+
+  "arrowUpColor": "#F85757",
+  "arrowDownColor": "#845FEF",
+
+  "lineSeparatorColor": "#161515"
+
 }
diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json
@@ -1,6 +1,6 @@
 {
     "accentColor": "#2C3D66FF",
-    "foregroundColor": "#ffffffFF",
+    "foregroundColor": "#FFFFFFFF",
     "foregroundColor2": "#7A8EA1FF",
     "foregroundColor3": "#ABC0D3FF",
     "backgroundColor": "#202337FF",
@@ -14,9 +14,19 @@
     "buttonColorHovered": "#4068B929",
     "buttonColorPressed": "#2932546C",
     "buttonTextDisabledColor": "#444444FF",
-    "buttonTextEnabledColor": "#ffffffFF",
-    "buttonTextHoveredColor": "#ffffffFF",
-    "buttonTextPressedColor": "#ffffffFF",
+    "buttonTextEnabledColor": "#FFFFFFFF",
+    "buttonTextHoveredColor": "#FFFFFFFF",
+    "buttonTextPressedColor": "#FFFFFFFF",
+
+    "buttonSecondaryColorDisabled": "#28375AFF",
+    "buttonSecondaryColorEnabled":  "#293254FF",
+    "buttonSecondaryColorHovered":  "#4068B929",
+    "buttonSecondaryColorPressed":  "#2932546C",
+
+    "buttonCancelColorDisabled": "#28375AFF",
+    "buttonCancelColorEnabled":  "#293254FF",
+    "buttonCancelColorHovered":  "#4068B929",
+    "buttonCancelColorPressed":  "#2932546C",
 
     "gradientButtonStartColor": "#4986EAAD",
     "gradientButtonEndColor": "#5A68E6FF",
@@ -65,9 +75,11 @@
     "textSelectedColor": "#0e1021FF",
 
     "textFieldBackgroundColor": "#313555FF",
-    "textFieldActiveBackgroundColor": "#313555CC",
+    "textFieldActiveBackgroundColor": "#3b3f62FF",
     "textFieldPrefixColor": "#8790B2FF",
-    "textFieldSuffixColor": "#456078FF#",
+    "textFieldSuffixColor": "#8790B2FF",
+
+    "tickerBadgeBackgroundColor": "#202337FF",
 
     "chartTradingLineBackgroundColor": "#24283dFF",
     "chartTradingLineColor": "#74fbeeFF",
@@ -91,16 +103,30 @@
     "sidebarLineTextHovered": "#2C87B9FF",
     "sidebarLineTextSelected": "#FFFFFFFF",
 
-    "tradeBuyModeSelectorBackgroundColorStart": "#6A4DE3FF",
-    "tradeBuyModeSelectorBackgroundColorEnd": "#2279F1FF",
     "tradeSellModeSelectorBackgroundColorStart": "#E52167FF",
-    "tradeSellModeSelectorBackgroundColorEnd": "#E216A9FF",
-    "tradeMarketModeSelectorNotSelectedBackgroundColor": "#89B6FF21",
+    "tradeSellModeSelectorBackgroundColorEnd":   "#CD0F53FF",
+    "tradeBuyModeSelectorBackgroundColorStart":  "#0F713CFF",
+    "tradeBuyModeSelectorBackgroundColorEnd":    "#037B3AFF",
+
+    "inputModifierBackgroundColor": "#89B6FF21",
+    "inputFieldBackgroundColor":    "#313555FF",
+
+    "inputFieldBorderColor":        "#20233788",
+    "inputPlaceholderTextColor":    "#FFFFFFFF",
+    "inputRightIconColor":          "#FFFFFFFF",
+    "inputLeftIconColor":           "#FFFFFFFF",
+    "inputLeftIconBackgroundColor": "#202337FF",
+
+    "listItemOddBackground": "#202337FF",
+    "listItemEvenBackground": "#24273DFF",
+    "listItemHoveredBackground": "#4068B9FF",
+
 
     "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"],
 
     "okColor": "#00C058FF",
-    "noColor": "#E52167FF",
+    "warningColor": "#E52167FF",
+    "swapIconColor": "#005FBEFF",
 
     "senderColorStart": "#F85757FF",
     "receiverColorStart": "#845FEFFF",