[device_info_plus] make toMap() json compatible#950

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.

Sign up for GitHub

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

Closed
iapicca wants to merge 12 commits into from
Closed

[device_info_plus] make toMap() json compatible #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2c0b90e
[device_info_plus_platform_interface] rename method toMap to toJson i…
Jul 7, 2022
3c0b8e6
[device_info_plus_platform_interface] rename method toMap to toJson i…
Jul 7, 2022
609a700
[device_info_plus_platform_interface] update changelog and pubspec
Jul 7, 2022
0e29a2e
[device_info_plus_platform_interface] add missing tests
Jul 7, 2022
45ac46d
[device_info_plus_platform_interface] remove unnecessary calls in tests
Jul 7, 2022
f92c14b
[device_info_plus_platform_interface] remove duplicated tests
Jul 7, 2022
3252840
[device_info_plus_platform_interface] add missing test for in web_br…
Jul 7, 2022
2cb72f2
[device_info_plus_platform_interface] add missing test for browserNam…
Jul 7, 2022
3ae94df
restore toMap() in all device_info_plus_platform_interface models
Jul 18, 2022
5025899
remove toJson and fix web implementation
Jul 18, 2022
a68d64b
Merge branch 'main' into rename_device_info_base_to_map
Jul 18, 2022
a880118
update changelog
Jul 24, 2022
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
4 changes: 4 additions & 0 deletions packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 2.3.1+0

- ensure `toMap()` output compatible with `jsonEncode`

## 2.3.0+1

- Fix LinuxDeviceInfo.name docs
Expand Down
4 changes: 2 additions & 2 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/android_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {

/// Serializes [AndroidDeviceInfo] to map.
@override
Map<String, dynamic> toMap() {
Map<String, Object?> toMap() {
return {
'id': id,
'host': host,
Expand All@@ -141,7 +141,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
}

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfofromMap(Map<String, dynamic> map) {
factory AndroidDeviceInfo.fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
version: AndroidBuildVersion._fromMap(
map['version']?.cast<String, dynamic>() ?? {}),
Expand Down
2 changes: 1 addition & 1 deletion ...ages/device_info_plus/device_info_plus_platform_interface/lib/model/base_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();
Map<String, Object?> toMap();
}
34 changes: 17 additions & 17 deletions packages/device_info_plus/device_info_plus_platform_interface/lib/model/ios_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,24 +44,9 @@ class IosDeviceInfo implements BaseDeviceInfo {
/// Operating system information derived from `sys/utsname.h`.
final IosUtsname utsname;

/// Deserializes from the map message received from [_kChannel].
static IosDeviceInfo fromMap(Map<String, dynamic> map) {
return IosDeviceInfo(
name: map['name'],
systemName: map['systemName'],
systemVersion: map['systemVersion'],
model: map['model'],
localizedModel: map['localizedModel'],
identifierForVendor: map['identifierForVendor'],
isPhysicalDevice: map['isPhysicalDevice'] == 'true',
utsname:
IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
);
}

/// Serializes [IosDeviceInfo] to a map.
@override
Map<String, dynamic> toMap() {
Map<String, Object?> toMap() {
return {
'name': name,
'model': model,
Expand All@@ -73,6 +58,21 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// Deserializes from the map message received from [_kChannel].
factory IosDeviceInfo.fromMap(Map<String, dynamic> map) {
return IosDeviceInfo(
name: map['name'],
systemName: map['systemName'],
systemVersion: map['systemVersion'],
model: map['model'],
localizedModel: map['localizedModel'],
identifierForVendor: map['identifierForVendor'],
isPhysicalDevice: map['isPhysicalDevice'] == 'true',
utsname:
IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
);
}
}

/// Information derived from `utsname`.
Expand DownExpand Up@@ -113,7 +113,7 @@ class IosUtsname {
}

/// Serializes [ IosUtsname ] to map.
Map<String, dynamic> _toMap() {
Map<String, Object?> _toMap() {
return {
'release': release,
'version': version,
Expand Down
2 changes: 1 addition & 1 deletion ...ges/device_info_plus/device_info_plus_platform_interface/lib/model/linux_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ class LinuxDeviceInfo implements BaseDeviceInfo {

/// Serializes [LinuxDeviceInfo] to a map.
@override
Map<String, dynamic> toMap() {
Map<String, Object?> toMap() {
return {
'name': name,
'version': version,
Expand Down
4 changes: 2 additions & 2 deletions ...ges/device_info_plus/device_info_plus_platform_interface/lib/model/macos_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {

/// Serializes [MacOsDeviceInfo] to map.
@override
Map<String, dynamic> toMap() {
Map<String, Object?> toMap() {
return {
'arch': arch,
'model': model,
Expand All@@ -72,7 +72,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
}

/// Constructs a [MacOsDeviceInfo] from a Map of dynamic.
static MacOsDeviceInfofromMap(Map<dynamic, dynamic> map) {
factory MacOsDeviceInfo.fromMap(Map<dynamic, dynamic> map) {
return MacOsDeviceInfo(
computerName: map['computerName'],
hostName: map['hostName'],
Expand Down
85 changes: 47 additions & 38 deletions ...ages/device_info_plus/device_info_plus_platform_interface/lib/model/web_browser_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
required this.appCodeName,
required this.appName,
required this.appVersion,
required this.browserName,
required this.deviceMemory,
required this.language,
required this.languages,
Expand All@@ -51,12 +52,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
required this.vendorSub,
required this.maxTouchPoints,
required this.hardwareConcurrency,
});

/// the name of the current browser.
BrowserName get browserName {
return _parseUserAgentToBrowserName();
}
}) : assert(browserName == _parseUserAgentToBrowserName(userAgent));

/// the internal "code" name of the current browser.
/// Note: Do not rely on this property to return the correct value.
Expand All@@ -70,6 +66,9 @@ class WebBrowserInfo implements BaseDeviceInfo {
/// Note: Do not rely on this property to return the correct value.
final String? appVersion;

/// the name of the current browser.
final BrowserName browserName;

/// the amount of device memory in gigabytes. This value is an approximation given by rounding to the nearest power of 2 and dividing that number by 1024.
final int? deviceMemory;

Expand DownExpand Up@@ -109,11 +108,13 @@ class WebBrowserInfo implements BaseDeviceInfo {
final int? maxTouchPoints;

/// Deserializes from the map message received from [Navigator].
static WebBrowserInfofromMap(Map<String, dynamic> map) {
factory WebBrowserInfo.fromMap(Map<String, dynamic> map) {
return WebBrowserInfo(
appCodeName: map['appCodeName'],
appName: map['appName'],
appVersion: map['appVersion'],
browserName: _broserNameFromString(map['browserName']) ??
_parseUserAgentToBrowserName(map['userAgent']),
deviceMemory: map['deviceMemory'],
language: map['language'],
languages: map['languages'],
Expand All@@ -130,9 +131,9 @@ class WebBrowserInfo implements BaseDeviceInfo {

/// Serializes [WebBrowserInfo] to a map.
@override
Map<String, dynamic> toMap() {
Map<String, Object?> toMap() {
return {
'browserName': browserName,
'browserName': browserName.name,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -149,36 +150,44 @@ class WebBrowserInfo implements BaseDeviceInfo {
'maxTouchPoints': maxTouchPoints,
};
}
}

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
return BrowserName.unknown;
} else if (_userAgent.contains('Firefox')) {
return BrowserName.firefox;
// "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
} else if (_userAgent.contains('SamsungBrowser')) {
return BrowserName.samsungInternet;
// "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
} else if (_userAgent.contains('Opera') || _userAgent.contains('OPR')) {
return BrowserName.opera;
// "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
} else if (_userAgent.contains('Trident')) {
return BrowserName.msie;
// "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
} else if (_userAgent.contains('Edg')) {
return BrowserName.edge;
// https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
// "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
// "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
} else if (_userAgent.contains('Chrome')) {
return BrowserName.chrome;
// "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
} else if (_userAgent.contains('Safari')) {
return BrowserName.safari;
// "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
} else {
return BrowserName.unknown;
BrowserName? _broserNameFromString(String? name) {
for (final browserName in BrowserName.values) {
if (browserName.name == name) {
return browserName;
}
}
return null;
}

BrowserName _parseUserAgentToBrowserName(userAgent) {
if (userAgent == null) {
return BrowserName.unknown;
} else if (userAgent.contains('Firefox')) {
return BrowserName.firefox;
// "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
} else if (userAgent.contains('SamsungBrowser')) {
return BrowserName.samsungInternet;
// "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
} else if (userAgent.contains('Opera') || userAgent.contains('OPR')) {
return BrowserName.opera;
// "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
} else if (userAgent.contains('Trident')) {
return BrowserName.msie;
// "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
} else if (userAgent.contains('Edg')) {
return BrowserName.edge;
// https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
// "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
// "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
} else if (userAgent.contains('Chrome')) {
return BrowserName.chrome;
// "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
} else if (userAgent.contains('Safari')) {
return BrowserName.safari;
// "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
} else {
return BrowserName.unknown;
}
}
2 changes: 1 addition & 1 deletion packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: device_info_plus_platform_interface
description: A common platform interface for the device_info_plus plugin.
version: 2.3.0+1
version: 2.3.1+0
homepage: https://plus.fluttercommunity.dev/
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/

Expand Down
15 changes: 13 additions & 2 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/android_device_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/android_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -17,7 +19,7 @@ void main() {
const supported32BitAbis = <String?>['x86 (IA-32)', 'MMX'];
const supported64BitAbis = <String?>['x86-64', 'MMX', 'SSSE3'];
const systemFeatures = ['FEATURE_AUDIO_PRO', 'FEATURE_AUDIO_OUTPUT'];
final androidDeviceInfoMap = <String, dynamic>{
const androidDeviceInfoMap = <String, dynamic>{
'id': 'id',
'host': 'host',
'tags': 'tags',
Expand DownExpand Up@@ -74,12 +76,21 @@ void main() {
expect(androidDeviceInfo.version.securityPatch, 'securityPatch');
});

test('toMap should return map with correct key and map', () {
test('toJson should return map with correct key and map', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});

test('jsonEncode / jsonDecode should return the correct map', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

final json = jsonEncode(androidDeviceInfo.toMap());

expect(jsonDecode(json), androidDeviceInfoMap);
});
});
});
}
12 changes: 11 additions & 1 deletion ...device_info_plus/device_info_plus_platform_interface/test/model/ios_device_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/ios_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -38,11 +40,19 @@ void main() {
expect(iosDeviceInfo.utsname.nodename, 'nodename');
});

test('toMap should return map with correct key and map', () {
test('toJson should return map with correct key and map', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});

test('jsonEncode / jsonDecode should return the correct map', () {
final androidDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

final json = jsonEncode(androidDeviceInfo.toMap());

expect(jsonDecode(json), iosDeviceInfoMap);
});
});
});
}
62 changes: 35 additions & 27 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/linux_device_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/linux_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
group('$LinuxDeviceInfo', () {
test('toMap should return map with correct key and map', () {
final linuxDeviceInfo = LinuxDeviceInfo(
name: 'name',
version: 'version',
id: 'id',
idLike: ['idLike'],
versionCodename: 'versionCodename',
versionId: 'versionId',
prettyName: 'prettyName',
buildId: 'buildId',
variant: 'variant',
variantId: 'variantId',
machineId: 'machineId',
);
const linuxDeviceInfoMap = <String, Object?>{
'name': 'name',
'version': 'version',
'id': 'id',
'idLike': ['idLike'],
'versionCodename': 'versionCodename',
'versionId': 'versionId',
'prettyName': 'prettyName',
'buildId': 'buildId',
'variant': 'variant',
'variantId': 'variantId',
'machineId': 'machineId',
};

final linuxDeviceInfo = LinuxDeviceInfo(
name: 'name',
version: 'version',
id: 'id',
idLike: ['idLike'],
versionCodename: 'versionCodename',
versionId: 'versionId',
prettyName: 'prettyName',
buildId: 'buildId',
variant: 'variant',
variantId: 'variantId',
machineId: 'machineId',
);
test('toJson should return map with correct key and map', () {
expect(linuxDeviceInfo.toMap(), linuxDeviceInfoMap);
});
test('jsonEncode / jsonDecode should return the correct map', () {
final json = jsonEncode(linuxDeviceInfo.toMap());

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
'id': 'id',
'idLike': ['idLike'],
'versionCodename': 'versionCodename',
'versionId': 'versionId',
'prettyName': 'prettyName',
'buildId': 'buildId',
'variant': 'variant',
'variantId': 'variantId',
'machineId': 'machineId',
});
expect(jsonDecode(json), linuxDeviceInfoMap);
});
});
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[device_info_plus] make toMap() json compatible#950

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.

 Sign up for GitHub

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

 Closed

iapicca
wants to merge
12
commits into

from

 Closed


[device_info_plus] make toMap() json compatible
#950
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2c0b90e

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
3c0b8e6

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
609a700

[device_info_plus_platform_interface] update changelog and pubspec

Jul 7, 2022
0e29a2e

[device_info_plus_platform_interface] add missing tests

Jul 7, 2022
45ac46d

[device_info_plus_platform_interface] remove unnecessary calls in tests

Jul 7, 2022
f92c14b

[device_info_plus_platform_interface] remove duplicated tests

Jul 7, 2022
3252840

[device_info_plus_platform_interface] add missing test for in web_br…

Jul 7, 2022
2cb72f2

[device_info_plus_platform_interface] add missing test for browserNam…

Jul 7, 2022
3ae94df

restore toMap() in all device_info_plus_platform_interface models

Jul 18, 2022
5025899

remove toJson and fix web implementation

Jul 18, 2022
a68d64b

Merge branch 'main' into rename_device_info_base_to_map

Jul 18, 2022
a880118

update changelog

Jul 24, 2022

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


4 changes: 4 additions & 0 deletions
packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 2.3.1+0

- ensure `toMap()` output compatible with `jsonEncode`

## 2.3.0+1

- Fix LinuxDeviceInfo.name docs
Expand Down

4 changes: 2 additions & 2 deletions
...s/device_info_plus/device_info_plus_platform_interface/lib/model/android_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {

 /// Serializes [AndroidDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'id': id,
 'host': host,
Expand All@@ -141,7 +141,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
 }

 /// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfofromMap(Map<String, dynamic> map) {
factory AndroidDeviceInfo.fromMap(Map<String, dynamic> map) {
 return AndroidDeviceInfo(
 version: AndroidBuildVersion._fromMap(
 map['version']?.cast<String, dynamic>() ?? {}),
Expand Down

2 changes: 1 addition & 1 deletion
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/base_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
/// The base class for platform's device info.
abstract class BaseDeviceInfo {
 /// Serializes device info properties to a map.
 Map<String, dynamic> toMap();
 Map<String, Object?> toMap();
}

34 changes: 17 additions & 17 deletions
packages/device_info_plus/device_info_plus_platform_interface/lib/model/ios_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,24 +44,9 @@ class IosDeviceInfo implements BaseDeviceInfo {
 /// Operating system information derived from `sys/utsname.h`.
 final IosUtsname utsname;

 /// Deserializes from the map message received from [_kChannel].
 static IosDeviceInfo fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }

 /// Serializes [IosDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'model': model,
Expand All@@ -73,6 +58,21 @@ class IosDeviceInfo implements BaseDeviceInfo {
 'isPhysicalDevice': isPhysicalDevice.toString(),
 };
 }

 /// Deserializes from the map message received from [_kChannel].
 factory IosDeviceInfo.fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }
}

/// Information derived from `utsname`.
Expand DownExpand Up@@ -113,7 +113,7 @@ class IosUtsname {
 }

 /// Serializes [ IosUtsname ] to map.
 Map<String, dynamic> _toMap() {
 Map<String, Object?> _toMap() {
 return {
 'release': release,
 'version': version,
Expand Down

2 changes: 1 addition & 1 deletion
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/linux_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ class LinuxDeviceInfo implements BaseDeviceInfo {

 /// Serializes [LinuxDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'version': version,
Expand Down

4 changes: 2 additions & 2 deletions
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/macos_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {

 /// Serializes [MacOsDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'arch': arch,
 'model': model,
Expand All@@ -72,7 +72,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
 }

 /// Constructs a [MacOsDeviceInfo] from a Map of dynamic.
static MacOsDeviceInfofromMap(Map<dynamic, dynamic> map) {
factory MacOsDeviceInfo.fromMap(Map<dynamic, dynamic> map) {
 return MacOsDeviceInfo(
 computerName: map['computerName'],
 hostName: map['hostName'],
Expand Down

85 changes: 47 additions & 38 deletions
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/web_browser_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.appCodeName,
 required this.appName,
 required this.appVersion,
 required this.browserName,
 required this.deviceMemory,
 required this.language,
 required this.languages,
Expand All@@ -51,12 +52,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.vendorSub,
 required this.maxTouchPoints,
 required this.hardwareConcurrency,
 });

 /// the name of the current browser.
 BrowserName get browserName {
 return _parseUserAgentToBrowserName();
 }
 }) : assert(browserName == _parseUserAgentToBrowserName(userAgent));

 /// the internal "code" name of the current browser.
 /// Note: Do not rely on this property to return the correct value.
Expand All@@ -70,6 +66,9 @@ class WebBrowserInfo implements BaseDeviceInfo {
 /// Note: Do not rely on this property to return the correct value.
 final String? appVersion;

 /// the name of the current browser.
 final BrowserName browserName;

 /// the amount of device memory in gigabytes. This value is an approximation given by rounding to the nearest power of 2 and dividing that number by 1024.
 final int? deviceMemory;

Expand DownExpand Up@@ -109,11 +108,13 @@ class WebBrowserInfo implements BaseDeviceInfo {
 final int? maxTouchPoints;

 /// Deserializes from the map message received from [Navigator].
static WebBrowserInfofromMap(Map<String, dynamic> map) {
factory WebBrowserInfo.fromMap(Map<String, dynamic> map) {
 return WebBrowserInfo(
 appCodeName: map['appCodeName'],
 appName: map['appName'],
 appVersion: map['appVersion'],
 browserName: _broserNameFromString(map['browserName']) ??
 _parseUserAgentToBrowserName(map['userAgent']),
 deviceMemory: map['deviceMemory'],
 language: map['language'],
 languages: map['languages'],
Expand All@@ -130,9 +131,9 @@ class WebBrowserInfo implements BaseDeviceInfo {

 /// Serializes [WebBrowserInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'browserName': browserName,
 'browserName': browserName.name,
 'appCodeName': appCodeName,
 'appName': appName,
 'appVersion': appVersion,
Expand All@@ -149,36 +150,44 @@ class WebBrowserInfo implements BaseDeviceInfo {
 'maxTouchPoints': maxTouchPoints,
 };
 }
}

 BrowserName _parseUserAgentToBrowserName() {
 final _userAgent = userAgent;
 if (_userAgent == null) {
 return BrowserName.unknown;
 } else if (_userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (_userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (_userAgent.contains('Opera') || _userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (_userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (_userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (_userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (_userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
BrowserName? _broserNameFromString(String? name) {
 for (final browserName in BrowserName.values) {
 if (browserName.name == name) {
 return browserName;
 }
 }
 return null;
}

BrowserName _parseUserAgentToBrowserName(userAgent) {
 if (userAgent == null) {
 return BrowserName.unknown;
 } else if (userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (userAgent.contains('Opera') || userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
 }
}

2 changes: 1 addition & 1 deletion
packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: device_info_plus_platform_interface
description: A common platform interface for the device_info_plus plugin.
version: 2.3.0+1
version: 2.3.1+0
homepage: https://plus.fluttercommunity.dev/
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/

Expand Down

15 changes: 13 additions & 2 deletions
...ce_info_plus/device_info_plus_platform_interface/test/model/android_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/android_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -17,7 +19,7 @@ void main() {
 const supported32BitAbis = <String?>['x86 (IA-32)', 'MMX'];
 const supported64BitAbis = <String?>['x86-64', 'MMX', 'SSSE3'];
 const systemFeatures = ['FEATURE_AUDIO_PRO', 'FEATURE_AUDIO_OUTPUT'];
final androidDeviceInfoMap = <String, dynamic>{
const androidDeviceInfoMap = <String, dynamic>{
 'id': 'id',
 'host': 'host',
 'tags': 'tags',
Expand DownExpand Up@@ -74,12 +76,21 @@ void main() {
 expect(androidDeviceInfo.version.securityPatch, 'securityPatch');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), androidDeviceInfoMap);
 });
 });
 });
}

12 changes: 11 additions & 1 deletion
...device_info_plus/device_info_plus_platform_interface/test/model/ios_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/ios_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -38,11 +40,19 @@ void main() {
 expect(iosDeviceInfo.utsname.nodename, 'nodename');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), iosDeviceInfoMap);
 });
 });
 });
}

62 changes: 35 additions & 27 deletions
...vice_info_plus/device_info_plus_platform_interface/test/model/linux_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/linux_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
 group('$LinuxDeviceInfo', () {
 test('toMap should return map with correct key and map', () {
 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 const linuxDeviceInfoMap = <String, Object?>{
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 };

 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 test('toJson should return map with correct key and map', () {
 expect(linuxDeviceInfo.toMap(), linuxDeviceInfoMap);
 });
 test('jsonEncode / jsonDecode should return the correct map', () {
 final json = jsonEncode(linuxDeviceInfo.toMap());

 expect(linuxDeviceInfo.toMap(), {
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 });
 expect(jsonDecode(json), linuxDeviceInfoMap);
 });
 });
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[device_info_plus] make toMap() json compatible#950

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.

 Sign up for GitHub

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

 Closed

iapicca
wants to merge
12
commits into

from

 Closed


[device_info_plus] make toMap() json compatible
#950
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2c0b90e

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
3c0b8e6

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
609a700

[device_info_plus_platform_interface] update changelog and pubspec

Jul 7, 2022
0e29a2e

[device_info_plus_platform_interface] add missing tests

Jul 7, 2022
45ac46d

[device_info_plus_platform_interface] remove unnecessary calls in tests

Jul 7, 2022
f92c14b

[device_info_plus_platform_interface] remove duplicated tests

Jul 7, 2022
3252840

[device_info_plus_platform_interface] add missing test for in web_br…

Jul 7, 2022
2cb72f2

[device_info_plus_platform_interface] add missing test for browserNam…

Jul 7, 2022
3ae94df

restore toMap() in all device_info_plus_platform_interface models

Jul 18, 2022
5025899

remove toJson and fix web implementation

Jul 18, 2022
a68d64b

Merge branch 'main' into rename_device_info_base_to_map

Jul 18, 2022
a880118

update changelog

Jul 24, 2022

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


4 changes: 4 additions & 0 deletions
packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 2.3.1+0

- ensure `toMap()` output compatible with `jsonEncode`

## 2.3.0+1

- Fix LinuxDeviceInfo.name docs
Expand Down

4 changes: 2 additions & 2 deletions
...s/device_info_plus/device_info_plus_platform_interface/lib/model/android_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {

 /// Serializes [AndroidDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'id': id,
 'host': host,
Expand All@@ -141,7 +141,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
 }

 /// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfofromMap(Map<String, dynamic> map) {
factory AndroidDeviceInfo.fromMap(Map<String, dynamic> map) {
 return AndroidDeviceInfo(
 version: AndroidBuildVersion._fromMap(
 map['version']?.cast<String, dynamic>() ?? {}),
Expand Down

2 changes: 1 addition & 1 deletion
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/base_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
/// The base class for platform's device info.
abstract class BaseDeviceInfo {
 /// Serializes device info properties to a map.
 Map<String, dynamic> toMap();
 Map<String, Object?> toMap();
}

34 changes: 17 additions & 17 deletions
packages/device_info_plus/device_info_plus_platform_interface/lib/model/ios_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,24 +44,9 @@ class IosDeviceInfo implements BaseDeviceInfo {
 /// Operating system information derived from `sys/utsname.h`.
 final IosUtsname utsname;

 /// Deserializes from the map message received from [_kChannel].
 static IosDeviceInfo fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }

 /// Serializes [IosDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'model': model,
Expand All@@ -73,6 +58,21 @@ class IosDeviceInfo implements BaseDeviceInfo {
 'isPhysicalDevice': isPhysicalDevice.toString(),
 };
 }

 /// Deserializes from the map message received from [_kChannel].
 factory IosDeviceInfo.fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }
}

/// Information derived from `utsname`.
Expand DownExpand Up@@ -113,7 +113,7 @@ class IosUtsname {
 }

 /// Serializes [ IosUtsname ] to map.
 Map<String, dynamic> _toMap() {
 Map<String, Object?> _toMap() {
 return {
 'release': release,
 'version': version,
Expand Down

2 changes: 1 addition & 1 deletion
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/linux_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ class LinuxDeviceInfo implements BaseDeviceInfo {

 /// Serializes [LinuxDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'version': version,
Expand Down

4 changes: 2 additions & 2 deletions
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/macos_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {

 /// Serializes [MacOsDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'arch': arch,
 'model': model,
Expand All@@ -72,7 +72,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
 }

 /// Constructs a [MacOsDeviceInfo] from a Map of dynamic.
static MacOsDeviceInfofromMap(Map<dynamic, dynamic> map) {
factory MacOsDeviceInfo.fromMap(Map<dynamic, dynamic> map) {
 return MacOsDeviceInfo(
 computerName: map['computerName'],
 hostName: map['hostName'],
Expand Down

85 changes: 47 additions & 38 deletions
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/web_browser_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.appCodeName,
 required this.appName,
 required this.appVersion,
 required this.browserName,
 required this.deviceMemory,
 required this.language,
 required this.languages,
Expand All@@ -51,12 +52,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.vendorSub,
 required this.maxTouchPoints,
 required this.hardwareConcurrency,
 });

 /// the name of the current browser.
 BrowserName get browserName {
 return _parseUserAgentToBrowserName();
 }
 }) : assert(browserName == _parseUserAgentToBrowserName(userAgent));

 /// the internal "code" name of the current browser.
 /// Note: Do not rely on this property to return the correct value.
Expand All@@ -70,6 +66,9 @@ class WebBrowserInfo implements BaseDeviceInfo {
 /// Note: Do not rely on this property to return the correct value.
 final String? appVersion;

 /// the name of the current browser.
 final BrowserName browserName;

 /// the amount of device memory in gigabytes. This value is an approximation given by rounding to the nearest power of 2 and dividing that number by 1024.
 final int? deviceMemory;

Expand DownExpand Up@@ -109,11 +108,13 @@ class WebBrowserInfo implements BaseDeviceInfo {
 final int? maxTouchPoints;

 /// Deserializes from the map message received from [Navigator].
static WebBrowserInfofromMap(Map<String, dynamic> map) {
factory WebBrowserInfo.fromMap(Map<String, dynamic> map) {
 return WebBrowserInfo(
 appCodeName: map['appCodeName'],
 appName: map['appName'],
 appVersion: map['appVersion'],
 browserName: _broserNameFromString(map['browserName']) ??
 _parseUserAgentToBrowserName(map['userAgent']),
 deviceMemory: map['deviceMemory'],
 language: map['language'],
 languages: map['languages'],
Expand All@@ -130,9 +131,9 @@ class WebBrowserInfo implements BaseDeviceInfo {

 /// Serializes [WebBrowserInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'browserName': browserName,
 'browserName': browserName.name,
 'appCodeName': appCodeName,
 'appName': appName,
 'appVersion': appVersion,
Expand All@@ -149,36 +150,44 @@ class WebBrowserInfo implements BaseDeviceInfo {
 'maxTouchPoints': maxTouchPoints,
 };
 }
}

 BrowserName _parseUserAgentToBrowserName() {
 final _userAgent = userAgent;
 if (_userAgent == null) {
 return BrowserName.unknown;
 } else if (_userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (_userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (_userAgent.contains('Opera') || _userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (_userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (_userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (_userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (_userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
BrowserName? _broserNameFromString(String? name) {
 for (final browserName in BrowserName.values) {
 if (browserName.name == name) {
 return browserName;
 }
 }
 return null;
}

BrowserName _parseUserAgentToBrowserName(userAgent) {
 if (userAgent == null) {
 return BrowserName.unknown;
 } else if (userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (userAgent.contains('Opera') || userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
 }
}

2 changes: 1 addition & 1 deletion
packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: device_info_plus_platform_interface
description: A common platform interface for the device_info_plus plugin.
version: 2.3.0+1
version: 2.3.1+0
homepage: https://plus.fluttercommunity.dev/
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/

Expand Down

15 changes: 13 additions & 2 deletions
...ce_info_plus/device_info_plus_platform_interface/test/model/android_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/android_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -17,7 +19,7 @@ void main() {
 const supported32BitAbis = <String?>['x86 (IA-32)', 'MMX'];
 const supported64BitAbis = <String?>['x86-64', 'MMX', 'SSSE3'];
 const systemFeatures = ['FEATURE_AUDIO_PRO', 'FEATURE_AUDIO_OUTPUT'];
final androidDeviceInfoMap = <String, dynamic>{
const androidDeviceInfoMap = <String, dynamic>{
 'id': 'id',
 'host': 'host',
 'tags': 'tags',
Expand DownExpand Up@@ -74,12 +76,21 @@ void main() {
 expect(androidDeviceInfo.version.securityPatch, 'securityPatch');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), androidDeviceInfoMap);
 });
 });
 });
}

12 changes: 11 additions & 1 deletion
...device_info_plus/device_info_plus_platform_interface/test/model/ios_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/ios_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -38,11 +40,19 @@ void main() {
 expect(iosDeviceInfo.utsname.nodename, 'nodename');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), iosDeviceInfoMap);
 });
 });
 });
}

62 changes: 35 additions & 27 deletions
...vice_info_plus/device_info_plus_platform_interface/test/model/linux_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/linux_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
 group('$LinuxDeviceInfo', () {
 test('toMap should return map with correct key and map', () {
 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 const linuxDeviceInfoMap = <String, Object?>{
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 };

 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 test('toJson should return map with correct key and map', () {
 expect(linuxDeviceInfo.toMap(), linuxDeviceInfoMap);
 });
 test('jsonEncode / jsonDecode should return the correct map', () {
 final json = jsonEncode(linuxDeviceInfo.toMap());

 expect(linuxDeviceInfo.toMap(), {
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 });
 expect(jsonDecode(json), linuxDeviceInfoMap);
 });
 });
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[device_info_plus] make toMap() json compatible#950

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.

 Sign up for GitHub

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

 Closed

iapicca
wants to merge
12
commits into

from

 Closed


[device_info_plus] make toMap() json compatible
#950
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2c0b90e

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
3c0b8e6

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
609a700

[device_info_plus_platform_interface] update changelog and pubspec

Jul 7, 2022
0e29a2e

[device_info_plus_platform_interface] add missing tests

Jul 7, 2022
45ac46d

[device_info_plus_platform_interface] remove unnecessary calls in tests

Jul 7, 2022
f92c14b

[device_info_plus_platform_interface] remove duplicated tests

Jul 7, 2022
3252840

[device_info_plus_platform_interface] add missing test for in web_br…

Jul 7, 2022
2cb72f2

[device_info_plus_platform_interface] add missing test for browserNam…

Jul 7, 2022
3ae94df

restore toMap() in all device_info_plus_platform_interface models

Jul 18, 2022
5025899

remove toJson and fix web implementation

Jul 18, 2022
a68d64b

Merge branch 'main' into rename_device_info_base_to_map

Jul 18, 2022
a880118

update changelog

Jul 24, 2022

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


4 changes: 4 additions & 0 deletions
packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 2.3.1+0

- ensure `toMap()` output compatible with `jsonEncode`

## 2.3.0+1

- Fix LinuxDeviceInfo.name docs
Expand Down

4 changes: 2 additions & 2 deletions
...s/device_info_plus/device_info_plus_platform_interface/lib/model/android_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {

 /// Serializes [AndroidDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'id': id,
 'host': host,
Expand All@@ -141,7 +141,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
 }

 /// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfofromMap(Map<String, dynamic> map) {
factory AndroidDeviceInfo.fromMap(Map<String, dynamic> map) {
 return AndroidDeviceInfo(
 version: AndroidBuildVersion._fromMap(
 map['version']?.cast<String, dynamic>() ?? {}),
Expand Down

2 changes: 1 addition & 1 deletion
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/base_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
/// The base class for platform's device info.
abstract class BaseDeviceInfo {
 /// Serializes device info properties to a map.
 Map<String, dynamic> toMap();
 Map<String, Object?> toMap();
}

34 changes: 17 additions & 17 deletions
packages/device_info_plus/device_info_plus_platform_interface/lib/model/ios_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,24 +44,9 @@ class IosDeviceInfo implements BaseDeviceInfo {
 /// Operating system information derived from `sys/utsname.h`.
 final IosUtsname utsname;

 /// Deserializes from the map message received from [_kChannel].
 static IosDeviceInfo fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }

 /// Serializes [IosDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'model': model,
Expand All@@ -73,6 +58,21 @@ class IosDeviceInfo implements BaseDeviceInfo {
 'isPhysicalDevice': isPhysicalDevice.toString(),
 };
 }

 /// Deserializes from the map message received from [_kChannel].
 factory IosDeviceInfo.fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }
}

/// Information derived from `utsname`.
Expand DownExpand Up@@ -113,7 +113,7 @@ class IosUtsname {
 }

 /// Serializes [ IosUtsname ] to map.
 Map<String, dynamic> _toMap() {
 Map<String, Object?> _toMap() {
 return {
 'release': release,
 'version': version,
Expand Down

2 changes: 1 addition & 1 deletion
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/linux_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ class LinuxDeviceInfo implements BaseDeviceInfo {

 /// Serializes [LinuxDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'version': version,
Expand Down

4 changes: 2 additions & 2 deletions
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/macos_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {

 /// Serializes [MacOsDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'arch': arch,
 'model': model,
Expand All@@ -72,7 +72,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
 }

 /// Constructs a [MacOsDeviceInfo] from a Map of dynamic.
static MacOsDeviceInfofromMap(Map<dynamic, dynamic> map) {
factory MacOsDeviceInfo.fromMap(Map<dynamic, dynamic> map) {
 return MacOsDeviceInfo(
 computerName: map['computerName'],
 hostName: map['hostName'],
Expand Down

85 changes: 47 additions & 38 deletions
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/web_browser_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.appCodeName,
 required this.appName,
 required this.appVersion,
 required this.browserName,
 required this.deviceMemory,
 required this.language,
 required this.languages,
Expand All@@ -51,12 +52,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.vendorSub,
 required this.maxTouchPoints,
 required this.hardwareConcurrency,
 });

 /// the name of the current browser.
 BrowserName get browserName {
 return _parseUserAgentToBrowserName();
 }
 }) : assert(browserName == _parseUserAgentToBrowserName(userAgent));

 /// the internal "code" name of the current browser.
 /// Note: Do not rely on this property to return the correct value.
Expand All@@ -70,6 +66,9 @@ class WebBrowserInfo implements BaseDeviceInfo {
 /// Note: Do not rely on this property to return the correct value.
 final String? appVersion;

 /// the name of the current browser.
 final BrowserName browserName;

 /// the amount of device memory in gigabytes. This value is an approximation given by rounding to the nearest power of 2 and dividing that number by 1024.
 final int? deviceMemory;

Expand DownExpand Up@@ -109,11 +108,13 @@ class WebBrowserInfo implements BaseDeviceInfo {
 final int? maxTouchPoints;

 /// Deserializes from the map message received from [Navigator].
static WebBrowserInfofromMap(Map<String, dynamic> map) {
factory WebBrowserInfo.fromMap(Map<String, dynamic> map) {
 return WebBrowserInfo(
 appCodeName: map['appCodeName'],
 appName: map['appName'],
 appVersion: map['appVersion'],
 browserName: _broserNameFromString(map['browserName']) ??
 _parseUserAgentToBrowserName(map['userAgent']),
 deviceMemory: map['deviceMemory'],
 language: map['language'],
 languages: map['languages'],
Expand All@@ -130,9 +131,9 @@ class WebBrowserInfo implements BaseDeviceInfo {

 /// Serializes [WebBrowserInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'browserName': browserName,
 'browserName': browserName.name,
 'appCodeName': appCodeName,
 'appName': appName,
 'appVersion': appVersion,
Expand All@@ -149,36 +150,44 @@ class WebBrowserInfo implements BaseDeviceInfo {
 'maxTouchPoints': maxTouchPoints,
 };
 }
}

 BrowserName _parseUserAgentToBrowserName() {
 final _userAgent = userAgent;
 if (_userAgent == null) {
 return BrowserName.unknown;
 } else if (_userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (_userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (_userAgent.contains('Opera') || _userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (_userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (_userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (_userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (_userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
BrowserName? _broserNameFromString(String? name) {
 for (final browserName in BrowserName.values) {
 if (browserName.name == name) {
 return browserName;
 }
 }
 return null;
}

BrowserName _parseUserAgentToBrowserName(userAgent) {
 if (userAgent == null) {
 return BrowserName.unknown;
 } else if (userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (userAgent.contains('Opera') || userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
 }
}

2 changes: 1 addition & 1 deletion
packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: device_info_plus_platform_interface
description: A common platform interface for the device_info_plus plugin.
version: 2.3.0+1
version: 2.3.1+0
homepage: https://plus.fluttercommunity.dev/
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/

Expand Down

15 changes: 13 additions & 2 deletions
...ce_info_plus/device_info_plus_platform_interface/test/model/android_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/android_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -17,7 +19,7 @@ void main() {
 const supported32BitAbis = <String?>['x86 (IA-32)', 'MMX'];
 const supported64BitAbis = <String?>['x86-64', 'MMX', 'SSSE3'];
 const systemFeatures = ['FEATURE_AUDIO_PRO', 'FEATURE_AUDIO_OUTPUT'];
final androidDeviceInfoMap = <String, dynamic>{
const androidDeviceInfoMap = <String, dynamic>{
 'id': 'id',
 'host': 'host',
 'tags': 'tags',
Expand DownExpand Up@@ -74,12 +76,21 @@ void main() {
 expect(androidDeviceInfo.version.securityPatch, 'securityPatch');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), androidDeviceInfoMap);
 });
 });
 });
}

12 changes: 11 additions & 1 deletion
...device_info_plus/device_info_plus_platform_interface/test/model/ios_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/ios_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -38,11 +40,19 @@ void main() {
 expect(iosDeviceInfo.utsname.nodename, 'nodename');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), iosDeviceInfoMap);
 });
 });
 });
}

62 changes: 35 additions & 27 deletions
...vice_info_plus/device_info_plus_platform_interface/test/model/linux_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/linux_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
 group('$LinuxDeviceInfo', () {
 test('toMap should return map with correct key and map', () {
 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 const linuxDeviceInfoMap = <String, Object?>{
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 };

 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 test('toJson should return map with correct key and map', () {
 expect(linuxDeviceInfo.toMap(), linuxDeviceInfoMap);
 });
 test('jsonEncode / jsonDecode should return the correct map', () {
 final json = jsonEncode(linuxDeviceInfo.toMap());

 expect(linuxDeviceInfo.toMap(), {
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 });
 expect(jsonDecode(json), linuxDeviceInfoMap);
 });
 });
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[device_info_plus] make toMap() json compatible#950

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.

 Sign up for GitHub

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

 Closed

iapicca
wants to merge
12
commits into

from

 Closed


[device_info_plus] make toMap() json compatible
#950
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2c0b90e

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
3c0b8e6

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
609a700

[device_info_plus_platform_interface] update changelog and pubspec

Jul 7, 2022
0e29a2e

[device_info_plus_platform_interface] add missing tests

Jul 7, 2022
45ac46d

[device_info_plus_platform_interface] remove unnecessary calls in tests

Jul 7, 2022
f92c14b

[device_info_plus_platform_interface] remove duplicated tests

Jul 7, 2022
3252840

[device_info_plus_platform_interface] add missing test for in web_br…

Jul 7, 2022
2cb72f2

[device_info_plus_platform_interface] add missing test for browserNam…

Jul 7, 2022
3ae94df

restore toMap() in all device_info_plus_platform_interface models

Jul 18, 2022
5025899

remove toJson and fix web implementation

Jul 18, 2022
a68d64b

Merge branch 'main' into rename_device_info_base_to_map

Jul 18, 2022
a880118

update changelog

Jul 24, 2022

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


4 changes: 4 additions & 0 deletions
packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 2.3.1+0

- ensure `toMap()` output compatible with `jsonEncode`

## 2.3.0+1

- Fix LinuxDeviceInfo.name docs
Expand Down

4 changes: 2 additions & 2 deletions
...s/device_info_plus/device_info_plus_platform_interface/lib/model/android_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {

 /// Serializes [AndroidDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'id': id,
 'host': host,
Expand All@@ -141,7 +141,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
 }

 /// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfofromMap(Map<String, dynamic> map) {
factory AndroidDeviceInfo.fromMap(Map<String, dynamic> map) {
 return AndroidDeviceInfo(
 version: AndroidBuildVersion._fromMap(
 map['version']?.cast<String, dynamic>() ?? {}),
Expand Down

2 changes: 1 addition & 1 deletion
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/base_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
/// The base class for platform's device info.
abstract class BaseDeviceInfo {
 /// Serializes device info properties to a map.
 Map<String, dynamic> toMap();
 Map<String, Object?> toMap();
}

34 changes: 17 additions & 17 deletions
packages/device_info_plus/device_info_plus_platform_interface/lib/model/ios_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,24 +44,9 @@ class IosDeviceInfo implements BaseDeviceInfo {
 /// Operating system information derived from `sys/utsname.h`.
 final IosUtsname utsname;

 /// Deserializes from the map message received from [_kChannel].
 static IosDeviceInfo fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }

 /// Serializes [IosDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'model': model,
Expand All@@ -73,6 +58,21 @@ class IosDeviceInfo implements BaseDeviceInfo {
 'isPhysicalDevice': isPhysicalDevice.toString(),
 };
 }

 /// Deserializes from the map message received from [_kChannel].
 factory IosDeviceInfo.fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }
}

/// Information derived from `utsname`.
Expand DownExpand Up@@ -113,7 +113,7 @@ class IosUtsname {
 }

 /// Serializes [ IosUtsname ] to map.
 Map<String, dynamic> _toMap() {
 Map<String, Object?> _toMap() {
 return {
 'release': release,
 'version': version,
Expand Down

2 changes: 1 addition & 1 deletion
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/linux_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ class LinuxDeviceInfo implements BaseDeviceInfo {

 /// Serializes [LinuxDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'version': version,
Expand Down

4 changes: 2 additions & 2 deletions
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/macos_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {

 /// Serializes [MacOsDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'arch': arch,
 'model': model,
Expand All@@ -72,7 +72,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
 }

 /// Constructs a [MacOsDeviceInfo] from a Map of dynamic.
static MacOsDeviceInfofromMap(Map<dynamic, dynamic> map) {
factory MacOsDeviceInfo.fromMap(Map<dynamic, dynamic> map) {
 return MacOsDeviceInfo(
 computerName: map['computerName'],
 hostName: map['hostName'],
Expand Down

85 changes: 47 additions & 38 deletions
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/web_browser_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.appCodeName,
 required this.appName,
 required this.appVersion,
 required this.browserName,
 required this.deviceMemory,
 required this.language,
 required this.languages,
Expand All@@ -51,12 +52,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.vendorSub,
 required this.maxTouchPoints,
 required this.hardwareConcurrency,
 });

 /// the name of the current browser.
 BrowserName get browserName {
 return _parseUserAgentToBrowserName();
 }
 }) : assert(browserName == _parseUserAgentToBrowserName(userAgent));

 /// the internal "code" name of the current browser.
 /// Note: Do not rely on this property to return the correct value.
Expand All@@ -70,6 +66,9 @@ class WebBrowserInfo implements BaseDeviceInfo {
 /// Note: Do not rely on this property to return the correct value.
 final String? appVersion;

 /// the name of the current browser.
 final BrowserName browserName;

 /// the amount of device memory in gigabytes. This value is an approximation given by rounding to the nearest power of 2 and dividing that number by 1024.
 final int? deviceMemory;

Expand DownExpand Up@@ -109,11 +108,13 @@ class WebBrowserInfo implements BaseDeviceInfo {
 final int? maxTouchPoints;

 /// Deserializes from the map message received from [Navigator].
static WebBrowserInfofromMap(Map<String, dynamic> map) {
factory WebBrowserInfo.fromMap(Map<String, dynamic> map) {
 return WebBrowserInfo(
 appCodeName: map['appCodeName'],
 appName: map['appName'],
 appVersion: map['appVersion'],
 browserName: _broserNameFromString(map['browserName']) ??
 _parseUserAgentToBrowserName(map['userAgent']),
 deviceMemory: map['deviceMemory'],
 language: map['language'],
 languages: map['languages'],
Expand All@@ -130,9 +131,9 @@ class WebBrowserInfo implements BaseDeviceInfo {

 /// Serializes [WebBrowserInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'browserName': browserName,
 'browserName': browserName.name,
 'appCodeName': appCodeName,
 'appName': appName,
 'appVersion': appVersion,
Expand All@@ -149,36 +150,44 @@ class WebBrowserInfo implements BaseDeviceInfo {
 'maxTouchPoints': maxTouchPoints,
 };
 }
}

 BrowserName _parseUserAgentToBrowserName() {
 final _userAgent = userAgent;
 if (_userAgent == null) {
 return BrowserName.unknown;
 } else if (_userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (_userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (_userAgent.contains('Opera') || _userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (_userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (_userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (_userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (_userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
BrowserName? _broserNameFromString(String? name) {
 for (final browserName in BrowserName.values) {
 if (browserName.name == name) {
 return browserName;
 }
 }
 return null;
}

BrowserName _parseUserAgentToBrowserName(userAgent) {
 if (userAgent == null) {
 return BrowserName.unknown;
 } else if (userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (userAgent.contains('Opera') || userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
 }
}

2 changes: 1 addition & 1 deletion
packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: device_info_plus_platform_interface
description: A common platform interface for the device_info_plus plugin.
version: 2.3.0+1
version: 2.3.1+0
homepage: https://plus.fluttercommunity.dev/
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/

Expand Down

15 changes: 13 additions & 2 deletions
...ce_info_plus/device_info_plus_platform_interface/test/model/android_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/android_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -17,7 +19,7 @@ void main() {
 const supported32BitAbis = <String?>['x86 (IA-32)', 'MMX'];
 const supported64BitAbis = <String?>['x86-64', 'MMX', 'SSSE3'];
 const systemFeatures = ['FEATURE_AUDIO_PRO', 'FEATURE_AUDIO_OUTPUT'];
final androidDeviceInfoMap = <String, dynamic>{
const androidDeviceInfoMap = <String, dynamic>{
 'id': 'id',
 'host': 'host',
 'tags': 'tags',
Expand DownExpand Up@@ -74,12 +76,21 @@ void main() {
 expect(androidDeviceInfo.version.securityPatch, 'securityPatch');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), androidDeviceInfoMap);
 });
 });
 });
}

12 changes: 11 additions & 1 deletion
...device_info_plus/device_info_plus_platform_interface/test/model/ios_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/ios_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -38,11 +40,19 @@ void main() {
 expect(iosDeviceInfo.utsname.nodename, 'nodename');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), iosDeviceInfoMap);
 });
 });
 });
}

62 changes: 35 additions & 27 deletions
...vice_info_plus/device_info_plus_platform_interface/test/model/linux_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/linux_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
 group('$LinuxDeviceInfo', () {
 test('toMap should return map with correct key and map', () {
 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 const linuxDeviceInfoMap = <String, Object?>{
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 };

 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 test('toJson should return map with correct key and map', () {
 expect(linuxDeviceInfo.toMap(), linuxDeviceInfoMap);
 });
 test('jsonEncode / jsonDecode should return the correct map', () {
 final json = jsonEncode(linuxDeviceInfo.toMap());

 expect(linuxDeviceInfo.toMap(), {
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 });
 expect(jsonDecode(json), linuxDeviceInfoMap);
 });
 });
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[device_info_plus] make toMap() json compatible#950

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.

 Sign up for GitHub

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

 Closed

iapicca
wants to merge
12
commits into

from

 Closed


[device_info_plus] make toMap() json compatible
#950
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2c0b90e

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
3c0b8e6

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
609a700

[device_info_plus_platform_interface] update changelog and pubspec

Jul 7, 2022
0e29a2e

[device_info_plus_platform_interface] add missing tests

Jul 7, 2022
45ac46d

[device_info_plus_platform_interface] remove unnecessary calls in tests

Jul 7, 2022
f92c14b

[device_info_plus_platform_interface] remove duplicated tests

Jul 7, 2022
3252840

[device_info_plus_platform_interface] add missing test for in web_br…

Jul 7, 2022
2cb72f2

[device_info_plus_platform_interface] add missing test for browserNam…

Jul 7, 2022
3ae94df

restore toMap() in all device_info_plus_platform_interface models

Jul 18, 2022
5025899

remove toJson and fix web implementation

Jul 18, 2022
a68d64b

Merge branch 'main' into rename_device_info_base_to_map

Jul 18, 2022
a880118

update changelog

Jul 24, 2022

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


4 changes: 4 additions & 0 deletions
packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 2.3.1+0

- ensure `toMap()` output compatible with `jsonEncode`

## 2.3.0+1

- Fix LinuxDeviceInfo.name docs
Expand Down

4 changes: 2 additions & 2 deletions
...s/device_info_plus/device_info_plus_platform_interface/lib/model/android_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {

 /// Serializes [AndroidDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'id': id,
 'host': host,
Expand All@@ -141,7 +141,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
 }

 /// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfofromMap(Map<String, dynamic> map) {
factory AndroidDeviceInfo.fromMap(Map<String, dynamic> map) {
 return AndroidDeviceInfo(
 version: AndroidBuildVersion._fromMap(
 map['version']?.cast<String, dynamic>() ?? {}),
Expand Down

2 changes: 1 addition & 1 deletion
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/base_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
/// The base class for platform's device info.
abstract class BaseDeviceInfo {
 /// Serializes device info properties to a map.
 Map<String, dynamic> toMap();
 Map<String, Object?> toMap();
}

34 changes: 17 additions & 17 deletions
packages/device_info_plus/device_info_plus_platform_interface/lib/model/ios_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,24 +44,9 @@ class IosDeviceInfo implements BaseDeviceInfo {
 /// Operating system information derived from `sys/utsname.h`.
 final IosUtsname utsname;

 /// Deserializes from the map message received from [_kChannel].
 static IosDeviceInfo fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }

 /// Serializes [IosDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'model': model,
Expand All@@ -73,6 +58,21 @@ class IosDeviceInfo implements BaseDeviceInfo {
 'isPhysicalDevice': isPhysicalDevice.toString(),
 };
 }

 /// Deserializes from the map message received from [_kChannel].
 factory IosDeviceInfo.fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }
}

/// Information derived from `utsname`.
Expand DownExpand Up@@ -113,7 +113,7 @@ class IosUtsname {
 }

 /// Serializes [ IosUtsname ] to map.
 Map<String, dynamic> _toMap() {
 Map<String, Object?> _toMap() {
 return {
 'release': release,
 'version': version,
Expand Down

2 changes: 1 addition & 1 deletion
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/linux_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ class LinuxDeviceInfo implements BaseDeviceInfo {

 /// Serializes [LinuxDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'version': version,
Expand Down

4 changes: 2 additions & 2 deletions
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/macos_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {

 /// Serializes [MacOsDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'arch': arch,
 'model': model,
Expand All@@ -72,7 +72,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
 }

 /// Constructs a [MacOsDeviceInfo] from a Map of dynamic.
static MacOsDeviceInfofromMap(Map<dynamic, dynamic> map) {
factory MacOsDeviceInfo.fromMap(Map<dynamic, dynamic> map) {
 return MacOsDeviceInfo(
 computerName: map['computerName'],
 hostName: map['hostName'],
Expand Down

85 changes: 47 additions & 38 deletions
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/web_browser_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.appCodeName,
 required this.appName,
 required this.appVersion,
 required this.browserName,
 required this.deviceMemory,
 required this.language,
 required this.languages,
Expand All@@ -51,12 +52,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.vendorSub,
 required this.maxTouchPoints,
 required this.hardwareConcurrency,
 });

 /// the name of the current browser.
 BrowserName get browserName {
 return _parseUserAgentToBrowserName();
 }
 }) : assert(browserName == _parseUserAgentToBrowserName(userAgent));

 /// the internal "code" name of the current browser.
 /// Note: Do not rely on this property to return the correct value.
Expand All@@ -70,6 +66,9 @@ class WebBrowserInfo implements BaseDeviceInfo {
 /// Note: Do not rely on this property to return the correct value.
 final String? appVersion;

 /// the name of the current browser.
 final BrowserName browserName;

 /// the amount of device memory in gigabytes. This value is an approximation given by rounding to the nearest power of 2 and dividing that number by 1024.
 final int? deviceMemory;

Expand DownExpand Up@@ -109,11 +108,13 @@ class WebBrowserInfo implements BaseDeviceInfo {
 final int? maxTouchPoints;

 /// Deserializes from the map message received from [Navigator].
static WebBrowserInfofromMap(Map<String, dynamic> map) {
factory WebBrowserInfo.fromMap(Map<String, dynamic> map) {
 return WebBrowserInfo(
 appCodeName: map['appCodeName'],
 appName: map['appName'],
 appVersion: map['appVersion'],
 browserName: _broserNameFromString(map['browserName']) ??
 _parseUserAgentToBrowserName(map['userAgent']),
 deviceMemory: map['deviceMemory'],
 language: map['language'],
 languages: map['languages'],
Expand All@@ -130,9 +131,9 @@ class WebBrowserInfo implements BaseDeviceInfo {

 /// Serializes [WebBrowserInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'browserName': browserName,
 'browserName': browserName.name,
 'appCodeName': appCodeName,
 'appName': appName,
 'appVersion': appVersion,
Expand All@@ -149,36 +150,44 @@ class WebBrowserInfo implements BaseDeviceInfo {
 'maxTouchPoints': maxTouchPoints,
 };
 }
}

 BrowserName _parseUserAgentToBrowserName() {
 final _userAgent = userAgent;
 if (_userAgent == null) {
 return BrowserName.unknown;
 } else if (_userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (_userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (_userAgent.contains('Opera') || _userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (_userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (_userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (_userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (_userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
BrowserName? _broserNameFromString(String? name) {
 for (final browserName in BrowserName.values) {
 if (browserName.name == name) {
 return browserName;
 }
 }
 return null;
}

BrowserName _parseUserAgentToBrowserName(userAgent) {
 if (userAgent == null) {
 return BrowserName.unknown;
 } else if (userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (userAgent.contains('Opera') || userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
 }
}

2 changes: 1 addition & 1 deletion
packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: device_info_plus_platform_interface
description: A common platform interface for the device_info_plus plugin.
version: 2.3.0+1
version: 2.3.1+0
homepage: https://plus.fluttercommunity.dev/
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/

Expand Down

15 changes: 13 additions & 2 deletions
...ce_info_plus/device_info_plus_platform_interface/test/model/android_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/android_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -17,7 +19,7 @@ void main() {
 const supported32BitAbis = <String?>['x86 (IA-32)', 'MMX'];
 const supported64BitAbis = <String?>['x86-64', 'MMX', 'SSSE3'];
 const systemFeatures = ['FEATURE_AUDIO_PRO', 'FEATURE_AUDIO_OUTPUT'];
final androidDeviceInfoMap = <String, dynamic>{
const androidDeviceInfoMap = <String, dynamic>{
 'id': 'id',
 'host': 'host',
 'tags': 'tags',
Expand DownExpand Up@@ -74,12 +76,21 @@ void main() {
 expect(androidDeviceInfo.version.securityPatch, 'securityPatch');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), androidDeviceInfoMap);
 });
 });
 });
}

12 changes: 11 additions & 1 deletion
...device_info_plus/device_info_plus_platform_interface/test/model/ios_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/ios_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -38,11 +40,19 @@ void main() {
 expect(iosDeviceInfo.utsname.nodename, 'nodename');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), iosDeviceInfoMap);
 });
 });
 });
}

62 changes: 35 additions & 27 deletions
...vice_info_plus/device_info_plus_platform_interface/test/model/linux_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/linux_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
 group('$LinuxDeviceInfo', () {
 test('toMap should return map with correct key and map', () {
 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 const linuxDeviceInfoMap = <String, Object?>{
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 };

 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 test('toJson should return map with correct key and map', () {
 expect(linuxDeviceInfo.toMap(), linuxDeviceInfoMap);
 });
 test('jsonEncode / jsonDecode should return the correct map', () {
 final json = jsonEncode(linuxDeviceInfo.toMap());

 expect(linuxDeviceInfo.toMap(), {
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 });
 expect(jsonDecode(json), linuxDeviceInfoMap);
 });
 });
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[device_info_plus] make toMap() json compatible#950

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.

 Sign up for GitHub

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

 Closed

iapicca
wants to merge
12
commits into

from

 Closed


[device_info_plus] make toMap() json compatible
#950
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2c0b90e

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
3c0b8e6

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
609a700

[device_info_plus_platform_interface] update changelog and pubspec

Jul 7, 2022
0e29a2e

[device_info_plus_platform_interface] add missing tests

Jul 7, 2022
45ac46d

[device_info_plus_platform_interface] remove unnecessary calls in tests

Jul 7, 2022
f92c14b

[device_info_plus_platform_interface] remove duplicated tests

Jul 7, 2022
3252840

[device_info_plus_platform_interface] add missing test for in web_br…

Jul 7, 2022
2cb72f2

[device_info_plus_platform_interface] add missing test for browserNam…

Jul 7, 2022
3ae94df

restore toMap() in all device_info_plus_platform_interface models

Jul 18, 2022
5025899

remove toJson and fix web implementation

Jul 18, 2022
a68d64b

Merge branch 'main' into rename_device_info_base_to_map

Jul 18, 2022
a880118

update changelog

Jul 24, 2022

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


4 changes: 4 additions & 0 deletions
packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 2.3.1+0

- ensure `toMap()` output compatible with `jsonEncode`

## 2.3.0+1

- Fix LinuxDeviceInfo.name docs
Expand Down

4 changes: 2 additions & 2 deletions
...s/device_info_plus/device_info_plus_platform_interface/lib/model/android_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {

 /// Serializes [AndroidDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'id': id,
 'host': host,
Expand All@@ -141,7 +141,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
 }

 /// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfofromMap(Map<String, dynamic> map) {
factory AndroidDeviceInfo.fromMap(Map<String, dynamic> map) {
 return AndroidDeviceInfo(
 version: AndroidBuildVersion._fromMap(
 map['version']?.cast<String, dynamic>() ?? {}),
Expand Down

2 changes: 1 addition & 1 deletion
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/base_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
/// The base class for platform's device info.
abstract class BaseDeviceInfo {
 /// Serializes device info properties to a map.
 Map<String, dynamic> toMap();
 Map<String, Object?> toMap();
}

34 changes: 17 additions & 17 deletions
packages/device_info_plus/device_info_plus_platform_interface/lib/model/ios_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,24 +44,9 @@ class IosDeviceInfo implements BaseDeviceInfo {
 /// Operating system information derived from `sys/utsname.h`.
 final IosUtsname utsname;

 /// Deserializes from the map message received from [_kChannel].
 static IosDeviceInfo fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }

 /// Serializes [IosDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'model': model,
Expand All@@ -73,6 +58,21 @@ class IosDeviceInfo implements BaseDeviceInfo {
 'isPhysicalDevice': isPhysicalDevice.toString(),
 };
 }

 /// Deserializes from the map message received from [_kChannel].
 factory IosDeviceInfo.fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }
}

/// Information derived from `utsname`.
Expand DownExpand Up@@ -113,7 +113,7 @@ class IosUtsname {
 }

 /// Serializes [ IosUtsname ] to map.
 Map<String, dynamic> _toMap() {
 Map<String, Object?> _toMap() {
 return {
 'release': release,
 'version': version,
Expand Down

2 changes: 1 addition & 1 deletion
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/linux_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ class LinuxDeviceInfo implements BaseDeviceInfo {

 /// Serializes [LinuxDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'version': version,
Expand Down

4 changes: 2 additions & 2 deletions
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/macos_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {

 /// Serializes [MacOsDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'arch': arch,
 'model': model,
Expand All@@ -72,7 +72,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
 }

 /// Constructs a [MacOsDeviceInfo] from a Map of dynamic.
static MacOsDeviceInfofromMap(Map<dynamic, dynamic> map) {
factory MacOsDeviceInfo.fromMap(Map<dynamic, dynamic> map) {
 return MacOsDeviceInfo(
 computerName: map['computerName'],
 hostName: map['hostName'],
Expand Down

85 changes: 47 additions & 38 deletions
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/web_browser_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.appCodeName,
 required this.appName,
 required this.appVersion,
 required this.browserName,
 required this.deviceMemory,
 required this.language,
 required this.languages,
Expand All@@ -51,12 +52,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.vendorSub,
 required this.maxTouchPoints,
 required this.hardwareConcurrency,
 });

 /// the name of the current browser.
 BrowserName get browserName {
 return _parseUserAgentToBrowserName();
 }
 }) : assert(browserName == _parseUserAgentToBrowserName(userAgent));

 /// the internal "code" name of the current browser.
 /// Note: Do not rely on this property to return the correct value.
Expand All@@ -70,6 +66,9 @@ class WebBrowserInfo implements BaseDeviceInfo {
 /// Note: Do not rely on this property to return the correct value.
 final String? appVersion;

 /// the name of the current browser.
 final BrowserName browserName;

 /// the amount of device memory in gigabytes. This value is an approximation given by rounding to the nearest power of 2 and dividing that number by 1024.
 final int? deviceMemory;

Expand DownExpand Up@@ -109,11 +108,13 @@ class WebBrowserInfo implements BaseDeviceInfo {
 final int? maxTouchPoints;

 /// Deserializes from the map message received from [Navigator].
static WebBrowserInfofromMap(Map<String, dynamic> map) {
factory WebBrowserInfo.fromMap(Map<String, dynamic> map) {
 return WebBrowserInfo(
 appCodeName: map['appCodeName'],
 appName: map['appName'],
 appVersion: map['appVersion'],
 browserName: _broserNameFromString(map['browserName']) ??
 _parseUserAgentToBrowserName(map['userAgent']),
 deviceMemory: map['deviceMemory'],
 language: map['language'],
 languages: map['languages'],
Expand All@@ -130,9 +131,9 @@ class WebBrowserInfo implements BaseDeviceInfo {

 /// Serializes [WebBrowserInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'browserName': browserName,
 'browserName': browserName.name,
 'appCodeName': appCodeName,
 'appName': appName,
 'appVersion': appVersion,
Expand All@@ -149,36 +150,44 @@ class WebBrowserInfo implements BaseDeviceInfo {
 'maxTouchPoints': maxTouchPoints,
 };
 }
}

 BrowserName _parseUserAgentToBrowserName() {
 final _userAgent = userAgent;
 if (_userAgent == null) {
 return BrowserName.unknown;
 } else if (_userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (_userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (_userAgent.contains('Opera') || _userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (_userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (_userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (_userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (_userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
BrowserName? _broserNameFromString(String? name) {
 for (final browserName in BrowserName.values) {
 if (browserName.name == name) {
 return browserName;
 }
 }
 return null;
}

BrowserName _parseUserAgentToBrowserName(userAgent) {
 if (userAgent == null) {
 return BrowserName.unknown;
 } else if (userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (userAgent.contains('Opera') || userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
 }
}

2 changes: 1 addition & 1 deletion
packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: device_info_plus_platform_interface
description: A common platform interface for the device_info_plus plugin.
version: 2.3.0+1
version: 2.3.1+0
homepage: https://plus.fluttercommunity.dev/
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/

Expand Down

15 changes: 13 additions & 2 deletions
...ce_info_plus/device_info_plus_platform_interface/test/model/android_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/android_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -17,7 +19,7 @@ void main() {
 const supported32BitAbis = <String?>['x86 (IA-32)', 'MMX'];
 const supported64BitAbis = <String?>['x86-64', 'MMX', 'SSSE3'];
 const systemFeatures = ['FEATURE_AUDIO_PRO', 'FEATURE_AUDIO_OUTPUT'];
final androidDeviceInfoMap = <String, dynamic>{
const androidDeviceInfoMap = <String, dynamic>{
 'id': 'id',
 'host': 'host',
 'tags': 'tags',
Expand DownExpand Up@@ -74,12 +76,21 @@ void main() {
 expect(androidDeviceInfo.version.securityPatch, 'securityPatch');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), androidDeviceInfoMap);
 });
 });
 });
}

12 changes: 11 additions & 1 deletion
...device_info_plus/device_info_plus_platform_interface/test/model/ios_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/ios_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -38,11 +40,19 @@ void main() {
 expect(iosDeviceInfo.utsname.nodename, 'nodename');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), iosDeviceInfoMap);
 });
 });
 });
}

62 changes: 35 additions & 27 deletions
...vice_info_plus/device_info_plus_platform_interface/test/model/linux_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/linux_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
 group('$LinuxDeviceInfo', () {
 test('toMap should return map with correct key and map', () {
 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 const linuxDeviceInfoMap = <String, Object?>{
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 };

 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 test('toJson should return map with correct key and map', () {
 expect(linuxDeviceInfo.toMap(), linuxDeviceInfoMap);
 });
 test('jsonEncode / jsonDecode should return the correct map', () {
 final json = jsonEncode(linuxDeviceInfo.toMap());

 expect(linuxDeviceInfo.toMap(), {
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 });
 expect(jsonDecode(json), linuxDeviceInfoMap);
 });
 });
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[device_info_plus] make toMap() json compatible#950

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.

 Sign up for GitHub

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

 Closed

iapicca
wants to merge
12
commits into

from

 Closed


[device_info_plus] make toMap() json compatible
#950
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2c0b90e

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
3c0b8e6

[device_info_plus_platform_interface] rename method toMap to toJson i…

Jul 7, 2022
609a700

[device_info_plus_platform_interface] update changelog and pubspec

Jul 7, 2022
0e29a2e

[device_info_plus_platform_interface] add missing tests

Jul 7, 2022
45ac46d

[device_info_plus_platform_interface] remove unnecessary calls in tests

Jul 7, 2022
f92c14b

[device_info_plus_platform_interface] remove duplicated tests

Jul 7, 2022
3252840

[device_info_plus_platform_interface] add missing test for in web_br…

Jul 7, 2022
2cb72f2

[device_info_plus_platform_interface] add missing test for browserNam…

Jul 7, 2022
3ae94df

restore toMap() in all device_info_plus_platform_interface models

Jul 18, 2022
5025899

remove toJson and fix web implementation

Jul 18, 2022
a68d64b

Merge branch 'main' into rename_device_info_base_to_map

Jul 18, 2022
a880118

update changelog

Jul 24, 2022

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


4 changes: 4 additions & 0 deletions
packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 2.3.1+0

- ensure `toMap()` output compatible with `jsonEncode`

## 2.3.0+1

- Fix LinuxDeviceInfo.name docs
Expand Down

4 changes: 2 additions & 2 deletions
...s/device_info_plus/device_info_plus_platform_interface/lib/model/android_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {

 /// Serializes [AndroidDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'id': id,
 'host': host,
Expand All@@ -141,7 +141,7 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
 }

 /// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfofromMap(Map<String, dynamic> map) {
factory AndroidDeviceInfo.fromMap(Map<String, dynamic> map) {
 return AndroidDeviceInfo(
 version: AndroidBuildVersion._fromMap(
 map['version']?.cast<String, dynamic>() ?? {}),
Expand Down

2 changes: 1 addition & 1 deletion
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/base_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
/// The base class for platform's device info.
abstract class BaseDeviceInfo {
 /// Serializes device info properties to a map.
 Map<String, dynamic> toMap();
 Map<String, Object?> toMap();
}

34 changes: 17 additions & 17 deletions
packages/device_info_plus/device_info_plus_platform_interface/lib/model/ios_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,24 +44,9 @@ class IosDeviceInfo implements BaseDeviceInfo {
 /// Operating system information derived from `sys/utsname.h`.
 final IosUtsname utsname;

 /// Deserializes from the map message received from [_kChannel].
 static IosDeviceInfo fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }

 /// Serializes [IosDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'model': model,
Expand All@@ -73,6 +58,21 @@ class IosDeviceInfo implements BaseDeviceInfo {
 'isPhysicalDevice': isPhysicalDevice.toString(),
 };
 }

 /// Deserializes from the map message received from [_kChannel].
 factory IosDeviceInfo.fromMap(Map<String, dynamic> map) {
 return IosDeviceInfo(
 name: map['name'],
 systemName: map['systemName'],
 systemVersion: map['systemVersion'],
 model: map['model'],
 localizedModel: map['localizedModel'],
 identifierForVendor: map['identifierForVendor'],
 isPhysicalDevice: map['isPhysicalDevice'] == 'true',
 utsname:
 IosUtsname._fromMap(map['utsname']?.cast<String, dynamic>() ?? {}),
 );
 }
}

/// Information derived from `utsname`.
Expand DownExpand Up@@ -113,7 +113,7 @@ class IosUtsname {
 }

 /// Serializes [ IosUtsname ] to map.
 Map<String, dynamic> _toMap() {
 Map<String, Object?> _toMap() {
 return {
 'release': release,
 'version': version,
Expand Down

2 changes: 1 addition & 1 deletion
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/linux_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ class LinuxDeviceInfo implements BaseDeviceInfo {

 /// Serializes [LinuxDeviceInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'name': name,
 'version': version,
Expand Down

4 changes: 2 additions & 2 deletions
...ges/device_info_plus/device_info_plus_platform_interface/lib/model/macos_device_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {

 /// Serializes [MacOsDeviceInfo] to map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'arch': arch,
 'model': model,
Expand All@@ -72,7 +72,7 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
 }

 /// Constructs a [MacOsDeviceInfo] from a Map of dynamic.
static MacOsDeviceInfofromMap(Map<dynamic, dynamic> map) {
factory MacOsDeviceInfo.fromMap(Map<dynamic, dynamic> map) {
 return MacOsDeviceInfo(
 computerName: map['computerName'],
 hostName: map['hostName'],
Expand Down

85 changes: 47 additions & 38 deletions
...ages/device_info_plus/device_info_plus_platform_interface/lib/model/web_browser_info.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.appCodeName,
 required this.appName,
 required this.appVersion,
 required this.browserName,
 required this.deviceMemory,
 required this.language,
 required this.languages,
Expand All@@ -51,12 +52,7 @@ class WebBrowserInfo implements BaseDeviceInfo {
 required this.vendorSub,
 required this.maxTouchPoints,
 required this.hardwareConcurrency,
 });

 /// the name of the current browser.
 BrowserName get browserName {
 return _parseUserAgentToBrowserName();
 }
 }) : assert(browserName == _parseUserAgentToBrowserName(userAgent));

 /// the internal "code" name of the current browser.
 /// Note: Do not rely on this property to return the correct value.
Expand All@@ -70,6 +66,9 @@ class WebBrowserInfo implements BaseDeviceInfo {
 /// Note: Do not rely on this property to return the correct value.
 final String? appVersion;

 /// the name of the current browser.
 final BrowserName browserName;

 /// the amount of device memory in gigabytes. This value is an approximation given by rounding to the nearest power of 2 and dividing that number by 1024.
 final int? deviceMemory;

Expand DownExpand Up@@ -109,11 +108,13 @@ class WebBrowserInfo implements BaseDeviceInfo {
 final int? maxTouchPoints;

 /// Deserializes from the map message received from [Navigator].
static WebBrowserInfofromMap(Map<String, dynamic> map) {
factory WebBrowserInfo.fromMap(Map<String, dynamic> map) {
 return WebBrowserInfo(
 appCodeName: map['appCodeName'],
 appName: map['appName'],
 appVersion: map['appVersion'],
 browserName: _broserNameFromString(map['browserName']) ??
 _parseUserAgentToBrowserName(map['userAgent']),
 deviceMemory: map['deviceMemory'],
 language: map['language'],
 languages: map['languages'],
Expand All@@ -130,9 +131,9 @@ class WebBrowserInfo implements BaseDeviceInfo {

 /// Serializes [WebBrowserInfo] to a map.
 @override
 Map<String, dynamic> toMap() {
 Map<String, Object?> toMap() {
 return {
 'browserName': browserName,
 'browserName': browserName.name,
 'appCodeName': appCodeName,
 'appName': appName,
 'appVersion': appVersion,
Expand All@@ -149,36 +150,44 @@ class WebBrowserInfo implements BaseDeviceInfo {
 'maxTouchPoints': maxTouchPoints,
 };
 }
}

 BrowserName _parseUserAgentToBrowserName() {
 final _userAgent = userAgent;
 if (_userAgent == null) {
 return BrowserName.unknown;
 } else if (_userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (_userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (_userAgent.contains('Opera') || _userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (_userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (_userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (_userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (_userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
BrowserName? _broserNameFromString(String? name) {
 for (final browserName in BrowserName.values) {
 if (browserName.name == name) {
 return browserName;
 }
 }
 return null;
}

BrowserName _parseUserAgentToBrowserName(userAgent) {
 if (userAgent == null) {
 return BrowserName.unknown;
 } else if (userAgent.contains('Firefox')) {
 return BrowserName.firefox;
 // "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
 } else if (userAgent.contains('SamsungBrowser')) {
 return BrowserName.samsungInternet;
 // "Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G955F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.4 Chrome/67.0.3396.87 Mobile Safari/537.36
 } else if (userAgent.contains('Opera') || userAgent.contains('OPR')) {
 return BrowserName.opera;
 // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 OPR/57.0.3098.106"
 } else if (userAgent.contains('Trident')) {
 return BrowserName.msie;
 // "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; Zoom 3.6.0; wbx 1.0.0; rv:11.0) like Gecko"
 } else if (userAgent.contains('Edg')) {
 return BrowserName.edge;
 // https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43"
 // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299"
 } else if (userAgent.contains('Chrome')) {
 return BrowserName.chrome;
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/66.0.3359.181 Chrome/66.0.3359.181 Safari/537.36"
 } else if (userAgent.contains('Safari')) {
 return BrowserName.safari;
 // "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1 980x1306"
 } else {
 return BrowserName.unknown;
 }
}

2 changes: 1 addition & 1 deletion
packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: device_info_plus_platform_interface
description: A common platform interface for the device_info_plus plugin.
version: 2.3.0+1
version: 2.3.1+0
homepage: https://plus.fluttercommunity.dev/
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/

Expand Down

15 changes: 13 additions & 2 deletions
...ce_info_plus/device_info_plus_platform_interface/test/model/android_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/android_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -17,7 +19,7 @@ void main() {
 const supported32BitAbis = <String?>['x86 (IA-32)', 'MMX'];
 const supported64BitAbis = <String?>['x86-64', 'MMX', 'SSSE3'];
 const systemFeatures = ['FEATURE_AUDIO_PRO', 'FEATURE_AUDIO_OUTPUT'];
final androidDeviceInfoMap = <String, dynamic>{
const androidDeviceInfoMap = <String, dynamic>{
 'id': 'id',
 'host': 'host',
 'tags': 'tags',
Expand DownExpand Up@@ -74,12 +76,21 @@ void main() {
 expect(androidDeviceInfo.version.securityPatch, 'securityPatch');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo =
 AndroidDeviceInfo.fromMap(androidDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), androidDeviceInfoMap);
 });
 });
 });
}

12 changes: 11 additions & 1 deletion
...device_info_plus/device_info_plus_platform_interface/test/model/ios_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/ios_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -38,11 +40,19 @@ void main() {
 expect(iosDeviceInfo.utsname.nodename, 'nodename');
 });

 test('toMap should return map with correct key and map', () {
 test('toJson should return map with correct key and map', () {
 final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
 });

 test('jsonEncode / jsonDecode should return the correct map', () {
 final androidDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);

 final json = jsonEncode(androidDeviceInfo.toMap());

 expect(jsonDecode(json), iosDeviceInfoMap);
 });
 });
 });
}

62 changes: 35 additions & 27 deletions
...vice_info_plus/device_info_plus_platform_interface/test/model/linux_device_info_test.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
import 'dart:convert';

import 'package:device_info_plus_platform_interface/model/linux_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
 group('$LinuxDeviceInfo', () {
 test('toMap should return map with correct key and map', () {
 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 const linuxDeviceInfoMap = <String, Object?>{
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 };

 final linuxDeviceInfo = LinuxDeviceInfo(
 name: 'name',
 version: 'version',
 id: 'id',
 idLike: ['idLike'],
 versionCodename: 'versionCodename',
 versionId: 'versionId',
 prettyName: 'prettyName',
 buildId: 'buildId',
 variant: 'variant',
 variantId: 'variantId',
 machineId: 'machineId',
 );
 test('toJson should return map with correct key and map', () {
 expect(linuxDeviceInfo.toMap(), linuxDeviceInfoMap);
 });
 test('jsonEncode / jsonDecode should return the correct map', () {
 final json = jsonEncode(linuxDeviceInfo.toMap());

 expect(linuxDeviceInfo.toMap(), {
 'name': 'name',
 'version': 'version',
 'id': 'id',
 'idLike': ['idLike'],
 'versionCodename': 'versionCodename',
 'versionId': 'versionId',
 'prettyName': 'prettyName',
 'buildId': 'buildId',
 'variant': 'variant',
 'variantId': 'variantId',
 'machineId': 'machineId',
 });
 expect(jsonDecode(json), linuxDeviceInfoMap);
 });
 });
}
Loading