From 6be22f2fc711e9926b1aac284500b0bb1dd4314e Mon Sep 17 00:00:00 2001 From: Sarah Audina Date: Sat, 1 Apr 2023 01:18:41 +0800 Subject: [PATCH 1/2] fix: change logo on navbar, removed shadow from spotlight crowdaction card's lock icon --- assets/fonts/icons/CollactionIcons.ttf | Bin 19292 -> 19492 bytes assets/fonts/icons/config.json | 14 ++++++++++++++ lib/presentation/core/collaction_icons.dart | 1 + lib/presentation/home/home_screen.dart | 2 +- .../shared_widgets/crowdaction_card.dart | 2 ++ .../shared_widgets/custom_fab.dart | 18 ++++++++++-------- 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/assets/fonts/icons/CollactionIcons.ttf b/assets/fonts/icons/CollactionIcons.ttf index fc4ea67c4a8be7fbb1e509aa9d617ffbb95811f0..244092ccd42558953df88fca0173ddecf1ff41c8 100644 GIT binary patch delta 611 zcmXv}OK1~O6uo!eWG4McCRjTnlbA8uAdR0%Vq;JeEm#eR3lYJhkuc2%$s{QjOmR^+ zf})Gc6j9NIP+UqO8-@CzigY2^g@TI~B9$@=1zo6J*o=23_~5*E&*$Cy-tt|Xy@%7` zsWkw+4FG3#BVRYt3w{7@4uIcVs!SH+hu(Anh$jFt=gWosSorT^i?R-e$|Q*Q*>9@n z2|LTiL}Srsf1rL}iNCMZ^!&NWQVc+75icA0MjglTA^BU0hpKs_@ZH$9^a5aH7J!|p z*Dg=|{1f>CkX@%o?7lM}&cp#JOW?)e%thbfU(mxWQlNEm;nDxoUb9Plj*Sxc0_Ui- zoO^LINE5%A)0jcsT*BoXE4rqKc1DO2c*?$W;{dNobuLEf>~?h?W{7(`jjcf|Vd=IF zV1c#2Q<3Wo^Fj`aW}7Q`=))+O<80l$#(I3cj?I;womQ;b;7@VAmQEcAKw0yxP~^5h zZAQiC=_z`beTfy>Y3PE@5P%4107*|IF%Z!P1aT7{NDL*lG|C<(2T|7g1QB=1ef_f5 zA4~4REyOipM`REioT>zd74B;Lrm84M0~;6cm7=1ma8KGd$Ww*`8`trQ>mB*Dq8^m| z=&y!9uY^*Pgwj5ot4gVmnv(FA>q`D=$CJ#}V?Qu%ejHiFc=Oru$4F!}JH}z6`7-+e MyZK73RC7Q34^qyPlmGw# delta 398 zcmXw!KS)AR6vn^fduf>vZQ>B2Z5h-SE;)q&@RQ7D#1GEcZF{a45mzzoq zuv`P8GnFYOpBxVnz~%+~m2^UmyNgqAoHaF`W?(xO+I+9EhSEyDP`@&s`Mpo}kC|*t zjueC2fVIv(smO&K<>-|APWFSVvXb~#T+J#l%>%+hF1w!Bs$2cQ>;y02-miHA5{R>` zy+&hXrEjv0UO{Jq*OGDeUyUy#B`ym~?7LwxDIarAQU_>_e$_Gs$fq``HP5h%C9wEY z5II-tM1fnT=8%`Gy~9P6*jqV8u;|0O&oBTT`lwm?5ci_0T}Wtaf`fXZ9SDqRJK~&0 meYeJW7cFGF^Q)ILKP0IK!4HzOLg<{>xWaL5Gkik40`Lb0aAu|e diff --git a/assets/fonts/icons/config.json b/assets/fonts/icons/config.json index 68df9cd4..827383cd 100644 --- a/assets/fonts/icons/config.json +++ b/assets/fonts/icons/config.json @@ -691,6 +691,20 @@ "search": [ "heart-sm" ] + }, + { + "uid": "6555d0250a6170b636ae88f62a3bf3a4", + "css": "logo", + "code": 59491, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M42.8 785.8L419.3 998.5 417.2 777.7C416.8 734.2 393.3 694.3 355.6 672.8H355.6C317.6 651.1 270.9 651.5 233.2 673.7L42.8 785.8ZM867.6 783.9L493 1000 493.1 779.2C493.1 735.8 516.2 695.6 553.8 673.7H553.8C591.6 651.7 638.3 651.6 676.2 673.5L867.6 783.9ZM0.7 720.3L0 287.9 191.4 398C229 419.6 252.4 459.7 252.6 503.1H252.6C252.8 546.9 229.6 587.4 191.8 609.4L0.7 720.3ZM870.1 214.2L493.5 1.5 495.6 222.3C496 265.8 519.5 305.7 557.2 327.2H557.2C595.2 348.9 641.9 348.5 679.6 326.3L870.1 214.2ZM45.2 216.1L419.8 0 419.7 220.8C419.7 264.2 396.6 304.4 359 326.3H359C321.2 348.3 274.5 348.4 236.6 326.5L45.2 216.1Z", + "width": 870 + }, + "search": [ + "logo" + ] } ] } \ No newline at end of file diff --git a/lib/presentation/core/collaction_icons.dart b/lib/presentation/core/collaction_icons.dart index 2d0fb003..10522270 100644 --- a/lib/presentation/core/collaction_icons.dart +++ b/lib/presentation/core/collaction_icons.dart @@ -70,4 +70,5 @@ class CollactionIcons { static const IconData trash = IconData(0xe832, fontFamily: _kFontFam); static const IconData heart_filled = IconData(0xe833, fontFamily: _kFontFam); static const IconData heart = IconData(0xe834, fontFamily: _kFontFam); + static const IconData logo = IconData(0xe863, fontFamily: _kFontFam); } diff --git a/lib/presentation/home/home_screen.dart b/lib/presentation/home/home_screen.dart index 9c04554c..cfa80edb 100644 --- a/lib/presentation/home/home_screen.dart +++ b/lib/presentation/home/home_screen.dart @@ -32,7 +32,7 @@ class HomePage extends StatelessWidget { elevation: 0, items: const [ BottomNavigationBarItem( - icon: Icon(CollactionIcons.collaction), + icon: Icon(CollactionIcons.logo), label: '', ), BottomNavigationBarItem( diff --git a/lib/presentation/shared_widgets/crowdaction_card.dart b/lib/presentation/shared_widgets/crowdaction_card.dart index 7d2a8d28..be44c672 100644 --- a/lib/presentation/shared_widgets/crowdaction_card.dart +++ b/lib/presentation/shared_widgets/crowdaction_card.dart @@ -1,5 +1,6 @@ import 'package:auto_route/auto_route.dart'; import 'package:cached_network_image/cached_network_image.dart'; + // ignore: depend_on_referenced_packages import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'; import 'package:flutter/material.dart'; @@ -92,6 +93,7 @@ class _CrowdActionCardState extends State CollactionIcons.lock, color: kPrimaryColor300, ), + elevation: 0, ), CountryIcon( countryCode: widget.crowdAction.location.code, diff --git a/lib/presentation/shared_widgets/custom_fab.dart b/lib/presentation/shared_widgets/custom_fab.dart index f1050f23..0b798c62 100644 --- a/lib/presentation/shared_widgets/custom_fab.dart +++ b/lib/presentation/shared_widgets/custom_fab.dart @@ -8,15 +8,16 @@ class CustomFAB extends StatelessWidget { final String? heroTag; final GestureTapCallback? onPressed; final Color? color; + final double? elevation; - const CustomFAB({ - super.key, - required this.child, - this.isMini = false, - this.heroTag = "fabBtn", - this.onPressed, - this.color, - }); + const CustomFAB( + {super.key, + required this.child, + this.isMini = false, + this.heroTag = "fabBtn", + this.onPressed, + this.color, + this.elevation}); @override Widget build(BuildContext context) { @@ -27,6 +28,7 @@ class CustomFAB extends StatelessWidget { color ?? (onPressed != null ? kAccentColor : kDisabledButtonColor), mini: isMini, child: child, + elevation: elevation ?? 6, ); } } From b3d2f05247c3e22592fd6bc26cd9e4736835a181 Mon Sep 17 00:00:00 2001 From: Sarah Audina Date: Sat, 1 Apr 2023 01:56:09 +0800 Subject: [PATCH 2/2] fix: align country icon on spotlight crowdaction card --- lib/presentation/shared_widgets/crowdaction_card.dart | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/presentation/shared_widgets/crowdaction_card.dart b/lib/presentation/shared_widgets/crowdaction_card.dart index be44c672..b06f89f8 100644 --- a/lib/presentation/shared_widgets/crowdaction_card.dart +++ b/lib/presentation/shared_widgets/crowdaction_card.dart @@ -95,9 +95,12 @@ class _CrowdActionCardState extends State ), elevation: 0, ), - CountryIcon( - countryCode: widget.crowdAction.location.code, - radius: 20, + Padding( + padding: const EdgeInsets.only(top: 3.0), + child: CountryIcon( + countryCode: widget.crowdAction.location.code, + radius: 20, + ), ) ]), )