wip: fix issues.

app/README.md

@@ -18,7 +18,7 @@ class Test {
 
 ```
 
-2. `app` 项目目录下执行 `flutter packages pub run build_runner build`
+2. `app` 项目目录下执行 `flutter packages pub get && flutter packages pub run build_runner build --delete-conflicting-outputs`
 
 3. 将在 `lib/models/test.provider.dart` 生成如下代码:
 ```dart

app/lib/constants/sp_keys.dart

@@ -0,0 +1,3 @@
+class SPKeys {
+  static final String brightnessMode = 'BRIGHTNESS_MODE';
+}

app/lib/main.dart

@@ -1,3 +1,5 @@
+import 'package:dde_gesture_manager/models/configs.dart';
+import 'package:dde_gesture_manager/models/configs.provider.dart';
 import 'package:dde_gesture_manager/models/settings.provider.dart';
 import 'package:dde_gesture_manager/utils/init.dart';
 import 'package:flutter/foundation.dart';
@@ -17,17 +19,25 @@ class MyApp extends StatelessWidget {
     return MultiProvider(
       providers: [
         ChangeNotifierProvider(create: (context) => SettingsProvider()),
+        ChangeNotifierProvider(create: (context) => ConfigsProvider()),
       ],
       builder: (context, child) {
         var isDarkMode = context.watch<SettingsProvider>().isDarkMode;
+        var brightnessMode = context.watch<ConfigsProvider>().brightnessMode;
+        late bool showDarkMode;
+        if (brightnessMode == BrightnessMode.system) {
+          showDarkMode = isDarkMode ?? false;
+        } else {
+          showDarkMode = brightnessMode == BrightnessMode.dark;
+        }
         return MaterialApp(
           title: 'Flutter Demo',
           theme: ThemeData(
-            primarySwatch: isDarkMode == true ? Colors.blue : Colors.blue,
-            brightness: isDarkMode == true ? Brightness.dark : Brightness.light,
+            primarySwatch: showDarkMode ? Colors.blue : Colors.blue,
+            brightness: showDarkMode ? Brightness.dark : Brightness.light,
           ),
           home: AnimatedCrossFade(
-            crossFadeState: isDarkMode != null ? CrossFadeState.showFirst : CrossFadeState.showSecond,
+            crossFadeState: isDarkMode != null ? CrossFadeState.showSecond : CrossFadeState.showFirst,
             alignment: Alignment.center,
             layoutBuilder: (topChild, topChildKey, bottomChild, bottomChildKey) => Stack(
               clipBehavior: Clip.none,
@@ -37,14 +47,12 @@ class MyApp extends StatelessWidget {
                 Positioned(key: topChildKey, child: topChild),
               ],
             ),
-            firstChild: MyHomePage(title: 'Flutter Demo Home Page'),
-            secondChild: Builder(builder: (context) {
-              initEvents(context);
-              return Center(
-                child: CircularProgressIndicator(),
-              );
+            firstChild: Builder(builder: (context) {
+              Future.microtask(() => initEvents(context));
+              return Container();
             }),
-            duration: Duration(seconds: 1),
+            secondChild: MyHomePage(title: 'Flutter Demo Home Page'),
+            duration: Duration(milliseconds: 500),
           ),
         );
       },
@@ -72,6 +80,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
   @override
   Widget build(BuildContext context) {
+    var brightnessMode = context.watch<ConfigsProvider>().brightnessMode;
     return Scaffold(
       appBar: AppBar(
         title: Text(widget.title),
@@ -87,6 +96,40 @@ class _MyHomePageState extends State<MyHomePage> {
               '$_counter',
               style: Theme.of(context).textTheme.headline4,
             ),
+            ListTile(
+              title: const Text('System'),
+              leading: Radio<BrightnessMode>(
+                value: BrightnessMode.system,
+                groupValue: brightnessMode,
+                onChanged: (BrightnessMode? value) {
+                  context.read<ConfigsProvider>().setProps(brightnessMode: value);
+                },
+              ),
+            ),
+            ListTile(
+              title: const Text('Light'),
+              leading: Radio<BrightnessMode>(
+                value: BrightnessMode.light,
+                groupValue: brightnessMode,
+                onChanged: (BrightnessMode? value) {
+                  setState(() {
+                    context.read<ConfigsProvider>().setProps(brightnessMode: value);
+                  });
+                },
+              ),
+            ),
+            ListTile(
+              title: const Text('Dark'),
+              leading: Radio<BrightnessMode>(
+                value: BrightnessMode.dark,
+                groupValue: brightnessMode,
+                onChanged: (BrightnessMode? value) {
+                  setState(() {
+                    context.read<ConfigsProvider>().setProps(brightnessMode: value);
+                  });
+                },
+              ),
+            ),
           ],
         ),
       ),

app/lib/models/configs.dart

@@ -0,0 +1,19 @@
+import 'package:dde_gesture_manager/builder/provider_annotation.dart';
+import 'package:dde_gesture_manager/constants/sp_keys.dart';
+import 'package:dde_gesture_manager/utils/helper.dart';
+
+enum BrightnessMode {
+  system,
+  light,
+  dark,
+}
+
+@ProviderModel()
+class Configs {
+  @ProviderModelProp()
+  BrightnessMode? brightnessMode;
+
+  Configs() {
+    this.brightnessMode = BrightnessMode.values[H().sp.getInt(SPKeys.brightnessMode)?.clamp(0, 2) ?? 0];
+  }
+}

app/lib/models/settings.dart

@@ -4,7 +4,4 @@ import 'package:dde_gesture_manager/builder/provider_annotation.dart';
 class Settings {
   @ProviderModelProp()
   bool? isDarkMode;
-
-  @ProviderModelProp()
-  String? name;
 }

app/lib/utils/init_linux.dart

@@ -1,5 +1,4 @@
 import 'package:dde_gesture_manager/utils/helper.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:gsettings/gsettings.dart';
 import 'package:provider/provider.dart';
@@ -12,17 +11,22 @@ Future<void> initEvents(BuildContext context) async {
     context.read<SettingsProvider>().setProps(isDarkMode: isDark);
   } else {
     var xsettings = GSettings('com.deepin.xsettings');
-    xsettings.get('theme-name').then((value) {
-      Future.delayed(
-        Duration(seconds: 1),
-        () => context.read<SettingsProvider>().setProps(isDarkMode: value.toString().contains('dark')),
-      );
-    });
-    xsettings.keysChanged.listen((event) {
-      xsettings.get('theme-name').then((value) {
-        context.read<SettingsProvider>().setProps(isDarkMode: value.toString().contains('dark'));
+    String? themeName;
+    try {
+      themeName = (await xsettings.get('theme-name')).toString();
+    } catch (e) {
+      print(e);
+      context.read<SettingsProvider>().setProps(isDarkMode: false);
+    }
+
+    if (themeName != null) {
+      context.read<SettingsProvider>().setProps(isDarkMode: themeName.contains('dark'));
+      xsettings.keysChanged.listen((event) {
+        xsettings.get('theme-name').then((value) {
+          context.read<SettingsProvider>().setProps(isDarkMode: value.toString().contains('dark'));
+        });
       });
-    });
+    }
   }
 }