mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-06-08 02:12:49 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix id style and connect black theme text color

Browse Source
This commit is contained in:
rustdesk 2022-09-27 19:42:05 +08:00
parent 0eaa7d167e
commit 5e26d96a56
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/common.dart
View File

@ -133,6 +133,7 @@ class MyTheme {
scaffoldBackgroundColor: Color(0xFFEEEEEE), scaffoldBackgroundColor: Color(0xFFEEEEEE),
textTheme: const TextTheme( textTheme: const TextTheme(
titleLarge: TextStyle(fontSize: 19, color: Colors.black87), titleLarge: TextStyle(fontSize: 19, color: Colors.black87),
titleSmall: TextStyle(fontSize: 14, color: Colors.black87),
bodySmall: TextStyle(fontSize: 12, color: Colors.black54, height: 1.25), bodySmall: TextStyle(fontSize: 12, color: Colors.black54, height: 1.25),
bodyMedium: TextStyle(fontSize: 14, color: Colors.black54, height: 1.25), bodyMedium: TextStyle(fontSize: 14, color: Colors.black54, height: 1.25),
), ),
@ -162,6 +163,7 @@ class MyTheme {
scaffoldBackgroundColor: Color(0xFF141414), scaffoldBackgroundColor: Color(0xFF141414),
textTheme: const TextTheme( textTheme: const TextTheme(
titleLarge: TextStyle(fontSize: 19), titleLarge: TextStyle(fontSize: 19),
titleSmall: TextStyle(fontSize: 14),
bodySmall: TextStyle(fontSize: 12, height: 1.25), bodySmall: TextStyle(fontSize: 12, height: 1.25),
bodyMedium: TextStyle(fontSize: 14, height: 1.25)), bodyMedium: TextStyle(fontSize: 14, height: 1.25)),
cardColor: Color(0xFF252525), cardColor: Color(0xFF252525),

2
flutter/lib/common/widgets/peer_card.dart
View File

@ -169,6 +169,7 @@ class _PeerCardState extends State<_PeerCard>
child: Text( child: Text(
alias.isEmpty ? formatID(peer.id) : alias, alias.isEmpty ? formatID(peer.id) : alias,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.titleSmall,
)), )),
]).marginOnly(bottom: 2), ]).marginOnly(bottom: 2),
Align( Align(
@ -261,6 +262,7 @@ class _PeerCardState extends State<_PeerCard>
child: Text( child: Text(
peer.alias.isEmpty ? formatID(peer.id) : peer.alias, peer.alias.isEmpty ? formatID(peer.id) : peer.alias,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.titleSmall,
)), )),
]).paddingSymmetric(vertical: 8)), ]).paddingSymmetric(vertical: 8)),
_actionMore(peer), _actionMore(peer),

5
flutter/lib/desktop/pages/remote_tab_page.dart
View File

@ -9,6 +9,7 @@ import 'package:flutter_hbb/consts.dart';
import 'package:flutter_hbb/desktop/pages/remote_page.dart'; import 'package:flutter_hbb/desktop/pages/remote_page.dart';
import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
import 'package:flutter_hbb/utils/multi_window_manager.dart'; import 'package:flutter_hbb/utils/multi_window_manager.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import '../../mobile/widgets/dialog.dart'; import '../../mobile/widgets/dialog.dart';
@ -127,8 +128,8 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
icon, icon,
Tooltip( Tooltip(
message: '$msgDirect\n$msgSecure', message: '$msgDirect\n$msgSecure',
child: Image.asset( child: SvgPicture.asset(
'assets/${connectionType.secure.value}${connectionType.direct.value}.png', 'assets/${connectionType.secure.value}${connectionType.direct.value}.svg',
width: themeConf.iconSize, width: themeConf.iconSize,
height: themeConf.iconSize, height: themeConf.iconSize,
).paddingOnly(right: 5), ).paddingOnly(right: 5),

8
flutter/lib/desktop/widgets/button.dart
View File

@ -73,10 +73,10 @@ class _ButtonState extends State<Button> {
), ),
style: TextStyle( style: TextStyle(
fontSize: widget.textSize ?? 12.0, fontSize: widget.textSize ?? 12.0,
color: pressed.value || !widget.isOutline color: widget.isOutline
? Theme.of(context).backgroundColor ? widget.textColor ??
: widget.textColor ?? Theme.of(context).textTheme.titleLarge?.color
Theme.of(context).textTheme.titleLarge?.color), : Colors.white),
).marginSymmetric(horizontal: 12), ).marginSymmetric(horizontal: 12),
)), )),
)); ));