Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # app/lib/pages/local_manager.dart
2021-10-12 14:19:56 +08:00
parent 12cdbaecbe bf652afe6c
commit 1797ea1d5d
5 changed files with 151 additions and 35 deletions
@@ -1,7 +1,15 @@
 import 'package:dde_gesture_manager/builder/provider_annotation.dart';
+import 'package:flutter/material.dart';
+
+export 'package:flutter/material.dart' show Color;

@ProviderModel()
 class Settings {
  @ProviderModelProp()
  bool? isDarkMode;
+
+  @ProviderModelProp()
+  Color? activeColor;
+
+  Color get currentActiveColor => activeColor ?? const Color(0xff0069cc);
 }