Migrate design to null safety (#430)

Closes #200
SharezoneApp · Mar 8, 2023 · 2fa2c17 · 2fa2c17
1 parent 8933c38
commit 2fa2c17
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/lib/design/lib/src/color_parser.dart b/lib/design/lib/src/color_parser.dart
@@ -15,9 +15,9 @@ class ColorParser {
     return rgbColor.toHexColor().toString();
   }
 
-  static Color fromHex(String hex) {
+  static Color fromHex(String? hex) {
     if (hex == null) return Colors.blue;
     final rgbColor = colorlib.HexColor(hex).toRgbColor();
-    return Color.fromARGB(255, rgbColor.r, rgbColor.g, rgbColor.b);
+    return Color.fromARGB(255, rgbColor.r as int, rgbColor.g as int, rgbColor.b as int);
   }
 }
diff --git a/lib/design/lib/src/design.dart b/lib/design/lib/src/design.dart
@@ -17,17 +17,20 @@ enum DesignType {
   color,
 }
 
-DesignType designTypeFromJson(dynamic data) =>
+DesignType? designTypeFromJson(dynamic data) =>
     enumFromString<DesignType>(DesignType.values, data,
         orElse: DesignType.color);
 
-String designTypeToJson(DesignType designType) => enumToString(designType);
+String? designTypeToJson(DesignType? designType) => enumToString(designType);
 
 class Design {
   final String hex;
   final DesignType type;
 
-  const Design._({this.hex, this.type});
+  const Design._({
+    required this.hex,
+    required this.type,
+  });
 
   factory Design.standard() => Design.fromColor(Colors.lightBlue);
 
@@ -46,9 +49,9 @@ class Design {
       if (data is String) {
         return Design._(hex: data, type: DesignType.color);
       }
-      DesignType type = designTypeFromJson(data['type']);
+      DesignType? type = designTypeFromJson(data['type']);
       if (type == DesignType.color) {
-        return Design._(hex: data['color'], type: type);
+        return Design._(hex: data['color'], type: type!);
       }
       return Design.standard();
     } catch (_) {
@@ -93,5 +96,5 @@ class Design {
     Colors.grey,
     Colors.brown,
     Colors.black87,
-  ].map((color) => Design.fromColor(color)).toList();
+  ].map((color) => Design.fromColor(color!)).toList();
 }
diff --git a/lib/design/pubspec.yaml b/lib/design/pubspec.yaml
@@ -12,7 +12,7 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: ">=2.10.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   sharezone_common: