Skip to content

Commit 85fff02

Browse files
committed
message_list: reduce redundant arguments
1 parent d2e73e9 commit 85fff02

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

lib/widgets/message_list.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,19 +1272,19 @@ class DateText extends StatelessWidget {
12721272
),
12731273
formatHeaderDate(
12741274
zulipLocalizations,
1275-
DateTime.fromMillisecondsSinceEpoch(timestamp * 1000),
1276-
now: ZulipBinding.instance.now()));
1275+
DateTime.fromMillisecondsSinceEpoch(timestamp * 1000)));
12771276
}
12781277
}
12791278

12801279
@visibleForTesting
12811280
String formatHeaderDate(
12821281
ZulipLocalizations zulipLocalizations,
1283-
DateTime dateTime, {
1284-
required DateTime now,
1285-
}) {
1286-
assert(!dateTime.isUtc && !now.isUtc,
1287-
'`dateTime` and `now` need to be in local time.');
1282+
DateTime dateTime,
1283+
) {
1284+
assert(!dateTime.isUtc,
1285+
'`dateTime` need to be in local time.');
1286+
1287+
final now = ZulipBinding.instance.now();
12881288

12891289
if (dateTime.year == now.year &&
12901290
dateTime.month == now.month &&

test/widgets/message_list_test.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'dart:convert';
22

33
import 'package:checks/checks.dart';
4+
import 'package:clock/clock.dart';
45
import 'package:collection/collection.dart';
56
import 'package:flutter/material.dart';
67
import 'package:flutter/rendering.dart';
@@ -1107,7 +1108,7 @@ void main() {
11071108
.initNarrow.equals(DmNarrow.withUser(eg.otherUser.userId, selfUserId: eg.selfUser.userId));
11081109
await tester.pumpAndSettle();
11091110
});
1110-
1111+
11111112
testWidgets('does not navigate on tapping recipient header in DmNarrow', (tester) async {
11121113
final pushedRoutes = <Route<void>>[];
11131114
final navObserver = TestNavigatorObserver()
@@ -1129,7 +1130,6 @@ void main() {
11291130

11301131
group('formatHeaderDate', () {
11311132
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
1132-
final now = DateTime.parse("2023-01-10 12:00");
11331133
final testCases = [
11341134
("2023-01-10 12:00", zulipLocalizations.today),
11351135
("2023-01-10 00:00", zulipLocalizations.today),
@@ -1144,8 +1144,10 @@ void main() {
11441144
];
11451145
for (final (dateTime, expected) in testCases) {
11461146
test('$dateTime returns $expected', () {
1147-
check(formatHeaderDate(zulipLocalizations, DateTime.parse(dateTime), now: now))
1148-
.equals(expected);
1147+
withClock(Clock.fixed(DateTime.parse("2023-01-10 12:00")), () {
1148+
check(formatHeaderDate(zulipLocalizations, DateTime.parse(dateTime)))
1149+
.equals(expected);
1150+
});
11491151
});
11501152
}
11511153
});

0 commit comments

Comments
 (0)