remove fluent

This commit is contained in:
rustdesk
2023-05-24 14:18:42 +08:00
parent 7dcfcd4b18
commit bd3386e014
7 changed files with 100 additions and 138 deletions

View File

@@ -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(

View File

@@ -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,
),

View File

@@ -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'),
),
);
});