From f8540442d20dc22f14f92af15453ff9add8c0b29 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Thu, 29 Feb 2024 08:20:44 +0100 Subject: [PATCH 1/4] migrate device_info_plus to package:web --- .../device_info_plus/lib/src/device_info_plus_web.dart | 6 ++++-- packages/device_info_plus/device_info_plus/pubspec.yaml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart b/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart index fd3fee6442..9c6c61556c 100644 --- a/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart +++ b/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'dart:html' as html show window, Navigator; +import 'package:web/web.dart' as html show window, Navigator; import 'package:device_info_plus_platform_interface/device_info_plus_platform_interface.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; @@ -28,7 +28,9 @@ class DeviceInfoPlusWebPlugin extends DeviceInfoPlatform { 'appCodeName': _navigator.appCodeName, 'appName': _navigator.appName, 'appVersion': _navigator.appVersion, - 'deviceMemory': _navigator.deviceMemory, + // property is missing. + // ticket: https://github.com/dart-lang/web/issues/192 + // 'deviceMemory': _navigator.deviceMemory, 'language': _navigator.language, 'languages': _navigator.languages, 'platform': _navigator.platform, diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index d9ef03442c..5de69583aa 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -33,6 +33,7 @@ dependencies: flutter_web_plugins: sdk: flutter meta: ^1.8.0 + web: '>=0.3.0 <=0.6.0' # win32 is compatible across v4 and v5 for Win32 only (not COM) win32: ">=4.0.0 <6.0.0" @@ -46,5 +47,5 @@ dev_dependencies: test: ^1.22.0 environment: - sdk: ">=2.18.0 <4.0.0" + sdk: ">=3.2.0 <4.0.0" flutter: ">=3.3.0" From dbe3c0470fc4e3db333cfa4322e869372db5def1 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Thu, 29 Feb 2024 09:07:54 +0100 Subject: [PATCH 2/4] Navigator requires web 0.5.0 --- packages/device_info_plus/device_info_plus/pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index 5de69583aa..792452f9d1 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -33,7 +33,7 @@ dependencies: flutter_web_plugins: sdk: flutter meta: ^1.8.0 - web: '>=0.3.0 <=0.6.0' + web: '>=0.5.0 <=0.6.0' # win32 is compatible across v4 and v5 for Win32 only (not COM) win32: ">=4.0.0 <6.0.0" @@ -47,5 +47,5 @@ dev_dependencies: test: ^1.22.0 environment: - sdk: ">=3.2.0 <4.0.0" + sdk: ">=3.3.0 <4.0.0" flutter: ">=3.3.0" From 157ebb41f354a03b6a733d1b68c36fd1c40ba273 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Thu, 29 Feb 2024 19:51:41 +0100 Subject: [PATCH 3/4] external extension function to read device memory --- .../device_info_plus/lib/src/device_info_plus_web.dart | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart b/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart index 9c6c61556c..708b85222e 100644 --- a/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart +++ b/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart @@ -28,9 +28,7 @@ class DeviceInfoPlusWebPlugin extends DeviceInfoPlatform { 'appCodeName': _navigator.appCodeName, 'appName': _navigator.appName, 'appVersion': _navigator.appVersion, - // property is missing. - // ticket: https://github.com/dart-lang/web/issues/192 - // 'deviceMemory': _navigator.deviceMemory, + 'deviceMemory': _navigator.deviceMemory, 'language': _navigator.language, 'languages': _navigator.languages, 'platform': _navigator.platform, @@ -46,3 +44,9 @@ class DeviceInfoPlusWebPlugin extends DeviceInfoPlatform { ); } } + +/// Property is missing. +/// Ticket: https://github.com/dart-lang/web/issues/192 +extension on html.Navigator { + external double get deviceMemory; +} From ad0ca413f07e27a975db885bf3d51c00e3656ab7 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Thu, 29 Feb 2024 19:53:36 +0100 Subject: [PATCH 4/4] fix type --- .../device_info_plus/lib/src/device_info_plus_web.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart b/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart index 708b85222e..4ebe0b874f 100644 --- a/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart +++ b/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart @@ -47,6 +47,7 @@ class DeviceInfoPlusWebPlugin extends DeviceInfoPlatform { /// Property is missing. /// Ticket: https://github.com/dart-lang/web/issues/192 +/// Probably won't be an int? in the future! extension on html.Navigator { - external double get deviceMemory; + external int? get deviceMemory; }