diff --git a/app/lib/features/chat/chat_screen_float.dart b/app/lib/features/chat/chat_screen_float.dart index 9bbf929b..49b6564d 100644 --- a/app/lib/features/chat/chat_screen_float.dart +++ b/app/lib/features/chat/chat_screen_float.dart @@ -63,7 +63,6 @@ mixin _ChatScreenFloat on State, _ChatScreenWorkspace { label: 'Float (${chatFloatShortcutLabel()})', onPressed: () => _floatPane(pane.id), materialIcon: Icons.picture_in_picture_alt_outlined, - cupertinoIcon: CupertinoIcons.rectangle_on_rectangle, ), ]; } diff --git a/app/lib/features/chat/chat_screen_workspace.dart b/app/lib/features/chat/chat_screen_workspace.dart index dde1b317..479db5af 100644 --- a/app/lib/features/chat/chat_screen_workspace.dart +++ b/app/lib/features/chat/chat_screen_workspace.dart @@ -39,9 +39,7 @@ mixin _ChatScreenWorkspace on State { ChatCompactSidebar( navigation: navigation?.registry.canNavigate == true ? ShellDestinationMenu( - cupertino: - chatControlsStyleOf(context) == - ChatControlsStyle.cupertino, + cupertino: false, current: AppDestination.chat, onSelected: navigation!.registry.navigateTo, ) diff --git a/app/lib/features/chat/conversation/chat_bar_control_style.dart b/app/lib/features/chat/conversation/chat_bar_control_style.dart index 2536c089..5bd04969 100644 --- a/app/lib/features/chat/conversation/chat_bar_control_style.dart +++ b/app/lib/features/chat/conversation/chat_bar_control_style.dart @@ -23,19 +23,3 @@ ButtonStyle chatBarTextButtonStyle( /// Horizontal padding inside the bar's text buttons (model, mode). const EdgeInsets chatBarButtonPadding = EdgeInsets.symmetric(horizontal: 12); - -/// Puts [content] (a button's child) in the bar's foreground colour: the -/// chat's tint if it has one, else `onSurfaceVariant`. Kept for existing -/// callers; the Material path colours buttons with [chatBarTextButtonStyle]. -Widget chatBarCupertinoContent(BuildContext context, Widget content) { - final color = - ChatBarTintScope.foregroundOf(context) ?? - Theme.of(context).colorScheme.onSurfaceVariant; - return IconTheme.merge( - data: IconThemeData(color: color), - child: DefaultTextStyle.merge( - style: TextStyle(color: color), - child: content, - ), - ); -} diff --git a/app/lib/features/chat/conversation/chat_task_presentation.dart b/app/lib/features/chat/conversation/chat_task_presentation.dart index 01a649db..1a31a194 100644 --- a/app/lib/features/chat/conversation/chat_task_presentation.dart +++ b/app/lib/features/chat/conversation/chat_task_presentation.dart @@ -3,10 +3,6 @@ import 'package:flutter/material.dart'; import '../domain/chat_task_metadata.dart'; import '../../../ui/text/monospace.dart'; -/// Always false: the app is Material-only. Kept so existing callers compile; -/// a later run removes it with its callers. -bool taskCupertino(BuildContext context) => false; - Color taskSecondary(BuildContext context) => Theme.of(context).colorScheme.onSurfaceVariant; diff --git a/app/lib/features/chat/conversation/chat_thread_view.dart b/app/lib/features/chat/conversation/chat_thread_view.dart index 35abf0e4..8e04d58c 100644 --- a/app/lib/features/chat/conversation/chat_thread_view.dart +++ b/app/lib/features/chat/conversation/chat_thread_view.dart @@ -2,7 +2,6 @@ import '../../../shell/windows/window_scope.dart'; import '../../terminal/terminal_open_action.dart'; import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; @@ -1408,9 +1407,6 @@ class _ChatThreadViewState extends State { identifier: 'chat-files-toggle', onPressed: _toggleFiles, materialIcon: _filesVisible ? Icons.folder : Icons.folder_outlined, - cupertinoIcon: _filesVisible - ? CupertinoIcons.folder_fill - : CupertinoIcons.folder, ), ], moreActions: [ @@ -1422,7 +1418,6 @@ class _ChatThreadViewState extends State { label: 'Chat details', onPressed: _openInfo, materialIcon: Icons.info_outline, - cupertinoIcon: CupertinoIcons.info, ), ...widget.paneControls, chatShellRunMenuAction(onPressed: _runShellFromMenu), diff --git a/app/lib/features/chat/screen.dart b/app/lib/features/chat/screen.dart index c9c278d3..00f08340 100644 --- a/app/lib/features/chat/screen.dart +++ b/app/lib/features/chat/screen.dart @@ -13,7 +13,6 @@ import 'dart:async'; import '../../ui/motion/motion.dart'; import '../../ui/motion/container_transform_source.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart' show setEquals; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -407,14 +406,12 @@ class _ChatScreenState extends State label: 'Add chat pane', onPressed: () => _addPane(paneContext), materialIcon: Icons.add_box_outlined, - cupertinoIcon: CupertinoIcons.plus_square, ), if (_workspace.paneCount > 1) ChatBarAction( label: 'Open chats (${_workspace.paneCount})', onPressed: () => _pickPane(paneContext), materialIcon: Icons.view_quilt_outlined, - cupertinoIcon: CupertinoIcons.square_split_2x2, ), if (_workspace.paneCount > 1 && showsListBesideDetail(context)) chatCenterStageAction(ChatCenterStageController.instance), @@ -428,7 +425,6 @@ class _ChatScreenState extends State label: 'Close pane', onPressed: () => _closePane(pane.id), materialIcon: Icons.close, - cupertinoIcon: CupertinoIcons.xmark, ), ], ), @@ -507,8 +503,6 @@ class _ChatScreenState extends State ), ChatWorkspaceEntrance( visible: selected != null, - cupertino: - chatControlsStyleOf(context) == ChatControlsStyle.cupertino, child: ExcludeFocus( excluding: selected == null, child: MediaQuery( diff --git a/app/lib/features/chat/ui/folder_picker/folder_picker_list.dart b/app/lib/features/chat/ui/folder_picker/folder_picker_list.dart index 2001d1be..ba4b21d1 100644 --- a/app/lib/features/chat/ui/folder_picker/folder_picker_list.dart +++ b/app/lib/features/chat/ui/folder_picker/folder_picker_list.dart @@ -7,39 +7,33 @@ import 'folder_picker_status.dart'; /// The body: loading, the inline error, or recent folders (home level only) /// followed by the current folder's folders and its dimmed, unselectable files. class FolderPickerList extends StatelessWidget { - const FolderPickerList({ - super.key, - required this.cupertino, - required this.controller, - }); + const FolderPickerList({super.key, required this.controller}); - final bool cupertino; final FolderPickerController controller; @override Widget build(BuildContext context) { final listing = controller.listing; if (controller.error != null) { - return FolderPickerError(cupertino: cupertino, controller: controller); + return FolderPickerError(controller: controller); } if (listing == null) { - return FolderPickerLoading(cupertino: cupertino); + return FolderPickerLoading(); } final entries = controller.entries; final recents = controller.filter.trim().isEmpty ? controller.recents : const []; final rows = [ - if (controller.loading) FolderPickerLoadingBar(cupertino: cupertino), + if (controller.loading) const FolderPickerLoadingBar(), if (recents.isNotEmpty) ...[ - FolderSectionHeader(cupertino: cupertino, text: 'Recent folders'), + const FolderSectionHeader(text: 'Recent folders'), for (final path in recents) _RecentRow( label: homeRelativeLabel(listing.home, path), onTap: () => controller.open(path), ), FolderSectionHeader( - cupertino: cupertino, text: 'In ${homeRelativeLabel(listing.home, listing.path)}', ), ], @@ -52,7 +46,6 @@ class FolderPickerList extends StatelessWidget { ), if (entries.isEmpty) FolderPickerNote( - cupertino: cupertino, text: controller.filter.trim().isNotEmpty ? 'Nothing here matches “${controller.filter.trim()}”.' : controller.hiddenCount > 0 @@ -61,7 +54,6 @@ class FolderPickerList extends StatelessWidget { ), if (listing.truncated) FolderPickerNote( - cupertino: cupertino, text: 'This folder is large; only the first entries are shown. ' 'Use the filter or type the path instead.', @@ -107,7 +99,7 @@ class _EntryRow extends StatelessWidget { ? Row( mainAxisSize: MainAxisSize.min, children: [ - if (entry.isGitRepo) const FolderGitBadge(cupertino: false), + if (entry.isGitRepo) const FolderGitBadge(), const SizedBox(width: 4), const Icon(Icons.chevron_right), ], @@ -129,9 +121,7 @@ class _EntryRow extends StatelessWidget { /// The small "git" mark on a repository folder. class FolderGitBadge extends StatelessWidget { - const FolderGitBadge({super.key, required this.cupertino}); - - final bool cupertino; + const FolderGitBadge({super.key}); @override Widget build(BuildContext context) { diff --git a/app/lib/features/chat/ui/folder_picker/folder_picker_page.dart b/app/lib/features/chat/ui/folder_picker/folder_picker_page.dart index 03a4389e..df25c8a6 100644 --- a/app/lib/features/chat/ui/folder_picker/folder_picker_page.dart +++ b/app/lib/features/chat/ui/folder_picker/folder_picker_page.dart @@ -80,17 +80,10 @@ class _FolderPickerPageState extends State { final body = Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - FolderBreadcrumbs(cupertino: false, controller: _controller), - FolderPickerToolbar( - cupertino: false, - controller: _controller, - filter: _filter, - ), - Expanded( - child: FolderPickerList(cupertino: false, controller: _controller), - ), + FolderBreadcrumbs(controller: _controller), + FolderPickerToolbar(controller: _controller, filter: _filter), + Expanded(child: FolderPickerList(controller: _controller)), FolderStartBar( - cupertino: false, path: _controller.selectable, home: _controller.home, onStart: _start, diff --git a/app/lib/features/chat/ui/folder_picker/folder_picker_parts.dart b/app/lib/features/chat/ui/folder_picker/folder_picker_parts.dart index f95bd61e..eaa84475 100644 --- a/app/lib/features/chat/ui/folder_picker/folder_picker_parts.dart +++ b/app/lib/features/chat/ui/folder_picker/folder_picker_parts.dart @@ -7,13 +7,8 @@ import 'folder_picker_purpose.dart'; /// The path from `~` to the current folder; every crumb but the last opens /// that folder. It scrolls so the current folder stays visible. class FolderBreadcrumbs extends StatelessWidget { - const FolderBreadcrumbs({ - super.key, - required this.cupertino, - required this.controller, - }); + const FolderBreadcrumbs({super.key, required this.controller}); - final bool cupertino; final FolderPickerController controller; @override @@ -88,12 +83,10 @@ class FolderBreadcrumbs extends StatelessWidget { class FolderPickerToolbar extends StatelessWidget { const FolderPickerToolbar({ super.key, - required this.cupertino, required this.controller, required this.filter, }); - final bool cupertino; final FolderPickerController controller; final TextEditingController filter; @@ -153,14 +146,12 @@ class FolderPickerToolbar extends StatelessWidget { class FolderStartBar extends StatelessWidget { const FolderStartBar({ super.key, - required this.cupertino, required this.path, required this.home, required this.onStart, this.purpose = FolderPickerPurpose.startChat, }); - final bool cupertino; final String? path; final String? home; final VoidCallback onStart; diff --git a/app/lib/features/chat/ui/folder_picker/folder_picker_status.dart b/app/lib/features/chat/ui/folder_picker/folder_picker_status.dart index 219d2013..cee95dfe 100644 --- a/app/lib/features/chat/ui/folder_picker/folder_picker_status.dart +++ b/app/lib/features/chat/ui/folder_picker/folder_picker_status.dart @@ -5,9 +5,7 @@ import 'folder_picker_controller.dart'; /// First load: a centred native activity indicator. class FolderPickerLoading extends StatelessWidget { - const FolderPickerLoading({super.key, required this.cupertino}); - - final bool cupertino; + const FolderPickerLoading({super.key}); @override Widget build(BuildContext context) { @@ -22,9 +20,7 @@ class FolderPickerLoading extends StatelessWidget { /// A later load keeps the previous listing on screen under a thin indicator. class FolderPickerLoadingBar extends StatelessWidget { - const FolderPickerLoadingBar({super.key, required this.cupertino}); - - final bool cupertino; + const FolderPickerLoadingBar({super.key}); @override Widget build(BuildContext context) { @@ -38,13 +34,8 @@ class FolderPickerLoadingBar extends StatelessWidget { /// The server's refusal shown in place (outside home, permission denied, /// missing folder), with Retry, Back to the last good folder, and Home. class FolderPickerError extends StatelessWidget { - const FolderPickerError({ - super.key, - required this.cupertino, - required this.controller, - }); + const FolderPickerError({super.key, required this.controller}); - final bool cupertino; final FolderPickerController controller; @override @@ -97,13 +88,8 @@ class FolderPickerError extends StatelessWidget { /// A section label above recent folders and the folder's own entries. class FolderSectionHeader extends StatelessWidget { - const FolderSectionHeader({ - super.key, - required this.cupertino, - required this.text, - }); + const FolderSectionHeader({super.key, required this.text}); - final bool cupertino; final String text; @override @@ -120,13 +106,8 @@ class FolderSectionHeader extends StatelessWidget { /// A quiet explanatory line (empty folder, no matches, truncated listing). class FolderPickerNote extends StatelessWidget { - const FolderPickerNote({ - super.key, - required this.cupertino, - required this.text, - }); + const FolderPickerNote({super.key, required this.text}); - final bool cupertino; final String text; @override diff --git a/app/lib/features/chat/ui/sessions/chat_adaptive.dart b/app/lib/features/chat/ui/sessions/chat_adaptive.dart index 10884cd3..5831c600 100644 --- a/app/lib/features/chat/ui/sessions/chat_adaptive.dart +++ b/app/lib/features/chat/ui/sessions/chat_adaptive.dart @@ -1,21 +1,12 @@ import '../../../../ui/adaptive/segmented_bar_overflow.dart'; import 'package:flutter/material.dart'; -/// Which standard control family this screen renders. -enum ChatControlsStyle { material, cupertino } - -/// Always Material: the app is Material-only, so no screen ever asks for the -/// Cupertino family. The parameter stays for callers. -ChatControlsStyle chatControlsStyleOf(BuildContext context) => - ChatControlsStyle.material; - class ChatBarAction extends StatelessWidget implements SegmentedOverflowable { const ChatBarAction({ super.key, required this.label, required this.onPressed, required this.materialIcon, - required this.cupertinoIcon, this.identifier, }); @@ -23,8 +14,6 @@ class ChatBarAction extends StatelessWidget implements SegmentedOverflowable { final VoidCallback onPressed; final IconData materialIcon; - /// Kept for callers; the Material toolbar always draws [materialIcon]. - final IconData cupertinoIcon; final String? identifier; /// A narrow bar moves it into its More menu, under the bar's host's icon. diff --git a/app/lib/features/chat/ui/sessions/chat_sessions_screen.dart b/app/lib/features/chat/ui/sessions/chat_sessions_screen.dart index aed5f5e4..118ef1d3 100644 --- a/app/lib/features/chat/ui/sessions/chat_sessions_screen.dart +++ b/app/lib/features/chat/ui/sessions/chat_sessions_screen.dart @@ -4,7 +4,6 @@ import 'chat_machine_picker.dart'; import '../../../../ui/adaptive/segmented_bar.dart'; import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../../ui/layout/content_width.dart'; @@ -437,14 +436,12 @@ class _ChatSessionsScreenState extends State { label: 'New chat', onPressed: _newChat, materialIcon: Icons.add, - cupertinoIcon: CupertinoIcons.add, ), ChatBarAction( key: const Key('chat-refresh'), label: 'Refresh', onPressed: _controller.refresh, materialIcon: Icons.refresh, - cupertinoIcon: CupertinoIcons.refresh, ), ]; } diff --git a/app/lib/features/chat/workspace/chat_center_stage_action.dart b/app/lib/features/chat/workspace/chat_center_stage_action.dart index 262b3881..39dab9ec 100644 --- a/app/lib/features/chat/workspace/chat_center_stage_action.dart +++ b/app/lib/features/chat/workspace/chat_center_stage_action.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../ui/sessions/chat_adaptive.dart'; @@ -16,8 +15,5 @@ ChatBarAction chatCenterStageAction(ChatCenterStageController controller) { materialIcon: controller.value ? Icons.view_quilt_outlined : Icons.center_focus_strong_outlined, - cupertinoIcon: controller.value - ? CupertinoIcons.square_split_2x2 - : CupertinoIcons.viewfinder, ); } diff --git a/app/lib/features/chat/workspace/chat_workspace_entrance.dart b/app/lib/features/chat/workspace/chat_workspace_entrance.dart index 2c9f080f..d2b5a9af 100644 --- a/app/lib/features/chat/workspace/chat_workspace_entrance.dart +++ b/app/lib/features/chat/workspace/chat_workspace_entrance.dart @@ -9,12 +9,10 @@ class ChatWorkspaceEntrance extends StatefulWidget { const ChatWorkspaceEntrance({ super.key, required this.visible, - required this.cupertino, required this.child, }); final bool visible; - final bool cupertino; final Widget child; @override diff --git a/app/notes/material-chat-cleanup.md b/app/notes/material-chat-cleanup.md new file mode 100644 index 00000000..96c69090 --- /dev/null +++ b/app/notes/material-chat-cleanup.md @@ -0,0 +1,16 @@ +# Material chat cleanup evidence + +- Removed live Cupertino imports, icon metadata, the obsolete `ChatControlsStyle` + branch, and unused always-false presentation helpers from the assigned chat + lanes. +- Removed local Cupertino compatibility flags from workspace entrance and folder + picker widgets; shared `SegmentedBar`/`SegmentedBackButton` compatibility + arguments remain because those APIs are outside this lane. +- Preserved Material icons, native back behavior, pane focus, workspace + transitions, folder navigation, and session behavior. +- Focused watchdog: 50 passed, 0 failed across sessions, folder picker, + workspace entrance/workspace, floating pane, focus, toolbar tint, and header + tests. +- `tool/analyze.sh`: clean. +- No rendered capture was performed; these changes remove alternate metadata and + branches without changing Material layout or visual behavior. diff --git a/app/test/features/chat/conversation/chat_bar_tint_test.dart b/app/test/features/chat/conversation/chat_bar_tint_test.dart index 907d4ce6..34e8f45b 100644 --- a/app/test/features/chat/conversation/chat_bar_tint_test.dart +++ b/app/test/features/chat/conversation/chat_bar_tint_test.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -38,7 +37,6 @@ Widget _header({ label: 'Files', onPressed: () {}, materialIcon: Icons.folder_outlined, - cupertinoIcon: CupertinoIcons.folder, ), ], ); diff --git a/app/test/features/chat/conversation/chat_thread_header_test.dart b/app/test/features/chat/conversation/chat_thread_header_test.dart index 7a54fc00..696ce2e9 100644 --- a/app/test/features/chat/conversation/chat_thread_header_test.dart +++ b/app/test/features/chat/conversation/chat_thread_header_test.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/chat/conversation/chat_bar_control_style.dart'; @@ -56,7 +55,6 @@ void main() { label: 'More action', onPressed: () {}, materialIcon: Icons.more_horiz, - cupertinoIcon: CupertinoIcons.ellipsis, ), ], ), @@ -206,14 +204,12 @@ void main() { label: 'Sidebar action', onPressed: () => sidebar++, materialIcon: Icons.menu, - cupertinoIcon: CupertinoIcons.sidebar_left, ), paneControls: [ ChatBarAction( label: 'Pane action', onPressed: () => pane++, materialIcon: Icons.add_box, - cupertinoIcon: CupertinoIcons.plus_square, ), ], ), diff --git a/app/test/features/chat/workspace/chat_workspace_entrance_test.dart b/app/test/features/chat/workspace/chat_workspace_entrance_test.dart index c92a22ef..a0f403d7 100644 --- a/app/test/features/chat/workspace/chat_workspace_entrance_test.dart +++ b/app/test/features/chat/workspace/chat_workspace_entrance_test.dart @@ -15,7 +15,6 @@ void main() { child: SizedBox.expand( child: ChatWorkspaceEntrance( visible: visible, - cupertino: false, child: Material(child: child), ), ),