From 612b5647fc5ccf78bfd29c492c86cf393dc11425 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Wed, 29 Jan 2020 20:36:54 +0200 Subject: [PATCH] CWA-169 | added morph images to assets, added morph contact to settings page and morph link to disclaimer page --- assets/images/2.0x/morph_icon.png | Bin 0 -> 1741 bytes assets/images/3.0x/morph_icon.png | Bin 0 -> 2685 bytes assets/images/morph_icon.png | Bin 0 -> 895 bytes .../screens/disclaimer/disclaimer_page.dart | 22 ++++++++++++++++++ lib/src/screens/settings/settings.dart | 8 +++++++ 5 files changed, 30 insertions(+) create mode 100644 assets/images/2.0x/morph_icon.png create mode 100644 assets/images/3.0x/morph_icon.png create mode 100644 assets/images/morph_icon.png diff --git a/assets/images/2.0x/morph_icon.png b/assets/images/2.0x/morph_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a897a73b13895ce7d93f1ddedd502e8a27d1886e GIT binary patch literal 1741 zcmV;;1~U1HP)K~#7F%~@M) zR7Dv6X3pMd#V%ARN;Hc^5vo!Wh!R3936TUJEElyv1Y&$KURppC9z@GEyjdO;@Ik>; zfkdQ$iHQ%ErL^2qy2V}yAS{aEQV6G%ZtLzjXPi0hw%gr3yJxm#>DRP7oilUx|K|Vx zx%@*g3@GuIc%4d431e(J2=NhyA_n3Gm^a#n073pd$O{2RXh7F>f3>yS!q!4Nm|k@w2+W z!ftb01WLW7K8?^rymb+>0Pc+-_r^Rs-k|9kEcTYJ)~M2$E#n3FsQMg~HZJilD@oT@ zN%c@jh7j@~~_MfRmW& zelghA)7+HsD89lBSfTlcIn!hYRWpnk@qwKX#5$!lBhYvOuS3j)aTp|_KHaB{{6_|Y z2|OOaHA_oYy*eFn1F7{+*QT)*rT5Re+=1~=J$w=#55=0#a9g_BkUx%M(>51o&WzyNKNL4_Xx5GS z+8{m@As>T~?WtZI3MrU7zXxuQff=*Aq3Hxy+MF0p_$Dd%e1j7O;|*aQem%-?>7rrX zfghZncTe6yQ^_Za>wi&P|J!YrDfd~)iV)s<|35h08J~v+Va{9!Hg2XEGbU;|VhaV9*V;p+n0>$0-^zlZR zQAF)-lN;)DIDy!Oo8Z|gJy^S?3r{{RAKWhPy|PbTSh6@SPzgb;KmF*NVDM4Gn9okz z_J0|!UUVna=NE*{;C^+!eNT)VPq1~X6R*rlB(7@&=Njz2ixE;p`73;|iH3St()yfS z4J$slhlQm*d;n9&#gwTEHf?obqJ`I*TY&o=_B_hJ$(!~>7K^}17c>j+iZ$nrx4W>i zJd9C~C2#ZkLI*Z{L6P^k^$6FUuqmHj$Pwtc%W%2X!(C_HX4c#etl83uvEv4eq@3NV z_gq-Ll9;oY6~dar4U1QWFnf*zQ=Ze!x^$>JE;pNr>;+#35RmB<>SSmO zIMdoA9v`V1g}T}ZZr>I&M(PeBJ}7}kxzXn{XppZ1BnU~I{KJz*4h+9nkH+N|1D*E` z?B2y-XsNx{*uW48ORgt8&q@hlO_0RJ76o0M$r z7$k9}O~IXZN6ZTiv^I@K%@Ma{pPM&yRQ;eMHlD?_TYn-0`7l-~K1~9e;o1So=~U+) zZ>;OvTJRz5xaY!8-?-BD^Vb-ttsOA9y`ADhOBk{c@)4gV0aHdmB_whFY~LQ3OX9$H zxlr%eJ0Dc-)zN;Zw|wff0Vb^;?1?70`o)@w7lN0ZT<>o9e;b9SdWY?PoqR3Xy;Db+ zPn&heGYDROhY&3f8Zw^P5~-C6NWk2E5)lGf%32sk1-}4EPC#JknB`f$3y^`hBs_R; z-=x^Og!#_Fj75-?QkJ0VjLnO$Oh~*m_cW`8?!sGK8zU-5$_#DUA@#ti`1+)oBc41B zOdIu*C>CQRfb0ICdSG|5N0zCt*6u(3BZ5R+(8eR}#BJWzQ1U%5X8X=Shm8m2X59!>X=?#9DkSZOY0ZhX+ z^z4XUT-Zg%$xV|84{%0kS;h;W*ah?7Obm}=ShBPIWGK(G5?Um(eQ^mhRU{A0^Ect= jSV99~z3XtMM#tiRt$3K3*$s7!00000NkvXXu0mjfRA4jX literal 0 HcmV?d00001 diff --git a/assets/images/3.0x/morph_icon.png b/assets/images/3.0x/morph_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..db98d49da84ddf84192f2d49f622b766254a126c GIT binary patch literal 2685 zcmV-@3WD{CP)_zgomx8%DFh1?N@$%?#{oiH+d-=YDnt8M z!<5$2jzj1agBsg79j4kk0|_CG36X@vD3sy}NL2{g{2;&XcAww3`N1W*%kA#HgCu+g z<}P=8Z+AcY`Tl%wm*F}hH;^0fdNYDB_+kMg2*!d;AX|PXfME2t3JfMg-W5y5$}VHo9Q`oR!Vh?EdCoD`9RRAPXv z*IEwjM+%^nAW4jeXB5z|o0TZV0mwu{%ry5$fMS)ZQbN#;BxWQAi6UQB2n9%*puCxD zbLfEfjdZd%8WvFu1*I)7y^bW{njonfjb{|n0GlzcA&Meq_x3WqOot1&B4|}$RnXx4 z@OV>AJV-Sern$t8Z{lzWX;KlcotP-(NRSGG9?nm!2&~S9LugJm&YQ8ifG$S~y-mZ! zLmFdj)tvNsZOz?H)pmbmo1nZIYYORF?81ZxdvK0_E^F>-I$~#QTLf9knH1yh(yD z=NfN=xCF^0a3Y0rx9Cp+(zlKA{b;PnTARy+IXV4KJjC%wF%`sx`CHs%pq9zLSf)0L zAeryn45l>_mZ>3abBxcgVWQPoDF8*au36EA?JxyJIM2U{$&m<*RM9YkNKWfv6TY;R zx3iVO>vM3doEJpFO0tk@6%*Ty$dv%ly?(H=j3kZ-%brha}2-gOd~^Un^%&GxnJ$Xmgie>>mB2VB&r>ex5ker9w+ninpB$#94$8;48U>*&CDXm z(0C3Uz=)WruS%zPv~!~A_Rkym>8>_>DcezdDJ4kH(<_>q49*_ zXq-Vavj}oxUW2Hu@X-NW^YK$|iQtK?m+|$7!njeGk;U=L=X_YWpl|3ic>(LG|JmE? zKtZ@>W_;kU95}@JGr-3e{n0~Oa{m60JFt91A2g5SZf;TtenG?b9UjaI4p)jG2^}qu zz%dxhmS)Cfj~OmtngVsld@;rq_{PH>cTzEx2}+7=p!)qzHa<%X9s59o;s4K$BgBVc(HLKN4j6`XY{^m zYx*yyD{${(PW~qdm-zIe!1)i-h@V(jh(hZfeRyhDC*~}Ga-^kmJh{n>ycPYbjSYsX zN@vbF8UiB7X^d>R1UWJsx6CY_zhRg%HH^o9uH&1zy-|?!50`l#aq38a{WMLo*?=Lm>?xomWJVTullEXsq#|r^h+p(s?g7j&jF1m9Q4WQusq)G=Ya1ph z<=~&Ep#945EB|Uq1n17#caef|y!ReWY_+N*hz_ovhv5s+TURSUW8uS78ZKQ*oLLJ? zWegQ>Wa4D?Xd-%h4gCIh2EB6FRpilQYWw1^>Lum8OfS~S4=Hohra@*_WurC|9G_hD z;vWan<8E`|Tm&UAQNd{=UF+%QWSR=wy+Rz3FV>!!5M@w^+M~YyM%oxx-Y_`+x+j31 zuCdke?>8f8I3dT9PCNd#CmRJiJCdutqCxJjSiV{Wg-xH*8$m99$Z#RlKP?m!6rB#0 z`f>LC#3v*j_n-ELq3d$2SP_z0zPz#mNyviXcx)s))r>5UC*aUmxE3 zoBgCxZ#A)ZuOWMY~@6c}WZrG+<`RqM3df_~1-*G-KAul>H?GmoCB; zN?$gp5bYl;8s!yzPz6$d=rz4$$mI+XWSJRI1cj)t_DAm-wNJV2{;-Ea zf6q1bU2fIzzC!aNODc~3d-(bw)3+N6Rn$aiSA=f z*dMk0k$+wr)oKr75`mdUL8<;q!Xn*P1G%}Usd`TOm*v|WOa_={VX6M|Z|rPpyTjhx z-B>;ul+>>rd*oQ#!yyK4(cDLGC)$m6Ix|JCY@<5)k^2V=Fm_l~ww-FoP~IP{uET=` zBxH083;%rLS84U18i*o8bkBGDM403sZW36tj4@F(-qa*j!v*r4n$$=rnu(TIN{Jan%I-i}8CaE1U4ix2;}Knqv9hq) zwO=JMgGd=cgRmkVC724y(rKLfRFV>nloK=(D`&1-Og++Uxkwv~XVd(5fTqa;u^tmB rU#;aiOoZe@0=bSLjIL0sNr}d1+KfuC4Vtvo00000NkvXXu0mjf3cm_y literal 0 HcmV?d00001 diff --git a/assets/images/morph_icon.png b/assets/images/morph_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e4b019b864eb6520fdf0b72898d92376b4019774 GIT binary patch literal 895 zcmV-_1AzRAP)Te zqKhPiT>$oohcpO2O{6#iJUHmkUV4&okeRW`)?^PVN)LpnLJE+=y&=v!%!HKPhQ_?+ zR!&Nv+;#>jLPlB6h^`f9m2SFyuJNP-jd?BYa`{6!%tZQ-d#JY9T0(BW%b6gcN4`zI zKM+;PldMKh63#*R&Y3bLuf>LgffnSvLeB})XCcP!9w506n@ZH94=55n`w{h=Js-r@ zrh>&eN{jL6F@~a3Dn^F43|o+IF!+4$g1TI}ACxf@^Nlr-a#89>|K3(ER+x=DK7jnav zS3tPap`!W{Gi)QHi9yIL+8Io+vLvwRwixsL!VqqCt)i?_;P?pz?d=MRPR6WX0cNK| zW>jEO#bf4}nXtsob8AA;8_@Z@m-(U_N)ITq&41&GMO zg51)LB=|CH4Sy#`v*CQdb7k{xfwzu`#MBIuBEb0|b7;MqlyaIam>$c((k}}Jo>>!o zulqw-Tnyp!M{{!hjnI2hOtWLM*&(fdM1 { static const xmrtoUrl = 'https://xmr.to/app_static/html/tos.html'; static const changenowUrl = 'https://changenow.io/terms-of-use'; + static const morphUrl = 'http://morphtoken.com/terms'; final bool _isAccepted; bool _checked = false; @@ -197,6 +198,27 @@ class DisclaimerBodyState extends State { )) ], ), + SizedBox( + height: 16.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: GestureDetector( + onTap: () => launchUrl(morphUrl), + child: Text( + morphUrl, + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.blue, + fontSize: 14.0, + fontWeight: FontWeight.normal, + decoration: TextDecoration.underline), + ), + )) + ], + ), SizedBox( height: 16.0, ) diff --git a/lib/src/screens/settings/settings.dart b/lib/src/screens/settings/settings.dart index 72602c4d8..b2f53bfea 100644 --- a/lib/src/screens/settings/settings.dart +++ b/lib/src/screens/settings/settings.dart @@ -51,12 +51,14 @@ class SettingsFormState extends State { final _twitterImage = Image.asset('assets/images/Twitter.png'); final _changeNowImage = Image.asset('assets/images/change_now.png'); final _xmrBtcImage = Image.asset('assets/images/xmr_btc.png'); + final _morphImage = Image.asset('assets/images/morph_icon.png'); final _emailUrl = 'mailto:support@cakewallet.io'; final _telegramUrl = 'https:t.me/cakewallet_bot'; final _twitterUrl = 'https:twitter.com/CakewalletXMR'; final _changeNowUrl = 'mailto:support@changenow.io'; final _xmrToUrl = 'mailto:support@xmr.to'; + final _morphUrl = 'mailto:support@morphtoken.com'; final _items = List(); @@ -267,6 +269,12 @@ class SettingsFormState extends State { link: 'support@xmr.to', image: _xmrBtcImage, attribute: Attributes.link), + SettingsItem( + onTaped: () => _launchUrl(_morphUrl), + title: 'MorphToken', + link: 'support@morphtoken.com', + image: _morphImage, + attribute: Attributes.link), SettingsItem( onTaped: () { Navigator.push(