Skip to content

Commit b5bfc2f

Browse files
boyan01boyan01
authored
[desktop_drop] improve enumerateDraggingItems on macOS (#215)
* improve enumerateDraggingItems on macOS * update changelog
1 parent 60efa8a commit b5bfc2f

File tree

10 files changed

+99
-82
lines changed

10 files changed

+99
-82
lines changed

‎packages/desktop_drop/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ build/
1010

1111
*.iml
1212

13-
pubspec.lock
13+
/pubspec.lock

‎packages/desktop_drop/CHANGELOG.md‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
# Changelog
22

3+
## 0.4.1
4+
5+
* [macOS] improve enumerateDraggingItems on macOS.
6+
37
## 0.4.0
4-
* [Android] update to later version of kotlin(1.5.2). [#155](https://github.com/MixinNetwork/flutter-plugins/pull/155) by [Cal Holloway](https://github.com/CalHoll)
5-
* [macOS] Fix broken gestures when used with modified MainFlutterWindow. [#162](https://github.com/MixinNetwork/flutter-plugins/pull/162) by [Josh Matthews](https://github.com/jmatth)
8+
9+
* [Android] update to later version of kotlin(1.5.2). [#155](https://github.com/MixinNetwork/flutter-plugins/pull/155)
10+
by [Cal Holloway](https://github.com/CalHoll)
11+
* [macOS] Fix broken gestures when used with modified
12+
MainFlutterWindow. [#162](https://github.com/MixinNetwork/flutter-plugins/pull/162)
13+
by [Josh Matthews](https://github.com/jmatth)
614

715
## 0.3.3
816

9-
* Fix dragging multiple files at once from Apple Music does not work well. [#72](https://github.com/MixinNetwork/flutter-plugins/issues/72)
17+
* Fix dragging multiple files at once from Apple Music does not work
18+
well. [#72](https://github.com/MixinNetwork/flutter-plugins/issues/72)
1019

1120
## 0.3.2
1221

@@ -19,6 +28,7 @@
1928
## 0.3.0
2029

2130
** BREAK CHANGES**
31+
2232
* replace DropDoneDetails property `urls: List<Uri>` to `files: List<XFile>`. which is more general.
2333

2434
## 0.2.0

‎packages/desktop_drop/example/lib/main.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class _ExampleDragTargetState extends State<ExampleDragTarget> {
9696
alignment: Alignment.topRight,
9797
child: Text(
9898
'$offset',
99-
style: Theme.of(context).textTheme.caption,
99+
style: Theme.of(context).textTheme.bodySmall,
100100
),
101101
)
102102
],

‎packages/desktop_drop/example/macos/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.11'
1+
platform :osx, '10.14'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎packages/desktop_drop/example/macos/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ EXTERNAL SOURCES:
1515

1616
SPEC CHECKSUMS:
1717
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
18-
FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
18+
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
1919

20-
PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
20+
PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
2121

2222
COCOAPODS: 1.11.3

‎packages/desktop_drop/example/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -203,7 +203,7 @@
203203
isa = PBXProject;
204204
attributes = {
205205
LastSwiftUpdateCheck = 0920;
206-
LastUpgradeCheck = 0930;
206+
LastUpgradeCheck = 1300;
207207
ORGANIZATIONNAME = "";
208208
TargetAttributes = {
209209
33CC10EC2044A3C60003C045 = {
@@ -256,6 +256,7 @@
256256
/* Begin PBXShellScriptBuildPhase section */
257257
3399D490228B24CF009A79C7 /* ShellScript */ = {
258258
isa = PBXShellScriptBuildPhase;
259+
alwaysOutOfDate = 1;
259260
buildActionMask = 2147483647;
260261
files = (
261262
);
@@ -404,7 +405,7 @@
404405
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
405406
GCC_WARN_UNUSED_FUNCTION = YES;
406407
GCC_WARN_UNUSED_VARIABLE = YES;
407-
MACOSX_DEPLOYMENT_TARGET = 10.11;
408+
MACOSX_DEPLOYMENT_TARGET = 10.14;
408409
MTL_ENABLE_DEBUG_INFO = NO;
409410
SDKROOT = macosx;
410411
SWIFT_COMPILATION_MODE = wholemodule;
@@ -483,7 +484,7 @@
483484
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
484485
GCC_WARN_UNUSED_FUNCTION = YES;
485486
GCC_WARN_UNUSED_VARIABLE = YES;
486-
MACOSX_DEPLOYMENT_TARGET = 10.11;
487+
MACOSX_DEPLOYMENT_TARGET = 10.14;
487488
MTL_ENABLE_DEBUG_INFO = YES;
488489
ONLY_ACTIVE_ARCH = YES;
489490
SDKROOT = macosx;
@@ -530,7 +531,7 @@
530531
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
531532
GCC_WARN_UNUSED_FUNCTION = YES;
532533
GCC_WARN_UNUSED_VARIABLE = YES;
533-
MACOSX_DEPLOYMENT_TARGET = 10.11;
534+
MACOSX_DEPLOYMENT_TARGET = 10.14;
534535
MTL_ENABLE_DEBUG_INFO = NO;
535536
SDKROOT = macosx;
536537
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/desktop_drop/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

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

‎packages/desktop_drop/example/pubspec.lock‎

Lines changed: 57 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,56 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
url: "https://pub.dartlang.org"
8+
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
9+
url: "https://pub.dev"
910
source: hosted
10-
version: "2.9.0"
11+
version: "2.10.0"
1112
boolean_selector:
1213
dependency: transitive
1314
description:
1415
name: boolean_selector
15-
url: "https://pub.dartlang.org"
16+
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
17+
url: "https://pub.dev"
1618
source: hosted
17-
version: "2.1.0"
19+
version: "2.1.1"
1820
characters:
1921
dependency: transitive
2022
description:
2123
name: characters
22-
url: "https://pub.dartlang.org"
24+
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
25+
url: "https://pub.dev"
2326
source: hosted
2427
version: "1.2.1"
2528
clock:
2629
dependency: transitive
2730
description:
2831
name: clock
29-
url: "https://pub.dartlang.org"
32+
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
33+
url: "https://pub.dev"
3034
source: hosted
3135
version: "1.1.1"
3236
collection:
3337
dependency: transitive
3438
description:
3539
name: collection
36-
url: "https://pub.dartlang.org"
40+
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
41+
url: "https://pub.dev"
3742
source: hosted
38-
version: "1.16.0"
43+
version: "1.17.0"
3944
cross_file:
4045
dependency: "direct main"
4146
description:
4247
name: cross_file
43-
url: "https://pub.dartlang.org"
48+
sha256: "552ffd2f851d4314958e6265452af1891959e00cd32b6d17452c5b836e27a0fa"
49+
url: "https://pub.dev"
4450
source: hosted
4551
version: "0.3.2"
4652
cupertino_icons:
4753
dependency: "direct main"
4854
description:
4955
name: cupertino_icons
50-
url: "https://pub.dartlang.org"
56+
sha256: "486b7bc707424572cdf7bd7e812a0c146de3fd47ecadf070254cc60383f21dd8"
57+
url: "https://pub.dev"
5158
source: hosted
5259
version: "1.0.3"
5360
desktop_drop:
@@ -61,7 +68,8 @@ packages:
6168
dependency: transitive
6269
description:
6370
name: fake_async
64-
url: "https://pub.dartlang.org"
71+
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
72+
url: "https://pub.dev"
6573
source: hosted
6674
version: "1.3.1"
6775
flutter:
@@ -73,7 +81,8 @@ packages:
7381
dependency: "direct dev"
7482
description:
7583
name: flutter_lints
76-
url: "https://pub.dartlang.org"
84+
sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
85+
url: "https://pub.dev"
7786
source: hosted
7887
version: "1.0.4"
7988
flutter_test:
@@ -90,42 +99,48 @@ packages:
9099
dependency: transitive
91100
description:
92101
name: js
93-
url: "https://pub.dartlang.org"
102+
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
103+
url: "https://pub.dev"
94104
source: hosted
95-
version: "0.6.4"
105+
version: "0.6.5"
96106
lints:
97107
dependency: transitive
98108
description:
99109
name: lints
100-
url: "https://pub.dartlang.org"
110+
sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
111+
url: "https://pub.dev"
101112
source: hosted
102113
version: "1.0.1"
103114
matcher:
104115
dependency: transitive
105116
description:
106117
name: matcher
107-
url: "https://pub.dartlang.org"
118+
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
119+
url: "https://pub.dev"
108120
source: hosted
109-
version: "0.12.12"
121+
version: "0.12.13"
110122
material_color_utilities:
111123
dependency: transitive
112124
description:
113125
name: material_color_utilities
114-
url: "https://pub.dartlang.org"
126+
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
127+
url: "https://pub.dev"
115128
source: hosted
116-
version: "0.1.5"
129+
version: "0.2.0"
117130
meta:
118131
dependency: transitive
119132
description:
120133
name: meta
121-
url: "https://pub.dartlang.org"
134+
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
135+
url: "https://pub.dev"
122136
source: hosted
123137
version: "1.8.0"
124138
path:
125139
dependency: transitive
126140
description:
127141
name: path
128-
url: "https://pub.dartlang.org"
142+
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
143+
url: "https://pub.dev"
129144
source: hosted
130145
version: "1.8.2"
131146
sky_engine:
@@ -137,51 +152,58 @@ packages:
137152
dependency: transitive
138153
description:
139154
name: source_span
140-
url: "https://pub.dartlang.org"
155+
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
156+
url: "https://pub.dev"
141157
source: hosted
142-
version: "1.9.0"
158+
version: "1.9.1"
143159
stack_trace:
144160
dependency: transitive
145161
description:
146162
name: stack_trace
147-
url: "https://pub.dartlang.org"
163+
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
164+
url: "https://pub.dev"
148165
source: hosted
149-
version: "1.10.0"
166+
version: "1.11.0"
150167
stream_channel:
151168
dependency: transitive
152169
description:
153170
name: stream_channel
154-
url: "https://pub.dartlang.org"
171+
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
172+
url: "https://pub.dev"
155173
source: hosted
156-
version: "2.1.0"
174+
version: "2.1.1"
157175
string_scanner:
158176
dependency: transitive
159177
description:
160178
name: string_scanner
161-
url: "https://pub.dartlang.org"
179+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
180+
url: "https://pub.dev"
162181
source: hosted
163-
version: "1.1.1"
182+
version: "1.2.0"
164183
term_glyph:
165184
dependency: transitive
166185
description:
167186
name: term_glyph
168-
url: "https://pub.dartlang.org"
187+
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
188+
url: "https://pub.dev"
169189
source: hosted
170190
version: "1.2.1"
171191
test_api:
172192
dependency: transitive
173193
description:
174194
name: test_api
175-
url: "https://pub.dartlang.org"
195+
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
196+
url: "https://pub.dev"
176197
source: hosted
177-
version: "0.4.12"
198+
version: "0.4.16"
178199
vector_math:
179200
dependency: transitive
180201
description:
181202
name: vector_math
182-
url: "https://pub.dartlang.org"
203+
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
204+
url: "https://pub.dev"
183205
source: hosted
184-
version: "2.1.2"
206+
version: "2.1.4"
185207
sdks:
186-
dart: ">=2.17.0-0 <3.0.0"
208+
dart: ">=2.18.0 <3.0.0"
187209
flutter: ">=1.22.0"

0 commit comments

Comments
 (0)