diff --git a/lib/feature/bell/bell_bloc.dart b/lib/bloc/bell_bloc.dart similarity index 87% rename from lib/feature/bell/bell_bloc.dart rename to lib/bloc/bell_bloc.dart index 98cb082..d85f139 100644 --- a/lib/feature/bell/bell_bloc.dart +++ b/lib/bloc/bell_bloc.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import '../../product/base/bloc/base_bloc.dart'; -import 'bell_model.dart'; +import '../product/base/bloc/base_bloc.dart'; +import '../feature/bell/bell_model.dart'; class BellBloc extends BlocBase { diff --git a/lib/feature/devices/device_detail/device_detail_bloc.dart b/lib/bloc/device_detail_bloc.dart similarity index 95% rename from lib/feature/devices/device_detail/device_detail_bloc.dart rename to lib/bloc/device_detail_bloc.dart index 86823b5..c2a7825 100644 --- a/lib/feature/devices/device_detail/device_detail_bloc.dart +++ b/lib/bloc/device_detail_bloc.dart @@ -9,11 +9,11 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:sfm_app/product/services/api_services.dart'; import 'package:sfm_app/product/utils/device_utils.dart'; -import '../../../product/utils/date_time_utils.dart'; -import '../../device_log/device_logs_model.dart'; -import '../device_model.dart'; +import '../product/utils/date_time_utils.dart'; +import '../feature/device_log/device_logs_model.dart'; +import '../feature/devices/device_model.dart'; -import '../../../product/base/bloc/base_bloc.dart'; +import '../product/base/bloc/base_bloc.dart'; class DetailDeviceBloc extends BlocBase { APIServices apiServices = APIServices(); diff --git a/lib/feature/device_log/device_logs_bloc.dart b/lib/bloc/device_logs_bloc.dart similarity index 96% rename from lib/feature/device_log/device_logs_bloc.dart rename to lib/bloc/device_logs_bloc.dart index 9acf5d9..4e9a799 100644 --- a/lib/feature/device_log/device_logs_bloc.dart +++ b/lib/bloc/device_logs_bloc.dart @@ -7,8 +7,8 @@ import 'package:sfm_app/product/base/bloc/base_bloc.dart'; import 'package:sfm_app/product/services/api_services.dart'; import 'package:sfm_app/product/utils/date_time_utils.dart'; -import '../../product/utils/device_utils.dart'; -import 'device_logs_model.dart'; +import '../product/utils/device_utils.dart'; +import '../feature/device_log/device_logs_model.dart'; class DeviceLogsBloc extends BlocBase { APIServices apiServices = APIServices(); diff --git a/lib/feature/settings/device_notification_settings/device_notification_settings_bloc.dart b/lib/bloc/device_notification_settings_bloc.dart similarity index 91% rename from lib/feature/settings/device_notification_settings/device_notification_settings_bloc.dart rename to lib/bloc/device_notification_settings_bloc.dart index 5cd8ed8..046f28f 100644 --- a/lib/feature/settings/device_notification_settings/device_notification_settings_bloc.dart +++ b/lib/bloc/device_notification_settings_bloc.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'device_notification_settings_model.dart'; -import '../../../product/base/bloc/base_bloc.dart'; +import '../feature/settings/device_notification_settings/device_notification_settings_model.dart'; +import '../product/base/bloc/base_bloc.dart'; class DeviceNotificationSettingsBloc extends BlocBase { final listNotifications = diff --git a/lib/feature/devices/device_update/device_update_bloc.dart b/lib/bloc/device_update_bloc.dart similarity index 95% rename from lib/feature/devices/device_update/device_update_bloc.dart rename to lib/bloc/device_update_bloc.dart index c01fc87..66aab6a 100644 --- a/lib/feature/devices/device_update/device_update_bloc.dart +++ b/lib/bloc/device_update_bloc.dart @@ -6,15 +6,15 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:intl/intl.dart'; -import '../../../product/services/api_services.dart'; -import '../../../product/services/language_services.dart'; -import '../../../product/shared/model/ward_model.dart'; -import '../../../product/utils/response_status_utils.dart'; +import '../product/services/api_services.dart'; +import '../product/services/language_services.dart'; +import '../product/shared/model/ward_model.dart'; +import '../product/utils/response_status_utils.dart'; -import '../../../product/shared/model/district_model.dart'; -import '../../../product/shared/model/province_model.dart'; -import '../device_model.dart'; -import '../../../product/base/bloc/base_bloc.dart'; +import '../product/shared/model/district_model.dart'; +import '../product/shared/model/province_model.dart'; +import '../feature/devices/device_model.dart'; +import '../product/base/bloc/base_bloc.dart'; class DeviceUpdateBloc extends BlocBase { APIServices apiServices = APIServices(); diff --git a/lib/feature/devices/devices_manager_bloc.dart b/lib/bloc/devices_manager_bloc.dart similarity index 92% rename from lib/feature/devices/devices_manager_bloc.dart rename to lib/bloc/devices_manager_bloc.dart index b475e73..71ebf49 100644 --- a/lib/feature/devices/devices_manager_bloc.dart +++ b/lib/bloc/devices_manager_bloc.dart @@ -3,11 +3,11 @@ import 'dart:convert'; import 'package:sfm_app/product/constant/app/app_constants.dart'; -import 'device_model.dart'; -import '../../product/base/bloc/base_bloc.dart'; -import '../../product/services/api_services.dart'; +import '../feature/devices/device_model.dart'; +import '../product/base/bloc/base_bloc.dart'; +import '../product/services/api_services.dart'; -import '../../product/utils/device_utils.dart'; +import '../product/utils/device_utils.dart'; class DevicesManagerBloc extends BlocBase { APIServices apiServices = APIServices(); diff --git a/lib/feature/inter_family/group_detail/group_detail_bloc.dart b/lib/bloc/group_detail_bloc.dart similarity index 92% rename from lib/feature/inter_family/group_detail/group_detail_bloc.dart rename to lib/bloc/group_detail_bloc.dart index 9442a43..ed22171 100644 --- a/lib/feature/inter_family/group_detail/group_detail_bloc.dart +++ b/lib/bloc/group_detail_bloc.dart @@ -4,13 +4,13 @@ import 'dart:async'; import 'dart:convert'; import 'package:flutter/widgets.dart'; -import '../../devices/device_model.dart'; -import '../../../product/base/bloc/base_bloc.dart'; -import '../../../product/services/api_services.dart'; -import '../../../product/services/language_services.dart'; -import '../../../product/utils/response_status_utils.dart'; +import '../feature/devices/device_model.dart'; +import '../product/base/bloc/base_bloc.dart'; +import '../product/services/api_services.dart'; +import '../product/services/language_services.dart'; +import '../product/utils/response_status_utils.dart'; -import 'group_detail_model.dart'; +import '../feature/inter_family/group_detail/group_detail_model.dart'; class DetailGroupBloc extends BlocBase { APIServices apiServices = APIServices(); diff --git a/lib/feature/home/home_bloc.dart b/lib/bloc/home_bloc.dart similarity index 97% rename from lib/feature/home/home_bloc.dart rename to lib/bloc/home_bloc.dart index e4f7f21..e0443bb 100644 --- a/lib/feature/home/home_bloc.dart +++ b/lib/bloc/home_bloc.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'device_alias_model.dart'; +import '../feature/home/device_alias_model.dart'; -import '../../product/base/bloc/base_bloc.dart'; +import '../product/base/bloc/base_bloc.dart'; class HomeBloc extends BlocBase { diff --git a/lib/feature/inter_family/inter_family_bloc.dart b/lib/bloc/inter_family_bloc.dart similarity index 92% rename from lib/feature/inter_family/inter_family_bloc.dart rename to lib/bloc/inter_family_bloc.dart index 2541080..1387676 100644 --- a/lib/feature/inter_family/inter_family_bloc.dart +++ b/lib/bloc/inter_family_bloc.dart @@ -5,13 +5,13 @@ import 'dart:convert'; import 'dart:developer'; import 'package:flutter/material.dart'; -import '../../product/constant/app/app_constants.dart'; +import '../product/constant/app/app_constants.dart'; -import '../../product/services/api_services.dart'; -import '../../product/base/bloc/base_bloc.dart'; -import '../../product/services/language_services.dart'; -import '../../product/utils/response_status_utils.dart'; -import 'groups/groups_model.dart'; +import '../product/services/api_services.dart'; +import '../product/base/bloc/base_bloc.dart'; +import '../product/services/language_services.dart'; +import '../product/utils/response_status_utils.dart'; +import '../feature/inter_family/groups/groups_model.dart'; class InterFamilyBloc extends BlocBase { APIServices apiServices = APIServices(); diff --git a/lib/feature/auth/login/bloc/login_bloc.dart b/lib/bloc/login_bloc.dart similarity index 90% rename from lib/feature/auth/login/bloc/login_bloc.dart rename to lib/bloc/login_bloc.dart index a892c57..be91d1c 100644 --- a/lib/feature/auth/login/bloc/login_bloc.dart +++ b/lib/bloc/login_bloc.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import '../../../../product/base/bloc/base_bloc.dart'; +import '../product/base/bloc/base_bloc.dart'; class LoginBloc extends BlocBase{ diff --git a/lib/feature/main/main_bloc.dart b/lib/bloc/main_bloc.dart similarity index 96% rename from lib/feature/main/main_bloc.dart rename to lib/bloc/main_bloc.dart index a38a62b..a13d607 100644 --- a/lib/feature/main/main_bloc.dart +++ b/lib/bloc/main_bloc.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:sfm_app/product/base/bloc/base_bloc.dart'; -import '../bell/bell_model.dart'; +import '../feature/bell/bell_model.dart'; class MainBloc extends BlocBase { final bellBloc = StreamController.broadcast(); diff --git a/lib/feature/map/map_bloc.dart b/lib/bloc/map_bloc.dart similarity index 91% rename from lib/feature/map/map_bloc.dart rename to lib/bloc/map_bloc.dart index ab41c5c..ec5d44b 100644 --- a/lib/feature/map/map_bloc.dart +++ b/lib/bloc/map_bloc.dart @@ -4,11 +4,11 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import '../../product/services/map_services.dart'; -import '../../product/shared/shared_snack_bar.dart'; -import '../devices/device_model.dart'; -import '../../product/base/bloc/base_bloc.dart'; -import '../../product/services/api_services.dart'; +import '../product/services/map_services.dart'; +import '../product/shared/shared_snack_bar.dart'; +import '../feature/devices/device_model.dart'; +import '../product/base/bloc/base_bloc.dart'; +import '../product/services/api_services.dart'; class MapBloc extends BlocBase { APIServices apiServices = APIServices(); diff --git a/lib/feature/settings/settings_bloc.dart b/lib/bloc/settings_bloc.dart similarity index 84% rename from lib/feature/settings/settings_bloc.dart rename to lib/bloc/settings_bloc.dart index ea88d57..31008e1 100644 --- a/lib/feature/settings/settings_bloc.dart +++ b/lib/bloc/settings_bloc.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'profile/profile_model.dart'; -import '../../product/base/bloc/base_bloc.dart'; +import '../feature/settings/profile/profile_model.dart'; +import '../product/base/bloc/base_bloc.dart'; class SettingsBloc extends BlocBase { // Settings Screen diff --git a/lib/feature/auth/login/screen/login_screen.dart b/lib/feature/auth/login/screen/login_screen.dart index 0bafef4..8cccba8 100644 --- a/lib/feature/auth/login/screen/login_screen.dart +++ b/lib/feature/auth/login/screen/login_screen.dart @@ -16,7 +16,7 @@ import '../../../../product/constant/icon/icon_constants.dart'; import '../../../../product/extention/context_extention.dart'; import '../../../../product/constant/image/image_constants.dart'; import '../../../../product/services/language_services.dart'; -import '../bloc/login_bloc.dart'; +import '../../../../bloc/login_bloc.dart'; import '../../../../product/base/bloc/base_bloc.dart'; import '../../../../product/shared/shared_background.dart'; diff --git a/lib/feature/bell/bell_screen.dart b/lib/feature/bell/bell_screen.dart index 982fbca..6cb2006 100644 --- a/lib/feature/bell/bell_screen.dart +++ b/lib/feature/bell/bell_screen.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import '../../product/extention/context_extention.dart'; import '../../product/services/language_services.dart'; import '../../product/constant/enums/app_theme_enums.dart'; -import 'bell_bloc.dart'; +import '../../bloc/bell_bloc.dart'; import '../../product/base/bloc/base_bloc.dart'; import '../../product/services/api_services.dart'; import 'bell_model.dart'; diff --git a/lib/feature/device_log/device_logs_screen.dart b/lib/feature/device_log/device_logs_screen.dart index 3f666c0..9fa0a87 100644 --- a/lib/feature/device_log/device_logs_screen.dart +++ b/lib/feature/device_log/device_logs_screen.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'widgets/tag_widget.dart'; import '../devices/device_model.dart'; -import 'device_logs_bloc.dart'; +import '../../bloc/device_logs_bloc.dart'; import '../../product/constant/icon/icon_constants.dart'; import '../../product/extention/context_extention.dart'; import '../../product/services/language_services.dart'; diff --git a/lib/feature/devices/device_detail/device_detail_screen.dart b/lib/feature/devices/device_detail/device_detail_screen.dart index 97c89a3..0be363e 100644 --- a/lib/feature/devices/device_detail/device_detail_screen.dart +++ b/lib/feature/devices/device_detail/device_detail_screen.dart @@ -14,7 +14,7 @@ import '../../../product/services/language_services.dart'; import '../../../product/utils/device_utils.dart'; import '../../../product/constant/icon/icon_constants.dart'; -import 'device_detail_bloc.dart'; +import '../../../bloc/device_detail_bloc.dart'; class DetailDeviceScreen extends StatefulWidget { const DetailDeviceScreen({super.key, required this.thingID}); diff --git a/lib/feature/devices/device_update/device_update_screen.dart b/lib/feature/devices/device_update/device_update_screen.dart index d8c3aef..7e3b6a3 100644 --- a/lib/feature/devices/device_update/device_update_screen.dart +++ b/lib/feature/devices/device_update/device_update_screen.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:search_choices/search_choices.dart'; import '../device_model.dart'; -import 'device_update_bloc.dart'; +import '../../../bloc/device_update_bloc.dart'; import 'map_dialog.dart'; import '../../../product/base/bloc/base_bloc.dart'; import '../../../product/extention/context_extention.dart'; diff --git a/lib/feature/devices/device_update/map_dialog.dart b/lib/feature/devices/device_update/map_dialog.dart index 5c31ead..a1ebb60 100644 --- a/lib/feature/devices/device_update/map_dialog.dart +++ b/lib/feature/devices/device_update/map_dialog.dart @@ -5,7 +5,7 @@ import 'package:http/http.dart' as http; import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'device_update_bloc.dart'; +import '../../../bloc/device_update_bloc.dart'; import '../../../product/constant/app/app_constants.dart'; import '../../../product/extention/context_extention.dart'; import '../../../product/services/language_services.dart'; diff --git a/lib/feature/devices/devices_manager_screen.dart b/lib/feature/devices/devices_manager_screen.dart index da0e56e..3dee5ba 100644 --- a/lib/feature/devices/devices_manager_screen.dart +++ b/lib/feature/devices/devices_manager_screen.dart @@ -6,7 +6,7 @@ import 'package:sfm_app/product/shared/shared_pie_chart.dart'; import 'add_new_device_widget.dart'; import 'delete_device_widget.dart'; import 'device_model.dart'; -import 'devices_manager_bloc.dart'; +import '../../bloc/devices_manager_bloc.dart'; import '../../product/base/bloc/base_bloc.dart'; import '../../product/constant/enums/app_route_enums.dart'; import '../../product/constant/enums/role_enums.dart'; diff --git a/lib/feature/home/home_screen.dart b/lib/feature/home/home_screen.dart index 5900d15..f59574a 100644 --- a/lib/feature/home/home_screen.dart +++ b/lib/feature/home/home_screen.dart @@ -12,7 +12,7 @@ import '../settings/device_notification_settings/device_notification_settings_mo import '../../product/extention/context_extention.dart'; import '../../product/services/api_services.dart'; import '../../product/services/language_services.dart'; -import 'home_bloc.dart'; +import '../../bloc/home_bloc.dart'; import '../../product/base/bloc/base_bloc.dart'; class HomeScreen extends StatefulWidget { diff --git a/lib/feature/inter_family/group_detail/add_device_to_group_dialog.dart b/lib/feature/inter_family/group_detail/add_device_to_group_dialog.dart index 75ced8d..dd1c2a7 100644 --- a/lib/feature/inter_family/group_detail/add_device_to_group_dialog.dart +++ b/lib/feature/inter_family/group_detail/add_device_to_group_dialog.dart @@ -2,7 +2,7 @@ import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:flutter/material.dart'; -import 'group_detail_bloc.dart'; +import '../../../bloc/group_detail_bloc.dart'; import '../../../product/constant/icon/icon_constants.dart'; import '../../../product/services/language_services.dart'; diff --git a/lib/feature/inter_family/group_detail/group_detail_screen.dart b/lib/feature/inter_family/group_detail/group_detail_screen.dart index a894eff..7e57068 100644 --- a/lib/feature/inter_family/group_detail/group_detail_screen.dart +++ b/lib/feature/inter_family/group_detail/group_detail_screen.dart @@ -1,7 +1,7 @@ // ignore_for_file: use_build_context_synchronously import 'package:flutter/material.dart'; -import 'group_detail_bloc.dart'; +import '../../../bloc/group_detail_bloc.dart'; import 'group_detail_model.dart'; import '../../../product/base/bloc/base_bloc.dart'; import '../../../product/constant/app/app_constants.dart'; diff --git a/lib/feature/inter_family/groups/groups_screen.dart b/lib/feature/inter_family/groups/groups_screen.dart index 501260f..40e05ed 100644 --- a/lib/feature/inter_family/groups/groups_screen.dart +++ b/lib/feature/inter_family/groups/groups_screen.dart @@ -5,7 +5,7 @@ import 'package:go_router/go_router.dart'; import '../../../product/constant/enums/app_route_enums.dart'; import 'groups_model.dart'; -import '../inter_family_bloc.dart'; +import '../../../bloc/inter_family_bloc.dart'; import '../inter_family_widget.dart'; import '../../../product/base/bloc/base_bloc.dart'; import '../../../product/constant/app/app_constants.dart'; diff --git a/lib/feature/inter_family/groups/groups_widget.dart b/lib/feature/inter_family/groups/groups_widget.dart index 621d059..baa0a4f 100644 --- a/lib/feature/inter_family/groups/groups_widget.dart +++ b/lib/feature/inter_family/groups/groups_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:qr_flutter/qr_flutter.dart'; -import '../inter_family_bloc.dart'; +import '../../../bloc/inter_family_bloc.dart'; import '../../../product/constant/icon/icon_constants.dart'; import '../../../product/extention/context_extention.dart'; import '../../../product/services/language_services.dart'; diff --git a/lib/feature/inter_family/inter_family_screen.dart b/lib/feature/inter_family/inter_family_screen.dart index c192618..eeb6751 100644 --- a/lib/feature/inter_family/inter_family_screen.dart +++ b/lib/feature/inter_family/inter_family_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'groups/groups_screen.dart'; -import 'inter_family_bloc.dart'; +import '../../bloc/inter_family_bloc.dart'; import 'inter_family_widget.dart'; import '../../product/base/bloc/base_bloc.dart'; import '../../product/constant/app/app_constants.dart'; diff --git a/lib/feature/inter_family/inter_family_widget.dart b/lib/feature/inter_family/inter_family_widget.dart index 87c857e..9c65c97 100644 --- a/lib/feature/inter_family/inter_family_widget.dart +++ b/lib/feature/inter_family/inter_family_widget.dart @@ -1,7 +1,7 @@ // ignore_for_file: use_build_context_synchronously import 'package:flutter/material.dart'; -import 'inter_family_bloc.dart'; +import '../../bloc/inter_family_bloc.dart'; import '../../product/constant/icon/icon_constants.dart'; import '../../product/services/language_services.dart'; import '../../product/utils/qr_utils.dart'; diff --git a/lib/feature/main/main_screen.dart b/lib/feature/main/main_screen.dart index f37e563..5eb7a39 100644 --- a/lib/feature/main/main_screen.dart +++ b/lib/feature/main/main_screen.dart @@ -8,20 +8,20 @@ import 'package:go_router/go_router.dart'; // import 'package:persistent_bottom_nav_bar_v2/persistent-tab-view.dart'; import 'package:badges/badges.dart' as badges; import 'package:persistent_bottom_nav_bar/persistent_bottom_nav_bar.dart'; -import '../home/home_bloc.dart'; +import '../../bloc/home_bloc.dart'; import '../../product/constant/app/app_constants.dart'; import '../../product/constant/enums/app_route_enums.dart'; import '../../product/permission/location_permission.dart'; import '../../product/services/theme_services.dart'; -import '../devices/devices_manager_bloc.dart'; +import '../../bloc/devices_manager_bloc.dart'; import '../devices/devices_manager_screen.dart'; import '../home/home_screen.dart'; -import '../inter_family/inter_family_bloc.dart'; +import '../../bloc/inter_family_bloc.dart'; import '../inter_family/inter_family_screen.dart'; -import '../device_log/device_logs_bloc.dart'; +import '../../bloc/device_logs_bloc.dart'; import '../device_log/device_logs_screen.dart'; -import 'main_bloc.dart'; -import '../map/map_bloc.dart'; +import '../../bloc/main_bloc.dart'; +import '../../bloc/map_bloc.dart'; import '../map/map_screen.dart'; import '../../product/base/bloc/base_bloc.dart'; import '../../product/constant/enums/app_theme_enums.dart'; diff --git a/lib/feature/map/map_screen.dart b/lib/feature/map/map_screen.dart index e62e052..f4a45ae 100644 --- a/lib/feature/map/map_screen.dart +++ b/lib/feature/map/map_screen.dart @@ -7,7 +7,7 @@ import 'package:geolocator/geolocator.dart'; import 'package:google_maps_cluster_manager_2/google_maps_cluster_manager_2.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:sfm_app/feature/devices/device_model.dart'; -import 'package:sfm_app/feature/map/map_bloc.dart'; +import 'package:sfm_app/bloc/map_bloc.dart'; import 'package:sfm_app/feature/map/widget/on_tap_marker_widget.dart'; import 'package:sfm_app/product/base/bloc/base_bloc.dart'; import 'package:sfm_app/product/constant/icon/icon_constants.dart'; diff --git a/lib/feature/map/widget/on_tap_marker_widget.dart b/lib/feature/map/widget/on_tap_marker_widget.dart index 57d715e..22af79e 100644 --- a/lib/feature/map/widget/on_tap_marker_widget.dart +++ b/lib/feature/map/widget/on_tap_marker_widget.dart @@ -7,7 +7,7 @@ import 'show_direction_widget.dart'; import 'show_nearest_place.dart'; import '../../../product/constant/icon/icon_constants.dart'; import '../../../product/extention/context_extention.dart'; -import '../map_bloc.dart'; +import '../../../bloc/map_bloc.dart'; import '../../../product/services/api_services.dart'; import '../../../product/services/language_services.dart'; import '../../../product/utils/device_utils.dart'; diff --git a/lib/feature/map/widget/show_direction_widget.dart b/lib/feature/map/widget/show_direction_widget.dart index a1757ed..be120f1 100644 --- a/lib/feature/map/widget/show_direction_widget.dart +++ b/lib/feature/map/widget/show_direction_widget.dart @@ -7,7 +7,7 @@ import 'package:sfm_app/product/constant/icon/icon_constants.dart'; import 'package:sfm_app/product/extention/context_extention.dart'; import 'package:sfm_app/product/services/language_services.dart'; -import '../map_bloc.dart'; +import '../../../bloc/map_bloc.dart'; showDirections( BuildContext context, diff --git a/lib/feature/map/widget/show_nearest_place.dart b/lib/feature/map/widget/show_nearest_place.dart index ffe3658..8d80e81 100644 --- a/lib/feature/map/widget/show_nearest_place.dart +++ b/lib/feature/map/widget/show_nearest_place.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import '../map_bloc.dart'; +import '../../../bloc/map_bloc.dart'; import 'show_direction_widget.dart'; import '../../../product/constant/icon/icon_constants.dart'; import '../../../product/extention/context_extention.dart'; diff --git a/lib/feature/settings/device_notification_settings/device_notification_settings_screen.dart b/lib/feature/settings/device_notification_settings/device_notification_settings_screen.dart index 0f0c3c7..742c0ec 100644 --- a/lib/feature/settings/device_notification_settings/device_notification_settings_screen.dart +++ b/lib/feature/settings/device_notification_settings/device_notification_settings_screen.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:flutter/material.dart'; import '../../../product/shared/shared_snack_bar.dart'; -import 'device_notification_settings_bloc.dart'; +import '../../../bloc/device_notification_settings_bloc.dart'; import 'device_notification_settings_model.dart'; import '../../../product/base/bloc/base_bloc.dart'; import '../../../product/extention/context_extention.dart'; diff --git a/lib/feature/settings/profile/profile_screen.dart b/lib/feature/settings/profile/profile_screen.dart index 648e39b..f46d305 100644 --- a/lib/feature/settings/profile/profile_screen.dart +++ b/lib/feature/settings/profile/profile_screen.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import '../../../product/shared/shared_snack_bar.dart'; import '../../../product/constant/icon/icon_constants.dart'; import '../../../product/services/api_services.dart'; -import '../settings_bloc.dart'; +import '../../../bloc/settings_bloc.dart'; import '../../../product/shared/shared_input_decoration.dart'; import '../../../product/extention/context_extention.dart'; import '../../../product/services/language_services.dart'; diff --git a/lib/feature/settings/settings_screen.dart b/lib/feature/settings/settings_screen.dart index 0ff5c12..0e44c4b 100644 --- a/lib/feature/settings/settings_screen.dart +++ b/lib/feature/settings/settings_screen.dart @@ -8,7 +8,7 @@ import '../../product/constant/icon/icon_constants.dart'; import '../../product/extention/context_extention.dart'; import '../../product/services/api_services.dart'; import 'profile/profile_model.dart'; -import 'settings_bloc.dart'; +import '../../bloc/settings_bloc.dart'; import '../../product/base/bloc/base_bloc.dart'; import '../../product/services/language_services.dart'; diff --git a/lib/main.dart b/lib/main.dart index 7461d2b..41b104b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,7 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; import 'product/services/theme_services.dart'; import 'product/services/language_services.dart'; -import 'feature/main/main_bloc.dart'; +import 'bloc/main_bloc.dart'; import 'product/base/bloc/base_bloc.dart'; import 'product/constant/navigation/navigation_router.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/product/constant/navigation/navigation_router.dart b/lib/product/constant/navigation/navigation_router.dart index f026d4d..0838db6 100644 --- a/lib/product/constant/navigation/navigation_router.dart +++ b/lib/product/constant/navigation/navigation_router.dart @@ -1,29 +1,29 @@ import 'package:go_router/go_router.dart'; -import 'package:sfm_app/feature/devices/device_detail/device_detail_bloc.dart'; -import 'package:sfm_app/feature/devices/device_detail/device_detail_screen.dart'; -import 'package:sfm_app/feature/settings/device_notification_settings/device_notification_settings_bloc.dart'; -import 'package:sfm_app/feature/settings/device_notification_settings/device_notification_settings_screen.dart'; +import '../../../bloc/device_detail_bloc.dart'; +import '../../../feature/devices/device_detail/device_detail_screen.dart'; +import '../../../bloc/device_notification_settings_bloc.dart'; +import '../../../feature/settings/device_notification_settings/device_notification_settings_screen.dart'; import '../app/app_constants.dart'; -import '../../../feature/auth/login/bloc/login_bloc.dart'; +import '../../../bloc/login_bloc.dart'; import '../../../feature/auth/login/screen/login_screen.dart'; -import '../../../feature/bell/bell_bloc.dart'; +import '../../../bloc/bell_bloc.dart'; import '../../../feature/bell/bell_screen.dart'; -import '../../../feature/devices/device_update/device_update_bloc.dart'; +import '../../../bloc/device_update_bloc.dart'; import '../../../feature/devices/device_update/device_update_screen.dart'; -import '../../../feature/devices/devices_manager_bloc.dart'; +import '../../../bloc/devices_manager_bloc.dart'; import '../../../feature/devices/devices_manager_screen.dart'; import '../../../feature/error/not_found_screen.dart'; -import '../../../feature/inter_family/group_detail/group_detail_bloc.dart'; +import '../../../bloc/group_detail_bloc.dart'; import '../../../feature/inter_family/group_detail/group_detail_screen.dart'; -import '../../../feature/inter_family/inter_family_bloc.dart'; +import '../../../bloc/inter_family_bloc.dart'; import '../../../feature/inter_family/inter_family_screen.dart'; -import '../../../feature/device_log/device_logs_bloc.dart'; +import '../../../bloc/device_logs_bloc.dart'; import '../../../feature/device_log/device_logs_screen.dart'; -import '../../../feature/main/main_bloc.dart'; +import '../../../bloc/main_bloc.dart'; import '../../../feature/main/main_screen.dart'; -import '../../../feature/map/map_bloc.dart'; +import '../../../bloc/map_bloc.dart'; import '../../../feature/map/map_screen.dart'; -import '../../../feature/settings/settings_bloc.dart'; +import '../../../bloc/settings_bloc.dart'; import '../../../feature/settings/settings_screen.dart'; import '../../../product/base/bloc/base_bloc.dart'; import '../enums/app_route_enums.dart';