Refactor to directly call Platform.is and make .isWeb constant

.gitignore

@@ -28,6 +28,7 @@
 .packages
 .pub-cache/
 .pub/
+/pubspec.lock
 /build/
 
 # Web related

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Changelog
+
+## 1.1.0
+
+- Refactor to call Platform.is* in a more direct way
+- Make UniversalPlatform.isWeb constant
+- Add UniversalPlatformType.Other and .None
+
 ## 1.0.0-nullsafety
 - Migrate to nnbd
 

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   collection:
     dependency: transitive
     description:
@@ -20,13 +20,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -45,13 +52,13 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0-nullsafety"
+    version: "1.1.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sized_context_example
 description: A new Flutter application.
-version: 1.0.0+1
+version: 1.1.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -14,3 +14,5 @@ dependencies:
 
 flutter:
   uses-material-design: true
+
+publish_to: none

lib/src/universal_platform.dart

@@ -0,0 +1,3 @@
+export 'universal_platform_none.dart'
+    if (dart.library.io) 'universal_platform_io.dart'
+    if (dart.library.html) 'universal_platform_html.dart';

lib/src/universal_platform_html.dart

@@ -0,0 +1,19 @@
+import 'universal_platform_type.dart';
+
+abstract class UniversalPlatform {
+  static UniversalPlatformType get value => UniversalPlatform.Web;
+
+  static bool get isAndroid => false;
+  static bool get isFuchsia => false;
+  static bool get isIOS => false;
+  static bool get isLinux => false;
+  static bool get isMacOS => false;
+  static bool get isWindows => false;
+  static bool get isOther => false;
+
+  static const bool isWeb = true;
+  static const bool isNone = false;
+
+  static bool get isDesktop => isLinux || isMacOS || isWindows;
+  static bool get isDesktopOrWeb => isDesktop || isWeb;
+}

lib/src/universal_platform_io.dart

@@ -0,0 +1,40 @@
+import 'dart:io' show Platform;
+
+import 'universal_platform_type.dart';
+
+abstract class UniversalPlatform {
+  static UniversalPlatformType get value {
+    UniversalPlatformType result;
+    if (Platform.isAndroid) {
+      result = UniversalPlatformType.Android;
+    } else if (Platform.isIOS) {
+      result = UniversalPlatformType.IOS;
+    } else if (Platform.isFuchsia) {
+      result = UniversalPlatformType.Fuchsia;
+    } else if (Platform.isLinux) {
+      result = UniversalPlatformType.Linux;
+    } else if (Platform.isMacOS) {
+      result = UniversalPlatformType.MacOS;
+    } else if (Platform.isWindows) {
+      result = UniversalPlatformType.Windows;
+    } else {
+      result = UniversalPlatformType.Other;
+    }
+    return result;
+  }
+
+  static bool get isAndroid => Platform.isAndroid;
+  static bool get isFuchsia => Platform.isFuchsia;
+  static bool get isIOS => Platform.isIOS;
+  static bool get isLinux => Platform.isLinux;
+  static bool get isMacOS => Platform.isMacOS;
+  static bool get isWindows => Platform.isWindows;
+  static bool get isOther =>
+      UniversalPlatform.current == UniversalPlatformType.Other;
+
+  static const bool isWeb = false;
+  static const bool isNone = false;
+
+  static bool get isDesktop => isLinux || isMacOS || isWindows;
+  static bool get isDesktopOrWeb => isDesktop || isWeb;
+}

lib/src/universal_platform_none.dart

@@ -0,0 +1,19 @@
+import 'universal_platform_type.dart';
+
+abstract class UniversalPlatform {
+  static UniversalPlatformType get value => UniversalPlatform.None;
+
+  static bool get isAndroid => false;
+  static bool get isFuchsia => false;
+  static bool get isIOS => false;
+  static bool get isLinux => false;
+  static bool get isMacOS => false;
+  static bool get isWindows => false;
+  static bool get isOther => false;
+
+  static const bool isWeb = false;
+  static const bool isNone = true;
+
+  static bool get isDesktop => isLinux || isMacOS || isWindows;
+  static bool get isDesktopOrWeb => isDesktop || isWeb;
+}

lib/src/universal_platform_type.dart

@@ -0,0 +1,11 @@
+enum UniversalPlatformType {
+  Web,
+  Windows,
+  Linux,
+  MacOS,
+  Android,
+  Fuchsia,
+  IOS,
+  Other,
+  None,
+}

lib/universal_platform.dart

@@ -1,28 +1,2 @@
-library universal_platform;
-import 'src/universal_platform_locator.dart' if(dart.library.io) 'src/platform_io.dart';
-
-export 'src/universal_platform_locator.dart' if(dart.library.io) 'src/platform_io.dart';
-
-abstract class UniversalPlatform {
-
-  static UniversalPlatformType get value => currentUniversalPlatform;
-
-  static bool get isWeb => currentUniversalPlatform == UniversalPlatformType.Web;
-  static bool get isMacOS => currentUniversalPlatform == UniversalPlatformType.MacOS;
-  static bool get isWindows => currentUniversalPlatform == UniversalPlatformType.Windows;
-  static bool get isLinux => currentUniversalPlatform == UniversalPlatformType.Linux;
-  static bool get isAndroid => currentUniversalPlatform == UniversalPlatformType.Android;
-  static bool get isIOS => currentUniversalPlatform == UniversalPlatformType.IOS;
-  static bool get isFuchsia => currentUniversalPlatform == UniversalPlatformType.Fuchsia;
-
-}
-
-enum UniversalPlatformType {
-  Web,
-  Windows,
-  Linux,
-  MacOS,
-  Android,
-  Fuchsia,
-  IOS
-}
+export 'src/universal_platform.dart' show UniversalPlatform;
+export 'src/universal_platform_type.dart' show UniversalPlatformType;

pubspec.yaml

@@ -1,9 +1,7 @@
 name: universal_platform
 description: Replacement for dart.io.Platform class which works on Web as well as Desktop and Mobile. Allows platform checks in your view/model layer easily.
-version: 1.0.0-nullsafety
+version: 1.1.0
 homepage: https://github.com/gskinnerTeam/flutter-universal-platform
 
 environment:
   sdk: '>=2.12.0-dev <3.0.0'
-
-dependencies: