From 9d2bd1b37a5308564322c0125b3a52939cd226b1 Mon Sep 17 00:00:00 2001 From: Kima Date: Wed, 13 Mar 2024 22:59:26 +0100 Subject: [PATCH] new refilcplus page tier cards --- refilc/assets/images/plus_tier_cap.png | Bin 1141 -> 1710 bytes refilc/assets/images/plus_tier_ink.png | Bin 1305 -> 1546 bytes .../lib/premium/components/plan_card.dart | 354 +++++++++--------- refilc_mobile_ui/lib/premium/plus_screen.dart | 43 ++- refilc_plus | 2 +- 5 files changed, 222 insertions(+), 177 deletions(-) diff --git a/refilc/assets/images/plus_tier_cap.png b/refilc/assets/images/plus_tier_cap.png index ad117d367eb2e4931faf0ef11ee941d3627957cd..c476908fddda05f674946663557cf3ce156552cf 100644 GIT binary patch delta 1679 zcmey$v5r@@I^i^K`LXDk-K zb$ZkmyBL>UuUTKeX4Uo3cV-pyS~l!{{e1QMd;3M#2J}TQlXLxIrIa;s(JUn?ZD-}R zFBh4IBu7ouh?*#~*GP8p3*Q&@dlg^Jy}MFxt%J#02R<|3a=`?#4aH|3XRv-sy1>)I zc=CBdna=#RTtB)Uels+GJh*?>zBa8j^%u7ExhwzvtJR>t_OijYTkMN+b2G$Cws|nv z?GCLj`lGW*x+bTi_xO+3TE6uMJk+;nU0~O}d`a*xg8^?$xvWF>kND5MM?VYRxLf~W zFE`_M2OlN7mPMS^vpLu;rB^BHGF#m{a$#zUk;<75)~>(*vi5wO73`ePu*z4JBu7hwMqa(VLRPOWVP znh8I4ocP?(WA{4$#olRWq|8+d9M*SEh(7lA<{=&FhwV2fd|am)2<#=e0G28$>r-lmn*Hc{d=!vFZ-eF;4|_UlLCY{ zM&6FJVLcYgTP^Zi_PO@L(znt{Kli^{bxEe=Ov??CsvQQ)H#DCXEaGw(7kp%?esY!6 z?Y|oX+phK1+8nLivDg3jH?!gk^_M~mO>EAyH*Sz~%QHN%(@40HcZvTz2^NX-w~FQc zmA)s&Y}#6C^YRo8UZIz7)N++`BW%WuC4Da3q*v-Q>Z?JS2EMz;QV5M#Ye zuvG7VXs5SBxc^tC|C+6P&lX2Kb7Gcz8l)D&GohQSdW~RQ8+Yp}zphg|moP32`Ki*Y zw&Jwr>6KP7f%^{3J!A6ruUW|TBK`-frOVH6JXZgJ-B9D+jA>JurtwFo-CoW&)BPi3 zUm?d==Fj|vJ6jn(WL!^=^nWzn`s;4n#@?`}w!TK}ZHu+Pm{%)Fo0#WZQ+hSwzV#Q& zg`d_Q*AsB)lNI&KzNE6_LDrF^(iLYOY{*=fb8Yp)7OewD_VM0V6ram(D7?)+52<}Vgh{eGo{OH&&}wN+U4axDfR!)3=>`#moUXO zr7tr%J}O$@JbV7|kCOqsKeSRG8@$tD^bza*u_bepagy3k2le_@?C(6MGn|?FH%y_$ ze8K*3%L6O9w}giN6noyr^=Esr?U^6ZK72n5b{Lw?(EE8b@f36Yj(0m%zg>)RdGf4c z_p*T2gVhXMBBy(HiwK{%Rl$35%9NN*)6Q9PpW)nA^;lbkjq7F0vEsu4oiC=YI(%%A zO;JFib)Hp9R935L z-X>yn_7V5}!lP?4B%*6iKC8Bx$XoVi_VL0+J|6?QOio{1mbm}!LVxw0b|oHO&8cac ztTN#}9Vb(T*xRMd&!*lu@6W03XBWw3!tL%omt|(#R?YO*Kf!le&pXt&91NXodD}}R zWR9=i=g-GCJER|~?a04(IsAW(oB!!4>F4LBpLXXhsW{3z)lHg#fq}u()z4*}Q$iB} DG|(bl delta 1106 zcmZ3-`;|knGr-TCmrII^fq{Y7)59f*fq_Abfq_AjgN=cK!8v^Q*NKWI^(?9_>G^2|L~gb=ENe75ShhK$ z+^gVu-d~dmPHT-;&2je<>HT=<@N~h?Hj1}3gf1}F>L{@;S(A~na{cYoiMeS3fk)!` zGU^lhyhIExd_1bQ?@*Aa)cg7E(Z6QM-lL03}Z)IJ+ zGBK{|M4%7vtd#X(nhAd`?Ydqp*`1#Gx1!g~EnlVm)()0%N3V!frJ_5rQ#PiZ`Spoa z%Y;4uuZEiQE~P{l!R0?A7BzkkkzAwoB+BEWZnJa!0j1a5^-i`ud3yd}#?+lf-!!@e zZ;BM@E(y`yvf!zAh{W;8C)-Z9uefZIvE}rRCP%f1+q+h?F3p%1(7)=+?u)gD_GwiG zA1r!vnS1^X9lojyX8)YlrH82HEXv?r9dPN<1P-aqwkPa%p7mpIb)2u|sHPEmr7hu= z=k8MBHF>PwXR7L}n(v;_b>DX*Z=uzP5A9N6wXfa2iE7?{{p5)G)fuP0-eC&jmeT1w zzo^*nuVj!)!;I*Yt8z^PgY61ZL-Lf)ubTOd$txhyddW^rovF{&QeQIiJc=xpekEPp zwd_i{#1akPn7lw<<7O+c}e2u-1v%iiIpL)M^tB9OqB{rudj9xj9Peu!Thi2 z?ot_!{VB`x!(EdWsNH6^{KR^Gq4KoIo%3(F&#OODyJGI4Z_m_s$A{E*@f=&fRzYIxnD0Z}a9G zdQ-UVgL8M6J>Jl`_>ttNnb#{m*IOH@3+Bb}#xC1nn=spB>$ddp0{gQogTgMYt6kOc zYuo1yZ#O&rQg61?a<=;9W+u8ahrjVy&hnk+yh|*CIo-0pGs^u<|2Wq_>bCQOi#g)_ z!XauW9@vC_sQ;YuZ<%xbGNt84alh6s;+NVSYx$4GsAQV_0*CugBQKm_naTR?T=1>> ze>|&Bl({Ib?2Dbaw!Q9&%}Tjh4>IhEJ|2JQv->5V#N(TCjU|%I33h7zs;{1#_TG76 z_rT=sMpaMC$#0XyQ+jS`e3W{0;ClU`vwI$-Jmq*~yKJ)ZqHD|Ta~IB^T$Hjp+wgpg z%Wk&63J<=>eMlAzyxjS7|Gck%H=ob?bGvitW|c!4Hc!+qfAf!ebmU^=&zo=bE(b;b aWtU8H4dr;XQi_3rfx*+&&t;ucLK6Tl=oT9Q diff --git a/refilc/assets/images/plus_tier_ink.png b/refilc/assets/images/plus_tier_ink.png index 4afa961ec41152dd77c6564b48f644cc51952002..5d47d0799f5b12b64d28a5a1b4ab1b71dca44033 100644 GIT binary patch delta 1514 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 Column( - children: [ - const SizedBox( - height: 10.0, - ), - Row( - children: [ - SizedBox( - width: 22.22, - child: Text( - e[0], - style: const TextStyle(fontSize: 18.0), + const SizedBox( + height: 12.0, + ), + Text( + description, + style: TextStyle( + color: const Color(0xFF011234).withOpacity(0.6), + fontSize: 13.69, + fontWeight: FontWeight.w500, + ), + ), + const SizedBox( + height: 14.20, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: features + .map((e) => Column( + children: [ + const SizedBox( + height: 10.0, + ), + Row( + children: [ + SizedBox( + width: 22.22, + child: Text( + e[0], + style: const TextStyle(fontSize: 18.0), + ), ), - ), - const SizedBox( - width: 14.0, - ), - Expanded( - child: e[1].endsWith('tier_benefits') - ? Text.rich( - style: const TextStyle( - height: 1.2, - fontWeight: FontWeight.w500, - color: Color(0xFF011234), - fontSize: 13.69, - ), - TextSpan( - children: [ - TextSpan( - text: 'every'.i18n, - ), - e[1].startsWith('cap') - ? const TextSpan( - text: 'reFilc+', - style: TextStyle( - color: - Color(0xFF47BB00), - fontWeight: - FontWeight.w600, + const SizedBox( + width: 14.0, + ), + Expanded( + child: e[1].endsWith('tier_benefits') + ? Text.rich( + style: const TextStyle( + height: 1.2, + fontWeight: FontWeight.w500, + color: Color(0xFF011234), + fontSize: 13.69, + ), + TextSpan( + children: [ + TextSpan( + text: 'every'.i18n, + ), + e[1].startsWith('cap') + ? const TextSpan( + text: 'reFilc+', + style: TextStyle( + color: + Color(0xFF7C3EFF), + fontWeight: + FontWeight.w600, + ), + ) + : TextSpan( + children: [ + const TextSpan( + text: 'reFilc+', + style: TextStyle( + color: Color( + 0xFF7C3EFF), + fontWeight: + FontWeight + .w600, + ), + ), + TextSpan( + text: 'and'.i18n, + ), + const TextSpan( + text: + 'reFilc+ Gold', + style: TextStyle( + color: Color( + 0xFF0061BB), + fontWeight: + FontWeight + .w600, + ), + ), + ], ), - ) - : TextSpan( - children: [ - const TextSpan( - text: 'reFilc+', - style: TextStyle( - color: Color( - 0xFF47BB00), - fontWeight: - FontWeight.w600, - ), - ), - TextSpan( - text: 'and'.i18n, - ), - const TextSpan( - text: 'reFilc+ Gold', - style: TextStyle( - color: Color( - 0xFF0061BB), - fontWeight: - FontWeight.w600, - ), - ), - ], - ), - TextSpan(text: 'benefit'.i18n), - ], + TextSpan(text: 'benefit'.i18n), + ], + ), + ) + : Text( + e[1], + maxLines: 2, + style: const TextStyle( + height: 1.2, + color: Color(0xFF011234), + fontWeight: FontWeight.w500, + fontSize: 13.69, + ), ), - ) - : Text( - e[1], - maxLines: 2, - style: const TextStyle( - height: 1.2, - color: Color(0xFF011234), - fontWeight: FontWeight.w500, - fontSize: 13.69, - ), - ), - ), - ], - ), - ], - )) - .toList(), - ), - ], + ), + ], + ), + ], + )) + .toList(), + ), + ], + ), ), ), ), diff --git a/refilc_mobile_ui/lib/premium/plus_screen.dart b/refilc_mobile_ui/lib/premium/plus_screen.dart index 95e2b6b3..21518331 100644 --- a/refilc_mobile_ui/lib/premium/plus_screen.dart +++ b/refilc_mobile_ui/lib/premium/plus_screen.dart @@ -19,6 +19,37 @@ class PlusScreen extends StatelessWidget { @override Widget build(BuildContext context) { + LinearGradient plusGradient = const LinearGradient( + colors: [ + Color(0xFF7087FF), + Color(0xFF9069FF), + Color(0xFFE4D7FF), + Color(0xFFDBC5FF), + Color(0xFFE57DFF), + Color(0xFFDBB7FF), + Color(0xFF6850FF), + Color(0xFF2144FF), + ], + stops: [0.0, 0.16, 0.32, 0.49, 0.69, 0.8, 0.92, 1.0], + begin: Alignment.topLeft, + end: Alignment.bottomRight, + ); + LinearGradient goldGradient = const LinearGradient( + colors: [ + Color(0xFFFFBD70), + Color(0xFFFFDE69), + Color(0xFFFFECD7), + Color(0xFFFFE4C5), + Color(0xFFFFDB7D), + Color(0xFFFFDEB7), + Color(0xFFFFAE50), + Color(0xFFFF9921), + ], + stops: [0.0, 0.16, 0.32, 0.49, 0.69, 0.8, 0.92, 1.0], + begin: Alignment.topLeft, + end: Alignment.bottomRight, + ); + return Scaffold( backgroundColor: const Color(0xffF4F9FF), body: Container( @@ -168,12 +199,13 @@ class PlusScreen extends StatelessWidget { iconPath: 'assets/images/plus_tier_cap.png', title: 'reFilc+', description: 'tier_rfp'.i18n, - color: const Color.fromARGB(255, 97, 0, 187), + color: const Color(0xFF7C3EFF), + gradient: plusGradient, id: 'refilcplus', price: 0.99, borderRadius: const BorderRadius.vertical( top: Radius.circular(16.0), - bottom: Radius.circular(8.0)), + bottom: Radius.circular(16.0)), features: [ ['✨', 'rfp_1'.i18n], ['1️⃣', 'rfp_5'.i18n], @@ -184,7 +216,7 @@ class PlusScreen extends StatelessWidget { ], ), const SizedBox( - height: 8.0, + height: 12.0, ), PlusPlanCard( active: ActiveSponsorCard.estimateLevel( @@ -193,11 +225,12 @@ class PlusScreen extends StatelessWidget { iconPath: 'assets/images/plus_tier_ink.png', title: 'reFilc+ Gold', description: 'tier_rfpgold'.i18n, - color: const Color.fromARGB(255, 187, 137, 0), + color: const Color(0xFFFFBD3E), + gradient: goldGradient, id: 'refilcplusgold', price: 2.99, borderRadius: const BorderRadius.vertical( - top: Radius.circular(8.0), + top: Radius.circular(16.0), bottom: Radius.circular(16.0)), features: [ ['🕑', 'rfp_7'.i18n], diff --git a/refilc_plus b/refilc_plus index a4d569db..a1e434f0 160000 --- a/refilc_plus +++ b/refilc_plus @@ -1 +1 @@ -Subproject commit a4d569db8d8cffa5342fabacd7d1f3ee4fe43061 +Subproject commit a1e434f0204d7131bee009b786dadb2184f4822c