hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix colors in light theme

Browse Source
This commit is contained in:
NicKoehler 2023-02-22 22:44:06 +01:00
parent 325077435c
commit b5ca85fb9b
No known key found for this signature in database
GPG Key ID: BAE01394EB51AC58
1 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
flutter/lib/desktop/pages/file_manager_page.dart
View File

@ -567,7 +567,7 @@ class _FileManagerPageState extends State<FileManagerPage>
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).cardColor, color: Theme.of(context).cardColor,
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(8.0), Radius.circular(15.0),
), ),
), ),
child: Column( child: Column(
@ -584,7 +584,7 @@ class _FileManagerPageState extends State<FileManagerPage>
.tabBarTheme .tabBarTheme
.labelColor, .labelColor,
), ),
), ).paddingOnly(left: 15),
const SizedBox( const SizedBox(
width: 16.0, width: 16.0,
), ),
@ -602,44 +602,57 @@ class _FileManagerPageState extends State<FileManagerPage>
item.jobName, item.jobName,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
).paddingSymmetric(vertical: 10),
),
Text(
'${translate("Total")} ${readableFileSize(item.totalSize.toDouble())}',
style: TextStyle(
fontSize: 12,
color: MyTheme.darkGray,
), ),
), ),
Wrap( Offstage(
children: [ offstage:
Text( item.state != JobState.inProgress,
'${item.display()} ${max(0, item.fileNum)}/${item.fileCount} '), child: Text(
Text( '${translate("Speed")} ${readableFileSize(item.speed)}/s',
'${translate("files")} ${readableFileSize(item.totalSize.toDouble())} '), style: TextStyle(
Offstage( fontSize: 12,
offstage: item.state != color: MyTheme.darkGray,
JobState.inProgress,
child: Text(
'${"${readableFileSize(item.speed)}/s"} '),
), ),
Offstage( ),
offstage: item.state != ),
JobState.inProgress, Offstage(
child: LinearPercentIndicator( offstage:
padding: EdgeInsets.all(0), item.state == JobState.inProgress,
width: MediaQuery.of(context) child: Text(
.size translate(
.width * item.display(),
0.15,
animateFromLastPercent: true,
center: Text(
'${(item.finishedSize / item.totalSize * 100).toStringAsFixed(0)}%',
),
barRadius: Radius.circular(15),
percent: item.finishedSize /
item.totalSize,
progressColor: MyTheme.accent,
backgroundColor:
Color(0xFF4C4F62),
lineHeight:
kDesktopFileTransferRowHeight,
).paddingSymmetric(vertical: 15),
), ),
], style: TextStyle(
fontSize: 12,
color: MyTheme.darkGray,
),
),
),
Offstage(
offstage:
item.state != JobState.inProgress,
child: LinearPercentIndicator(
padding: EdgeInsets.only(right: 15),
animateFromLastPercent: true,
center: Text(
'${(item.finishedSize / item.totalSize * 100).toStringAsFixed(0)}%',
),
barRadius: Radius.circular(15),
percent: item.finishedSize /
item.totalSize,
progressColor: MyTheme.accent,
backgroundColor:
Theme.of(context).hoverColor,
lineHeight:
kDesktopFileTransferRowHeight,
).paddingSymmetric(vertical: 15),
), ),
], ],
), ),
@ -655,9 +668,7 @@ class _FileManagerPageState extends State<FileManagerPage>
}, },
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/refresh.svg", "assets/refresh.svg",
color: Theme.of(context) color: Colors.white,
.tabBarTheme
.labelColor,
), ),
color: MyTheme.accent, color: MyTheme.accent,
hoverColor: MyTheme.accent80, hoverColor: MyTheme.accent80,
@ -667,9 +678,7 @@ class _FileManagerPageState extends State<FileManagerPage>
padding: EdgeInsets.only(right: 15), padding: EdgeInsets.only(right: 15),
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/close.svg", "assets/close.svg",
color: Theme.of(context) color: Colors.white,
.tabBarTheme
.labelColor,
), ),
onPressed: () { onPressed: () {
model.jobTable.removeAt(index); model.jobTable.removeAt(index);