make toMap() json compatible#1132

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
Yczar wants to merge 5 commits into from
Closed

make toMap() json compatible #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da30be
fix: make toMap() json compatible
Yczar Oct 2, 2022
4a12ee6
added the missing override to the model
Yczar Oct 2, 2022
251532c
added unit tests to the toJson models added
Yczar Oct 2, 2022
bee0706
fixed issue with unit tests
Yczar Oct 2, 2022
dbbfe8a
removed redundant browser name in toMap function
Yczar Oct 2, 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
9 changes: 9 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `android.os.Build`.
Expand DownExpand Up@@ -135,6 +137,10 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [AndroidDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
Expand DownExpand Up@@ -220,6 +226,9 @@ class AndroidBuildVersion {
};
}

/// `toJson()` returns a JSON string representation of [AndroidBuildVersion] Model.
String toJson() => jsonEncode(toMap());

/// Deserializes from the map message received from [_kChannel].
static AndroidBuildVersion _fromMap(Map<String, dynamic> map) {
return AndroidBuildVersion._(
Expand Down
5 changes: 5 additions & 0 deletions ...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,10 @@
import 'dart:convert';

/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();

/// `toJson()` returns a JSON string representation of [BaseDeviceInfo] Model.
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `UIDevice`.
Expand DownExpand Up@@ -73,6 +75,10 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// `toJson()` returns a JSON string representation of [IosDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}

/// Information derived from `utsname`.
Expand Down
6 changes: 6 additions & 0 deletions ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Device information for a Linux system.
Expand DownExpand Up@@ -156,4 +158,8 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
'machineId': machineId,
};
}

/// `toJson()` returns a JSON string representation of [LinuxDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating MACOS device information.
Expand DownExpand Up@@ -86,4 +88,8 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
systemGUID: map['systemGUID'],
);
}

/// `toJson()` returns a JSON string representation of [MacOsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
7 changes: 6 additions & 1 deletion ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// List of supported browsers
Expand DownExpand Up@@ -132,7 +134,6 @@ class WebBrowserInfo implements BaseDeviceInfo {
@override
Map<String, dynamic> toMap() {
return {
'browserName': browserName,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -150,6 +151,10 @@ class WebBrowserInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [WebBrowserInfo] Model.
@override
String toJson() => jsonEncode(toMap());

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
Expand Down
6 changes: 6 additions & 0 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating WINDOWS device information.
Expand DownExpand Up@@ -32,4 +34,8 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
'systemMemoryInMegabytes': systemMemoryInMegabytes,
};
}

/// `toJson()` returns a JSON string representation of [WindowsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
12 changes: 12 additions & 0 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 DownExpand Up@@ -78,6 +80,16 @@ void main() {

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});
test('toJson should return correct json string', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);
final androidDeviceInfoJson = jsonEncode(androidDeviceInfo.toMap());
expect(
androidDeviceInfo.toJson(),
androidDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
11 changes: 11 additions & 0 deletions ...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@@ -43,6 +45,15 @@ void main() {

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
final iosDeviceInfoJson = jsonEncode(iosDeviceInfo.toMap());
expect(
iosDeviceInfo.toJson(),
iosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
37 changes: 23 additions & 14 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,23 +1,24 @@
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', () {
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('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',
);

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
Expand All@@ -32,5 +33,13 @@ void main() {
'machineId': 'machineId',
});
});
test('toJson should return correct json string', () {
final linuxDeviceInfoJson = jsonEncode(linuxDeviceInfo.toMap());
expect(
linuxDeviceInfo.toJson(),
linuxDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
11 changes: 11 additions & 0 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/macos_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/macos_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -69,6 +71,15 @@ void main() {

expect(macosDeviceInfo.toMap(), macosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final macosDeviceInfo = MacOsDeviceInfo.fromMap(macosDeviceInfoMap);
final macosDeviceInfoJson = jsonEncode(macosDeviceInfo.toMap());
expect(
macosDeviceInfo.toJson(),
macosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
12 changes: 11 additions & 1 deletion ...evice_info_plus/device_info_plus_platform_interface/test/model/web_browser_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import 'dart:convert';

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

void main() {
group('$WebBrowserInfo', () {
group('fromMap | toMap', () {
const webBrowserInfoMap = <String, dynamic>{
'browserName': BrowserName.safari,
'appCodeName': 'appCodeName',
'appName': 'appName',
'appVersion': 'appVersion',
Expand DownExpand Up@@ -46,6 +47,15 @@ void main() {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
expect(webBrowserInfo.toMap(), webBrowserInfoMap);
});
test('toJson should return correct json string', () {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
final webBrowserInfoJson = jsonEncode(webBrowserInfo.toMap());
expect(
webBrowserInfo.toJson(),
webBrowserInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
15 changes: 15 additions & 0 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/windows_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/windows_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -16,5 +18,18 @@ void main() {
'systemMemoryInMegabytes': 16,
});
});
test('toJson should return correct json string', () {
final windowsDeviceInfo = WindowsDeviceInfo(
computerName: 'computerName',
numberOfCores: 4,
systemMemoryInMegabytes: 16,
);
final windowsDeviceInfoJson = jsonEncode(windowsDeviceInfo.toMap());
expect(
windowsDeviceInfo.toJson(),
windowsDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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

make toMap() json compatible#1132

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
Yczar wants to merge 5 commits into from
Closed

make toMap() json compatible #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da30be
fix: make toMap() json compatible
Yczar Oct 2, 2022
4a12ee6
added the missing override to the model
Yczar Oct 2, 2022
251532c
added unit tests to the toJson models added
Yczar Oct 2, 2022
bee0706
fixed issue with unit tests
Yczar Oct 2, 2022
dbbfe8a
removed redundant browser name in toMap function
Yczar Oct 2, 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
9 changes: 9 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `android.os.Build`.
Expand DownExpand Up@@ -135,6 +137,10 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [AndroidDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
Expand DownExpand Up@@ -220,6 +226,9 @@ class AndroidBuildVersion {
};
}

/// `toJson()` returns a JSON string representation of [AndroidBuildVersion] Model.
String toJson() => jsonEncode(toMap());

/// Deserializes from the map message received from [_kChannel].
static AndroidBuildVersion _fromMap(Map<String, dynamic> map) {
return AndroidBuildVersion._(
Expand Down
5 changes: 5 additions & 0 deletions ...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,10 @@
import 'dart:convert';

/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();

/// `toJson()` returns a JSON string representation of [BaseDeviceInfo] Model.
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `UIDevice`.
Expand DownExpand Up@@ -73,6 +75,10 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// `toJson()` returns a JSON string representation of [IosDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}

/// Information derived from `utsname`.
Expand Down
6 changes: 6 additions & 0 deletions ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Device information for a Linux system.
Expand DownExpand Up@@ -156,4 +158,8 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
'machineId': machineId,
};
}

/// `toJson()` returns a JSON string representation of [LinuxDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating MACOS device information.
Expand DownExpand Up@@ -86,4 +88,8 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
systemGUID: map['systemGUID'],
);
}

/// `toJson()` returns a JSON string representation of [MacOsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
7 changes: 6 additions & 1 deletion ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// List of supported browsers
Expand DownExpand Up@@ -132,7 +134,6 @@ class WebBrowserInfo implements BaseDeviceInfo {
@override
Map<String, dynamic> toMap() {
return {
'browserName': browserName,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -150,6 +151,10 @@ class WebBrowserInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [WebBrowserInfo] Model.
@override
String toJson() => jsonEncode(toMap());

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
Expand Down
6 changes: 6 additions & 0 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating WINDOWS device information.
Expand DownExpand Up@@ -32,4 +34,8 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
'systemMemoryInMegabytes': systemMemoryInMegabytes,
};
}

/// `toJson()` returns a JSON string representation of [WindowsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
12 changes: 12 additions & 0 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 DownExpand Up@@ -78,6 +80,16 @@ void main() {

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});
test('toJson should return correct json string', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);
final androidDeviceInfoJson = jsonEncode(androidDeviceInfo.toMap());
expect(
androidDeviceInfo.toJson(),
androidDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
11 changes: 11 additions & 0 deletions ...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@@ -43,6 +45,15 @@ void main() {

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
final iosDeviceInfoJson = jsonEncode(iosDeviceInfo.toMap());
expect(
iosDeviceInfo.toJson(),
iosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
37 changes: 23 additions & 14 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,23 +1,24 @@
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', () {
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('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',
);

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
Expand All@@ -32,5 +33,13 @@ void main() {
'machineId': 'machineId',
});
});
test('toJson should return correct json string', () {
final linuxDeviceInfoJson = jsonEncode(linuxDeviceInfo.toMap());
expect(
linuxDeviceInfo.toJson(),
linuxDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
11 changes: 11 additions & 0 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/macos_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/macos_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -69,6 +71,15 @@ void main() {

expect(macosDeviceInfo.toMap(), macosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final macosDeviceInfo = MacOsDeviceInfo.fromMap(macosDeviceInfoMap);
final macosDeviceInfoJson = jsonEncode(macosDeviceInfo.toMap());
expect(
macosDeviceInfo.toJson(),
macosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
12 changes: 11 additions & 1 deletion ...evice_info_plus/device_info_plus_platform_interface/test/model/web_browser_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import 'dart:convert';

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

void main() {
group('$WebBrowserInfo', () {
group('fromMap | toMap', () {
const webBrowserInfoMap = <String, dynamic>{
'browserName': BrowserName.safari,
'appCodeName': 'appCodeName',
'appName': 'appName',
'appVersion': 'appVersion',
Expand DownExpand Up@@ -46,6 +47,15 @@ void main() {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
expect(webBrowserInfo.toMap(), webBrowserInfoMap);
});
test('toJson should return correct json string', () {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
final webBrowserInfoJson = jsonEncode(webBrowserInfo.toMap());
expect(
webBrowserInfo.toJson(),
webBrowserInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
15 changes: 15 additions & 0 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/windows_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/windows_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -16,5 +18,18 @@ void main() {
'systemMemoryInMegabytes': 16,
});
});
test('toJson should return correct json string', () {
final windowsDeviceInfo = WindowsDeviceInfo(
computerName: 'computerName',
numberOfCores: 4,
systemMemoryInMegabytes: 16,
);
final windowsDeviceInfoJson = jsonEncode(windowsDeviceInfo.toMap());
expect(
windowsDeviceInfo.toJson(),
windowsDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
, '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

make toMap() json compatible#1132

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
Yczar wants to merge 5 commits into from
Closed

make toMap() json compatible #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da30be
fix: make toMap() json compatible
Yczar Oct 2, 2022
4a12ee6
added the missing override to the model
Yczar Oct 2, 2022
251532c
added unit tests to the toJson models added
Yczar Oct 2, 2022
bee0706
fixed issue with unit tests
Yczar Oct 2, 2022
dbbfe8a
removed redundant browser name in toMap function
Yczar Oct 2, 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
9 changes: 9 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `android.os.Build`.
Expand DownExpand Up@@ -135,6 +137,10 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [AndroidDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
Expand DownExpand Up@@ -220,6 +226,9 @@ class AndroidBuildVersion {
};
}

/// `toJson()` returns a JSON string representation of [AndroidBuildVersion] Model.
String toJson() => jsonEncode(toMap());

/// Deserializes from the map message received from [_kChannel].
static AndroidBuildVersion _fromMap(Map<String, dynamic> map) {
return AndroidBuildVersion._(
Expand Down
5 changes: 5 additions & 0 deletions ...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,10 @@
import 'dart:convert';

/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();

/// `toJson()` returns a JSON string representation of [BaseDeviceInfo] Model.
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `UIDevice`.
Expand DownExpand Up@@ -73,6 +75,10 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// `toJson()` returns a JSON string representation of [IosDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}

/// Information derived from `utsname`.
Expand Down
6 changes: 6 additions & 0 deletions ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Device information for a Linux system.
Expand DownExpand Up@@ -156,4 +158,8 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
'machineId': machineId,
};
}

/// `toJson()` returns a JSON string representation of [LinuxDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating MACOS device information.
Expand DownExpand Up@@ -86,4 +88,8 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
systemGUID: map['systemGUID'],
);
}

/// `toJson()` returns a JSON string representation of [MacOsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
7 changes: 6 additions & 1 deletion ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// List of supported browsers
Expand DownExpand Up@@ -132,7 +134,6 @@ class WebBrowserInfo implements BaseDeviceInfo {
@override
Map<String, dynamic> toMap() {
return {
'browserName': browserName,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -150,6 +151,10 @@ class WebBrowserInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [WebBrowserInfo] Model.
@override
String toJson() => jsonEncode(toMap());

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
Expand Down
6 changes: 6 additions & 0 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating WINDOWS device information.
Expand DownExpand Up@@ -32,4 +34,8 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
'systemMemoryInMegabytes': systemMemoryInMegabytes,
};
}

/// `toJson()` returns a JSON string representation of [WindowsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
12 changes: 12 additions & 0 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 DownExpand Up@@ -78,6 +80,16 @@ void main() {

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});
test('toJson should return correct json string', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);
final androidDeviceInfoJson = jsonEncode(androidDeviceInfo.toMap());
expect(
androidDeviceInfo.toJson(),
androidDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
11 changes: 11 additions & 0 deletions ...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@@ -43,6 +45,15 @@ void main() {

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
final iosDeviceInfoJson = jsonEncode(iosDeviceInfo.toMap());
expect(
iosDeviceInfo.toJson(),
iosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
37 changes: 23 additions & 14 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,23 +1,24 @@
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', () {
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('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',
);

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
Expand All@@ -32,5 +33,13 @@ void main() {
'machineId': 'machineId',
});
});
test('toJson should return correct json string', () {
final linuxDeviceInfoJson = jsonEncode(linuxDeviceInfo.toMap());
expect(
linuxDeviceInfo.toJson(),
linuxDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
11 changes: 11 additions & 0 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/macos_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/macos_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -69,6 +71,15 @@ void main() {

expect(macosDeviceInfo.toMap(), macosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final macosDeviceInfo = MacOsDeviceInfo.fromMap(macosDeviceInfoMap);
final macosDeviceInfoJson = jsonEncode(macosDeviceInfo.toMap());
expect(
macosDeviceInfo.toJson(),
macosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
12 changes: 11 additions & 1 deletion ...evice_info_plus/device_info_plus_platform_interface/test/model/web_browser_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import 'dart:convert';

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

void main() {
group('$WebBrowserInfo', () {
group('fromMap | toMap', () {
const webBrowserInfoMap = <String, dynamic>{
'browserName': BrowserName.safari,
'appCodeName': 'appCodeName',
'appName': 'appName',
'appVersion': 'appVersion',
Expand DownExpand Up@@ -46,6 +47,15 @@ void main() {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
expect(webBrowserInfo.toMap(), webBrowserInfoMap);
});
test('toJson should return correct json string', () {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
final webBrowserInfoJson = jsonEncode(webBrowserInfo.toMap());
expect(
webBrowserInfo.toJson(),
webBrowserInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
15 changes: 15 additions & 0 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/windows_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/windows_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -16,5 +18,18 @@ void main() {
'systemMemoryInMegabytes': 16,
});
});
test('toJson should return correct json string', () {
final windowsDeviceInfo = WindowsDeviceInfo(
computerName: 'computerName',
numberOfCores: 4,
systemMemoryInMegabytes: 16,
);
final windowsDeviceInfoJson = jsonEncode(windowsDeviceInfo.toMap());
expect(
windowsDeviceInfo.toJson(),
windowsDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
, '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 \u003e 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

make toMap() json compatible#1132

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
Yczar wants to merge 5 commits into from
Closed

make toMap() json compatible #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da30be
fix: make toMap() json compatible
Yczar Oct 2, 2022
4a12ee6
added the missing override to the model
Yczar Oct 2, 2022
251532c
added unit tests to the toJson models added
Yczar Oct 2, 2022
bee0706
fixed issue with unit tests
Yczar Oct 2, 2022
dbbfe8a
removed redundant browser name in toMap function
Yczar Oct 2, 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
9 changes: 9 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `android.os.Build`.
Expand DownExpand Up@@ -135,6 +137,10 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [AndroidDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
Expand DownExpand Up@@ -220,6 +226,9 @@ class AndroidBuildVersion {
};
}

/// `toJson()` returns a JSON string representation of [AndroidBuildVersion] Model.
String toJson() => jsonEncode(toMap());

/// Deserializes from the map message received from [_kChannel].
static AndroidBuildVersion _fromMap(Map<String, dynamic> map) {
return AndroidBuildVersion._(
Expand Down
5 changes: 5 additions & 0 deletions ...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,10 @@
import 'dart:convert';

/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();

/// `toJson()` returns a JSON string representation of [BaseDeviceInfo] Model.
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `UIDevice`.
Expand DownExpand Up@@ -73,6 +75,10 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// `toJson()` returns a JSON string representation of [IosDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}

/// Information derived from `utsname`.
Expand Down
6 changes: 6 additions & 0 deletions ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Device information for a Linux system.
Expand DownExpand Up@@ -156,4 +158,8 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
'machineId': machineId,
};
}

/// `toJson()` returns a JSON string representation of [LinuxDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating MACOS device information.
Expand DownExpand Up@@ -86,4 +88,8 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
systemGUID: map['systemGUID'],
);
}

/// `toJson()` returns a JSON string representation of [MacOsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
7 changes: 6 additions & 1 deletion ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// List of supported browsers
Expand DownExpand Up@@ -132,7 +134,6 @@ class WebBrowserInfo implements BaseDeviceInfo {
@override
Map<String, dynamic> toMap() {
return {
'browserName': browserName,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -150,6 +151,10 @@ class WebBrowserInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [WebBrowserInfo] Model.
@override
String toJson() => jsonEncode(toMap());

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
Expand Down
6 changes: 6 additions & 0 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating WINDOWS device information.
Expand DownExpand Up@@ -32,4 +34,8 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
'systemMemoryInMegabytes': systemMemoryInMegabytes,
};
}

/// `toJson()` returns a JSON string representation of [WindowsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
12 changes: 12 additions & 0 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 DownExpand Up@@ -78,6 +80,16 @@ void main() {

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});
test('toJson should return correct json string', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);
final androidDeviceInfoJson = jsonEncode(androidDeviceInfo.toMap());
expect(
androidDeviceInfo.toJson(),
androidDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
11 changes: 11 additions & 0 deletions ...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@@ -43,6 +45,15 @@ void main() {

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
final iosDeviceInfoJson = jsonEncode(iosDeviceInfo.toMap());
expect(
iosDeviceInfo.toJson(),
iosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
37 changes: 23 additions & 14 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,23 +1,24 @@
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', () {
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('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',
);

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
Expand All@@ -32,5 +33,13 @@ void main() {
'machineId': 'machineId',
});
});
test('toJson should return correct json string', () {
final linuxDeviceInfoJson = jsonEncode(linuxDeviceInfo.toMap());
expect(
linuxDeviceInfo.toJson(),
linuxDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
11 changes: 11 additions & 0 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/macos_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/macos_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -69,6 +71,15 @@ void main() {

expect(macosDeviceInfo.toMap(), macosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final macosDeviceInfo = MacOsDeviceInfo.fromMap(macosDeviceInfoMap);
final macosDeviceInfoJson = jsonEncode(macosDeviceInfo.toMap());
expect(
macosDeviceInfo.toJson(),
macosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
12 changes: 11 additions & 1 deletion ...evice_info_plus/device_info_plus_platform_interface/test/model/web_browser_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import 'dart:convert';

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

void main() {
group('$WebBrowserInfo', () {
group('fromMap | toMap', () {
const webBrowserInfoMap = <String, dynamic>{
'browserName': BrowserName.safari,
'appCodeName': 'appCodeName',
'appName': 'appName',
'appVersion': 'appVersion',
Expand DownExpand Up@@ -46,6 +47,15 @@ void main() {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
expect(webBrowserInfo.toMap(), webBrowserInfoMap);
});
test('toJson should return correct json string', () {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
final webBrowserInfoJson = jsonEncode(webBrowserInfo.toMap());
expect(
webBrowserInfo.toJson(),
webBrowserInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
15 changes: 15 additions & 0 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/windows_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/windows_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -16,5 +18,18 @@ void main() {
'systemMemoryInMegabytes': 16,
});
});
test('toJson should return correct json string', () {
final windowsDeviceInfo = WindowsDeviceInfo(
computerName: 'computerName',
numberOfCores: 4,
systemMemoryInMegabytes: 16,
);
final windowsDeviceInfoJson = jsonEncode(windowsDeviceInfo.toMap());
expect(
windowsDeviceInfo.toJson(),
windowsDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
, '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

make toMap() json compatible#1132

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
Yczar wants to merge 5 commits into from
Closed

make toMap() json compatible #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da30be
fix: make toMap() json compatible
Yczar Oct 2, 2022
4a12ee6
added the missing override to the model
Yczar Oct 2, 2022
251532c
added unit tests to the toJson models added
Yczar Oct 2, 2022
bee0706
fixed issue with unit tests
Yczar Oct 2, 2022
dbbfe8a
removed redundant browser name in toMap function
Yczar Oct 2, 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
9 changes: 9 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `android.os.Build`.
Expand DownExpand Up@@ -135,6 +137,10 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [AndroidDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
Expand DownExpand Up@@ -220,6 +226,9 @@ class AndroidBuildVersion {
};
}

/// `toJson()` returns a JSON string representation of [AndroidBuildVersion] Model.
String toJson() => jsonEncode(toMap());

/// Deserializes from the map message received from [_kChannel].
static AndroidBuildVersion _fromMap(Map<String, dynamic> map) {
return AndroidBuildVersion._(
Expand Down
5 changes: 5 additions & 0 deletions ...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,10 @@
import 'dart:convert';

/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();

/// `toJson()` returns a JSON string representation of [BaseDeviceInfo] Model.
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `UIDevice`.
Expand DownExpand Up@@ -73,6 +75,10 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// `toJson()` returns a JSON string representation of [IosDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}

/// Information derived from `utsname`.
Expand Down
6 changes: 6 additions & 0 deletions ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Device information for a Linux system.
Expand DownExpand Up@@ -156,4 +158,8 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
'machineId': machineId,
};
}

/// `toJson()` returns a JSON string representation of [LinuxDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating MACOS device information.
Expand DownExpand Up@@ -86,4 +88,8 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
systemGUID: map['systemGUID'],
);
}

/// `toJson()` returns a JSON string representation of [MacOsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
7 changes: 6 additions & 1 deletion ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// List of supported browsers
Expand DownExpand Up@@ -132,7 +134,6 @@ class WebBrowserInfo implements BaseDeviceInfo {
@override
Map<String, dynamic> toMap() {
return {
'browserName': browserName,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -150,6 +151,10 @@ class WebBrowserInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [WebBrowserInfo] Model.
@override
String toJson() => jsonEncode(toMap());

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
Expand Down
6 changes: 6 additions & 0 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating WINDOWS device information.
Expand DownExpand Up@@ -32,4 +34,8 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
'systemMemoryInMegabytes': systemMemoryInMegabytes,
};
}

/// `toJson()` returns a JSON string representation of [WindowsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
12 changes: 12 additions & 0 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 DownExpand Up@@ -78,6 +80,16 @@ void main() {

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});
test('toJson should return correct json string', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);
final androidDeviceInfoJson = jsonEncode(androidDeviceInfo.toMap());
expect(
androidDeviceInfo.toJson(),
androidDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
11 changes: 11 additions & 0 deletions ...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@@ -43,6 +45,15 @@ void main() {

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
final iosDeviceInfoJson = jsonEncode(iosDeviceInfo.toMap());
expect(
iosDeviceInfo.toJson(),
iosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
37 changes: 23 additions & 14 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,23 +1,24 @@
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', () {
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('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',
);

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
Expand All@@ -32,5 +33,13 @@ void main() {
'machineId': 'machineId',
});
});
test('toJson should return correct json string', () {
final linuxDeviceInfoJson = jsonEncode(linuxDeviceInfo.toMap());
expect(
linuxDeviceInfo.toJson(),
linuxDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
11 changes: 11 additions & 0 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/macos_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/macos_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -69,6 +71,15 @@ void main() {

expect(macosDeviceInfo.toMap(), macosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final macosDeviceInfo = MacOsDeviceInfo.fromMap(macosDeviceInfoMap);
final macosDeviceInfoJson = jsonEncode(macosDeviceInfo.toMap());
expect(
macosDeviceInfo.toJson(),
macosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
12 changes: 11 additions & 1 deletion ...evice_info_plus/device_info_plus_platform_interface/test/model/web_browser_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import 'dart:convert';

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

void main() {
group('$WebBrowserInfo', () {
group('fromMap | toMap', () {
const webBrowserInfoMap = <String, dynamic>{
'browserName': BrowserName.safari,
'appCodeName': 'appCodeName',
'appName': 'appName',
'appVersion': 'appVersion',
Expand DownExpand Up@@ -46,6 +47,15 @@ void main() {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
expect(webBrowserInfo.toMap(), webBrowserInfoMap);
});
test('toJson should return correct json string', () {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
final webBrowserInfoJson = jsonEncode(webBrowserInfo.toMap());
expect(
webBrowserInfo.toJson(),
webBrowserInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
15 changes: 15 additions & 0 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/windows_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/windows_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -16,5 +18,18 @@ void main() {
'systemMemoryInMegabytes': 16,
});
});
test('toJson should return correct json string', () {
final windowsDeviceInfo = WindowsDeviceInfo(
computerName: 'computerName',
numberOfCores: 4,
systemMemoryInMegabytes: 16,
);
final windowsDeviceInfoJson = jsonEncode(windowsDeviceInfo.toMap());
expect(
windowsDeviceInfo.toJson(),
windowsDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
, '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

make toMap() json compatible#1132

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
Yczar wants to merge 5 commits into from
Closed

make toMap() json compatible #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da30be
fix: make toMap() json compatible
Yczar Oct 2, 2022
4a12ee6
added the missing override to the model
Yczar Oct 2, 2022
251532c
added unit tests to the toJson models added
Yczar Oct 2, 2022
bee0706
fixed issue with unit tests
Yczar Oct 2, 2022
dbbfe8a
removed redundant browser name in toMap function
Yczar Oct 2, 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
9 changes: 9 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `android.os.Build`.
Expand DownExpand Up@@ -135,6 +137,10 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [AndroidDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
Expand DownExpand Up@@ -220,6 +226,9 @@ class AndroidBuildVersion {
};
}

/// `toJson()` returns a JSON string representation of [AndroidBuildVersion] Model.
String toJson() => jsonEncode(toMap());

/// Deserializes from the map message received from [_kChannel].
static AndroidBuildVersion _fromMap(Map<String, dynamic> map) {
return AndroidBuildVersion._(
Expand Down
5 changes: 5 additions & 0 deletions ...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,10 @@
import 'dart:convert';

/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();

/// `toJson()` returns a JSON string representation of [BaseDeviceInfo] Model.
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `UIDevice`.
Expand DownExpand Up@@ -73,6 +75,10 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// `toJson()` returns a JSON string representation of [IosDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}

/// Information derived from `utsname`.
Expand Down
6 changes: 6 additions & 0 deletions ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Device information for a Linux system.
Expand DownExpand Up@@ -156,4 +158,8 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
'machineId': machineId,
};
}

/// `toJson()` returns a JSON string representation of [LinuxDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating MACOS device information.
Expand DownExpand Up@@ -86,4 +88,8 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
systemGUID: map['systemGUID'],
);
}

/// `toJson()` returns a JSON string representation of [MacOsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
7 changes: 6 additions & 1 deletion ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// List of supported browsers
Expand DownExpand Up@@ -132,7 +134,6 @@ class WebBrowserInfo implements BaseDeviceInfo {
@override
Map<String, dynamic> toMap() {
return {
'browserName': browserName,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -150,6 +151,10 @@ class WebBrowserInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [WebBrowserInfo] Model.
@override
String toJson() => jsonEncode(toMap());

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
Expand Down
6 changes: 6 additions & 0 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating WINDOWS device information.
Expand DownExpand Up@@ -32,4 +34,8 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
'systemMemoryInMegabytes': systemMemoryInMegabytes,
};
}

/// `toJson()` returns a JSON string representation of [WindowsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
12 changes: 12 additions & 0 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 DownExpand Up@@ -78,6 +80,16 @@ void main() {

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});
test('toJson should return correct json string', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);
final androidDeviceInfoJson = jsonEncode(androidDeviceInfo.toMap());
expect(
androidDeviceInfo.toJson(),
androidDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
11 changes: 11 additions & 0 deletions ...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@@ -43,6 +45,15 @@ void main() {

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
final iosDeviceInfoJson = jsonEncode(iosDeviceInfo.toMap());
expect(
iosDeviceInfo.toJson(),
iosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
37 changes: 23 additions & 14 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,23 +1,24 @@
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', () {
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('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',
);

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
Expand All@@ -32,5 +33,13 @@ void main() {
'machineId': 'machineId',
});
});
test('toJson should return correct json string', () {
final linuxDeviceInfoJson = jsonEncode(linuxDeviceInfo.toMap());
expect(
linuxDeviceInfo.toJson(),
linuxDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
11 changes: 11 additions & 0 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/macos_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/macos_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -69,6 +71,15 @@ void main() {

expect(macosDeviceInfo.toMap(), macosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final macosDeviceInfo = MacOsDeviceInfo.fromMap(macosDeviceInfoMap);
final macosDeviceInfoJson = jsonEncode(macosDeviceInfo.toMap());
expect(
macosDeviceInfo.toJson(),
macosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
12 changes: 11 additions & 1 deletion ...evice_info_plus/device_info_plus_platform_interface/test/model/web_browser_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import 'dart:convert';

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

void main() {
group('$WebBrowserInfo', () {
group('fromMap | toMap', () {
const webBrowserInfoMap = <String, dynamic>{
'browserName': BrowserName.safari,
'appCodeName': 'appCodeName',
'appName': 'appName',
'appVersion': 'appVersion',
Expand DownExpand Up@@ -46,6 +47,15 @@ void main() {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
expect(webBrowserInfo.toMap(), webBrowserInfoMap);
});
test('toJson should return correct json string', () {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
final webBrowserInfoJson = jsonEncode(webBrowserInfo.toMap());
expect(
webBrowserInfo.toJson(),
webBrowserInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
15 changes: 15 additions & 0 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/windows_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/windows_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -16,5 +18,18 @@ void main() {
'systemMemoryInMegabytes': 16,
});
});
test('toJson should return correct json string', () {
final windowsDeviceInfo = WindowsDeviceInfo(
computerName: 'computerName',
numberOfCores: 4,
systemMemoryInMegabytes: 16,
);
final windowsDeviceInfoJson = jsonEncode(windowsDeviceInfo.toMap());
expect(
windowsDeviceInfo.toJson(),
windowsDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
, '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

make toMap() json compatible#1132

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
Yczar wants to merge 5 commits into from
Closed

make toMap() json compatible #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da30be
fix: make toMap() json compatible
Yczar Oct 2, 2022
4a12ee6
added the missing override to the model
Yczar Oct 2, 2022
251532c
added unit tests to the toJson models added
Yczar Oct 2, 2022
bee0706
fixed issue with unit tests
Yczar Oct 2, 2022
dbbfe8a
removed redundant browser name in toMap function
Yczar Oct 2, 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
9 changes: 9 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `android.os.Build`.
Expand DownExpand Up@@ -135,6 +137,10 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [AndroidDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
Expand DownExpand Up@@ -220,6 +226,9 @@ class AndroidBuildVersion {
};
}

/// `toJson()` returns a JSON string representation of [AndroidBuildVersion] Model.
String toJson() => jsonEncode(toMap());

/// Deserializes from the map message received from [_kChannel].
static AndroidBuildVersion _fromMap(Map<String, dynamic> map) {
return AndroidBuildVersion._(
Expand Down
5 changes: 5 additions & 0 deletions ...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,10 @@
import 'dart:convert';

/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();

/// `toJson()` returns a JSON string representation of [BaseDeviceInfo] Model.
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `UIDevice`.
Expand DownExpand Up@@ -73,6 +75,10 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// `toJson()` returns a JSON string representation of [IosDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}

/// Information derived from `utsname`.
Expand Down
6 changes: 6 additions & 0 deletions ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Device information for a Linux system.
Expand DownExpand Up@@ -156,4 +158,8 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
'machineId': machineId,
};
}

/// `toJson()` returns a JSON string representation of [LinuxDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating MACOS device information.
Expand DownExpand Up@@ -86,4 +88,8 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
systemGUID: map['systemGUID'],
);
}

/// `toJson()` returns a JSON string representation of [MacOsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
7 changes: 6 additions & 1 deletion ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// List of supported browsers
Expand DownExpand Up@@ -132,7 +134,6 @@ class WebBrowserInfo implements BaseDeviceInfo {
@override
Map<String, dynamic> toMap() {
return {
'browserName': browserName,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -150,6 +151,10 @@ class WebBrowserInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [WebBrowserInfo] Model.
@override
String toJson() => jsonEncode(toMap());

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
Expand Down
6 changes: 6 additions & 0 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating WINDOWS device information.
Expand DownExpand Up@@ -32,4 +34,8 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
'systemMemoryInMegabytes': systemMemoryInMegabytes,
};
}

/// `toJson()` returns a JSON string representation of [WindowsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
12 changes: 12 additions & 0 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 DownExpand Up@@ -78,6 +80,16 @@ void main() {

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});
test('toJson should return correct json string', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);
final androidDeviceInfoJson = jsonEncode(androidDeviceInfo.toMap());
expect(
androidDeviceInfo.toJson(),
androidDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
11 changes: 11 additions & 0 deletions ...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@@ -43,6 +45,15 @@ void main() {

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
final iosDeviceInfoJson = jsonEncode(iosDeviceInfo.toMap());
expect(
iosDeviceInfo.toJson(),
iosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
37 changes: 23 additions & 14 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,23 +1,24 @@
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', () {
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('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',
);

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
Expand All@@ -32,5 +33,13 @@ void main() {
'machineId': 'machineId',
});
});
test('toJson should return correct json string', () {
final linuxDeviceInfoJson = jsonEncode(linuxDeviceInfo.toMap());
expect(
linuxDeviceInfo.toJson(),
linuxDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
11 changes: 11 additions & 0 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/macos_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/macos_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -69,6 +71,15 @@ void main() {

expect(macosDeviceInfo.toMap(), macosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final macosDeviceInfo = MacOsDeviceInfo.fromMap(macosDeviceInfoMap);
final macosDeviceInfoJson = jsonEncode(macosDeviceInfo.toMap());
expect(
macosDeviceInfo.toJson(),
macosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
12 changes: 11 additions & 1 deletion ...evice_info_plus/device_info_plus_platform_interface/test/model/web_browser_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import 'dart:convert';

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

void main() {
group('$WebBrowserInfo', () {
group('fromMap | toMap', () {
const webBrowserInfoMap = <String, dynamic>{
'browserName': BrowserName.safari,
'appCodeName': 'appCodeName',
'appName': 'appName',
'appVersion': 'appVersion',
Expand DownExpand Up@@ -46,6 +47,15 @@ void main() {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
expect(webBrowserInfo.toMap(), webBrowserInfoMap);
});
test('toJson should return correct json string', () {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
final webBrowserInfoJson = jsonEncode(webBrowserInfo.toMap());
expect(
webBrowserInfo.toJson(),
webBrowserInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
15 changes: 15 additions & 0 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/windows_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/windows_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -16,5 +18,18 @@ void main() {
'systemMemoryInMegabytes': 16,
});
});
test('toJson should return correct json string', () {
final windowsDeviceInfo = WindowsDeviceInfo(
computerName: 'computerName',
numberOfCores: 4,
systemMemoryInMegabytes: 16,
);
final windowsDeviceInfoJson = jsonEncode(windowsDeviceInfo.toMap());
expect(
windowsDeviceInfo.toJson(),
windowsDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
, '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

make toMap() json compatible#1132

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
Yczar wants to merge 5 commits into from
Closed

make toMap() json compatible #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da30be
fix: make toMap() json compatible
Yczar Oct 2, 2022
4a12ee6
added the missing override to the model
Yczar Oct 2, 2022
251532c
added unit tests to the toJson models added
Yczar Oct 2, 2022
bee0706
fixed issue with unit tests
Yczar Oct 2, 2022
dbbfe8a
removed redundant browser name in toMap function
Yczar Oct 2, 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
9 changes: 9 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `android.os.Build`.
Expand DownExpand Up@@ -135,6 +137,10 @@ class AndroidDeviceInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [AndroidDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());

/// Deserializes from the message received from [_kChannel].
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
return AndroidDeviceInfo(
Expand DownExpand Up@@ -220,6 +226,9 @@ class AndroidBuildVersion {
};
}

/// `toJson()` returns a JSON string representation of [AndroidBuildVersion] Model.
String toJson() => jsonEncode(toMap());

/// Deserializes from the map message received from [_kChannel].
static AndroidBuildVersion _fromMap(Map<String, dynamic> map) {
return AndroidBuildVersion._(
Expand Down
5 changes: 5 additions & 0 deletions ...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,10 @@
import 'dart:convert';

/// The base class for platform's device info.
abstract class BaseDeviceInfo {
/// Serializes device info properties to a map.
Map<String, dynamic> toMap();

/// `toJson()` returns a JSON string representation of [BaseDeviceInfo] Model.
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Information derived from `UIDevice`.
Expand DownExpand Up@@ -73,6 +75,10 @@ class IosDeviceInfo implements BaseDeviceInfo {
'isPhysicalDevice': isPhysicalDevice.toString(),
};
}

/// `toJson()` returns a JSON string representation of [IosDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}

/// Information derived from `utsname`.
Expand Down
6 changes: 6 additions & 0 deletions ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Device information for a Linux system.
Expand DownExpand Up@@ -156,4 +158,8 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
'machineId': machineId,
};
}

/// `toJson()` returns a JSON string representation of [LinuxDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
6 changes: 6 additions & 0 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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating MACOS device information.
Expand DownExpand Up@@ -86,4 +88,8 @@ class MacOsDeviceInfo implements BaseDeviceInfo {
systemGUID: map['systemGUID'],
);
}

/// `toJson()` returns a JSON string representation of [MacOsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
7 changes: 6 additions & 1 deletion ...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@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// List of supported browsers
Expand DownExpand Up@@ -132,7 +134,6 @@ class WebBrowserInfo implements BaseDeviceInfo {
@override
Map<String, dynamic> toMap() {
return {
'browserName': browserName,
'appCodeName': appCodeName,
'appName': appName,
'appVersion': appVersion,
Expand All@@ -150,6 +151,10 @@ class WebBrowserInfo implements BaseDeviceInfo {
};
}

/// `toJson()` returns a JSON string representation of [WebBrowserInfo] Model.
@override
String toJson() => jsonEncode(toMap());

BrowserName _parseUserAgentToBrowserName() {
final _userAgent = userAgent;
if (_userAgent == null) {
Expand Down
6 changes: 6 additions & 0 deletions ...s/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';

import 'base_device_info.dart';

/// Object encapsulating WINDOWS device information.
Expand DownExpand Up@@ -32,4 +34,8 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
'systemMemoryInMegabytes': systemMemoryInMegabytes,
};
}

/// `toJson()` returns a JSON string representation of [WindowsDeviceInfo] Model.
@override
String toJson() => jsonEncode(toMap());
}
12 changes: 12 additions & 0 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 DownExpand Up@@ -78,6 +80,16 @@ void main() {

expect(androidDeviceInfo.toMap(), androidDeviceInfoMap);
});
test('toJson should return correct json string', () {
final androidDeviceInfo =
AndroidDeviceInfo.fromMap(androidDeviceInfoMap);
final androidDeviceInfoJson = jsonEncode(androidDeviceInfo.toMap());
expect(
androidDeviceInfo.toJson(),
androidDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
11 changes: 11 additions & 0 deletions ...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@@ -43,6 +45,15 @@ void main() {

expect(iosDeviceInfo.toMap(), iosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
final iosDeviceInfoJson = jsonEncode(iosDeviceInfo.toMap());
expect(
iosDeviceInfo.toJson(),
iosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
37 changes: 23 additions & 14 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,23 +1,24 @@
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', () {
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('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',
);

expect(linuxDeviceInfo.toMap(), {
'name': 'name',
'version': 'version',
Expand All@@ -32,5 +33,13 @@ void main() {
'machineId': 'machineId',
});
});
test('toJson should return correct json string', () {
final linuxDeviceInfoJson = jsonEncode(linuxDeviceInfo.toMap());
expect(
linuxDeviceInfo.toJson(),
linuxDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}
11 changes: 11 additions & 0 deletions ...vice_info_plus/device_info_plus_platform_interface/test/model/macos_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/macos_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand DownExpand Up@@ -69,6 +71,15 @@ void main() {

expect(macosDeviceInfo.toMap(), macosDeviceInfoMap);
});
test('toJson should return correct json string', () {
final macosDeviceInfo = MacOsDeviceInfo.fromMap(macosDeviceInfoMap);
final macosDeviceInfoJson = jsonEncode(macosDeviceInfo.toMap());
expect(
macosDeviceInfo.toJson(),
macosDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
12 changes: 11 additions & 1 deletion ...evice_info_plus/device_info_plus_platform_interface/test/model/web_browser_info_test.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import 'dart:convert';

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

void main() {
group('$WebBrowserInfo', () {
group('fromMap | toMap', () {
const webBrowserInfoMap = <String, dynamic>{
'browserName': BrowserName.safari,
'appCodeName': 'appCodeName',
'appName': 'appName',
'appVersion': 'appVersion',
Expand DownExpand Up@@ -46,6 +47,15 @@ void main() {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
expect(webBrowserInfo.toMap(), webBrowserInfoMap);
});
test('toJson should return correct json string', () {
final webBrowserInfo = WebBrowserInfo.fromMap(webBrowserInfoMap);
final webBrowserInfoJson = jsonEncode(webBrowserInfo.toMap());
expect(
webBrowserInfo.toJson(),
webBrowserInfoJson,
reason: 'toJson should return correct json string',
);
});
});
});
}
15 changes: 15 additions & 0 deletions ...ce_info_plus/device_info_plus_platform_interface/test/model/windows_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/windows_device_info.dart';
import 'package:flutter_test/flutter_test.dart';

Expand All@@ -16,5 +18,18 @@ void main() {
'systemMemoryInMegabytes': 16,
});
});
test('toJson should return correct json string', () {
final windowsDeviceInfo = WindowsDeviceInfo(
computerName: 'computerName',
numberOfCores: 4,
systemMemoryInMegabytes: 16,
);
final windowsDeviceInfoJson = jsonEncode(windowsDeviceInfo.toMap());
expect(
windowsDeviceInfo.toJson(),
windowsDeviceInfoJson,
reason: 'toJson should return correct json string',
);
});
});
}