From 19548e99abf8aa58008fe23fa2dec3af99a6ecc3 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Mon, 2 Jun 2025 10:18:20 +0300 Subject: [PATCH] indentation and formatting of `WaterHeaterBloc`. --- .../water_heater/bloc/water_heater_bloc.dart | 197 ++++++++++-------- .../water_heater/bloc/water_heater_state.dart | 2 - 2 files changed, 111 insertions(+), 88 deletions(-) diff --git a/lib/pages/device_managment/water_heater/bloc/water_heater_bloc.dart b/lib/pages/device_managment/water_heater/bloc/water_heater_bloc.dart index 38c7f2d6..560a61e1 100644 --- a/lib/pages/device_managment/water_heater/bloc/water_heater_bloc.dart +++ b/lib/pages/device_managment/water_heater/bloc/water_heater_bloc.dart @@ -1,5 +1,3 @@ -// water_heater_bloc.dart - import 'dart:async'; import 'package:bloc/bloc.dart'; @@ -49,7 +47,7 @@ class WaterHeaterBloc extends Bloc { on(_onStatusUpdated); } - FutureOr _initializeAddSchedule( + void _initializeAddSchedule( InitializeAddScheduleEvent event, Emitter emit, ) { @@ -71,7 +69,7 @@ class WaterHeaterBloc extends Bloc { } } - FutureOr _updateSelectedTime( + void _updateSelectedTime( UpdateSelectedTimeEvent event, Emitter emit, ) { @@ -80,7 +78,7 @@ class WaterHeaterBloc extends Bloc { emit(currentState.copyWith(selectedTime: event.selectedTime)); } - FutureOr _updateSelectedDay( + void _updateSelectedDay( UpdateSelectedDayEvent event, Emitter emit, ) { @@ -91,7 +89,7 @@ class WaterHeaterBloc extends Bloc { selectedDays: updatedDays, selectedTime: currentState.selectedTime)); } - FutureOr _updateFunctionOn( + void _updateFunctionOn( UpdateFunctionOnEvent event, Emitter emit, ) { @@ -100,16 +98,18 @@ class WaterHeaterBloc extends Bloc { functionOn: event.isOn, selectedTime: currentState.selectedTime)); } - FutureOr _updateScheduleEvent( + Future _updateScheduleEvent( UpdateScheduleEvent event, Emitter emit, ) async { final currentState = state; if (currentState is WaterHeaterDeviceStatusLoaded) { if (event.scheduleMode == ScheduleModes.schedule) { - emit(currentState.copyWith( - scheduleMode: ScheduleModes.schedule, - )); + emit( + currentState.copyWith( + scheduleMode: ScheduleModes.schedule, + ), + ); } if (event.scheduleMode == ScheduleModes.countdown) { final countdownRemaining = @@ -129,17 +129,19 @@ class WaterHeaterBloc extends Bloc { } else if (event.scheduleMode == ScheduleModes.inching) { final inchingDuration = Duration(hours: event.hours, minutes: event.minutes); - emit(currentState.copyWith( - scheduleMode: ScheduleModes.inching, - inchingHours: inchingDuration.inHours, - inchingMinutes: inchingDuration.inMinutes % 60, - isInchingActive: currentState.isInchingActive, - )); + emit( + currentState.copyWith( + scheduleMode: ScheduleModes.inching, + inchingHours: inchingDuration.inHours, + inchingMinutes: inchingDuration.inMinutes % 60, + isInchingActive: currentState.isInchingActive, + ), + ); } } } - FutureOr _controlWaterHeater( + Future _controlWaterHeater( ToggleWaterHeaterEvent event, Emitter emit, ) async { @@ -148,9 +150,11 @@ class WaterHeaterBloc extends Bloc { _updateLocalValue(event.code, event.value); - emit(currentState.copyWith( - status: deviceStatus, - )); + emit( + currentState.copyWith( + status: deviceStatus, + ), + ); final success = await controlDeviceService.controlDevice( deviceUuid: event.deviceId, @@ -164,37 +168,43 @@ class WaterHeaterBloc extends Bloc { if (event.code == "countdown_1") { final countdownDuration = Duration(seconds: event.value); - emit(currentState.copyWith( - countdownHours: countdownDuration.inHours, - countdownMinutes: countdownDuration.inMinutes % 60, - countdownRemaining: countdownDuration, - isCountdownActive: true, - )); + emit( + currentState.copyWith( + countdownHours: countdownDuration.inHours, + countdownMinutes: countdownDuration.inMinutes % 60, + countdownRemaining: countdownDuration, + isCountdownActive: true, + ), + ); if (countdownDuration.inSeconds > 0) { _startCountdownTimer(emit, countdownDuration); } else { _countdownTimer?.cancel(); - emit(currentState.copyWith( - countdownHours: 0, - countdownMinutes: 0, - countdownRemaining: Duration.zero, - isCountdownActive: false, - )); + emit( + currentState.copyWith( + countdownHours: 0, + countdownMinutes: 0, + countdownRemaining: Duration.zero, + isCountdownActive: false, + ), + ); } } else if (event.code == "switch_inching") { final inchingDuration = Duration(seconds: event.value); - emit(currentState.copyWith( - inchingHours: inchingDuration.inHours, - inchingMinutes: inchingDuration.inMinutes % 60, - isInchingActive: true, - )); + emit( + currentState.copyWith( + inchingHours: inchingDuration.inHours, + inchingMinutes: inchingDuration.inMinutes % 60, + isInchingActive: true, + ), + ); } } } } - FutureOr _stopScheduleEvent( + Future _stopScheduleEvent( StopScheduleEvent event, Emitter emit, ) async { @@ -205,18 +215,22 @@ class WaterHeaterBloc extends Bloc { _countdownTimer?.cancel(); if (isCountDown) { - emit(currentState.copyWith( - countdownHours: 0, - countdownMinutes: 0, - countdownRemaining: Duration.zero, - isCountdownActive: false, - )); + emit( + currentState.copyWith( + countdownHours: 0, + countdownMinutes: 0, + countdownRemaining: Duration.zero, + isCountdownActive: false, + ), + ); } else if (currentState.scheduleMode == ScheduleModes.inching) { - emit(currentState.copyWith( - inchingHours: 0, - inchingMinutes: 0, - isInchingActive: false, - )); + emit( + currentState.copyWith( + inchingHours: 0, + inchingMinutes: 0, + isInchingActive: false, + ), + ); } try { @@ -233,7 +247,7 @@ class WaterHeaterBloc extends Bloc { } } - FutureOr _fetchWaterHeaterStatus( + Future _fetchWaterHeaterStatus( WaterHeaterFetchStatusEvent event, Emitter emit, ) async { @@ -334,7 +348,10 @@ class WaterHeaterBloc extends Bloc { } catch (_) {} } - void _onStatusUpdated(StatusUpdated event, Emitter emit) { + void _onStatusUpdated( + StatusUpdated event, + Emitter emit, + ) { deviceStatus = event.deviceStatus; emit(WaterHeaterDeviceStatusLoaded(deviceStatus)); } @@ -345,12 +362,13 @@ class WaterHeaterBloc extends Bloc { ) { _countdownTimer?.cancel(); - _countdownTimer = Timer.periodic(const Duration(minutes: 1), (timer) { - add(DecrementCountdownEvent()); - }); + _countdownTimer = Timer.periodic( + const Duration(minutes: 1), + (timer) => add(DecrementCountdownEvent()), + ); } - _onDecrementCountdown( + void _onDecrementCountdown( DecrementCountdownEvent event, Emitter emit, ) { @@ -364,25 +382,28 @@ class WaterHeaterBloc extends Bloc { if (newRemaining <= Duration.zero) { _countdownTimer?.cancel(); - emit(currentState.copyWith( - countdownHours: 0, - countdownMinutes: 0, - isCountdownActive: false, - countdownRemaining: Duration.zero, - )); + emit( + currentState.copyWith( + countdownHours: 0, + countdownMinutes: 0, + isCountdownActive: false, + countdownRemaining: Duration.zero, + ), + ); return; } - int totalSeconds = newRemaining.inSeconds; + final totalSeconds = newRemaining.inSeconds; + final newHours = totalSeconds ~/ 3600; + final newMinutes = (totalSeconds % 3600) ~/ 60; - int newHours = totalSeconds ~/ 3600; - int newMinutes = (totalSeconds % 3600) ~/ 60; - - emit(currentState.copyWith( - countdownHours: newHours, - countdownMinutes: newMinutes, - countdownRemaining: newRemaining, - )); + emit( + currentState.copyWith( + countdownHours: newHours, + countdownMinutes: newMinutes, + countdownRemaining: newRemaining, + ), + ); } } } @@ -422,13 +443,17 @@ class WaterHeaterBloc extends Bloc { return super.close(); } - FutureOr _getSchedule( - GetSchedulesEvent event, Emitter emit) async { + Future _getSchedule( + GetSchedulesEvent event, + Emitter emit, + ) async { emit(ScheduleLoadingState()); try { - List schedules = await DevicesManagementApi() - .getDeviceSchedules(deviceStatus.uuid, event.category); + final schedules = await DevicesManagementApi().getDeviceSchedules( + deviceStatus.uuid, + event.category, + ); emit(WaterHeaterDeviceStatusLoaded( deviceStatus, @@ -436,7 +461,6 @@ class WaterHeaterBloc extends Bloc { scheduleMode: ScheduleModes.schedule, )); } catch (e) { - //(const WaterHeaterFailedState(error: 'Failed to fetch schedules.')); emit(WaterHeaterDeviceStatusLoaded( deviceStatus, schedules: const [], @@ -444,7 +468,7 @@ class WaterHeaterBloc extends Bloc { } } - FutureOr _onAddSchedule( + Future _onAddSchedule( AddScheduleEvent event, Emitter emit, ) async { @@ -458,8 +482,6 @@ class WaterHeaterBloc extends Bloc { days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays), ); - // emit(ScheduleLoadingState()); - bool success = await DevicesManagementApi() .addScheduleRecord(newSchedule, currentState.status.uuid); @@ -467,12 +489,11 @@ class WaterHeaterBloc extends Bloc { add(GetSchedulesEvent(category: 'switch_1', uuid: deviceStatus.uuid)); } else { emit(currentState); - //emit(const WaterHeaterFailedState(error: 'Failed to add schedule.')); } } } - FutureOr _onEditSchedule( + Future _onEditSchedule( EditWaterHeaterScheduleEvent event, Emitter emit, ) async { @@ -500,7 +521,7 @@ class WaterHeaterBloc extends Bloc { } } - FutureOr _onUpdateSchedule( + Future _onUpdateSchedule( UpdateScheduleEntryEvent event, Emitter emit, ) async { @@ -531,7 +552,7 @@ class WaterHeaterBloc extends Bloc { } } - FutureOr _onDeleteSchedule( + Future _onDeleteSchedule( DeleteScheduleEvent event, Emitter emit, ) async { @@ -553,12 +574,16 @@ class WaterHeaterBloc extends Bloc { } } - FutureOr _batchFetchWaterHeater( - FetchWaterHeaterBatchStatusEvent event, Emitter emit) async { + Future _batchFetchWaterHeater( + FetchWaterHeaterBatchStatusEvent event, + Emitter emit, + ) async { emit(WaterHeaterLoadingState()); try { - final status = await DevicesManagementApi().getBatchStatus(event.devicesUuid); + final status = await DevicesManagementApi().getBatchStatus( + event.devicesUuid, + ); deviceStatus = WaterHeaterStatusModel.fromJson(event.devicesUuid.first, status.status); @@ -568,7 +593,7 @@ class WaterHeaterBloc extends Bloc { } } - FutureOr _batchControlWaterHeater( + Future _batchControlWaterHeater( ControlWaterHeaterBatchEvent event, Emitter emit) async { if (state is WaterHeaterDeviceStatusLoaded) { final currentState = state as WaterHeaterDeviceStatusLoaded; diff --git a/lib/pages/device_managment/water_heater/bloc/water_heater_state.dart b/lib/pages/device_managment/water_heater/bloc/water_heater_state.dart index c2df43c3..974f5f2d 100644 --- a/lib/pages/device_managment/water_heater/bloc/water_heater_state.dart +++ b/lib/pages/device_managment/water_heater/bloc/water_heater_state.dart @@ -1,5 +1,3 @@ -// water_heater_state.dart - part of 'water_heater_bloc.dart'; sealed class WaterHeaterState extends Equatable {