refactor:

lib/widgets/app_bar/appbar_leading_image.dart

@@ -1,22 +1,16 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/widgets/custom_image_view.dart';
 import 'package:flutter/material.dart';
 
-// ignore: must_be_immutable
 class AppbarLeadingImage extends StatelessWidget {
-  AppbarLeadingImage({
-    Key? key,
+  const AppbarLeadingImage({
     this.imagePath,
     this.margin,
     this.onTap,
-  }) : super(
-          key: key,
-        );
+  });
 
-  String? imagePath;
-
-  EdgeInsetsGeometry? margin;
-
-  Function? onTap;
+  final String? imagePath;
+  final EdgeInsetsGeometry? margin;
+  final Function? onTap;
 
   @override
   Widget build(BuildContext context) {

lib/widgets/app_bar/appbar_subtitle.dart

@@ -1,22 +1,17 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/custom_text_style.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
-// ignore: must_be_immutable
 class AppbarSubtitle extends StatelessWidget {
-  AppbarSubtitle({
-    Key? key,
+  const AppbarSubtitle({
     required this.text,
     this.margin,
     this.onTap,
-  }) : super(
-          key: key,
-        );
+  });
 
-  String text;
-
-  EdgeInsetsGeometry? margin;
-
-  Function? onTap;
+  final String text;
+  final EdgeInsetsGeometry? margin;
+  final Function? onTap;
 
   @override
   Widget build(BuildContext context) {

lib/widgets/app_bar/appbar_title_circleimage.dart

@@ -1,19 +1,15 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/app_decoration.dart';
+import 'package:eatvio_app/widgets/custom_image_view.dart';
 import 'package:flutter/material.dart';
 
-// ignore: must_be_immutable
 class AppbarTitleCircleimage extends StatelessWidget {
-  AppbarTitleCircleimage({
-    Key? key,
+  const AppbarTitleCircleimage({
     this.imagePath,
     this.margin,
-  }) : super(
-          key: key,
-        );
+  });
 
-  String? imagePath;
-
-  EdgeInsetsGeometry? margin;
+  final String? imagePath;
+  final EdgeInsetsGeometry? margin;
 
   @override
   Widget build(BuildContext context) {

lib/widgets/app_bar/appbar_title_image.dart

@@ -1,7 +1,6 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/widgets/custom_image_view.dart';
 import 'package:flutter/material.dart';
 
-// ignore: must_be_immutable
 class AppbarTitleImage extends StatelessWidget {
   const AppbarTitleImage({required this.imagePath, super.key});
 

lib/widgets/app_bar/exit_button.dart

@@ -1,22 +1,16 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/custom_text_style.dart';
 import 'package:flutter/material.dart';
 
-// ignore: must_be_immutable
 class ExitButton extends StatelessWidget {
-  ExitButton({
-    Key? key,
+  const ExitButton({
     required this.text,
     this.margin,
     this.onTap,
-  }) : super(
-          key: key,
-        );
+  });
 
-  String text;
-
-  EdgeInsetsGeometry? margin;
-
-  Function? onTap;
+  final String text;
+  final EdgeInsetsGeometry? margin;
+  final Function? onTap;
 
   @override
   Widget build(BuildContext context) {

lib/widgets/custom_drop_down.dart

@@ -1,4 +1,5 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class CustomDropDown extends StatelessWidget {

lib/widgets/custom_edit_drop_down.dart

@@ -1,4 +1,4 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
 import 'package:flutter/material.dart';
 
 class CustomDropDown extends StatelessWidget {

lib/widgets/custom_expandable_list.dart

@@ -1,13 +1,15 @@
 import 'dart:convert';
-
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/token_storage.dart';
+import 'package:eatvio_app/localization/app_localization.dart';
 import 'package:eatvio_app/old/profile/my_profile_screen/bloc/my_profile_bloc.dart';
+import 'package:eatvio_app/theme/custom_button_style.dart';
 import 'package:eatvio_app/widgets/custom_hyper_switch.dart';
 import 'package:eatvio_app/widgets/custom_hypo_switch.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:http/http.dart' as http;
 import 'package:intl/intl.dart';

lib/widgets/custom_hyper_switch.dart

@@ -1,5 +1,5 @@
-import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/old/profile/my_profile_screen/bloc/my_profile_bloc.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class HyperSwitch extends StatefulWidget {

lib/widgets/custom_hypo_switch.dart

@@ -1,5 +1,5 @@
-import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/old/profile/my_profile_screen/bloc/my_profile_bloc.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class HypoSwitch extends StatefulWidget {

lib/widgets/custom_navigation_menu_item.dart

@@ -1,4 +1,5 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/widgets/custom_image_view.dart';
 import 'package:flutter/material.dart';
 
 class MenuItem extends StatelessWidget {

lib/widgets/custom_notification_screen.dart

@@ -1,4 +1,4 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class NotificationSwitch extends StatefulWidget {

lib/widgets/custom_outlined_button.dart

@@ -1,4 +1,4 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/custom_text_style.dart';
 import 'package:eatvio_app/widgets/base_button.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/custom_text_form_field.dart

@@ -1,4 +1,4 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 

lib/widgets/next_step_button.dart

@@ -1,4 +1,4 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:eatvio_app/widgets/base_button.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/nutrition_chart.dart

@@ -1,4 +1,4 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:eatvio_app/widgets/base_button.dart';
 import 'package:flutter/material.dart';