Skip to content

Commit b42bff8

Browse files
committed
API Changes from system_tray package
1 parent 2ff0c49 commit b42bff8

File tree

3 files changed

+8
-32
lines changed

3 files changed

+8
-32
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ lib/generated_plugin_registrant.dart
7676
**/ios/Flutter/flutter_assets/
7777
**/ios/ServiceDefinitions.json
7878
**/ios/Runner/GeneratedPluginRegistrant.*
79+
**/macos/Flutter/GeneratedPluginRegistrant.*
7980

8081
# Exceptions to above rules.
8182
!**/ios/**/default.mode1v3

lib/others/common.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,27 +182,27 @@ Future<void> initSystemTray() async {
182182
List<MenuItem> popularSites = [];
183183
Utils.initialSites.forEach((key, value) {
184184
popularSites.add(
185-
MenuItem(
185+
MenuItemLabel(
186186
label: key,
187-
onClicked: () {
187+
onClicked: (MenuItem item) {
188188
zeroNetUrl = defZeroNetUrl + value['url']!;
189189
launchUrl(Uri.parse(zeroNetUrl));
190190
},
191191
),
192192
);
193193
});
194194

195-
final menu = [
195+
final menuList = [
196196
SubMenu(
197197
label: "Popular Sites",
198198
children: [
199199
...popularSites,
200200
],
201201
),
202202
MenuSeparator(),
203-
MenuItem(
203+
MenuItemLabel(
204204
label: 'Exit',
205-
onClicked: appWindow.close,
205+
onClicked: (_) => appWindow.close,
206206
),
207207
];
208208

@@ -211,7 +211,8 @@ Future<void> initSystemTray() async {
211211
iconPath: path,
212212
toolTip: "ZeroNetX - ZeroNet Desktop Client",
213213
);
214-
214+
final menu = Menu();
215+
menu.buildFrom(menuList);
215216
await _systemTray.setContextMenu(menu);
216217

217218
_systemTray.registerSystemTrayEventHandler((eventName) {

macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)