Skip to content

feat(final-phase): polish & cross-cutting #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grunch merged 4 commits into from
Mar 31, 2026
Merged

feat(final-phase): polish & cross-cutting #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c057bb
feat(final-phase): polish & cross-cutting — T118-T125
grunch Mar 31, 2026
bbe6743
fix(phase17-r3): apply CodeRabbit round 3 — 15 findings fixed
grunch Mar 31, 2026
2eed209
fix(phase17-r4): apply CodeRabbit round 4 — 11 findings fixed
grunch Mar 31, 2026
4f73b29
fix(phase17-r5): apply CodeRabbit round 5 — l10n, _hasEmitted, theme-…
grunch Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/core/app_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,18 @@ abstract final class AppSpacing {
static const double xxl = 32;
}

// ── Responsive breakpoints ────────────────────────────────────────────────────

/// Logical-pixel breakpoints for responsive layouts.
///
/// - < [tablet] → mobile (single-column, overlay drawer, bottom nav)
/// - [tablet] – [desktop] → tablet (2-column grid, side panel)
/// - ≥ [desktop] → desktop (3-column grid, persistent sidebar, no bottom nav)
abstract final class AppBreakpoints {
static const double tablet = 600;
static const double desktop = 1200;
}

// ── Border-radius tokens ───────────────────────────────────────────────────────

abstract final class AppRadius {
Expand Down
158 changes: 105 additions & 53 deletions lib/features/chat/screens/chat_room_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,102 @@ class _ChatRoomScreenState extends ConsumerState<ChatRoomScreen> {
final colors = Theme.of(context).extension<AppColors>();
if (colors == null) throw StateError('AppColors theme extension must be registered');

final screenWidth = MediaQuery.sizeOf(context).width;
final showSidePanel = screenWidth >= AppBreakpoints.tablet;

// ── Side panel (tablet+) ─────────────────────────────────────────────────
// On tablet/desktop the info panels are always visible as a persistent
// sidebar rather than toggling over the message list.
Widget? sidePanel;
if (showSidePanel) {
sidePanel = SizedBox(
width: 300,
child: AnimatedSwitcher(
duration: const Duration(milliseconds: 200),
child: _showTradeInfo
? TradeInformationTab(
key: const ValueKey('trade'),
orderId: widget.orderId,
)
: _showUserInfo
? UserInformationTab(
key: const ValueKey('user'),
peerHandle: room.peerHandle,
peerPubkey: room.peerPubkey,
peerIconIndex: room.peerIconIndex,
peerColorHue: room.peerColorHue,
)
: Container(
key: const ValueKey('none'),
color: colors.backgroundCard,
child: Center(
child: Text(
'Select ℹ or 👤\nfor details',
textAlign: TextAlign.center,
style: TextStyle(color: colors.textSubtle),
),
),
),
),
);
}

// ── Chat column ──────────────────────────────────────────────────────────
final chatColumn = Column(
children: [
// Animated info panels (mobile only — on tablet+ shown as sidebar)
if (!showSidePanel)
AnimatedSwitcher(
duration: const Duration(milliseconds: 250),
child: _showTradeInfo
? TradeInformationTab(
key: const ValueKey('trade'),
orderId: widget.orderId,
)
: _showUserInfo
? UserInformationTab(
key: const ValueKey('user'),
peerHandle: room.peerHandle,
peerPubkey: room.peerPubkey,
peerIconIndex: room.peerIconIndex,
peerColorHue: room.peerColorHue,
)
: const SizedBox.shrink(key: ValueKey('none')),
),

// Message list
Expanded(
child: ListView.builder(
controller: _scrollController,
padding: const EdgeInsets.symmetric(vertical: AppSpacing.sm),
itemCount: _messages.length,
itemBuilder: (context, index) {
return MessageBubble(
message: _messages[index],
peerColorHue: room.peerColorHue,
);
},
),
),

// Composition bar
Padding(
padding: EdgeInsets.only(
left: AppSpacing.sm,
right: AppSpacing.sm,
bottom:
MediaQuery.of(context).viewInsets.bottom + AppSpacing.sm,
top: AppSpacing.xs,
),
child: MessageInput(
onSendText: _onSend,
onAttachFile: _onAttach,
isAttaching: _isAttaching,
),
),
],
);

return Scaffold(
// Keyboard avoidance is handled manually via viewInsets.bottom padding
// on the composition bar so the BottomNavBar does not push content twice.
Expand All @@ -158,59 +254,15 @@ class _ChatRoomScreenState extends ConsumerState<ChatRoomScreen> {
),
],
),
body: Column(
children: [
// Animated info panels
AnimatedSwitcher(
duration: const Duration(milliseconds: 250),
child: _showTradeInfo
? TradeInformationTab(
key: const ValueKey('trade'),
orderId: widget.orderId,
)
: _showUserInfo
? UserInformationTab(
key: const ValueKey('user'),
peerHandle: room.peerHandle,
peerPubkey: room.peerPubkey,
peerIconIndex: room.peerIconIndex,
peerColorHue: room.peerColorHue,
)
: const SizedBox.shrink(key: ValueKey('none')),
),

// Message list
Expanded(
child: ListView.builder(
controller: _scrollController,
padding: const EdgeInsets.symmetric(vertical: AppSpacing.sm),
itemCount: _messages.length,
itemBuilder: (context, index) {
return MessageBubble(
message: _messages[index],
peerColorHue: room.peerColorHue,
);
},
),
),

// Composition bar
Padding(
padding: EdgeInsets.only(
left: AppSpacing.sm,
right: AppSpacing.sm,
bottom: MediaQuery.of(context).viewInsets.bottom +
AppSpacing.sm,
top: AppSpacing.xs,
),
child: MessageInput(
onSendText: _onSend,
onAttachFile: _onAttach,
isAttaching: _isAttaching,
),
),
],
),
body: showSidePanel && sidePanel != null
? Row(
children: [
Expanded(child: chatColumn),
const VerticalDivider(width: 1),
sidePanel,
],
)
: chatColumn,
bottomNavigationBar: const BottomNavBar(),
);
}
Expand Down
Loading