From e759b62f5d9dd15520ddd7b2e52d55702b810f6a Mon Sep 17 00:00:00 2001 From: csf Date: Wed, 26 Oct 2022 21:13:32 +0900 Subject: [PATCH] opt cm chat icon style --- flutter/lib/common/widgets/overlay.dart | 9 ++++---- flutter/lib/consts.dart | 1 + .../lib/desktop/pages/file_manager_page.dart | 22 +++++++++---------- flutter/lib/desktop/pages/server_page.dart | 8 +++---- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/flutter/lib/common/widgets/overlay.dart b/flutter/lib/common/widgets/overlay.dart index 44b3f1308..81797962e 100644 --- a/flutter/lib/common/widgets/overlay.dart +++ b/flutter/lib/common/widgets/overlay.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; import 'package:provider/provider.dart'; +import '../../consts.dart'; import '../../desktop/widgets/tabbar_widget.dart'; import '../../models/chat_model.dart'; import '../../models/model.dart'; @@ -173,17 +174,17 @@ class DraggableMobileActions extends StatelessWidget { IconButton( color: Colors.white, onPressed: onBackPressed, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: const Icon(Icons.arrow_back)), IconButton( color: Colors.white, onPressed: onHomePressed, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: const Icon(Icons.home)), IconButton( color: Colors.white, onPressed: onRecentPressed, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: const Icon(Icons.more_horiz)), const VerticalDivider( width: 0, @@ -194,7 +195,7 @@ class DraggableMobileActions extends StatelessWidget { IconButton( color: Colors.white, onPressed: onHidePressed, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: const Icon(Icons.keyboard_arrow_down)), ], ), diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart index 726ae24be..b040ed9b0 100644 --- a/flutter/lib/consts.dart +++ b/flutter/lib/consts.dart @@ -37,6 +37,7 @@ const Size kConnectionManagerWindowSize = Size(300, 400); // Tabbar transition duration, now we remove the duration const Duration kTabTransitionDuration = Duration.zero; const double kEmptyMarginTop = 50; +const double kDesktopIconButtonSplashRadius = 20; /// [kDefaultScrollAmountMultiplier] indicates how many rows can be scrolled after a minimum scroll action of mouse const kDefaultScrollAmountMultiplier = 5.0; diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart index e31a0e1d9..042158fcb 100644 --- a/flutter/lib/desktop/pages/file_manager_page.dart +++ b/flutter/lib/desktop/pages/file_manager_page.dart @@ -175,7 +175,7 @@ class _FileManagerPageState extends State }, child: IconButton( icon: const Icon(Icons.more_vert), - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, onPressed: () => mod_menu.showMenu( context: context, position: menuPos, @@ -482,12 +482,12 @@ class _FileManagerPageState extends State onPressed: () { model.resumeJob(item.id); }, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: const Icon(Icons.restart_alt_rounded)), ), IconButton( icon: const Icon(Icons.delete_forever_outlined), - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, onPressed: () { model.jobTable.removeAt(index); model.cancelJob(item.id); @@ -556,7 +556,7 @@ class _FileManagerPageState extends State children: [ IconButton( icon: const Icon(Icons.arrow_back), - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, onPressed: () { selectedItems.clear(); model.goBack(isLocal: isLocal); @@ -564,7 +564,7 @@ class _FileManagerPageState extends State ), IconButton( icon: const Icon(Icons.arrow_upward), - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, onPressed: () { selectedItems.clear(); model.goToParentDirectory(isLocal: isLocal); @@ -614,13 +614,13 @@ class _FileManagerPageState extends State Future.delayed( Duration.zero, () => focusNode.requestFocus()); }, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: Icon(Icons.search)); case LocationStatus.pathLocation: return IconButton( color: Theme.of(context).disabledColor, onPressed: null, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: Icon(Icons.close)); case LocationStatus.fileSearchBar: return IconButton( @@ -638,7 +638,7 @@ class _FileManagerPageState extends State breadCrumbScrollToEnd(isLocal); model.refresh(isLocal: isLocal); }, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: const Icon(Icons.refresh)), ], ), @@ -655,7 +655,7 @@ class _FileManagerPageState extends State model.goHome(isLocal: isLocal); }, icon: const Icon(Icons.home_outlined), - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, ), IconButton( onPressed: () { @@ -704,7 +704,7 @@ class _FileManagerPageState extends State ); }); }, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: const Icon(Icons.create_new_folder_outlined)), IconButton( onPressed: validItems(selectedItems) @@ -714,7 +714,7 @@ class _FileManagerPageState extends State selectedItems.clear(); } : null, - splashRadius: 20, + splashRadius: kDesktopIconButtonSplashRadius, icon: const Icon(Icons.delete_forever_outlined)), menu(isLocal: isLocal), ], diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart index 94e0c2197..1dd4a0563 100644 --- a/flutter/lib/desktop/pages/server_page.dart +++ b/flutter/lib/desktop/pages/server_page.dart @@ -334,10 +334,10 @@ class _CmHeaderState extends State<_CmHeader> Offstage( offstage: !client.authorized || client.isFileTransfer, child: IconButton( - onPressed: () => checkClickTime( - client.id, () => gFFI.chatModel.toggleCMChatPage(client.id)), - icon: Icon(Icons.message_outlined), - ), + onPressed: () => checkClickTime( + client.id, () => gFFI.chatModel.toggleCMChatPage(client.id)), + icon: Icon(Icons.message_outlined), + splashRadius: kDesktopIconButtonSplashRadius), ) ], );