Merge branch 'macosui:dev' into dev

Adrian-Samoticha · May 5, 2024 · e4fde02 · e4fde02
2 parents 79447c3 + de31bfe
commit e4fde02
Show file tree

Hide file tree

Showing 15 changed files with 706 additions and 152 deletions.
diff --git a/.gitignore b/.gitignore
@@ -81,3 +81,4 @@ metrics
 coverage_report
 coverage
 example/macos/Flutter/GeneratedPluginRegistrant.swift
+example/devtools_options.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [2.0.7]
+### 🛠️ Updated 🛠️
+* Made most widgets aware of the user’s accent color and window state by adding respective fields to `MacosThemeData`.
+* `MacosCheckbox` has received a facelift to mimic the look and feel of native macOS checkboxes better.
+
 ## [2.0.6]
 ### 🛠️ Updated 🛠️
 * Implemented value equality for `MacosThemeData`.

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -47,8 +47,6 @@ class MacosUIGalleryApp extends StatelessWidget {
         final appTheme = context.watch<AppTheme>();
         return MacosApp(
           title: 'macos_ui Widget Gallery',
-          theme: MacosThemeData.light(),
-          darkTheme: MacosThemeData.dark(),
           themeMode: appTheme.mode,
           debugShowCheckedModeBanner: false,
           home: const WidgetGallery(),

diff --git a/example/lib/pages/buttons_page.dart b/example/lib/pages/buttons_page.dart
@@ -558,11 +558,20 @@ class _ButtonsPageState extends State<ButtonsPage> {
                   const SizedBox(height: 16),
                   const WidgetTextTitle2(widgetName: 'MacosCheckbox'),
                   const SizedBox(height: 8),
-                  MacosCheckbox(
-                    value: switchValue,
-                    onChanged: (value) {
-                      setState(() => switchValue = value);
-                    },
+                  Row(
+                    children: [
+                      MacosCheckbox(
+                        value: switchValue,
+                        onChanged: (value) {
+                          setState(() => switchValue = value);
+                        },
+                      ),
+                      const SizedBox(width: 8),
+                      MacosCheckbox(
+                        value: switchValue,
+                        onChanged: null,
+                      ),
+                    ],
                   ),
                   const SizedBox(height: 16),
                   const WidgetTextTitle2(widgetName: 'MacosRadioButton'),

diff --git a/lib/macos_ui.dart b/lib/macos_ui.dart
@@ -88,3 +88,4 @@ export 'src/theme/search_field_theme.dart';
 export 'src/theme/time_picker_theme.dart';
 export 'src/theme/tooltip_theme.dart';
 export 'src/theme/typography.dart';
+export 'src/enums/accent_color.dart';