lee/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-12-13 03:28:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3351 from NicKoehler/file-manager-redesign

Browse Source 
Back icon fix and backgroundColor flutter migration
This commit is contained in:
RustDesk
2023-02-24 16:14:41 +08:00
committed by GitHub
parent ca991ff39f ab9acc76fc
commit af2ef7ac5e
14 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/common/widgets/chat_page.dart
View File

@@ -75,7 +75,8 @@ class ChatPage extends StatelessWidget implements PageShape {
hintText:
"${translate('Write a message')}...",
filled: true,
fillColor: Theme.of(context).backgroundColor,
fillColor:
Theme.of(context).colorScheme.background,
contentPadding: EdgeInsets.all(10),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(6),
@@ -88,7 +89,8 @@ class ChatPage extends StatelessWidget implements PageShape {
: defaultInputDecoration(
hintText:
"${translate('Write a message')}...",
fillColor: Theme.of(context).backgroundColor),
fillColor:
Theme.of(context).colorScheme.background),
sendButtonBuilder: defaultSendButton(
padding: EdgeInsets.symmetric(
horizontal: 6, vertical: 0),

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

@@ -170,8 +170,8 @@ class _PeerCardState extends State<_PeerCard>
),
Expanded(
child: Container(
decoration:
BoxDecoration(color: Theme.of(context).backgroundColor),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.background),
child: Row(
children: [
Expanded(
@@ -266,7 +266,7 @@ class _PeerCardState extends State<_PeerCard>
),
),
Container(
color: Theme.of(context).backgroundColor,
color: Theme.of(context).colorScheme.background,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@@ -1173,7 +1173,7 @@ class ActionMore extends StatelessWidget {
radius: 14,
backgroundColor: _hover.value
? Theme.of(context).scaffoldBackgroundColor
: Theme.of(context).backgroundColor,
: Theme.of(context).colorScheme.background,
child: Icon(Icons.more_vert,
size: 18,
color: _hover.value

7
flutter/lib/common/widgets/peer_tab_page.dart
View File

@@ -156,7 +156,7 @@ class _PeerTabPageState extends State<PeerTabPage>
padding: const EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration(
color: model.currentTab == t
? Theme.of(context).backgroundColor
? Theme.of(context).colorScheme.background
: null,
borderRadius: BorderRadius.circular(isDesktop ? 2 : 6),
),
@@ -231,7 +231,8 @@ class _PeerTabPageState extends State<PeerTabPage>
Widget _createPeerViewTypeSwitch(BuildContext context) {
final textColor = Theme.of(context).textTheme.titleLarge?.color;
final activeDeco = BoxDecoration(color: Theme.of(context).backgroundColor);
final activeDeco =
BoxDecoration(color: Theme.of(context).colorScheme.background);
return Row(
children: [PeerUiType.grid, PeerUiType.list]
.map((type) => Obx(
@@ -351,7 +352,7 @@ class _PeerSearchBarState extends State<PeerSearchBar> {
return Container(
width: 120,
decoration: BoxDecoration(
color: Theme.of(context).backgroundColor,
color: Theme.of(context).colorScheme.background,
borderRadius: BorderRadius.circular(6),
),
child: Obx(() => Row(