merge fixes

This commit is contained in:
Serhii 2023-10-05 14:05:49 +03:00
parent c5c8f5844d
commit e15a4fc23a
4 changed files with 44 additions and 3 deletions

View file

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="300px" height="300px" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 52.1 (67048) - http://www.bohemiancoding.com/sketch -->
<title>banano-icon</title>
<desc>Created with Sketch.</desc>
<defs>
<radialGradient cx="15.8840638%" cy="10.8985871%" fx="15.8840638%" fy="10.8985871%" r="97.1594073%" id="radialGradient-1">
<stop stop-color="#FFFFFF" stop-opacity="0.15" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</radialGradient>
<path d="M127.311915,92.3143368 C71.5350042,99.3357531 45.8513339,50.2282589 50.406742,45.4368897 C53.4146482,42.2736165 58.0915878,42.0837393 62.1446654,41.9746609 C80.7936837,41.4696684 107.190339,63.2429265 112.543805,63.1358681 C122.912472,62.9237712 138.511048,46.4448548 148.731853,32.8605556 C153.009764,27.1783796 179.734555,18.6157261 176.77121,33.5453255 C167.162114,81.9640098 134.419486,91.4194901 127.311915,92.3143368 Z M49.6880853,0.685663156 C105.464996,-6.33575306 131.148666,42.7717411 126.591233,47.5631103 C123.583327,50.7263835 118.908412,50.9162607 114.855335,51.0253391 C96.2063165,51.5303316 69.8096611,29.7550535 64.4561957,29.8641319 C54.0875279,30.0762288 38.4889518,46.5551452 28.2661219,60.1394444 C23.9902364,65.8216204 -2.73455431,74.3842739 0.228790299,59.4566945 C9.83788587,11.0359902 42.5805144,1.58050993 49.6880853,0.685663156 Z" id="path-2"></path>
<filter x="-12.7%" y="-17.7%" width="125.4%" height="148.4%" filterUnits="objectBoundingBox" id="filter-3">
<feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="6.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.248131793 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="icon" transform="translate(-350.000000, -350.000000)">
<g id="banano-icon" transform="translate(150.000000, 150.000000)">
<g transform="translate(200.000000, 200.000000)">
<g id="base">
<rect id="path-1" fill="#FBDD11" x="0" y="0" width="300" height="300" rx="150"></rect>
<path d="M300,150 C300,232.842713 232.842713,300 150,300 C67.1572875,300 1.01453062e-14,232.842713 0,150 C-6.13029393e-17,149.499424 0.00245202796,148.99942 0.00734472809,148.5 C0.812166334,230.651854 67.6578633,297 150,297 C232.342137,297 299.187834,230.651854 299.992655,148.499998 C299.997548,148.99942 300,149.499424 300,150 Z" id="Combined-Shape" fill="#E8C900"></path>
<path d="M299.992655,151.500002 C299.187834,69.3481459 232.342137,3 150,3 C67.6578633,3 0.812166334,69.3481459 0.00734470617,151.500002 C0.00245202796,151.00058 6.13029393e-17,150.500576 0,150 C-1.01453062e-14,67.1572875 67.1572875,1.52179594e-14 150,0 C232.842713,-1.52179594e-14 300,67.1572875 300,150 C300,150.500576 299.997548,151.00058 299.992655,151.5 L299.992655,151.500002 Z" id="Combined-Shape" fill="#FFEF7F"></path>
<rect id="innerring" fill="#2A2A2E" x="15" y="15" width="270" height="270" rx="135"></rect>
</g>
<rect id="finish" fill="url(#radialGradient-1)" x="0" y="0" width="300" height="300" rx="150"></rect>
<g id="logo" transform="translate(61.800000, 103.800000)">
<g>
<use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
<use fill="#FBDD11" fill-rule="evenodd" xlink:href="#path-2"></use>
</g>
<path d="M126.983272,46.8179364 C125.005537,34.857328 99.2059868,-3.14784444 49.6880853,3.08566316 C42.5805144,3.98050993 9.83788587,13.4359902 0.228790299,61.8566945 C0.167353326,62.1661777 0.118677162,62.4655641 0.0822971972,62.7550887 C-0.0600755246,61.8129063 -0.0217470759,60.7187538 0.228790299,59.4566945 C9.83788587,11.0359902 42.5805144,1.58050993 49.6880853,0.685663156 C103.316569,-6.06530068 129.12544,39.0719514 126.983272,46.8179364 Z M50.0151677,48.5811968 C49.7651982,47.0698368 49.8956543,45.9744507 50.406742,45.4368897 C53.4146482,42.2736165 58.0915878,42.0837393 62.1446654,41.9746609 C80.7936837,41.4696684 107.190339,63.2429265 112.543805,63.1358681 C122.912472,62.9237712 138.511048,46.4448548 148.731853,32.8605556 C152.921054,27.2962093 178.635838,18.9696103 176.917726,32.646623 C175.376324,22.4429233 152.648107,30.0587543 148.731853,35.2605556 C138.511048,48.8448548 122.912472,65.3237712 112.543805,65.5358681 C107.190339,65.6429265 80.7936837,43.8696684 62.1446654,44.3746609 C58.0915878,44.4837393 53.4146482,44.6736165 50.406742,47.8368897 C50.2314392,48.0212728 50.1009172,48.2712832 50.0151677,48.5811968 Z" id="highlight" fill="#FFEF7F"></path>
<path d="M126.983272,44.4179364 C127.233256,45.9297444 127.102645,47.0254465 126.591233,47.5631103 C123.583327,50.7263835 118.908412,50.9162607 114.855335,51.0253391 C96.2063165,51.5303316 69.8096611,29.7550535 64.4561957,29.8641319 C54.0875279,30.0762288 38.4889518,46.5551452 28.2661219,60.1394444 C24.0788853,65.7038158 -1.63607031,74.0304648 0.0822971972,60.3550887 C1.62390252,70.5569961 24.3517431,62.9412182 28.2661219,57.7394444 C38.4889518,44.1551452 54.0875279,27.6762288 64.4561957,27.4641319 C69.8096611,27.3550535 96.2063165,49.1303316 114.855335,48.6253391 C118.908412,48.5162607 123.583327,48.3263835 126.591233,45.1631103 C126.766777,44.9785553 126.897454,44.7282506 126.983272,44.4179364 Z M50.0151677,46.1811968 C51.9932171,58.1408357 77.7928172,96.147995 127.311915,89.9143368 C134.419486,89.0194901 167.162114,79.5640098 176.77121,31.1453255 C176.83266,30.8357344 176.881344,30.5362453 176.917726,30.246623 C177.060071,31.1889119 177.021733,32.2831678 176.77121,33.5453255 C167.162114,81.9640098 134.419486,91.4194901 127.311915,92.3143368 C73.6814302,99.0655525 47.8726341,53.9246806 50.0151677,46.1811968 Z" id="shadow" fill="#E8C900"></path>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
assets/images/nano_menu.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

View file

@ -200,7 +200,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
static const zrx = CryptoCurrency(title: 'ZRX', tag: 'ETH', fullName: '0x Protocol', raw: 83, name: 'zrx', iconPath: 'assets/images/crypto_assets/zrx_icon.svg');
static const dydx = CryptoCurrency(title: 'DYDX', tag: 'ETH', fullName: 'dYdX', raw: 84, name: 'dydx', iconPath: 'assets/images/crypto_assets/dydx_icon.svg');
static const steth = CryptoCurrency(title: 'STETH', tag: 'ETH', fullName: 'Lido Staked Ethereum', raw: 85, name: 'steth', iconPath: 'assets/images/crypto_assets/steth_icon.svg');
static const banano = CryptoCurrency(title: 'BAN', raw: 86, name: 'banano', iconPath: 'assets/images/nano_icon.png');
static const banano = CryptoCurrency(title: 'BAN', raw: 86, name: 'banano', iconPath: 'assets/images/crypto_assets/ban_icon.svg');
static final Map<int, CryptoCurrency> _rawCurrencyMap =
[...all, ...havenCurrencies].fold<Map<int, CryptoCurrency>>(<int, CryptoCurrency>{}, (acc, item) {

View file

@ -30,8 +30,8 @@ class MenuWidgetState extends State<MenuWidget> {
this.litecoinIcon = Image.asset('assets/images/litecoin_menu.png'),
this.havenIcon = Image.asset('assets/images/haven_menu.png'),
this.ethereumIcon = Image.asset('assets/images/eth_icon.png'),
this.nanoIcon = Image.asset('assets/images/nano_icon.png'),
this.bananoIcon = Image.asset('assets/images/nano_icon.png');
this.nanoIcon = Image.asset('assets/images/nano_menu.png'),
this.bananoIcon = Image.asset('assets/images/nano_menu.png');
final largeScreen = 731;