Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #445 #471

Merged
merged 86 commits into from
Aug 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
aae8eb9
automatic changes
Adrian-Samoticha Aug 4, 2023
968cd31
imitate macOS’ push button look
Adrian-Samoticha Aug 6, 2023
b93084c
make push button appear secondary when window resigns main state
Adrian-Samoticha Aug 6, 2023
b4d22f1
migrate to stream builder
Adrian-Samoticha Aug 6, 2023
afc3a9c
fix incorrect text color in push button when window resigns main state
Adrian-Samoticha Aug 6, 2023
ab3092e
add missing comma
Adrian-Samoticha Aug 7, 2023
cb70113
implement `AccentColorListener`
Adrian-Samoticha Aug 7, 2023
6e77ab9
make push button listen to accent color changes
Adrian-Samoticha Aug 7, 2023
ba42d75
add missing comma
Adrian-Samoticha Aug 7, 2023
a549bca
deprecate `PushButtonTheme`
Adrian-Samoticha Aug 7, 2023
ba3d7ce
mimic macOS’ push button click effect
Adrian-Samoticha Aug 7, 2023
07490f0
do not init `WindowMainStateListener` if platform isn’t macOS
Adrian-Samoticha Aug 7, 2023
aa8f90d
do not init `AccentColorListener` if platform isn’t macOS
Adrian-Samoticha Aug 7, 2023
9b95a43
remove unused imports
Adrian-Samoticha Aug 7, 2023
0f52aaa
remove reference to deprecated API in documentation
Adrian-Samoticha Aug 7, 2023
85fe22f
deprecate `pressedOpacity`
Adrian-Samoticha Aug 7, 2023
856bfb0
remove deprecated `pressedOpacity` from `debugFillProperties`
Adrian-Samoticha Aug 7, 2023
3ca7e81
document `AccentColor`
Adrian-Samoticha Aug 7, 2023
3c96252
document `AccentColor` values
Adrian-Samoticha Aug 7, 2023
3d06510
increment version number
Adrian-Samoticha Aug 7, 2023
80bcf9a
add changelog entry for version 2.0.1
Adrian-Samoticha Aug 7, 2023
db6088b
upgrade to macos_window_utils 1.2.0
Adrian-Samoticha Aug 11, 2023
2423822
initialize `_isWindowMain` properly
Adrian-Samoticha Aug 11, 2023
1ef31a8
rename `isWindowMain` to `isMainWindow`
Adrian-Samoticha Aug 11, 2023
f064102
replace `print` with `debugPrint`
Adrian-Samoticha Aug 11, 2023
9040eb9
deprecate properties of `PushButtonThemeData` rather than `PushButton…
Adrian-Samoticha Aug 11, 2023
0df03af
fix typo in `AccentColor` documentation
Adrian-Samoticha Aug 11, 2023
bc32402
fix typo in `AccentColorListener` docs
Adrian-Samoticha Aug 11, 2023
ea6a7e5
automatic changes
Adrian-Samoticha Aug 4, 2023
f01d422
imitate macOS’ push button look
Adrian-Samoticha Aug 6, 2023
d0255e1
make push button appear secondary when window resigns main state
Adrian-Samoticha Aug 6, 2023
5e90519
migrate to stream builder
Adrian-Samoticha Aug 6, 2023
08727e0
fix incorrect text color in push button when window resigns main state
Adrian-Samoticha Aug 6, 2023
0c75ce2
add missing comma
Adrian-Samoticha Aug 7, 2023
7e9e602
implement `AccentColorListener`
Adrian-Samoticha Aug 7, 2023
6a31e1c
make push button listen to accent color changes
Adrian-Samoticha Aug 7, 2023
3eaab39
add missing comma
Adrian-Samoticha Aug 7, 2023
5d230a5
deprecate `PushButtonTheme`
Adrian-Samoticha Aug 7, 2023
c99b3f0
mimic macOS’ push button click effect
Adrian-Samoticha Aug 7, 2023
8196267
do not init `WindowMainStateListener` if platform isn’t macOS
Adrian-Samoticha Aug 7, 2023
555bae6
do not init `AccentColorListener` if platform isn’t macOS
Adrian-Samoticha Aug 7, 2023
b8b22d7
remove unused imports
Adrian-Samoticha Aug 7, 2023
04f2a11
remove reference to deprecated API in documentation
Adrian-Samoticha Aug 7, 2023
7e0f365
deprecate `pressedOpacity`
Adrian-Samoticha Aug 7, 2023
f27803d
remove deprecated `pressedOpacity` from `debugFillProperties`
Adrian-Samoticha Aug 7, 2023
cfacc99
document `AccentColor`
Adrian-Samoticha Aug 7, 2023
5cf616f
document `AccentColor` values
Adrian-Samoticha Aug 7, 2023
23ab438
increment version number
Adrian-Samoticha Aug 7, 2023
4aa2296
add changelog entry for version 2.0.1
Adrian-Samoticha Aug 7, 2023
c39ba50
upgrade to macos_window_utils 1.2.0
Adrian-Samoticha Aug 11, 2023
6a5dbe6
initialize `_isWindowMain` properly
Adrian-Samoticha Aug 11, 2023
6aa9d8a
rename `isWindowMain` to `isMainWindow`
Adrian-Samoticha Aug 11, 2023
db655a7
replace `print` with `debugPrint`
Adrian-Samoticha Aug 11, 2023
2058812
deprecate properties of `PushButtonThemeData` rather than `PushButton…
Adrian-Samoticha Aug 11, 2023
c017df4
fix typo in `AccentColor` documentation
Adrian-Samoticha Aug 11, 2023
5757632
fix typo in `AccentColorListener` docs
Adrian-Samoticha Aug 11, 2023
f767d4d
Merge branch 'macosui-dev' into dev
Adrian-Samoticha Aug 11, 2023
c97b901
remove push button theme test
Adrian-Samoticha Aug 11, 2023
ce55875
Update CHANGELOG.md
Adrian-Samoticha Aug 12, 2023
3c1d16f
change documentation of `WindowMainStateListener`
Adrian-Samoticha Aug 12, 2023
ad79ce5
update documentation
Adrian-Samoticha Aug 12, 2023
a90c980
update documentation
Adrian-Samoticha Aug 12, 2023
d229e15
update documentation
Adrian-Samoticha Aug 12, 2023
7d2ec54
change `var` to `final`
Adrian-Samoticha Aug 12, 2023
a3183b5
update deprecation message
Adrian-Samoticha Aug 12, 2023
92658d9
improve formatting
Adrian-Samoticha Aug 12, 2023
7b81123
improve formatting
Adrian-Samoticha Aug 12, 2023
fb22efa
fix grammatical error in debug print message
Adrian-Samoticha Aug 12, 2023
040b4a0
improve formatting
Adrian-Samoticha Aug 13, 2023
3a8aecb
rename `deinit` methods to `dispose`
Adrian-Samoticha Aug 15, 2023
48c2c26
move `utils.dart` into `utils` directory
Adrian-Samoticha Aug 15, 2023
ce94aa9
move `WindowMainStateListener` to separate file
Adrian-Samoticha Aug 15, 2023
ef8c156
move `AccentColorListener` to separate file
Adrian-Samoticha Aug 15, 2023
7fa0f23
move `MacOSBrightnessOverrideHandler` to separate file
Adrian-Samoticha Aug 15, 2023
3e50ae4
add example to `AccentColorListener`
Adrian-Samoticha Aug 15, 2023
47e6974
rename `isWindowMain` to `isMainWindow`
Adrian-Samoticha Aug 15, 2023
7b9b1b6
add example to `WindowMainStateListener`
Adrian-Samoticha Aug 15, 2023
a4b6c45
replace `child: ...` with `child: …` to avoid confusing the dots with…
Adrian-Samoticha Aug 19, 2023
4bd7d33
Update lib/src/utils/accent_color_listener.dart
Adrian-Samoticha Aug 19, 2023
21ebe83
Update lib/src/utils/accent_color_listener.dart
Adrian-Samoticha Aug 19, 2023
053befb
Update lib/src/utils/accent_color_listener.dart
Adrian-Samoticha Aug 19, 2023
9394422
rename `onChangedStream` to `onChanged`
Adrian-Samoticha Aug 19, 2023
76caa07
move `AccentColorListener` constructor to top of class
Adrian-Samoticha Aug 19, 2023
e8190d6
move `WindowMainStateListener` to top of class
Adrian-Samoticha Aug 19, 2023
673c720
add “Updated” heading to changelog entry for version 2.0.1
Adrian-Samoticha Aug 19, 2023
e78cd55
migrate to `ExcludeSemantics` in popup button
Adrian-Samoticha Aug 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [2.0.1]
### 🔄 Updated 🔄
* `PushButton` has received a facelift. It now mimics the look and feel of native macOS buttons more closely.
Adrian-Samoticha marked this conversation as resolved.
Show resolved Hide resolved
* **Note:** As a result, its `pressedOpacity` property and the `PushButtonTheme` class have been deprecated.

## [2.0.0]
### 🚨 Breaking Changes 🚨
* `macos_ui` has been migrated to utilize [macos_window_utils](https://pub.dev/packages/macos_window_utils) under the hood, which provides the following benefits:
Expand Down
2 changes: 2 additions & 0 deletions example/macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
import FlutterMacOS
import Foundation

import appkit_ui_element_colors
import macos_ui
import macos_window_utils
import path_provider_foundation
import url_launcher_macos

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
AppkitUiElementColorsPlugin.register(with: registry.registrar(forPlugin: "AppkitUiElementColorsPlugin"))
MacOSUiPlugin.register(with: registry.registrar(forPlugin: "MacOSUiPlugin"))
MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
Expand Down
8 changes: 7 additions & 1 deletion example/macos/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
PODS:
- appkit_ui_element_colors (1.0.0):
- FlutterMacOS
- FlutterMacOS (1.0.0)
- macos_ui (0.1.0):
- FlutterMacOS
Expand All @@ -11,13 +13,16 @@ PODS:
- FlutterMacOS

DEPENDENCIES:
- appkit_ui_element_colors (from `Flutter/ephemeral/.symlinks/plugins/appkit_ui_element_colors/macos`)
- FlutterMacOS (from `Flutter/ephemeral`)
- macos_ui (from `Flutter/ephemeral/.symlinks/plugins/macos_ui/macos`)
- macos_window_utils (from `Flutter/ephemeral/.symlinks/plugins/macos_window_utils/macos`)
- path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)

EXTERNAL SOURCES:
appkit_ui_element_colors:
:path: Flutter/ephemeral/.symlinks/plugins/appkit_ui_element_colors/macos
FlutterMacOS:
:path: Flutter/ephemeral
macos_ui:
Expand All @@ -30,6 +35,7 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos

SPEC CHECKSUMS:
appkit_ui_element_colors: 39bb2d80be3f19b152ccf4c70d5bbe6cba43d74a
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
macos_ui: 6229a8922cd97bafb7d9636c8eb8dfb0744183ca
macos_window_utils: 933f91f64805e2eb91a5bd057cf97cd097276663
Expand All @@ -38,4 +44,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: ff0a9a3ce75ee73f200ca7e2f47745698c917ef9

COCOAPODS: 1.11.3
COCOAPODS: 1.12.1
68 changes: 46 additions & 22 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
appkit_ui_element_colors:
dependency: transitive
description:
name: appkit_ui_element_colors
sha256: c3e50f900aae314d339de489535736238627071457c4a4a2dbbb1545b4f04f22
url: "https://pub.dev"
source: hosted
version: "1.0.0"
async:
dependency: transitive
description:
Expand Down Expand Up @@ -37,10 +45,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.17.2"
crypto:
dependency: transitive
description:
Expand All @@ -57,6 +65,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.5"
equatable:
dependency: transitive
description:
name: equatable
sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
url: "https://pub.dev"
source: hosted
version: "2.0.5"
fake_async:
dependency: transitive
description:
Expand Down Expand Up @@ -112,6 +128,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.1.0"
gradient_borders:
dependency: transitive
description:
name: gradient_borders
sha256: "69eeaff519d145a4c6c213ada1abae386bcc8981a4970d923e478ce7ba19e309"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
http:
dependency: transitive
description:
Expand All @@ -128,14 +152,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
js:
dependency: transitive
description:
name: js
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
url: "https://pub.dev"
source: hosted
version: "0.6.7"
lints:
dependency: transitive
description:
Expand All @@ -150,31 +166,31 @@ packages:
path: ".."
relative: true
source: path
version: "2.0.0"
version: "2.0.1"
macos_window_utils:
dependency: transitive
description:
name: macos_window_utils
sha256: b78a210aa70ca7ccad6e7b7b810fb4689c507f4a46e299214900b2a1eb70ea23
sha256: "43a90473f8786f00f07203e6819dab67e032f8896dafa4a6f85fbc71fba32c0b"
url: "https://pub.dev"
source: hosted
version: "1.1.3"
version: "1.2.0"
matcher:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.5.0"
meta:
dependency: transitive
description:
Expand Down Expand Up @@ -288,10 +304,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -328,10 +344,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.6.0"
typed_data:
dependency: transitive
description:
Expand Down Expand Up @@ -412,6 +428,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
win32:
dependency: transitive
description:
Expand All @@ -429,5 +453,5 @@ packages:
source: hosted
version: "1.0.0"
sdks:
dart: ">=3.0.0 <4.0.0"
dart: ">=3.1.0-185.0.dev <4.0.0"
flutter: ">=3.10.0"
11 changes: 7 additions & 4 deletions lib/src/buttons/popup_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1194,10 +1194,13 @@ class _MacosPopupButtonState<T> extends State<MacosPopupButton<T>>
}

hintIndex = items.length;
items.add(IgnorePointer(
ignoringSemantics: false,
child: displayedHint,
));
items.add(
ExcludeSemantics(
child: IgnorePointer(
child: displayedHint,
),
),
);
}

// If value is null (then _selectedIndex is null) then we
Expand Down
Loading
Loading