Skip to content

Commit b03aa1d

Browse files
jjoonleojjoonleo
authored
Merge pull request #284 from DevKor-github/248-오늘-일정-시간-실시간-변경
feat: implement ScheduleTimerBloc for managing schedule countdowns
2 parents c091863 + 29e05d9 commit b03aa1d

4 files changed

Lines changed: 202 additions & 22 deletions

File tree

‎lib/presentation/home/bloc/schedule_timer_bloc.dart‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
library;
2+
3+
import 'dart:async';
4+
import 'package:flutter_bloc/flutter_bloc.dart';
5+
import 'package:equatable/equatable.dart';
6+
7+
part 'schedule_timer_event.dart';
8+
part 'schedule_timer_state.dart';
9+
10+
class ScheduleTimerBloc extends Bloc<ScheduleTimerEvent, ScheduleTimerState> {
11+
StreamSubscription<DateTime>? _tickerSubscription;
12+
DateTime? _scheduleTime;
13+
14+
ScheduleTimerBloc() : super(const ScheduleTimerInitial()) {
15+
on<ScheduleTimerStarted>(_onTimerStarted);
16+
on<ScheduleTimerTicked>(_onTimerTicked);
17+
on<ScheduleTimerStopped>(_onTimerStopped);
18+
on<ScheduleTimerUpdated>(_onTimerUpdated);
19+
}
20+
21+
@override
22+
Future<void> close() {
23+
_tickerSubscription?.cancel();
24+
return super.close();
25+
}
26+
27+
void _onTimerStarted(
28+
ScheduleTimerStarted event, Emitter<ScheduleTimerState> emit) {
29+
_scheduleTime = event.scheduleTime;
30+
_tickerSubscription?.cancel();
31+
32+
// Calculate initial time difference
33+
final now = DateTime.now();
34+
final difference = event.scheduleTime.difference(now);
35+
36+
if (difference.inSeconds <= 0) {
37+
emit(ScheduleTimerFinished(scheduleTime: event.scheduleTime));
38+
return;
39+
}
40+
41+
emit(ScheduleTimerRunning(
42+
scheduleTime: event.scheduleTime,
43+
currentTime: now,
44+
remainingDuration: difference,
45+
));
46+
47+
// Calculate time until next minute boundary (when seconds = 0)
48+
final secondsUntilNextMinute = 60 - now.second;
49+
50+
// Create an initial timer to sync with minute boundaries
51+
Timer(Duration(seconds: secondsUntilNextMinute), () {
52+
// After the initial sync, start the regular minute timer
53+
add(ScheduleTimerTicked(DateTime.now()));
54+
55+
// Now create a periodic timer that runs exactly every minute
56+
_tickerSubscription = Stream.periodic(
57+
const Duration(minutes: 1),
58+
(_) => DateTime.now(),
59+
).listen((currentTime) {
60+
add(ScheduleTimerTicked(currentTime));
61+
});
62+
});
63+
}
64+
65+
void _onTimerTicked(
66+
ScheduleTimerTicked event, Emitter<ScheduleTimerState> emit) {
67+
if (_scheduleTime == null) return;
68+
69+
final difference = _scheduleTime!.difference(event.currentTime);
70+
71+
if (difference.inSeconds <= 0) {
72+
emit(ScheduleTimerFinished(scheduleTime: _scheduleTime!));
73+
_tickerSubscription?.cancel();
74+
} else {
75+
emit(ScheduleTimerRunning(
76+
scheduleTime: _scheduleTime!,
77+
currentTime: event.currentTime,
78+
remainingDuration: difference,
79+
));
80+
}
81+
}
82+
83+
void _onTimerStopped(
84+
ScheduleTimerStopped event, Emitter<ScheduleTimerState> emit) {
85+
_tickerSubscription?.cancel();
86+
_scheduleTime = null;
87+
emit(const ScheduleTimerInitial());
88+
}
89+
90+
void _onTimerUpdated(
91+
ScheduleTimerUpdated event, Emitter<ScheduleTimerState> emit) {
92+
if (event.scheduleTime == null) {
93+
_tickerSubscription?.cancel();
94+
_scheduleTime = null;
95+
emit(const ScheduleTimerInitial());
96+
} else {
97+
add(ScheduleTimerStarted(event.scheduleTime!));
98+
}
99+
}
100+
}

‎lib/presentation/home/bloc/schedule_timer_event.dart‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
part of 'schedule_timer_bloc.dart';
2+
3+
abstract class ScheduleTimerEvent extends Equatable {
4+
const ScheduleTimerEvent();
5+
6+
@override
7+
List<Object?> get props => [];
8+
}
9+
10+
class ScheduleTimerStarted extends ScheduleTimerEvent {
11+
final DateTime scheduleTime;
12+
13+
const ScheduleTimerStarted(this.scheduleTime);
14+
15+
@override
16+
List<Object?> get props => [scheduleTime];
17+
}
18+
19+
class ScheduleTimerTicked extends ScheduleTimerEvent {
20+
final DateTime currentTime;
21+
22+
const ScheduleTimerTicked(this.currentTime);
23+
24+
@override
25+
List<Object?> get props => [currentTime];
26+
}
27+
28+
class ScheduleTimerStopped extends ScheduleTimerEvent {
29+
const ScheduleTimerStopped();
30+
}
31+
32+
class ScheduleTimerUpdated extends ScheduleTimerEvent {
33+
final DateTime? scheduleTime;
34+
35+
const ScheduleTimerUpdated(this.scheduleTime);
36+
37+
@override
38+
List<Object?> get props => [scheduleTime];
39+
}

‎lib/presentation/home/bloc/schedule_timer_state.dart‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
part of 'schedule_timer_bloc.dart';
2+
3+
sealed class ScheduleTimerState extends Equatable {
4+
const ScheduleTimerState();
5+
6+
@override
7+
List<Object?> get props => [];
8+
}
9+
10+
class ScheduleTimerInitial extends ScheduleTimerState {
11+
const ScheduleTimerInitial();
12+
}
13+
14+
class ScheduleTimerRunning extends ScheduleTimerState {
15+
final DateTime scheduleTime;
16+
final DateTime currentTime;
17+
final Duration remainingDuration;
18+
19+
const ScheduleTimerRunning({
20+
required this.scheduleTime,
21+
required this.currentTime,
22+
required this.remainingDuration,
23+
});
24+
25+
@override
26+
List<Object?> get props => [scheduleTime, currentTime, remainingDuration];
27+
}
28+
29+
class ScheduleTimerFinished extends ScheduleTimerState {
30+
final DateTime scheduleTime;
31+
32+
const ScheduleTimerFinished({required this.scheduleTime});
33+
34+
@override
35+
List<Object?> get props => [scheduleTime];
36+
}

‎lib/presentation/home/components/todays_schedule_tile.dart‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_svg/flutter_svg.dart';
2+
import 'package:flutter_bloc/flutter_bloc.dart';
33
import 'package:on_time_front/domain/entities/schedule_entity.dart';
4-
import 'package:on_time_front/presentation/shared/constants/app_colors.dart';
4+
import 'package:on_time_front/presentation/home/bloc/schedule_timer_bloc.dart';
55

66
class TodaysScheduleTile extends StatelessWidget {
77
const TodaysScheduleTile({super.key, this.schedule});
@@ -23,18 +23,6 @@ class TodaysScheduleTile extends StatelessWidget {
2323
Widget _scheduleExists(BuildContext context) {
2424
final theme = Theme.of(context);
2525
final colorScheme = theme.colorScheme;
26-
final scheduleTime = schedule!.scheduleTime;
27-
final now = DateTime.now();
28-
final difference = scheduleTime.difference(now);
29-
30-
// Calculate hours and minutes until schedule
31-
final hoursUntil = difference.inHours;
32-
final minutesUntil = difference.inMinutes % 60;
33-
34-
// Determine AM/PM and format hour
35-
final hour = scheduleTime.hour;
36-
final period = hour >= 12 ? 'PM' : 'AM';
37-
final displayHour = hour == 0 ? 12 : (hour > 12 ? hour - 12 : hour);
3826

3927
return IntrinsicHeight(
4028
child: Row(
@@ -123,14 +111,31 @@ class _ScheduleLeftTimeColumn extends StatelessWidget {
123111

124112
@override
125113
Widget build(BuildContext context) {
126-
final leftTime = scheduleTime.difference(DateTime.now());
127-
//약속까지 hh:mm
128-
final hours = leftTime.inHours;
129-
final minutes = leftTime.inMinutes % 60;
130-
131-
return _TimeColumn(
132-
hour: hours,
133-
minute: minutes,
114+
return BlocProvider(
115+
create: (context) =>
116+
ScheduleTimerBloc()..add(ScheduleTimerStarted(scheduleTime)),
117+
child: BlocBuilder<ScheduleTimerBloc, ScheduleTimerState>(
118+
builder: (context, state) {
119+
Duration leftTime;
120+
121+
if (state is ScheduleTimerRunning) {
122+
leftTime = state.remainingDuration;
123+
} else if (state is ScheduleTimerFinished) {
124+
leftTime = Duration.zero;
125+
} else {
126+
// Initial state - calculate immediately
127+
leftTime = scheduleTime.difference(DateTime.now());
128+
}
129+
130+
final hours = leftTime.inHours;
131+
final minutes = leftTime.inMinutes % 60;
132+
133+
return _TimeColumn(
134+
hour: hours,
135+
minute: minutes,
136+
);
137+
},
138+
),
134139
);
135140
}
136141
}

0 commit comments

Comments
 (0)