From bd3386e0142e4bca19afe4ff03c93d4f7bd85fe9 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Wed, 24 May 2023 14:18:42 +0800 Subject: [PATCH] remove fluent --- flutter/assets/chat2.svg | 1 + flutter/lib/common/widgets/chat_page.dart | 3 +- flutter/lib/desktop/pages/server_page.dart | 30 ++-- flutter/lib/models/chat_model.dart | 4 +- flutter/macos/Podfile.lock | 4 +- flutter/pubspec.lock | 192 +++++++++------------ flutter/pubspec.yaml | 4 - 7 files changed, 100 insertions(+), 138 deletions(-) create mode 100644 flutter/assets/chat2.svg diff --git a/flutter/assets/chat2.svg b/flutter/assets/chat2.svg new file mode 100644 index 000000000..6510b0e1d --- /dev/null +++ b/flutter/assets/chat2.svg @@ -0,0 +1 @@ + diff --git a/flutter/lib/common/widgets/chat_page.dart b/flutter/lib/common/widgets/chat_page.dart index 751178ea6..76d4eed3e 100644 --- a/flutter/lib/common/widgets/chat_page.dart +++ b/flutter/lib/common/widgets/chat_page.dart @@ -1,5 +1,4 @@ import 'package:dash_chat_2/dash_chat_2.dart'; -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/models/chat_model.dart'; @@ -102,7 +101,7 @@ class ChatPage extends StatelessWidget implements PageShape { padding: EdgeInsets.symmetric(horizontal: 6, vertical: 0), color: MyTheme.accent, - icon: FluentIcons.send_24_filled, + icon: Icons.send_rounded, ), ), messageOptions: MessageOptions( diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart index e5860a4f3..b959f9ac4 100644 --- a/flutter/lib/desktop/pages/server_page.dart +++ b/flutter/lib/desktop/pages/server_page.dart @@ -12,7 +12,6 @@ import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:window_manager/window_manager.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import '../../common.dart'; import '../../common/widgets/chat_page.dart'; @@ -433,10 +432,7 @@ class _CmHeaderState extends State<_CmHeader> client.id, () => gFFI.chatModel.toggleCMChatPage(client.id), ), - icon: Icon( - FluentIcons.chat_32_filled, - color: Colors.white, - ), + icon: SvgPicture.asset('assets/chat2.svg'), splashRadius: kDesktopIconButtonSplashRadius, ), ) @@ -533,7 +529,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { children: [ buildPermissionIcon( client.keyboard, - FluentIcons.keyboard_24_filled, + Icons.keyboard, (enabled) { bind.cmSwitchPermission( connId: client.id, name: "keyboard", enabled: enabled); @@ -545,7 +541,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { ), buildPermissionIcon( client.clipboard, - FluentIcons.clipboard_24_filled, + Icons.assignment_rounded, (enabled) { bind.cmSwitchPermission( connId: client.id, name: "clipboard", enabled: enabled); @@ -557,7 +553,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { ), buildPermissionIcon( client.audio, - FluentIcons.speaker_1_24_filled, + Icons.volume_up_rounded, (enabled) { bind.cmSwitchPermission( connId: client.id, name: "audio", enabled: enabled); @@ -569,7 +565,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { ), buildPermissionIcon( client.file, - FluentIcons.arrow_sort_24_filled, + Icons.upload_file_rounded, (enabled) { bind.cmSwitchPermission( connId: client.id, name: "file", enabled: enabled); @@ -581,7 +577,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { ), buildPermissionIcon( client.restart, - FluentIcons.arrow_sync_circle_20_filled, + Icons.restart_alt_rounded, (enabled) { bind.cmSwitchPermission( connId: client.id, name: "restart", enabled: enabled); @@ -593,7 +589,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { ), buildPermissionIcon( client.recording, - FluentIcons.record_stop_24_filled, + Icons.videocam_rounded, (enabled) { bind.cmSwitchPermission( connId: client.id, name: "recording", enabled: enabled); @@ -644,7 +640,7 @@ class _CmControlPanel extends StatelessWidget { color: Colors.red, onClick: () => closeVoiceCall(), icon: Icon( - FluentIcons.call_end_20_filled, + Icons.call_end_rounded, color: Colors.white, size: 14, ), @@ -661,7 +657,7 @@ class _CmControlPanel extends StatelessWidget { color: MyTheme.accent, onClick: () => handleVoiceCall(true), icon: Icon( - FluentIcons.call_20_filled, + Icons.call_rounded, color: Colors.white, size: 14, ), @@ -674,7 +670,7 @@ class _CmControlPanel extends StatelessWidget { color: Colors.red, onClick: () => handleVoiceCall(false), icon: Icon( - FluentIcons.call_dismiss_20_filled, + Icons.phone_disabled_rounded, color: Colors.white, size: 14, ), @@ -704,7 +700,7 @@ class _CmControlPanel extends StatelessWidget { windowManager.minimize(); }, icon: Icon( - FluentIcons.shield_checkmark_20_filled, + Icons.security_rounded, color: Colors.white, size: 14, ), @@ -720,7 +716,7 @@ class _CmControlPanel extends StatelessWidget { onClick: handleDisconnect, text: 'Disconnect', icon: Icon( - FluentIcons.plug_disconnected_20_filled, + Icons.link_off_rounded, color: Colors.white, size: 14, ), @@ -765,7 +761,7 @@ class _CmControlPanel extends StatelessWidget { }, text: 'Accept', icon: Icon( - FluentIcons.shield_checkmark_20_filled, + Icons.security_rounded, color: Colors.white, size: 14, ), diff --git a/flutter/lib/models/chat_model.dart b/flutter/lib/models/chat_model.dart index 6b3379310..ae8689dbb 100644 --- a/flutter/lib/models/chat_model.dart +++ b/flutter/lib/models/chat_model.dart @@ -2,12 +2,12 @@ import 'dart:async'; import 'package:dash_chat_2/dash_chat_2.dart'; import 'package:draggable_float_widget/draggable_float_widget.dart'; -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hbb/models/platform_model.dart'; import 'package:get/get_rx/src/rx_types/rx_types.dart'; import 'package:get/get.dart'; import 'package:window_manager/window_manager.dart'; + import 'package:flutter_svg/flutter_svg.dart'; import '../consts.dart'; import '../common.dart'; @@ -119,7 +119,7 @@ class ChatModel with ChangeNotifier { } }, backgroundColor: Theme.of(context).colorScheme.primary, - child: Icon(FluentIcons.chat_24_filled), + child: SvgPicture.asset('assets/chat2.svg'), ), ); }); diff --git a/flutter/macos/Podfile.lock b/flutter/macos/Podfile.lock index 030ce1de2..3f6ebb9b6 100644 --- a/flutter/macos/Podfile.lock +++ b/flutter/macos/Podfile.lock @@ -95,12 +95,12 @@ SPEC CHECKSUMS: FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 + path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852 screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38 sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea texture_rgba_renderer: cbed959a3c127122194a364e14b8577bd62dc8f2 uni_links_desktop: 45900fb319df48fcdea2df0756e9c2626696b026 - url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451 + url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2 wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9 window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 window_size: 339dafa0b27a95a62a843042038fa6c3c48de195 diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index 06920dc5c..79c95f690 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: args - sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611" + sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" async: dependency: transitive description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" charcode: dependency: transitive description: @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: cli_util - sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 url: "https://pub.dev" source: hosted - version: "0.3.5" + version: "0.4.0" clock: dependency: transitive description: @@ -229,10 +229,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" colorize: dependency: transitive description: @@ -281,14 +281,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.17.2" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be - url: "https://pub.dev" - source: hosted - version: "1.0.5" dart_style: dependency: transitive description: @@ -300,11 +292,12 @@ packages: dash_chat_2: dependency: "direct main" description: - name: dash_chat_2 - sha256: "7ffdeb023fb2c9e194e2147ef8e967d36e4481493178051ceb36d98c62396ddd" - url: "https://pub.dev" - source: hosted - version: "0.0.15" + path: "." + ref: HEAD + resolved-ref: "8d850ab63532c36ed1d594ad4c81d4391ec3b1e1" + url: "https://github.com/Kingtous/Dash-Chat-2.git" + source: git + version: "0.0.16" debounce_throttle: dependency: "direct main" description: @@ -316,17 +309,18 @@ packages: desktop_drop: dependency: "direct main" description: - name: desktop_drop - sha256: "0cd056191b701a2b5ba040f2306349e461fafdaa5df4569b2228cdf87b58eced" - url: "https://pub.dev" - source: hosted - version: "0.3.3" + path: "packages/desktop_drop" + ref: ba76531701885d9de8a69ee0167e1610cf76e440 + resolved-ref: ba76531701885d9de8a69ee0167e1610cf76e440 + url: "https://github.com/Kingtous/mixin-flutter-plugins.git" + source: git + version: "0.4.1" desktop_multi_window: dependency: "direct main" description: path: "." - ref: "6cd00db1d68443aeeb13dc89f6a090a0ad5dbb3e" - resolved-ref: "6cd00db1d68443aeeb13dc89f6a090a0ad5dbb3e" + ref: "30518303e28702bf6b8110465293c05d21bc4cd2" + resolved-ref: "30518303e28702bf6b8110465293c05d21bc4cd2" url: "https://github.com/Kingtous/rustdesk_desktop_multi_window" source: git version: "0.1.0" @@ -422,10 +416,10 @@ packages: dependency: "direct dev" description: name: ffigen - sha256: "42bbfddebacef09c9a4eb2d9ef4049fa6a39edb8622b72ca69200cb6f1e3a6c0" + sha256: "4bbf1fa19723a90578e991b9a95afca43bea856809890a26609618fa29087427" url: "https://pub.dev" source: hosted - version: "7.2.4" + version: "7.2.11" file: dependency: transitive description: @@ -450,14 +444,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" - fluentui_system_icons: - dependency: "direct main" - description: - name: fluentui_system_icons - sha256: "745d58831bba404532bebce20286fb1920c650a4cc74678990251a16fb4d2600" - url: "https://pub.dev" - source: hosted - version: "1.1.201" flutter: dependency: "direct main" description: flutter @@ -556,10 +542,10 @@ packages: dependency: "direct main" description: name: flutter_launcher_icons - sha256: ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" url: "https://pub.dev" source: hosted - version: "0.11.0" + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -601,10 +587,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2" + sha256: f991fdb1533c3caeee0cdc14b04f50f0c3916f0dbcbc05237ccbe4e3c6b93f3f url: "https://pub.dev" source: hosted - version: "1.1.6" + version: "2.0.5" flutter_web_plugins: dependency: transitive description: flutter @@ -694,18 +680,18 @@ packages: dependency: "direct dev" description: name: icons_launcher - sha256: c8e3ae1263822feafaec8a3c666ec84c2143470e1612f5481f1c875024c5f37e + sha256: f8ccfb80b56856b6eac586980bdd9c14f5ec24fb87127514055445ceb9424f4c url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.1.0" image: dependency: "direct main" description: name: image - sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6" + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "4.0.17" image_picker: dependency: "direct main" description: @@ -750,10 +736,10 @@ packages: dependency: transitive description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" io: dependency: transitive description: @@ -766,10 +752,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -814,10 +800,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -854,50 +840,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637 + sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745" url: "https://pub.dev" source: hosted - version: "1.4.3+1" - package_info_plus_linux: - dependency: transitive - description: - name: package_info_plus_linux - sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc" - url: "https://pub.dev" - source: hosted - version: "1.0.5" - package_info_plus_macos: - dependency: transitive - description: - name: package_info_plus_macos - sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6 - url: "https://pub.dev" - source: hosted - version: "1.3.0" + version: "3.1.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8 + sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" url: "https://pub.dev" source: hosted - version: "1.0.2" - package_info_plus_web: - dependency: transitive - description: - name: package_info_plus_web - sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b - url: "https://pub.dev" - source: hosted - version: "1.0.6" - package_info_plus_windows: - dependency: transitive - description: - name: package_info_plus_windows - sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc" - url: "https://pub.dev" - source: hosted - version: "2.1.0" + version: "2.0.1" password_strength: dependency: "direct main" description: @@ -910,18 +864,10 @@ packages: dependency: "direct main" description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" - path_drawing: - dependency: transitive - description: - name: path_drawing - sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977 - url: "https://pub.dev" - source: hosted - version: "1.0.1" + version: "1.8.3" path_parsing: dependency: transitive description: @@ -1111,10 +1057,10 @@ packages: dependency: "direct main" description: name: scroll_pos - sha256: cfca311b6b8d51538ff90e206fbe6ce3b36e7125ea6da4a40eb626c7f9f083b1 + sha256: "4246bff3afc779d87cdf650a67d42d67ae71b23ff020d14592e6b89e28a7f9cc" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.4.0" settings_ui: dependency: "direct main" description: @@ -1260,10 +1206,10 @@ packages: dependency: "direct main" description: name: toggle_switch - sha256: "3814548f25ee11f88d3b1905e2e7c8e47e4a406752f553ed287f6d86a2dcf91d" + sha256: "9e6af1f0c5a97d9de41109dc7b9e1b3bbe73417f89b10e0e44dc834fb493d4cb" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "2.1.0" tuple: dependency: "direct main" description: @@ -1393,6 +1339,30 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.7" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: ea8d3fc7b2e0f35de38a7465063ecfcf03d8217f7962aa2a6717132cb5d43a79 + url: "https://pub.dev" + source: hosted + version: "1.1.5" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: a5eaa5d19e123ad4f61c3718ca1ed921c4e6254238d9145f82aa214955d9aced + url: "https://pub.dev" + source: hosted + version: "1.1.5" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "15edc42f7eaa478ce854eaf1fbb9062a899c0e4e56e775dd73b7f4709c97c4ca" + url: "https://pub.dev" + source: hosted + version: "1.1.5" vector_math: dependency: transitive description: @@ -1445,10 +1415,10 @@ packages: dependency: "direct main" description: name: visibility_detector - sha256: "15c54a459ec2c17b4705450483f3d5a2858e733aee893dcee9d75fd04814940d" + sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420 url: "https://pub.dev" source: hosted - version: "0.3.3" + version: "0.4.0+2" wakelock: dependency: "direct main" description: @@ -1525,11 +1495,11 @@ packages: dependency: "direct main" description: path: "." - ref: "94ff0eeb7e20e93f50022b2090f0b6ffb725c7df" - resolved-ref: "94ff0eeb7e20e93f50022b2090f0b6ffb725c7df" + ref: "8cb5bf683e6b7b3f73280449900fe8d2c6bfe011" + resolved-ref: "8cb5bf683e6b7b3f73280449900fe8d2c6bfe011" url: "https://github.com/Kingtous/rustdesk_window_manager" source: git - version: "0.3.1" + version: "0.3.4" window_size: dependency: "direct main" description: @@ -1575,10 +1545,10 @@ packages: dependency: "direct main" description: name: zxing2 - sha256: "1913c33844c68b62573741134ef5f987f1e15e331c95ac7dc327afbb9896e9ec" + sha256: "1e141568c9646bc262fa75aacf739bc151ef6ad0226997c0016cc3da358a1bbc" url: "https://pub.dev" source: hosted - version: "0.1.1" + version: "0.2.0" sdks: - dart: ">=2.18.0 <4.0.0" - flutter: ">=3.3.0" + dart: ">=3.0.0-0 <4.0.0" + flutter: ">=3.7.0-0" diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 95aa3497f..949964dec 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -27,9 +27,6 @@ dependencies: flutter_localizations: sdk: flutter - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.3 ffi: ^2.0.1 path_provider: ^2.0.12 external_path: ^1.0.1 @@ -106,7 +103,6 @@ dependencies: texture_rgba_renderer: ^0.0.16 percent_indicator: ^4.2.2 dropdown_button2: ^2.0.0 - fluentui_system_icons: ^1.1.201 dev_dependencies: icons_launcher: ^2.0.4