From d1f58a444d0bf143e9658cb0b2a43f363347530f Mon Sep 17 00:00:00 2001
From: 21pages <pages21@163.com>
Date: Wed, 1 Mar 2023 16:30:39 +0800
Subject: [PATCH] dark theme disabled button color, disabled combox color

Signed-off-by: 21pages <pages21@163.com>
---
 flutter/lib/common.dart                       | 21 ++++++++++++++-----
 .../desktop/pages/desktop_setting_page.dart   |  8 +++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index e0306a3a7..e049c0fe1 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -218,19 +218,30 @@ class MyTheme {
       labelColor: Colors.white70,
     ),
     scrollbarTheme: ScrollbarThemeData(
-      thumbColor: MaterialStateProperty.all(Colors.grey[500])
+      thumbColor: MaterialStateProperty.all(Colors.grey[500]),
     ),
     splashColor: Colors.transparent,
     highlightColor: Colors.transparent,
     splashFactory: isDesktop ? NoSplash.splashFactory : null,
     outlinedButtonTheme: OutlinedButtonThemeData(
-        style:
-            OutlinedButton.styleFrom(side: BorderSide(color: Colors.white38))),
+      style: OutlinedButton.styleFrom(
+        side: BorderSide(color: Colors.white38),
+        disabledForegroundColor: Colors.white70,
+      ),
+    ),
     textButtonTheme: isDesktop
         ? TextButtonThemeData(
-            style: ButtonStyle(splashFactory: NoSplash.splashFactory),
-          )
+            style: TextButton.styleFrom(
+            splashFactory: NoSplash.splashFactory,
+            disabledForegroundColor: Colors.white70,
+          ))
         : null,
+    elevatedButtonTheme: ElevatedButtonThemeData(
+      style: ElevatedButton.styleFrom(
+        disabledForegroundColor: Colors.white70,
+        disabledBackgroundColor: Colors.white10,
+      ),
+    ),
     checkboxTheme:
         const CheckboxThemeData(checkColor: MaterialStatePropertyAll(dark)),
     colorScheme: ColorScheme.fromSwatch(
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index 52f64c0e3..7d907d727 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -538,6 +538,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
               translate('Screen Share'),
               translate('Deny remote access'),
             ],
+            enabled: enabled,
             initialKey: initialKey,
             onChanged: (mode) async {
               String modeValue;
@@ -667,6 +668,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
 
           return _Card(title: 'Password', children: [
             _ComboBox(
+              enabled: !locked,
               keys: modeKeys,
               values: modeValues,
               initialKey: modeInitialKey,
@@ -1722,7 +1724,6 @@ class _ComboBox extends StatelessWidget {
     required this.values,
     required this.initialKey,
     required this.onChanged,
-    // ignore: unused_element
     this.enabled = true,
   }) : super(key: key);
 
@@ -1735,7 +1736,9 @@ class _ComboBox extends StatelessWidget {
     var ref = values[index].obs;
     current = keys[index];
     return Container(
-      decoration: BoxDecoration(border: Border.all(color: MyTheme.border)),
+      decoration: BoxDecoration(
+          border: Border.all(
+              color: _disabledTextColor(context, enabled) ?? MyTheme.border)),
       height: 30,
       child: Obx(() => DropdownButton<String>(
             isExpanded: true,
@@ -1744,6 +1747,7 @@ class _ComboBox extends StatelessWidget {
             underline: Container(
               height: 25,
             ),
+            style: TextStyle(color: _disabledTextColor(context, enabled)),
             icon: const Icon(
               Icons.expand_more_sharp,
               size: 20,