Skip to content

Commit bea819c

Browse files
smk762smk762
authored
Merge pull request #2246 from KomodoPlatform/dev
0.5.7.2 Release Candidate
2 parents 4af2a8a + 8d5ac29 commit bea819c

File tree

140 files changed

+3277
-3092
lines changed

Some content is hidden

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

140 files changed

+3277
-3092
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Please describe what you expected to happen.
2626
**Operating Environment(s):**
2727
- OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
2828
- OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
29-
- AtomicDEX Version: [e.g. 0.5.7.1]
29+
- AtomicDEX Version: [e.g. 0.5.7.2]
3030
- Build branch: [e.g. master/dev]
3131

3232

‎.github/workflows/atomicdex-desktop-ci.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ env:
1717
DEX_DISPLAY_NAME: "AtomicDex Desktop"
1818
DEX_COMPANY: "KomodoPlatform"
1919
DEX_WEBSITE: "https://atomicdex.io/"
20+
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
21+
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
22+
RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo
23+
VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo
2024

2125
jobs:
2226

@@ -79,6 +83,9 @@ jobs:
7983
ref: ${{ github.event.pull_request.head.sha }}
8084
submodules: 'true'
8185

86+
- name: Expose GitHub Runtime Env
87+
uses: crazy-max/ghaction-github-runtime@v2
88+
8289
- name: Setup Python
8390
uses: actions/setup-python@v4
8491
with:
@@ -181,13 +188,11 @@ jobs:
181188
echo "CC=clang-12" >> $GITHUB_ENV
182189
183190
- name: vcpkg deps (All)
184-
uses: lukka/run-vcpkg@v10
191+
uses: lukka/run-vcpkg@v11
185192
with:
186193
vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo'
187-
appendedCacheKey: ${{ hashFiles('vcpkg.json') }}
188194
vcpkgJsonGlob: 'vcpkg.json'
189195

190-
191196
- name: import code signing certificates (macos)
192197
if: runner.os == 'macOS' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository
193198
uses: Apple-Actions/import-codesign-certs@v1
@@ -256,6 +261,7 @@ jobs:
256261
shell: powershell
257262
run: |
258263
$Env:QT_VERSION = "${{ matrix.qt }}"
264+
$Env:CMAKE_BUILD_TYPE = "${{ matrix.type }}"
259265
.\ci_tools_atomic_dex\ci_scripts\windows_script.ps1
260266
261267
- name: Upload env variable for artifacts (Linux)

‎CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
1111
include(qt_prerequisites)
1212
include(cfg_hash)
1313

14-
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.1)
14+
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.2)
1515
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
1616

1717
include(cmake_default_options)
@@ -95,10 +95,11 @@ else ()
9595
configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config.json ${CMAKE_BINARY_DIR}/bin/assets/config/${PROJECT_VERSION}-coins.json COPYONLY)
9696
configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/coins COPYONLY)
9797
configure_file(${mm2_SOURCE_DIR}/mm2.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/${DEX_API}.exe COPYONLY)
98-
configure_file(${mm2_SOURCE_DIR}/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY)
99-
configure_file(${mm2_SOURCE_DIR}/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY)
98+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY)
99+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY)
100100
endif ()
101101

102+
102103
add_subdirectory(vendor/antara-gaming_sdk/modules)
103104

104105
##! Osx bundle icon

‎assets/themes/Binance - Dark/colors.json

+130-72
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,139 @@
11
{
2-
"accentColor": "#0A0A0AFF",
3-
"foregroundColor": "#ffffffFF",
4-
"backgroundColor": "#161515FF",
5-
"backgroundColorDeep": "#0A0A0AFF",
6-
7-
"busyIndicatorColor": "#cb9800FF",
8-
9-
"buttonColorDisabled": "#8B6900FF",
10-
"buttonColorEnabled": "#cb9800FF",
11-
"buttonColorHovered": "#EBB514FF",
12-
"buttonColorPressed": "#EBB514FF",
13-
"buttonTextDisabledColor": "#3B3B3BFF",
14-
"buttonTextEnabledColor": "#fafffaFF",
2+
"accentColor": "#F0B90BFF",
3+
"foregroundColor": "#FFFFFFFF",
4+
"foregroundColor2": "#8790B2FF",
5+
"foregroundColor3": "#ABC0D3FF",
6+
"backgroundColor": "#000000FF",
7+
"secondBackgroundColor": "#0E111AFF",
8+
"backgroundColorDeep": "#060A10FF",
9+
10+
"busyIndicatorColor": "#F0B90BFF",
11+
12+
"buttonColorDisabled": "#745804FF",
13+
"buttonColorEnabled": "#F0B90BFF",
14+
"buttonColorHovered": "#FFC200FF",
15+
"buttonColorPressed": "#F0B90B6C",
16+
17+
"buttonTextDisabledColor": "#444444FF",
18+
"buttonTextEnabledColor": "#FFFFFF",
1519
"buttonTextHoveredColor": "#000000FF",
1620
"buttonTextPressedColor": "#000000FF",
17-
18-
"gradientButtonStartColor": "#cb9800FF",
19-
"gradientButtonEndColor": "#cb9800FF",
20-
"gradientButtonDisabledStartColor": "#8B6900FF",
21-
"gradientButtonDisabledEndColor": "#8B6900FF",
22-
"gradientButtonHoveredStartColor": "#EBB514FF",
23-
"gradientButtonHoveredEndColor": "#EBB514FF",
24-
"gradientButtonPressedStartColor": "#EBB514FF",
25-
"gradientButtonPressedEndColor": "#EBB514FF",
26-
"gradientButtonTextEnabledColor": "#080707FF",
27-
"gradientButtonTextDisabledColor": "#3B3B3BFF",
21+
22+
"buttonSecondaryColorDisabled": "#745804",
23+
"buttonSecondaryColorEnabled": "#CFA00B",
24+
"buttonSecondaryColorHovered": "#FFC200FF",
25+
"buttonSecondaryColorPressed": "#F0B90B6C",
26+
27+
"buttonCancelColorDisabled": "#2C3D66FF",
28+
"buttonCancelColorEnabled": "#5B4606FF",
29+
"buttonCancelColorHovered": "#FFC200FF",
30+
"buttonCancelColorPressed": "#F0B90B6C",
31+
32+
"gradientButtonStartColor": "#F0B90BAD",
33+
"gradientButtonEndColor": "#F0B90BFF",
34+
"gradientButtonDisabledStartColor": "#F0B90B4D",
35+
"gradientButtonDisabledEndColor": "#F0B90B34",
36+
"gradientButtonHoveredStartColor": "#FFC200FF",
37+
"gradientButtonHoveredEndColor": "#FFD346FF",
38+
"gradientButtonPressedStartColor": "#F0B90BFF",
39+
"gradientButtonPressedEndColor": "#F0B90BFF",
40+
"gradientButtonTextEnabledColor": "#000000FF",
41+
"gradientButtonTextDisabledColor": "#000000FF",
2842
"gradientButtonTextHoveredColor": "#000000FF",
2943
"gradientButtonTextPressedColor": "#000000FF",
3044

31-
"checkBoxTickColor": "#FFFFFFFF",
32-
"checkBoxGradientStartColor": "#cb9800FF",
33-
"checkBoxGradientEndColor": "#EBB514FF",
34-
35-
"switchGradientStartColor": "#cb9800FF",
36-
"switchGradientEndColor": "#EBB514FF",
37-
"switchGradientStartColor2": "#FFFFFFFF",
38-
"switchGradientEndColor2": "#FFFFFFFF",
39-
40-
"modalPageCounterGradientStartColor": "#cb9800FF",
41-
"modalPageCounterGradientEndColor": "#EBB514FF",
42-
43-
"tabSelectedColor": "#EBB514FF",
44-
45-
"textDisabledColor": "#444444FF",
46-
"textSelectionColor": "#4986EAFF",
47-
"textPlaceholderColor": "#8B6900FF",
48-
"textSelectedColor": "#0e1021FF",
49-
50-
"textFieldBackgroundColor": "#0e0e0eFF",
51-
"textFieldActiveBackgroundColor": "#0c0c0cFF",
52-
"textFieldPrefixColor": "#8790B2FF",
53-
"textFieldSuffixColor": "#456078FF",
45+
"checkBoxTickColor": "#000000",
46+
"checkBoxGradientStartColor": "#F0B90BFF",
47+
"checkBoxGradientEndColor": "#F0B90BFF",
5448

55-
"comboBoxBackgroundColor": "#0A0A0AFF",
49+
"switchGradientStartColor": "#F0B90BFF",
50+
"switchGradientEndColor": "#F0B90BFF",
51+
"switchGradientStartColor2": "#000000",
52+
"switchGradientEndColor2": "#000000",
53+
54+
"comboBoxBackgroundColor": "#1D232FFF",
5655
"comboBoxArrowsColor": "#FFFFFFFF",
57-
"comboBoxDropdownItemHighlightedColor": "#111111FF",
58-
59-
"chartTradingLineBackgroundColor": "#24283dFF",
60-
"chartTradingLineColor": "#74fbeeFF",
61-
62-
"innerBackgroundColor": "#111111FF",
63-
64-
"floatingBackgroundColor": "#222222FF",
65-
66-
"sidebarBgColor": "#161515FF",
67-
"sidebarVersionTextColor": "#BBBBBBFF",
68-
"sidebarCursorStartColor": "#cb9800FF",
69-
"sidebarCursorEndColor": "#EBB51400",
70-
"sidebarLineTextHovered": "#8B6900FF",
71-
72-
"okColor": "#74fbeeFF",
73-
"noColor": "#d13990FF",
74-
75-
"senderColorStart": "#F85757FF",
76-
"receiverColorStart": "#845FEFFF",
77-
"arrowUpColor": "#F85757FF",
78-
"arrowDownColor": "#845FEFFF",
79-
80-
"lineSeparatorColor": "#222222FF"
56+
"comboBoxDropdownItemHighlightedColor": "#F0B90BFF",
57+
58+
"modalPageCounterGradientStartColor": "#F0B90BFF",
59+
"modalPageCounterGradientEndColor": "#F0B90BFF",
60+
61+
"notifPopupBackgroundColor": "#0E111AFF",
62+
"notifPopupTextColor": "#FFFFFFFF",
63+
"notifPopupTimerColor": "#8790B2FF",
64+
"notifPopupTimerBackgroundColor": "#94A3B11F",
65+
"notifPopupIconStartColor": "#FFFFFFFF",
66+
"notifPopupIconEndColor": "#FFFFFFFF",
67+
68+
"scrollBarIndicatorColor": "#8790B2",
69+
"scrollBarBackgroundColor": "#94A3B1",
70+
71+
"tabSelectedColor": "#F0B90B",
72+
73+
"textDisabledColor": "#707070",
74+
"textSelectionColor": "#F0B90B",
75+
"textPlaceholderColor": "#5A4400",
76+
"textSelectedColor": "#211D0E",
77+
78+
"textFieldBackgroundColor": "#262424",
79+
"textFieldActiveBackgroundColor": "#262424",
80+
"textFieldPrefixColor": "#F0B90B",
81+
"textFieldSuffixColor": "#F0B90B",
82+
83+
"tickerBadgeBackgroundColor": "#161515",
84+
85+
"chartTradingLineBackgroundColor": "#161515",
86+
"chartTradingLineColor": "#F0B90B",
87+
88+
"innerBackgroundColor": "#161515",
89+
90+
"floatingBackgroundColor": "#161515",
91+
92+
"rangeSliderBackgroundColor": "#F0B90B",
93+
"rangeSliderDistanceColor": "#F0B90B33",
94+
"rangeSliderIndicatorBackgroundStartColor": "#F0B90B",
95+
"rangeSliderIndicatorBackgroundEndColor": "#F0B90B",
96+
97+
"userIconColorStart": "#F0B90B",
98+
"userIconColorEnd": "#F0B90B33",
99+
100+
"sidebarBgColor": "#000000",
101+
"sidebarVersionTextColor": "#F0B90B",
102+
"sidebarCursorStartColor": "#F0B90B",
103+
"sidebarCursorEndColor": "#16151500",
104+
"sidebarLineTextHovered": "#F0B90B",
105+
"sidebarLineTextSelected": "#FFFFFF",
106+
107+
"tradeSellModeSelectorBackgroundColorStart": "#E52167",
108+
"tradeSellModeSelectorBackgroundColorEnd": "#CD0F53",
109+
"tradeBuyModeSelectorBackgroundColorStart": "#0BC05F",
110+
"tradeBuyModeSelectorBackgroundColorEnd": "#037B3A",
111+
112+
"inputModifierBackgroundColor": "#F0B90B21",
113+
"inputFieldBackgroundColor": "#161515",
114+
115+
"inputFieldBorderColor": "#F0B90B",
116+
"inputPlaceholderTextColor": "#FF00FF",
117+
"inputRightIconColor": "#FFFFFF",
118+
"inputLeftIconColor": "#FFFFFF",
119+
"inputLeftIconBackgroundColor": "#161515",
120+
121+
"listItemOddBackground": "#000000",
122+
"listItemEvenBackground": "#161515",
123+
"listItemHoveredBackground": "#5B4704",
124+
125+
"addressBookTagColors": ["#627EEA", "#FFD87A", "#F7931A"],
126+
127+
"okColor": "#00C058",
128+
"warningColor": "#E52167",
129+
"swapIconColor": "#005FBE",
130+
131+
"senderColorStart": "#F85757",
132+
"receiverColorStart": "#845FEF",
133+
134+
"arrowUpColor": "#F85757",
135+
"arrowDownColor": "#845FEF",
136+
137+
"lineSeparatorColor": "#161515"
138+
81139
}

‎assets/themes/Default - Dark/colors.json

+37-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"accentColor": "#2C3D66FF",
3-
"foregroundColor": "#ffffffFF",
3+
"foregroundColor": "#FFFFFFFF",
44
"foregroundColor2": "#7A8EA1FF",
55
"foregroundColor3": "#ABC0D3FF",
66
"backgroundColor": "#202337FF",
@@ -14,9 +14,19 @@
1414
"buttonColorHovered": "#4068B929",
1515
"buttonColorPressed": "#2932546C",
1616
"buttonTextDisabledColor": "#444444FF",
17-
"buttonTextEnabledColor": "#ffffffFF",
18-
"buttonTextHoveredColor": "#ffffffFF",
19-
"buttonTextPressedColor": "#ffffffFF",
17+
"buttonTextEnabledColor": "#FFFFFFFF",
18+
"buttonTextHoveredColor": "#FFFFFFFF",
19+
"buttonTextPressedColor": "#FFFFFFFF",
20+
21+
"buttonSecondaryColorDisabled": "#28375AFF",
22+
"buttonSecondaryColorEnabled": "#293254FF",
23+
"buttonSecondaryColorHovered": "#4068B929",
24+
"buttonSecondaryColorPressed": "#2932546C",
25+
26+
"buttonCancelColorDisabled": "#28375AFF",
27+
"buttonCancelColorEnabled": "#293254FF",
28+
"buttonCancelColorHovered": "#4068B929",
29+
"buttonCancelColorPressed": "#2932546C",
2030

2131
"gradientButtonStartColor": "#4986EAAD",
2232
"gradientButtonEndColor": "#5A68E6FF",
@@ -65,9 +75,11 @@
6575
"textSelectedColor": "#0e1021FF",
6676

6777
"textFieldBackgroundColor": "#313555FF",
68-
"textFieldActiveBackgroundColor": "#313555CC",
78+
"textFieldActiveBackgroundColor": "#3b3f62FF",
6979
"textFieldPrefixColor": "#8790B2FF",
70-
"textFieldSuffixColor": "#456078FF#",
80+
"textFieldSuffixColor": "#8790B2FF",
81+
82+
"tickerBadgeBackgroundColor": "#202337FF",
7183

7284
"chartTradingLineBackgroundColor": "#24283dFF",
7385
"chartTradingLineColor": "#74fbeeFF",
@@ -91,16 +103,30 @@
91103
"sidebarLineTextHovered": "#2C87B9FF",
92104
"sidebarLineTextSelected": "#FFFFFFFF",
93105

94-
"tradeBuyModeSelectorBackgroundColorStart": "#6A4DE3FF",
95-
"tradeBuyModeSelectorBackgroundColorEnd": "#2279F1FF",
96106
"tradeSellModeSelectorBackgroundColorStart": "#E52167FF",
97-
"tradeSellModeSelectorBackgroundColorEnd": "#E216A9FF",
98-
"tradeMarketModeSelectorNotSelectedBackgroundColor": "#89B6FF21",
107+
"tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF",
108+
"tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF",
109+
"tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF",
110+
111+
"inputModifierBackgroundColor": "#89B6FF21",
112+
"inputFieldBackgroundColor": "#313555FF",
113+
114+
"inputFieldBorderColor": "#20233788",
115+
"inputPlaceholderTextColor": "#FFFFFFFF",
116+
"inputRightIconColor": "#FFFFFFFF",
117+
"inputLeftIconColor": "#FFFFFFFF",
118+
"inputLeftIconBackgroundColor": "#202337FF",
119+
120+
"listItemOddBackground": "#202337FF",
121+
"listItemEvenBackground": "#24273DFF",
122+
"listItemHoveredBackground": "#4068B9FF",
123+
99124

100125
"addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"],
101126

102127
"okColor": "#00C058FF",
103-
"noColor": "#E52167FF",
128+
"warningColor": "#E52167FF",
129+
"swapIconColor": "#005FBEFF",
104130

105131
"senderColorStart": "#F85757FF",
106132
"receiverColorStart": "#845FEFFF",

0 commit comments

Comments
 (0)