Skip to content

Commit 0ce88f0

Browse files
committed
msglist [nfc]: Move a TODO; note question for Vlad
1 parent 2eb94c9 commit 0ce88f0

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

lib/widgets/message_list.dart

+23-20
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ class _MessageListPageState extends State<MessageListPage> {
5353
Widget build(BuildContext context) {
5454
return Scaffold(
5555
appBar: AppBar(title: MessageListAppBarTitle(narrow: widget.narrow)),
56+
// TODO question for Vlad: for a stream view, should we set
57+
// [backgroundColor] based on stream color, as in this frame:
58+
// https://www.figma.com/file/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=132%3A9684&mode=dev
59+
// That's not obviously preferred over the default background that
60+
// we matched to the Figma in 21dbae120. See another frame, which uses that:
61+
// https://www.figma.com/file/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=147%3A9088&mode=dev
5662
body: Builder(
5763
builder: (BuildContext context) => Center(
5864
child: Column(children: [
@@ -405,26 +411,23 @@ class MarkAsReadWidget extends StatelessWidget {
405411
secondChild: SizedBox(width: double.infinity,
406412
// Design referenced from:
407413
// https://www.figma.com/file/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?type=design&node-id=132-9684&mode=design&t=jJwHzloKJ0TMOG4M-0
408-
child: ColoredBox(
409-
// TODO(#368): this should pull from stream color
410-
color: Colors.transparent,
411-
child: Padding(
412-
// vertical padding adjusted for tap target height (48px) of button
413-
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10 - ((48 - 38) / 2)),
414-
child: FilledButton.icon(
415-
style: FilledButton.styleFrom(
416-
backgroundColor: _UnreadMarker.color,
417-
minimumSize: const Size.fromHeight(38),
418-
textStyle: const TextStyle(
419-
fontFamily: 'Source Sans 3',
420-
fontSize: 18,
421-
height: (23 / 18),
422-
).merge(weightVariableTextStyle(context)),
423-
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(7)),
424-
),
425-
onPressed: () => _handlePress(context),
426-
icon: const Icon(Icons.playlist_add_check),
427-
label: Text(zulipLocalizations.markAsReadLabel(unreadCount)))))));
414+
child: Padding(
415+
// vertical padding adjusted for tap target height (48px) of button
416+
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10 - ((48 - 38) / 2)),
417+
child: FilledButton.icon(
418+
style: FilledButton.styleFrom(
419+
backgroundColor: _UnreadMarker.color,
420+
minimumSize: const Size.fromHeight(38),
421+
textStyle: const TextStyle(
422+
fontFamily: 'Source Sans 3',
423+
fontSize: 18,
424+
height: (23 / 18),
425+
).merge(weightVariableTextStyle(context)),
426+
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(7)),
427+
),
428+
onPressed: () => _handlePress(context),
429+
icon: const Icon(Icons.playlist_add_check),
430+
label: Text(zulipLocalizations.markAsReadLabel(unreadCount))))));
428431
}
429432
}
430433

0 commit comments

Comments
 (0)