Merge pull request #517 from macosui/dev

Latest from dev
macosui · Sep 19, 2024 · b821b5e · b821b5e
2 parents b642144 + 6313ee5
commit b821b5e
Show file tree

Hide file tree

Showing 34 changed files with 1,424 additions and 762 deletions.
diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,5 @@ metrics
 
 coverage_report
 coverage
+example/macos/Flutter/GeneratedPluginRegistrant.swift
+example/devtools_options.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
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(),
@@ -223,6 +221,7 @@ class _WidgetGalleryState extends State<WidgetGallery> {
                       label: Text('ResizablePane'),
                     ),
                   ],
+                  expandDisclosureItems: true,
                 ),
                 SidebarItem(
                   leading: MacosImageIcon(

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/example/macos/Podfile.lock b/example/macos/Podfile.lock
@@ -39,9 +39,9 @@ SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   macos_ui: 6229a8922cd97bafb7d9636c8eb8dfb0744183ca
   macos_window_utils: 933f91f64805e2eb91a5bd057cf97cd097276663
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
 
 PODFILE CHECKSUM: ff0a9a3ce75ee73f200ca7e2f47745698c917ef9
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3
diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj
@@ -202,7 +202,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/example/macos/Runner/AppDelegate.swift b/example/macos/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true