Skip to content

Commit b821b5e

Browse files
authored
Merge pull request #517 from macosui/dev
Latest from dev
2 parents b642144 + 6313ee5 commit b821b5e

34 files changed

+1424
-762
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,5 @@ metrics
8080

8181
coverage_report
8282
coverage
83+
example/macos/Flutter/GeneratedPluginRegistrant.swift
84+
example/devtools_options.yaml

CHANGELOG.md

+115-79
Large diffs are not rendered by default.

example/lib/main.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ class MacosUIGalleryApp extends StatelessWidget {
4747
final appTheme = context.watch<AppTheme>();
4848
return MacosApp(
4949
title: 'macos_ui Widget Gallery',
50-
theme: MacosThemeData.light(),
51-
darkTheme: MacosThemeData.dark(),
5250
themeMode: appTheme.mode,
5351
debugShowCheckedModeBanner: false,
5452
home: const WidgetGallery(),
@@ -223,6 +221,7 @@ class _WidgetGalleryState extends State<WidgetGallery> {
223221
label: Text('ResizablePane'),
224222
),
225223
],
224+
expandDisclosureItems: true,
226225
),
227226
SidebarItem(
228227
leading: MacosImageIcon(

example/lib/pages/buttons_page.dart

+14-5
Original file line numberDiff line numberDiff line change
@@ -558,11 +558,20 @@ class _ButtonsPageState extends State<ButtonsPage> {
558558
const SizedBox(height: 16),
559559
const WidgetTextTitle2(widgetName: 'MacosCheckbox'),
560560
const SizedBox(height: 8),
561-
MacosCheckbox(
562-
value: switchValue,
563-
onChanged: (value) {
564-
setState(() => switchValue = value);
565-
},
561+
Row(
562+
children: [
563+
MacosCheckbox(
564+
value: switchValue,
565+
onChanged: (value) {
566+
setState(() => switchValue = value);
567+
},
568+
),
569+
const SizedBox(width: 8),
570+
MacosCheckbox(
571+
value: switchValue,
572+
onChanged: null,
573+
),
574+
],
566575
),
567576
const SizedBox(height: 16),
568577
const WidgetTextTitle2(widgetName: 'MacosRadioButton'),

example/macos/Podfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ SPEC CHECKSUMS:
3939
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
4040
macos_ui: 6229a8922cd97bafb7d9636c8eb8dfb0744183ca
4141
macos_window_utils: 933f91f64805e2eb91a5bd057cf97cd097276663
42-
path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
43-
url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
42+
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
43+
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
4444

4545
PODFILE CHECKSUM: ff0a9a3ce75ee73f200ca7e2f47745698c917ef9
4646

47-
COCOAPODS: 1.12.1
47+
COCOAPODS: 1.14.3

example/macos/Runner.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
isa = PBXProject;
203203
attributes = {
204204
LastSwiftUpdateCheck = 0920;
205-
LastUpgradeCheck = 1300;
205+
LastUpgradeCheck = 1510;
206206
ORGANIZATIONNAME = "";
207207
TargetAttributes = {
208208
33CC10EC2044A3C60003C045 = {

example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

example/macos/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true

0 commit comments

Comments
 (0)