Skip to content

Commit ddc9ade

Browse files
chrisbobbegnprice
authored andcommitted
model [nfc]: Pass TwentyFourHourTimeMode to MessageTimestampStyle.format
1 parent 4a77fbd commit ddc9ade

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

lib/widgets/lightbox.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,11 @@ class _LightboxPageLayoutState extends State<_LightboxPageLayout> {
177177

178178
PreferredSizeWidget? appBar;
179179
if (_headerFooterVisible) {
180-
final timestampText = MessageTimestampStyle.lightbox.format(
181-
widget.message.timestamp, now: DateTime.now(), zulipLocalizations: zulipLocalizations);
180+
final timestampText = MessageTimestampStyle.lightbox
181+
.format(widget.message.timestamp,
182+
now: DateTime.now(),
183+
twentyFourHourTimeMode: store.userSettings.twentyFourHourTime,
184+
zulipLocalizations: zulipLocalizations);
182185

183186
// We use plain [AppBar] instead of [ZulipAppBar], even though this page
184187
// has a [PerAccountStore], because:

lib/widgets/message_list.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1841,11 +1841,13 @@ class DateText extends StatelessWidget {
18411841

18421842
@override
18431843
Widget build(BuildContext context) {
1844+
final store = PerAccountStoreWidget.of(context);
18441845
final messageListTheme = MessageListTheme.of(context);
18451846
final zulipLocalizations = ZulipLocalizations.of(context);
18461847
final formattedTimestamp = MessageTimestampStyle.dateOnlyRelative.format(
18471848
timestamp,
18481849
now: ZulipBinding.instance.utcNow().toLocal(),
1850+
twentyFourHourTimeMode: store.userSettings.twentyFourHourTime,
18491851
zulipLocalizations: zulipLocalizations)!;
18501852
return Text(
18511853
style: TextStyle(
@@ -1887,8 +1889,11 @@ class SenderRow extends StatelessWidget {
18871889
final designVariables = DesignVariables.of(context);
18881890

18891891
final sender = store.getUser(message.senderId);
1890-
final timestamp = timestampStyle.format(
1891-
message.timestamp, now: DateTime.now(), zulipLocalizations: zulipLocalizations);
1892+
final timestamp = timestampStyle
1893+
.format(message.timestamp,
1894+
now: DateTime.now(),
1895+
twentyFourHourTimeMode: store.userSettings.twentyFourHourTime,
1896+
zulipLocalizations: zulipLocalizations);
18921897

18931898
final showAsMuted = _showAsMuted(context, store);
18941899

@@ -2016,6 +2021,7 @@ enum MessageTimestampStyle {
20162021
int messageTimestamp, {
20172022
required DateTime now,
20182023
required ZulipLocalizations zulipLocalizations,
2024+
required TwentyFourHourTimeMode twentyFourHourTimeMode,
20192025
}) {
20202026
final asDateTime =
20212027
DateTime.fromMillisecondsSinceEpoch(1000 * messageTimestamp);

test/widgets/message_list_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,6 +1656,7 @@ void main() {
16561656
final result = style.format(
16571657
timestamp,
16581658
now: testBinding.utcNow().toLocal(),
1659+
twentyFourHourTimeMode: TwentyFourHourTimeMode.localeDefault,
16591660
zulipLocalizations: zulipLocalizations);
16601661
check(result).equals(expected);
16611662
});

0 commit comments

Comments
 (0)