tuanta/sfm_app_final
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(architecture): centralize bloc files into dedicated folder

Browse Source
This commit is contained in:
anhtunz
2025-01-05 18:56:39 +07:00
parent fb12c44505
commit c2c685da86
37 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/feature/bell/bell_bloc.dart → lib/bloc/bell_bloc.dart
View File

@@ -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 {

8
lib/feature/devices/device_detail/device_detail_bloc.dart → lib/bloc/device_detail_bloc.dart
View File

@@ -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();

4
lib/feature/device_log/device_logs_bloc.dart → lib/bloc/device_logs_bloc.dart
View File

@@ -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();

4
lib/feature/settings/device_notification_settings/device_notification_settings_bloc.dart → lib/bloc/device_notification_settings_bloc.dart
View File

@@ -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 =

16
lib/feature/devices/device_update/device_update_bloc.dart → lib/bloc/device_update_bloc.dart
View File

@@ -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();

8
lib/feature/devices/devices_manager_bloc.dart → lib/bloc/devices_manager_bloc.dart
View File

@@ -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();

12
lib/feature/inter_family/group_detail/group_detail_bloc.dart → lib/bloc/group_detail_bloc.dart
View File

@@ -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();

4
lib/feature/home/home_bloc.dart → lib/bloc/home_bloc.dart
View File

@@ -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 {

12
lib/feature/inter_family/inter_family_bloc.dart → lib/bloc/inter_family_bloc.dart
View File

@@ -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();

2
lib/feature/auth/login/bloc/login_bloc.dart → lib/bloc/login_bloc.dart
View File

@@ -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{

2
lib/feature/main/main_bloc.dart → lib/bloc/main_bloc.dart
View File

@@ -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<Bell>.broadcast();

10
lib/feature/map/map_bloc.dart → lib/bloc/map_bloc.dart
View File

@@ -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();

4
lib/feature/settings/settings_bloc.dart → lib/bloc/settings_bloc.dart
View File

@@ -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

2
lib/feature/auth/login/screen/login_screen.dart
View File

@@ -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';

2
lib/feature/bell/bell_screen.dart
View File

@@ -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';

2
lib/feature/device_log/device_logs_screen.dart
View File

@@ -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';

2
lib/feature/devices/device_detail/device_detail_screen.dart
View File

@@ -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});

2
lib/feature/devices/device_update/device_update_screen.dart
View File

@@ -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';

2
lib/feature/devices/device_update/map_dialog.dart
View File

@@ -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';

2
lib/feature/devices/devices_manager_screen.dart
View File

@@ -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';

2
lib/feature/home/home_screen.dart
View File

@@ -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 {

2
lib/feature/inter_family/group_detail/add_device_to_group_dialog.dart
View File

@@ -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';

2
lib/feature/inter_family/group_detail/group_detail_screen.dart
View File

@@ -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';

2
lib/feature/inter_family/groups/groups_screen.dart
View File

@@ -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';

2
lib/feature/inter_family/groups/groups_widget.dart
View File

@@ -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';

2
lib/feature/inter_family/inter_family_screen.dart
View File

@@ -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';

2
lib/feature/inter_family/inter_family_widget.dart
View File

@@ -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';

12
lib/feature/main/main_screen.dart
View File

@@ -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';

2
lib/feature/map/map_screen.dart
View File

@@ -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';

2
lib/feature/map/widget/on_tap_marker_widget.dart
View File

@@ -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';

2
lib/feature/map/widget/show_direction_widget.dart
View File

@@ -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,

2
lib/feature/map/widget/show_nearest_place.dart
View File

@@ -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';

2
lib/feature/settings/device_notification_settings/device_notification_settings_screen.dart
View File

@@ -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';

2
lib/feature/settings/profile/profile_screen.dart
View File

@@ -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';

2
lib/feature/settings/settings_screen.dart
View File

@@ -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';

2
lib/main.dart
View File

@@ -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';

28
lib/product/constant/navigation/navigation_router.dart
View File

@@ -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';