From bd256ad1632e7c9dd5b737265c962791f5cd9bb7 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Sun, 25 Oct 2026 21:48:52 +0000 Subject: [PATCH] feat(app): structure chat session row information --- .../ui/sessions/session_list_cupertino.dart | 30 ++--- .../ui/sessions/session_list_material.dart | 30 ++--- .../chat/ui/sessions/session_row_content.dart | 104 ++++++++++-------- .../chat_session_row_layout_test.dart | 21 ++-- .../chat_session_row_material_test.dart | 29 ++--- 5 files changed, 107 insertions(+), 107 deletions(-) diff --git a/app/lib/features/chat/ui/sessions/session_list_cupertino.dart b/app/lib/features/chat/ui/sessions/session_list_cupertino.dart index 20c2d75d..d47d488b 100644 --- a/app/lib/features/chat/ui/sessions/session_list_cupertino.dart +++ b/app/lib/features/chat/ui/sessions/session_list_cupertino.dart @@ -153,7 +153,8 @@ class _CupertinoSessionRow extends StatelessWidget { // `DefaultTextStyle` instead of overriding it with the title's size. final theme = CupertinoTheme.of(context); final secondary = CupertinoColors.secondaryLabel.resolveFrom(context); - final meta = chatSessionRowMetaLines(session); + final meta = chatSessionMetaLines(session); + final recency = relativeChatSessionTime(session['updated_at']); final status = chatSessionRowStatus(session, unseen: unseen); final statusStyle = TextStyle( color: status == 'Closed' ? secondary : theme.primaryColor, @@ -171,27 +172,18 @@ class _CupertinoSessionRow extends StatelessWidget { ), // As on the web: the title with the unread/closed word trailing, then // the muted `recency · directory · model` line. - title: ChatSessionRowMeta( - meta: chatSessionTitle(session), + title: ChatSessionRowContent( + title: chatSessionTitle(session), status: status, - metaStyle: const TextStyle(), + recency: recency.isEmpty ? null : recency, + meta: meta, + titleStyle: theme.textTheme.textStyle.copyWith( + fontWeight: FontWeight.w600, + ), + metaStyle: TextStyle(color: secondary), statusStyle: statusStyle, ), - subtitle: meta.isEmpty - ? null - : Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - for (final line in meta) - Text( - line, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle(color: secondary), - ), - ], - ), + subtitle: null, onTap: () => onOpen(session), trailing: Row( mainAxisSize: MainAxisSize.min, diff --git a/app/lib/features/chat/ui/sessions/session_list_material.dart b/app/lib/features/chat/ui/sessions/session_list_material.dart index efc92f21..3807ffb9 100644 --- a/app/lib/features/chat/ui/sessions/session_list_material.dart +++ b/app/lib/features/chat/ui/sessions/session_list_material.dart @@ -158,7 +158,8 @@ class _MaterialSessionRow extends StatelessWidget { // passes colour only, so it keeps the tile's native subtitle style. final theme = Theme.of(context); final secondary = theme.colorScheme.onSurfaceVariant; - final meta = chatSessionRowMetaLines(session); + final meta = chatSessionMetaLines(session); + final recency = relativeChatSessionTime(session['updated_at']); final status = chatSessionRowStatus(session, unseen: unseen); final statusStyle = TextStyle( color: status == 'Closed' ? secondary : theme.colorScheme.primary, @@ -171,27 +172,18 @@ class _MaterialSessionRow extends StatelessWidget { leading: Icon(sessionMaterialIcon(session)), // As on the web: the title with the unread/closed word trailing, then // the muted `recency · directory · model` line. - title: ChatSessionRowMeta( - meta: chatSessionTitle(session), + title: ChatSessionRowContent( + title: chatSessionTitle(session), status: status, - metaStyle: const TextStyle(), + recency: recency.isEmpty ? null : recency, + meta: meta, + titleStyle: + theme.textTheme.titleSmall ?? + const TextStyle(fontWeight: FontWeight.w600), + metaStyle: TextStyle(color: secondary), statusStyle: statusStyle, ), - subtitle: meta.isEmpty - ? null - : Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - for (final line in meta) - Text( - line, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle(color: secondary), - ), - ], - ), + subtitle: null, onTap: () => onOpen(session), trailing: Row( mainAxisSize: MainAxisSize.min, diff --git a/app/lib/features/chat/ui/sessions/session_row_content.dart b/app/lib/features/chat/ui/sessions/session_row_content.dart index 42d0d8e3..e3524069 100644 --- a/app/lib/features/chat/ui/sessions/session_row_content.dart +++ b/app/lib/features/chat/ui/sessions/session_row_content.dart @@ -1,83 +1,97 @@ import 'package:flutter/material.dart'; -/// A chat session row line with the unread/closed word at its trailing edge: -/// the row's title line, as on the web. -/// -/// The directory/model is the part that ellipsises; the state word is the row's -/// only unread marker, so it keeps its intrinsic width and the metadata shrinks -/// first. If even the whole text column cannot hold the word at the current -/// text scale it is scaled down rather than clipped, so `New`/`Closed` is never -/// replaced by an ellipsis. -class ChatSessionRowMeta extends StatelessWidget { - const ChatSessionRowMeta({ +/// Hierarchical row copy shared by the Material and Cupertino list variants. +/// Each server-recorded fact keeps its own line; recency is visually anchored +/// at the end of its own line rather than competing with the other metadata. +class ChatSessionRowContent extends StatelessWidget { + const ChatSessionRowContent({ super.key, - required this.meta, + required this.title, required this.status, + required this.recency, + required this.meta, + required this.titleStyle, required this.metaStyle, required this.statusStyle, }); - final String meta; + final String title; final String? status; + final String? recency; + final List meta; + final TextStyle titleStyle; final TextStyle metaStyle; final TextStyle statusStyle; - /// The trailing word's intrinsic width is measured against the full text - /// column, minus this gap, so the row can never overflow the line. - static const _statusGap = 8.0; - @override Widget build(BuildContext context) { - return LayoutBuilder( - builder: (context, constraints) => Row( - children: [ - Expanded( + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + title, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: titleStyle, + ), + if (status != null) ...[ + const SizedBox(height: 2), + Align( + alignment: AlignmentDirectional.centerStart, + child: _StatusLabel(status: status!, style: statusStyle), + ), + ], + if (recency != null && recency!.isNotEmpty) ...[ + const SizedBox(height: 3), + Align( + alignment: AlignmentDirectional.centerEnd, child: Text( - meta, - maxLines: 1, - overflow: TextOverflow.ellipsis, + recency!, + maxLines: 2, + textAlign: TextAlign.end, style: metaStyle, ), ), - if (status != null) - ConstrainedBox( - constraints: BoxConstraints(maxWidth: constraints.maxWidth), - child: Padding( - padding: const EdgeInsetsDirectional.only(start: _statusGap), - child: FittedBox( - fit: BoxFit.scaleDown, - alignment: AlignmentDirectional.centerEnd, - child: status == 'New' - ? _UnreadBadge(style: statusStyle) - : Text(status!, maxLines: 1, style: statusStyle), - ), - ), - ), ], - ), + for (final line in meta) + Text( + line, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: metaStyle, + ), + ], ); } } -/// A chat with messages not yet seen: the word in a filled pill. -class _UnreadBadge extends StatelessWidget { - const _UnreadBadge({required this.style}); +class _StatusLabel extends StatelessWidget { + const _StatusLabel({required this.status, required this.style}); + final String status; final TextStyle style; @override Widget build(BuildContext context) { - final color = style.color ?? const Color(0xFF0A84FF); + if (status != 'New') { + return Text( + status, + maxLines: 2, + style: style.copyWith(fontWeight: FontWeight.w600), + ); + } + final color = style.color ?? Theme.of(context).colorScheme.primary; return DecoratedBox( key: const Key('chat-row-unread'), decoration: ShapeDecoration(color: color, shape: const StadiumBorder()), child: Padding( padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 1), child: Text( - 'New', - maxLines: 1, + status, + maxLines: 2, style: style.copyWith( - color: const Color(0xFFFFFFFF), + color: Colors.white, fontWeight: FontWeight.w700, ), ), diff --git a/app/test/features/chat/ui/sessions/chat_session_row_layout_test.dart b/app/test/features/chat/ui/sessions/chat_session_row_layout_test.dart index 3d9a31f5..ba951d96 100644 --- a/app/test/features/chat/ui/sessions/chat_session_row_layout_test.dart +++ b/app/test/features/chat/ui/sessions/chat_session_row_layout_test.dart @@ -177,10 +177,12 @@ void main() { expect(find.text('opencode'), findsNWidgets(2)); expect(find.text('/work'), findsNWidgets(2)); expect( - (tester.getCenter(find.text('Starred chat')).dy - - tester.getCenter(find.text('New')).dy) - .abs(), - lessThan(4), + tester.getCenter(find.text('New')).dy, + greaterThan(tester.getCenter(find.text('Starred chat')).dy), + ); + expect( + tester.getCenter(find.text('5 min ago')).dx, + greaterThan(tester.getCenter(find.text('Starred chat')).dx), ); // The meta line keeps `CupertinoListTile`'s native 12pt subtitle style; it @@ -234,7 +236,7 @@ void main() { final titleParagraph = tester.renderObject( find.text(title), ); - expect(titleParagraph.maxLines, 1); + expect(titleParagraph.maxLines, 2); expect(titleParagraph.didExceedMaxLines, isTrue); final metaParagraph = tester.renderObject( find.descendant( @@ -242,7 +244,7 @@ void main() { matching: find.text(meta), ), ); - expect(metaParagraph.maxLines, 1); + expect(metaParagraph.maxLines, 2); expect(metaParagraph.didExceedMaxLines, isTrue); // The state word is the row's only unread marker: at the smallest supported @@ -263,12 +265,9 @@ void main() { ); } - // The word shares the title's line, as on the web. expect( - (tester.getCenter(find.text(title)).dy - - tester.getCenter(find.text('New')).dy) - .abs(), - lessThan(20), + tester.getCenter(find.text('New')).dy, + greaterThan(tester.getCenter(find.text(title)).dy), ); }); } diff --git a/app/test/features/chat/ui/sessions/chat_session_row_material_test.dart b/app/test/features/chat/ui/sessions/chat_session_row_material_test.dart index 0e6c0aa8..ab227ae9 100644 --- a/app/test/features/chat/ui/sessions/chat_session_row_material_test.dart +++ b/app/test/features/chat/ui/sessions/chat_session_row_material_test.dart @@ -80,12 +80,13 @@ void main() { expect(find.text('/work'), findsNWidgets(2)); expect(find.text('New'), findsOneWidget); expect(find.text('2 hr ago'), findsOneWidget); - // As on the web, the unread word shares the title's line. expect( - (tester.getCenter(find.text('Starred chat')).dy - - tester.getCenter(find.text('New')).dy) - .abs(), - lessThan(4), + tester.getCenter(find.text('New')).dy, + greaterThan(tester.getCenter(find.text('Starred chat')).dy), + ); + expect( + tester.getCenter(find.text('5 min ago')).dx, + greaterThan(tester.getCenter(find.text('Starred chat')).dx), ); // The meta line is the theme's muted colour, not the title colour. @@ -158,7 +159,7 @@ void main() { final titleParagraph = tester.renderObject( find.text(title), ); - expect(titleParagraph.maxLines, 1); + expect(titleParagraph.maxLines, 2); expect(titleParagraph.didExceedMaxLines, isTrue); final metaParagraph = tester.renderObject( find.descendant( @@ -166,7 +167,7 @@ void main() { matching: find.text(meta), ), ); - expect(metaParagraph.maxLines, 1); + expect(metaParagraph.maxLines, 2); expect(metaParagraph.didExceedMaxLines, isTrue); // `New`/`Closed` is the row's only unread marker; it stays whole at the @@ -188,12 +189,14 @@ void main() { // The title/state and every metadata field occupy distinct lines. expect( - tester.getCenter( - find.descendant( - of: find.byKey(const Key('chat-row-s1')), - matching: find.text(meta).last, - ), - ).dy, + tester + .getCenter( + find.descendant( + of: find.byKey(const Key('chat-row-s1')), + matching: find.text(meta).last, + ), + ) + .dy, greaterThan(tester.getCenter(find.text(title)).dy), ); });