Merge pull request #389 from CollActionteam/fix/fixes-for-1.2.0-1/nav…

…bar-change-logo Fix/fixes for 1.2.0 1/navbar change logo
CollActionteam · Mar 31, 2023 · db8283d · db8283d
2 parents 6528ad6 + b3d2f05
commit db8283d
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 12 deletions.
diff --git a/assets/fonts/icons/CollactionIcons.ttf b/assets/fonts/icons/CollactionIcons.ttf
diff --git 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"
+      ]
     }
   ]
 }
diff --git 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
@@ -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
@@ -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,10 +93,14 @@ class _CrowdActionCardState extends State<CrowdActionCard>
                                   CollactionIcons.lock,
                                   color: kPrimaryColor300,
                                 ),
+                                elevation: 0,
+                              ),
+                            Padding(
+                              padding: const EdgeInsets.only(top: 3.0),
+                              child: CountryIcon(
+                                countryCode: widget.crowdAction.location.code,
+                                radius: 20,
                               ),
-                            CountryIcon(
-                              countryCode: widget.crowdAction.location.code,
-                              radius: 20,
                             )
                           ]),
                         )

diff --git 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,
     );
   }
 }