Merge pull request #183 from wiredashio/multiple_attachments

wiredashio · Mar 2, 2022 · c8740b2 · c8740b2
2 parents dcab425 + 8794238
commit c8740b2
Show file tree

Hide file tree

Showing 25 changed files with 1,607 additions and 1,356 deletions.
diff --git a/lib/src/common/build_info/device_id_generator.dart b/lib/src/common/build_info/device_id_generator.dart
@@ -51,7 +51,7 @@ class DeviceIdGenerator {
     }
 
     // first time generation or fallback in case of sharedPrefs error
-    final _deviceId = uuidV4.generate();
+    final _deviceId = const UuidV4Generator().generate();
     try {
       final prefs =
           await SharedPreferences.getInstance().timeout(_sharedPrefsTimeout);

diff --git a/lib/src/common/device_info/dart_html_device_info_generator.dart b/lib/src/common/device_info/dart_html_device_info_generator.dart
@@ -11,7 +11,7 @@ class _DartHtmlDeviceInfoGenerator implements DeviceInfoGenerator {
   final SingletonFlutterWindow window;
 
   @override
-  DeviceInfo generate() {
+  FlutterDeviceInfo generate() {
     final base = DeviceInfoGenerator.baseDeviceInfo(window);
     return base.copyWith(
       userAgent: html.window.navigator.userAgent,

diff --git a/lib/src/common/device_info/dart_io_device_info_generator.dart b/lib/src/common/device_info/dart_io_device_info_generator.dart
@@ -10,7 +10,7 @@ class _DartIoDeviceInfoGenerator implements DeviceInfoGenerator {
   final SingletonFlutterWindow window;
 
   @override
-  DeviceInfo generate() {
+  FlutterDeviceInfo generate() {
     final base = DeviceInfoGenerator.baseDeviceInfo(window);
     return base.copyWith(
       platformOS: Platform.operatingSystem,

diff --git a/lib/src/common/device_info/device_info.dart b/lib/src/common/device_info/device_info.dart
@@ -5,7 +5,13 @@ import 'package:flutter/widgets.dart';
 
 export 'dart:ui' show Brightness;
 
-class DeviceInfo {
+/// All information we can gather from the Flutter Framework about the
+/// device/window/canvas
+///
+/// Created by following implementations
+/// - [_DartHtmlDeviceInfoGenerator]
+/// - [_DartIoDeviceInfoGenerator]
+class FlutterDeviceInfo {
   /// The primary locale enabled on the device
   ///
   /// https://api.flutter.dev/flutter/dart-ui/SingletonFlutterWindow/locale.html
@@ -78,7 +84,7 @@ class DeviceInfo {
   /// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
   final String? userAgent;
 
-  const DeviceInfo({
+  const FlutterDeviceInfo({
     required this.platformLocale,
     required this.platformSupportedLocales,
     required this.padding,
@@ -95,7 +101,7 @@ class DeviceInfo {
     required this.gestureInsets,
   });
 
-  DeviceInfo copyWith({
+  FlutterDeviceInfo copyWith({
     String? deviceId,
     String? platformLocale,
     List<String>? platformSupportedLocales,
@@ -112,7 +118,7 @@ class DeviceInfo {
     Brightness? platformBrightness,
     WindowPadding? gestureInsets,
   }) {
-    return DeviceInfo(
+    return FlutterDeviceInfo(
       platformLocale: platformLocale ?? this.platformLocale,
       platformSupportedLocales:
           platformSupportedLocales ?? this.platformSupportedLocales,
@@ -154,7 +160,7 @@ class DeviceInfo {
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is DeviceInfo &&
+      (other is FlutterDeviceInfo &&
           runtimeType == other.runtimeType &&
           platformLocale == other.platformLocale &&
           listEquals(

diff --git a/lib/src/common/device_info/device_info_generator.dart b/lib/src/common/device_info/device_info_generator.dart
@@ -15,8 +15,8 @@ abstract class DeviceInfoGenerator {
     return createDeviceInfoGenerator(window);
   }
 
-  /// Collection of all [DeviceInfo] shared between all platforms
-  static DeviceInfo baseDeviceInfo(SingletonFlutterWindow window) {
+  /// Collection of all [FlutterDeviceInfo] shared between all platforms
+  static FlutterDeviceInfo baseDeviceInfo(SingletonFlutterWindow window) {
     Locale windowLocale() {
       // Flutter 1.26 (2.0.1) returns `Locale?`, 1.27 `Locale`
       // ignore: unnecessary_nullable_for_final_variable_declarations
@@ -31,7 +31,7 @@ abstract class DeviceInfoGenerator {
       return locales ?? [];
     }
 
-    return DeviceInfo(
+    return FlutterDeviceInfo(
       platformLocale: windowLocale().toLanguageTag(),
       platformSupportedLocales:
           windowLocales().map((it) => it.toLanguageTag()).toList(),
@@ -46,5 +46,6 @@ abstract class DeviceInfoGenerator {
     );
   }
 
-  DeviceInfo generate();
+  /// Collects information from Flutter
+  FlutterDeviceInfo generate();
 }