Skip to content

Commit 69b62ce

Browse files
committed
fix(circuit): local timezone was applied twice
1 parent 7e8a16f commit 69b62ce

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

lib/Screens/Racing/circuit.dart

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,13 @@ class CircuitScreenContent extends StatelessWidget {
231231
Session(
232232
session['state'],
233233
session['session'],
234-
DateTime.parse(
235-
session['endTime'] + session['gmtOffset']),
236-
DateTime.parse(
237-
session['startTime'] + session['gmtOffset']),
234+
DateTime.parse(session['endTime']),
235+
DateTime.parse(session['startTime']),
238236
null,
239-
DateTime.now().isBefore(DateTime.parse(
240-
session['endTime'] + session['gmtOffset'])) &&
241-
DateTime.now().isAfter(DateTime.parse(
242-
session['startTime'] + session['gmtOffset'])),
237+
DateTime.now().isBefore(
238+
DateTime.parse(session['endTime'])) &&
239+
DateTime.now().isAfter(
240+
DateTime.parse(session['startTime'])),
243241
),
244242
details['race']['meetingCountryName'],
245243
details['race']['meetingOfficialName'],

lib/api/formula1.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,16 +1052,17 @@ class Formula1 {
10521052

10531053
List<DateTime> sessionDates = [];
10541054
List sessionStates = [];
1055+
String gmtOffset =
1056+
formatedResponse['race']['meetingSessions'][0]?['gmtOffset'] ?? '';
1057+
10551058
for (var session in formatedResponse['race']['meetingSessions']) {
10561059
sessionDates.add(
10571060
DateTime.parse(
1058-
session['startTime'] + session['gmtOffset'],
1059-
),
1061+
session['startTime'] + gmtOffset,
1062+
).toLocal(),
10601063
);
10611064
sessionStates.add(session['state']);
10621065
}
1063-
String gmtOffset =
1064-
formatedResponse['race']['meetingSessions'][0]?['gmtOffset'] ?? '';
10651066
DateTime raceDate = DateTime.parse(
10661067
formatedResponse['race']['meetingEndDate']
10671068
.replaceAll('.000Z', '')

0 commit comments

Comments
 (0)