@@ -44,8 +44,8 @@ class SessionForm extends StatefulWidget {
44
44
dayId: dayId,
45
45
impression: DEFAULT_IMPRESSION ,
46
46
date: clock.now (),
47
- timeEnd: TimeOfDay .now (),
48
- timeStart: TimeOfDay . now () ,
47
+ timeEnd: TimeOfDay .fromDateTime (clock. now () ),
48
+ timeStart: null ,
49
49
);
50
50
51
51
@override
@@ -68,8 +68,10 @@ class _SessionFormState extends State<SessionForm> {
68
68
void initState () {
69
69
super .initState ();
70
70
71
- timeStartController.text = timeToString (widget._session.timeStart) ?? '' ;
72
- timeEndController.text = timeToString (widget._session.timeEnd) ?? '' ;
71
+ timeStartController.text =
72
+ widget._session.timeStart == null ? '' : timeToString (widget._session.timeStart)! ;
73
+ timeEndController.text =
74
+ widget._session.timeEnd == null ? '' : timeToString (widget._session.timeEnd)! ;
73
75
notesController.text = widget._session.notes;
74
76
75
77
selectedImpression[widget._session.impression - 1 ] = true ;
@@ -129,6 +131,7 @@ class _SessionFormState extends State<SessionForm> {
129
131
},
130
132
),
131
133
Row (
134
+ spacing: 10 ,
132
135
children: [
133
136
Flexible (
134
137
child: TextFormField (
@@ -163,16 +166,19 @@ class _SessionFormState extends State<SessionForm> {
163
166
if (timeStartController.text.isEmpty && timeEndController.text.isEmpty) {
164
167
return null ;
165
168
}
166
- final TimeOfDay startTime = stringToTime (timeStartController.text);
167
- final TimeOfDay endTime = stringToTime (timeEndController.text);
168
- if (startTime.isAfter (endTime)) {
169
- return AppLocalizations .of (context).timeStartAhead;
169
+
170
+ if (timeStartController.text.isNotEmpty && timeEndController.text.isNotEmpty) {
171
+ final TimeOfDay startTime = stringToTime (timeStartController.text);
172
+ final TimeOfDay endTime = stringToTime (timeEndController.text);
173
+ if (startTime.isAfter (endTime)) {
174
+ return AppLocalizations .of (context).timeStartAhead;
175
+ }
170
176
}
177
+
171
178
return null ;
172
179
},
173
180
),
174
181
),
175
- const SizedBox (width: 10 ),
176
182
Flexible (
177
183
child: TextFormField (
178
184
key: const ValueKey ('time-end' ),
0 commit comments