Merge pull request #258 from DevKor-github/257-alarm-screen-준비-시간-만료-시

Alarm Screen 시간 만료시 로직

Author: jjoonleo

lib/presentation/alarm/bloc/alarm_timer/alarm_timer_bloc.dart

@@ -40,6 +40,7 @@ class AlarmTimerBloc extends Bloc<AlarmTimerEvent, AlarmTimerState> {
     on<AlarmTimerStepNextShifted>(_onStepNext);
     on<AlarmTimerStepFinalized>(_onStepFinalized);
     on<AlarmTimerStepsUpdated>(_onStepUpdated);
+    on<AlarmTimerPreparationsTimeOvered>(_onPreparationsTimeOvered);
   }
 
   void _onStepUpdated(
@@ -99,6 +100,28 @@ class AlarmTimerBloc extends Bloc<AlarmTimerEvent, AlarmTimerState> {
     }
   }
 
+  void _startTicker(int duration, Emitter<AlarmTimerState> emit) {
+    _tickerSubscription?.cancel();
+    _tickerSubscription = Stream.periodic(const Duration(seconds: 1), (x) => x)
+        .take(duration)
+        .listen((tick) {
+      final newElapsed = tick + 1;
+      final newRemaining = duration - newElapsed;
+      final updatedTotalRemaining = state.totalRemainingTime - 1;
+
+      final updatedBeforeOutTime = state.beforeOutTime - 1;
+      final updatedIsLate = updatedBeforeOutTime <= 0;
+
+      add(AlarmTimerStepTicked(
+        preparationRemainingTime: newRemaining,
+        preparationElapsedTime: newElapsed,
+        totalRemainingTime: updatedTotalRemaining,
+        beforeOutTime: updatedBeforeOutTime,
+        isLate: updatedIsLate,
+      ));
+    });
+  }
+
   void _onStepSkipped(
       AlarmTimerStepSkipped event, Emitter<AlarmTimerState> emit) {
     final updatedStates =
@@ -125,17 +148,18 @@ class AlarmTimerBloc extends Bloc<AlarmTimerEvent, AlarmTimerState> {
       AlarmTimerStepNextShifted event, Emitter<AlarmTimerState> emit) {
     _tickerSubscription?.cancel();
 
-    if (state.currentStepIndex + 1 < state.preparationSteps.length) {
-      final nextStepIndex = state.currentStepIndex + 1;
+    final isLastStep =
+        state.currentStepIndex + 1 >= state.preparationSteps.length;
 
+    if (!isLastStep) {
+      final nextStepIndex = state.currentStepIndex + 1;
       final nextStepDuration =
           state.preparationSteps[nextStepIndex].preparationTime.inSeconds;
 
       final updatedStepStates =
           List<PreparationStateEnum>.from(state.preparationStepStates);
 
       updatedStepStates[state.currentStepIndex] = PreparationStateEnum.done;
-
       updatedStepStates[nextStepIndex] = PreparationStateEnum.now;
 
       emit(state.copyWith(
@@ -146,7 +170,13 @@ class AlarmTimerBloc extends Bloc<AlarmTimerEvent, AlarmTimerState> {
 
       add(AlarmTimerStepStarted(nextStepDuration));
     } else {
-      add(const AlarmTimerStepFinalized());
+      final wasSkipped = state.preparationStepStates[state.currentStepIndex] ==
+          PreparationStateEnum.done;
+      if (wasSkipped) {
+        add(const AlarmTimerStepFinalized());
+      } else {
+        add(const AlarmTimerPreparationsTimeOvered());
+      }
     }
   }
 
@@ -172,31 +202,45 @@ class AlarmTimerBloc extends Bloc<AlarmTimerEvent, AlarmTimerState> {
     ));
   }
 
-  void _startTicker(int duration, Emitter<AlarmTimerState> emit) {
+  @override
+  Future<void> close() {
     _tickerSubscription?.cancel();
-    _tickerSubscription = Stream.periodic(const Duration(seconds: 1), (x) => x)
-        .take(duration)
-        .listen((tick) {
-      final newElapsed = tick + 1;
-      final newRemaining = duration - newElapsed;
-      final updatedTotalRemaining = state.totalRemainingTime - 1;
+    return super.close();
+  }
 
+  void _onPreparationsTimeOvered(
+    AlarmTimerPreparationsTimeOvered event,
+    Emitter<AlarmTimerState> emit,
+  ) {
+    final updatedStates =
+        List<PreparationStateEnum>.from(state.preparationStepStates);
+    updatedStates[state.currentStepIndex] = PreparationStateEnum.done;
+
+    emit(AlarmTimerPreparationsTimeOver(
+      preparationSteps: state.preparationSteps,
+      currentStepIndex: state.currentStepIndex,
+      stepElapsedTimes: state.stepElapsedTimes,
+      preparationStepStates: updatedStates,
+      preparationRemainingTime: 0,
+      totalRemainingTime: 0,
+      totalPreparationTime: state.totalPreparationTime,
+      progress: 1.0,
+      beforeOutTime: state.beforeOutTime,
+      isLate: state.isLate,
+    ));
+
+    _tickerSubscription?.cancel();
+    _tickerSubscription =
+        Stream.periodic(const Duration(seconds: 1), (x) => x).listen((tick) {
       final updatedBeforeOutTime = state.beforeOutTime - 1;
       final updatedIsLate = updatedBeforeOutTime <= 0;
 
-      add(AlarmTimerStepTicked(
-        preparationRemainingTime: newRemaining,
-        preparationElapsedTime: newElapsed,
-        totalRemainingTime: updatedTotalRemaining,
-        beforeOutTime: updatedBeforeOutTime,
-        isLate: updatedIsLate,
-      ));
+      emit(
+        (state as AlarmTimerPreparationsTimeOver).copyWith(
+          beforeOutTime: updatedBeforeOutTime,
+          isLate: updatedIsLate,
+        ),
+      );
     });
   }
-
-  @override
-  Future<void> close() {
-    _tickerSubscription?.cancel();
-    return super.close();
-  }
 }

lib/presentation/alarm/bloc/alarm_timer/alarm_timer_event.dart

@@ -60,3 +60,7 @@ class AlarmTimerStepsUpdated extends AlarmTimerEvent {
   @override
   List<Object?> get props => [preparationSteps];
 }
+
+class AlarmTimerPreparationsTimeOvered extends AlarmTimerEvent {
+  const AlarmTimerPreparationsTimeOvered();
+}

lib/presentation/alarm/bloc/alarm_timer/alarm_timer_state.dart

@@ -208,6 +208,7 @@ class AlarmTimerPreparationCompletion extends AlarmTimerState {
     required super.isLate,
   });
 
+// 준비 완료 상태
   @override
   AlarmTimerPreparationCompletion copyWith({
     List<PreparationStepEntity>? preparationSteps,
@@ -237,3 +238,48 @@ class AlarmTimerPreparationCompletion extends AlarmTimerState {
     );
   }
 }
+
+// 준비 시간 만료 상태
+class AlarmTimerPreparationsTimeOver extends AlarmTimerState {
+  const AlarmTimerPreparationsTimeOver({
+    required super.preparationSteps,
+    required super.currentStepIndex,
+    required super.stepElapsedTimes,
+    required super.preparationStepStates,
+    required super.preparationRemainingTime,
+    required super.totalRemainingTime,
+    required super.totalPreparationTime,
+    required super.progress,
+    required super.beforeOutTime,
+    required super.isLate,
+  });
+
+  @override
+  AlarmTimerPreparationsTimeOver copyWith({
+    List<PreparationStepEntity>? preparationSteps,
+    int? currentStepIndex,
+    List<int>? stepElapsedTimes,
+    List<PreparationStateEnum>? preparationStepStates,
+    int? preparationRemainingTime,
+    int? totalRemainingTime,
+    int? totalPreparationTime,
+    double? progress,
+    int? beforeOutTime,
+    bool? isLate,
+  }) {
+    return AlarmTimerPreparationsTimeOver(
+      preparationSteps: preparationSteps ?? this.preparationSteps,
+      currentStepIndex: currentStepIndex ?? this.currentStepIndex,
+      stepElapsedTimes: stepElapsedTimes ?? this.stepElapsedTimes,
+      preparationStepStates:
+          preparationStepStates ?? this.preparationStepStates,
+      preparationRemainingTime:
+          preparationRemainingTime ?? this.preparationRemainingTime,
+      totalRemainingTime: totalRemainingTime ?? this.totalRemainingTime,
+      totalPreparationTime: totalPreparationTime ?? this.totalPreparationTime,
+      progress: progress ?? this.progress,
+      beforeOutTime: beforeOutTime ?? this.beforeOutTime,
+      isLate: isLate ?? this.isLate,
+    );
+  }
+}