fix :

1 - multi module in Auth select save selected module 2 - add flutter gen for assets builder
2025-05-19 16:16:33 +03:30
parent 982329a3eb
commit 905e407ccd
46 changed files with 1431 additions and 407 deletions
--- a/packages/core/lib/presentation/widget/bottom_navigation/wave_bottom_navigation.dart
+++ b/packages/core/lib/presentation/widget/bottom_navigation/wave_bottom_navigation.dart
@@ -3,7 +3,7 @@ import 'package:rasadyar_core/core.dart';

 class WaveBottomNavigationItem {
  final String title;
-  final String icon;
+  final Widget icon;

  WaveBottomNavigationItem({required this.title, required this.icon});
 }
@@ -112,12 +112,7 @@ class _WaveBottomNavigationState extends State<WaveBottomNavigation> {
                      children: [
                        Tooltip(
                          message: item.title,
-                          child: vecWidget(
-                            item.icon,
-                            color: Colors.white,
-                            width: 32,
-                            height: 32,
-                          ),
+                          child: item.icon
                        ),

                        /* Visibility(
--- a/packages/core/lib/presentation/widget/buttons/fab.dart
+++ b/packages/core/lib/presentation/widget/buttons/fab.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/presentation/common/app_color.dart';
-import 'package:rasadyar_core/presentation/common/assets.dart';
 import 'package:rasadyar_core/presentation/utils/color_utils.dart';
-import 'package:rasadyar_core/presentation/widget/vec_widget.dart';
+import '../../common/assets.gen.dart';

 class RFab extends StatefulWidget {
  final VoidCallback? onPressed;
@@ -22,7 +21,10 @@ class RFab extends StatefulWidget {
  RFab.smallAdd({required VoidCallback? onPressed, Key? key})
    : this.small(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecAddSvg),
+        icon:  Assets.vec.addSvg.svg(
+          width: 20,
+          height: 20,
+        ),
        backgroundColor: AppColor.greenNormal,
        key: key,
      );
@@ -30,7 +32,10 @@ class RFab extends StatefulWidget {
  RFab.add({required VoidCallback? onPressed, Key? key})
    : this(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecAddSvg),
+    icon:  Assets.vec.addSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.greenNormal,
        key: key,
      );
@@ -41,7 +46,10 @@ class RFab extends StatefulWidget {
  RFab.smallEdit({required VoidCallback? onPressed, Key? key})
    : this.small(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecEditSvg),
+    icon:  Assets.vec.addSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -49,7 +57,10 @@ class RFab extends StatefulWidget {
  RFab.edit({required VoidCallback? onPressed, Key? key})
    : this(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecEditSvg),
+    icon:  Assets.vec.addSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -60,7 +71,10 @@ class RFab extends StatefulWidget {
  RFab.smallDelete({required VoidCallback? onPressed, Key? key})
    : this.small(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecTrashSvg),
+    icon:  Assets.vec.trashSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.redNormal,
        key: key,
      );
@@ -68,7 +82,10 @@ class RFab extends StatefulWidget {
  RFab.delete({required VoidCallback? onPressed, Key? key})
    : this(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecTrashSvg),
+    icon:  Assets.vec.trashSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.redNormal,
        key: key,
      );
@@ -79,7 +96,10 @@ class RFab extends StatefulWidget {
  RFab.smallAction({required VoidCallback? onPressed, Key? key})
    : this.small(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecScanSvg),
+    icon:  Assets.vec.scanSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -87,7 +107,10 @@ class RFab extends StatefulWidget {
  RFab.action({required VoidCallback? onPressed, Key? key})
    : this(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecScanSvg),
+    icon:  Assets.vec.scanSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -98,7 +121,10 @@ class RFab extends StatefulWidget {
  RFab.smallFilter({required VoidCallback? onPressed, Key? key})
    : this.small(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecFilterSvg),
+    icon:  Assets.vec.scanSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -106,7 +132,10 @@ class RFab extends StatefulWidget {
  RFab.filter({required VoidCallback? onPressed, Key? key})
    : this(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecFilterSvg),
+    icon:  Assets.vec.scanSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -117,7 +146,10 @@ class RFab extends StatefulWidget {
  RFab.smallDownload({required VoidCallback? onPressed, Key? key})
    : this.small(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecDownloadSvg),
+    icon:  Assets.vec.downloadSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -125,7 +157,10 @@ class RFab extends StatefulWidget {
  RFab.download({required VoidCallback? onPressed, Key? key})
    : this(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecDownloadSvg),
+    icon:  Assets.vec.downloadSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -136,7 +171,10 @@ class RFab extends StatefulWidget {
  RFab.smallExcel({required VoidCallback? onPressed, Key? key})
    : this.small(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecDownloadSvg),
+    icon:  Assets.vec.excelDownloadSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.greenDark,
        key: key,
      );
@@ -144,7 +182,10 @@ class RFab extends StatefulWidget {
  RFab.excel({required VoidCallback? onPressed, Key? key})
    : this(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecDownloadSvg),
+    icon:  Assets.vec.excelDownloadSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.greenDark,
        key: key,
      );
@@ -155,7 +196,10 @@ class RFab extends StatefulWidget {
  RFab.smallBack({required VoidCallback? onPressed, Key? key})
    : this.small(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecArrowLeftSvg),
+ icon:  Assets.vec.arrowLeftSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
@@ -163,7 +207,10 @@ class RFab extends StatefulWidget {
  RFab.back({required VoidCallback? onPressed, Key? key})
    : this(
        onPressed: onPressed,
-        icon: vecWidget(Assets.vecArrowLeftSvg),
+    icon:  Assets.vec.arrowLeftSvg.svg(
+      width: 20,
+      height: 20,
+    ),
        backgroundColor: AppColor.blueNormal,
        key: key,
      );
--- a/packages/core/lib/presentation/widget/buttons/fab_outlined.dart
+++ b/packages/core/lib/presentation/widget/buttons/fab_outlined.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/presentation/common/app_color.dart';
-import 'package:rasadyar_core/presentation/common/assets.dart';
+import 'package:rasadyar_core/presentation/common/assets.gen.dart';
 import 'package:rasadyar_core/presentation/utils/color_utils.dart';
-import 'package:rasadyar_core/presentation/widget/vec_widget.dart';

 class RFabOutlined extends StatefulWidget {
  final Widget icon;
@@ -69,10 +68,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.greenNormal,
        borderColor: AppColor.greenNormal,
-        icon: vecWidget2(
-          Assets.vecAddSvg,
-
-          color: AppColor.greenNormal,
+        icon: Assets.vec.addSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -81,12 +83,14 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.greenNormal,
-        icon: vecWidget(
-          Assets.vecAddSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenNormal
-                  : AppColor.greenNormal.disabledColor,
+
+        icon: Assets.vec.addSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -96,12 +100,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.greenNormal,
        borderColor: AppColor.greenNormal,
-        icon: vecWidget(
-          Assets.vecAddSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenNormal
-                  : AppColor.greenNormal.disabledColor,
+        icon: Assets.vec.addSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -110,12 +115,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.greenNormal,
-        icon: vecWidget(
-          Assets.vecAddSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenNormal
-                  : AppColor.greenNormal.disabledColor,
+        icon: Assets.vec.addSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -128,12 +134,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecEditSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.editSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -142,12 +149,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecEditSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.editSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -157,12 +165,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecEditSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.editSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -171,12 +180,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecEditSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.editSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -189,12 +199,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.redNormal,
        borderColor: AppColor.redNormal,
-        icon: vecWidget(
-          Assets.vecTrashSvg,
-          color:
-              onPressed != null
-                  ? AppColor.redNormal
-                  : AppColor.redNormal.disabledColor,
+        icon: Assets.vec.trashSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.redNormal
+                : AppColor.redNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -203,12 +214,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.redNormal,
-        icon: vecWidget(
-          Assets.vecTrashSvg,
-          color:
-              onPressed != null
-                  ? AppColor.redNormal
-                  : AppColor.redNormal.disabledColor,
+        icon: Assets.vec.trashSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.redNormal
+                : AppColor.redNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -218,12 +230,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.redNormal,
        borderColor: AppColor.redNormal,
-        icon: vecWidget(
-          Assets.vecTrashSvg,
-          color:
-              onPressed != null
-                  ? AppColor.redNormal
-                  : AppColor.redNormal.disabledColor,
+        icon: Assets.vec.trashSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.redNormal
+                : AppColor.redNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -232,12 +245,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.redNormal,
-        icon: vecWidget(
-          Assets.vecTrashSvg,
-          color:
-              onPressed != null
-                  ? AppColor.redNormal
-                  : AppColor.redNormal.disabledColor,
+        icon: Assets.vec.trashSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.redNormal
+                : AppColor.redNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -250,12 +264,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecScanSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.scanSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -264,12 +279,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecScanSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.scanSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -279,12 +295,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecScanSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.scanSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -293,12 +310,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecScanSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.scanSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -311,12 +329,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecFilterSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.filterSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -325,12 +344,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecFilterSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.filterSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -340,12 +360,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecFilterSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.filterSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -354,12 +375,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecFilterSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.filterSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -372,12 +394,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecDownloadSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenDark
-                  : AppColor.greenDark.disabledColor,
+        icon: Assets.vec.downloadSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -386,12 +409,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecDownloadSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenDark
-                  : AppColor.greenDark.disabledColor,
+        icon: Assets.vec.downloadSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -401,12 +425,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecDownloadSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenDark
-                  : AppColor.greenDark.disabledColor,
+        icon: Assets.vec.downloadSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -415,12 +440,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecDownloadSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenDark
-                  : AppColor.greenDark.disabledColor,
+        icon: Assets.vec.downloadSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -433,12 +459,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.greenDark,
        borderColor: AppColor.greenDark,
-        icon: vecWidget(
-          Assets.vecDownloadSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenDark
-                  : AppColor.greenDark.disabledColor,
+        icon: Assets.vec.excelDownloadSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -447,12 +474,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.greenDark,
-        icon: vecWidget(
-          Assets.vecDownloadSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenDark
-                  : AppColor.greenDark.disabledColor,
+        icon: Assets.vec.excelDownloadSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -462,12 +490,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.greenDark,
        borderColor: AppColor.greenDark,
-        icon: vecWidget(
-          Assets.vecDownloadSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenDark
-                  : AppColor.greenDark.disabledColor,
+        icon: Assets.vec.excelDownloadSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -476,12 +505,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.greenDark,
-        icon: vecWidget(
-          Assets.vecDownloadSvg,
-          color:
-              onPressed != null
-                  ? AppColor.greenDark
-                  : AppColor.greenDark.disabledColor,
+        icon: Assets.vec.excelDownloadSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.greenNormal
+                : AppColor.greenNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -494,12 +524,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecArrowLeftSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.arrowLeftSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -508,12 +539,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecArrowLeftSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.arrowLeftSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -523,12 +555,13 @@ class RFabOutlined extends StatefulWidget {
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
        borderColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecArrowLeftSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.arrowLeftSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -537,12 +570,13 @@ class RFabOutlined extends StatefulWidget {
        key: key,
        onPressed: onPressed,
        backgroundColor: AppColor.blueNormal,
-        icon: vecWidget(
-          Assets.vecArrowLeftSvg,
-          color:
-              onPressed != null
-                  ? AppColor.blueNormal
-                  : AppColor.blueNormal.disabledColor,
+        icon: Assets.vec.arrowLeftSvg.svg(
+          colorFilter: ColorFilter.mode(
+            onPressed != null
+                ? AppColor.blueNormal
+                : AppColor.blueNormal.disabledColor,
+            BlendMode.srcIn,
+          ),
        ),
      );

@@ -550,11 +584,12 @@ class RFabOutlined extends StatefulWidget {
 }

 class _RFabOutlinedState extends State<RFabOutlined> {
-  bool isOnPressed =false;
+  bool isOnPressed = false;
+
  @override
  Widget build(BuildContext context) {
    return OutlinedButton(
-      onPressed:widget.onPressed ,
+      onPressed: widget.onPressed,
      style: ButtonStyle(
        side: WidgetStateProperty.resolveWith<BorderSide?>((states) {
          if (states.contains(WidgetState.disabled)) {
@@ -598,8 +633,7 @@ class _RFabOutlinedState extends State<RFabOutlined> {
        ),
        padding: WidgetStatePropertyAll(EdgeInsets.zero),
      ),
-      child: widget.icon
+      child: widget.icon,
    );
  }
 }
-
--- a/packages/core/lib/presentation/widget/card/card_with_icon_with_border.dart
+++ b/packages/core/lib/presentation/widget/card/card_with_icon_with_border.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CardIcon extends StatelessWidget {
+  const CardIcon({
+    super.key,
+    required this.title,
+    required this.icon,
+    this.onTap,
+  });
+
+  final String title;
+  final String icon;
+  final VoidCallback? onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      child: Card(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8),
+          side: const BorderSide(color: AppColor.blueNormal, width: 1),
+        ),
+        child: Container(
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(8),
+            color: Colors.white,
+          ),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              SvgGenImage(icon).svg(width: 50, height: 50),
+              const SizedBox(height: 8),
+              Text(
+                title,
+                style: AppFonts.yekan16.copyWith(color: AppColor.blueNormal),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/packages/core/lib/presentation/widget/vec_widget.dart
+++ b/packages/core/lib/presentation/widget/vec_widget.dart
@@ -22,7 +22,7 @@ SvgPicture vecWidget(
 }

 Widget vecWidgetWithOnTap({
-  required String assets,
+  required Widget child,
  required VoidCallback onTap,
  double? width,
  double? height,
@@ -31,14 +31,7 @@ Widget vecWidgetWithOnTap({
 }) {
  return InkWell(
    onTap: onTap,
-    child: SvgPicture(
-      AssetBytesLoader(assets),
-      width: width,
-      height: height,
-      fit: fit ?? BoxFit.contain,
-      colorFilter:
-          color != null ? ColorFilter.mode(color, BlendMode.srcIn) : null,
-    ),
+    child: child
  );
 }

--- a/packages/core/lib/presentation/widget/widget.dart
+++ b/packages/core/lib/presentation/widget/widget.dart
@@ -14,3 +14,4 @@ export 'pagination/show_more.dart';
 export 'tabs/new_tab.dart';
 export 'tabs/tab.dart';
 export 'vec_widget.dart';
+export 'card/card_with_icon_with_border.dart';