From cc8e01f00472450c223bb8b6b4e5142b6281bcde Mon Sep 17 00:00:00 2001
From: Ivan <42812006+ivan-015@users.noreply.github.com>
Date: Mon, 5 Oct 2020 02:11:50 -0600
Subject: [PATCH] Fixed UUID generation and json serialization (#95)

---
 .../entities/inherited_text.g.dart                       | 4 ++++
 lib/interpret_and_optimize/entities/layouts/row.g.dart   | 2 +-
 lib/interpret_and_optimize/entities/layouts/stack.dart   | 2 +-
 lib/interpret_and_optimize/entities/layouts/stack.g.dart | 2 +-
 .../services/pb_layout_generation_service.dart           | 9 ++++++---
 pubspec.yaml                                             | 2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/interpret_and_optimize/entities/inherited_text.g.dart b/lib/interpret_and_optimize/entities/inherited_text.g.dart
index 8440f19e..851eaa20 100644
--- a/lib/interpret_and_optimize/entities/inherited_text.g.dart
+++ b/lib/interpret_and_optimize/entities/inherited_text.g.dart
@@ -28,6 +28,8 @@ InheritedText _$InheritedTextFromJson(Map<String, dynamic> json) {
     ..text = json['text'] as String
     ..fontSize = json['fontSize'] as num
     ..fontName = json['fontName'] as String
+    ..fontWeight = json['fontWeight'] as String
+    ..fontStyle = json['fontStyle'] as String
     ..textAlignment = json['textAlignment'] as String
     ..letterSpacing = json['letterSpacing'] as num;
 }
@@ -49,6 +51,8 @@ Map<String, dynamic> _$InheritedTextToJson(InheritedText instance) =>
       'text': instance.text,
       'fontSize': instance.fontSize,
       'fontName': instance.fontName,
+      'fontWeight': instance.fontWeight,
+      'fontStyle': instance.fontStyle,
       'textAlignment': instance.textAlignment,
       'letterSpacing': instance.letterSpacing,
     };
diff --git a/lib/interpret_and_optimize/entities/layouts/row.g.dart b/lib/interpret_and_optimize/entities/layouts/row.g.dart
index c64576c9..7dd2ea9d 100644
--- a/lib/interpret_and_optimize/entities/layouts/row.g.dart
+++ b/lib/interpret_and_optimize/entities/layouts/row.g.dart
@@ -9,7 +9,7 @@ part of 'row.dart';
 PBIntermediateRowLayout _$PBIntermediateRowLayoutFromJson(
     Map<String, dynamic> json) {
   return PBIntermediateRowLayout(
-    UUID: json['UUID'] as String,
+    json['UUID'] as String,
   )
     ..subsemantic = json['subsemantic'] as String
     ..child = json['child']
diff --git a/lib/interpret_and_optimize/entities/layouts/stack.dart b/lib/interpret_and_optimize/entities/layouts/stack.dart
index 8bcc1bcc..2bac7c48 100644
--- a/lib/interpret_and_optimize/entities/layouts/stack.dart
+++ b/lib/interpret_and_optimize/entities/layouts/stack.dart
@@ -84,7 +84,7 @@ class PBIntermediateStackLayout extends PBLayoutIntermediateNode {
       List<PBIntermediateNode> children, PBContext currentContext) {
     /// The width of this stack must be the full width of the Scaffold or Artboard. As discussed, at some point we can change this but for now, this makes the most sense.
     var stack =
-        PBIntermediateStackLayout(UUID: Uuid().v4(), currentContext: currentContext);
+        PBIntermediateStackLayout(Uuid().v4(), currentContext: currentContext);
     stack.prototypeNode = prototypeNode;
     children.forEach((child) => stack.addChild(child));
     return stack;
diff --git a/lib/interpret_and_optimize/entities/layouts/stack.g.dart b/lib/interpret_and_optimize/entities/layouts/stack.g.dart
index 4bcf2d30..9d9edd57 100644
--- a/lib/interpret_and_optimize/entities/layouts/stack.g.dart
+++ b/lib/interpret_and_optimize/entities/layouts/stack.g.dart
@@ -9,7 +9,7 @@ part of 'stack.dart';
 PBIntermediateStackLayout _$PBIntermediateStackLayoutFromJson(
     Map<String, dynamic> json) {
   return PBIntermediateStackLayout(
-    UUID: json['UUID'] as String,
+    json['UUID'] as String,
   )
     ..subsemantic = json['subsemantic'] as String
     ..child = json['child']
diff --git a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart
index be1ce56a..7954a434 100644
--- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart
+++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart
@@ -38,11 +38,14 @@ class PBLayoutGenerationService implements PBGenerationService {
     Map<String, PBLayoutIntermediateNode> layoutHandlers = {
       'column': PBIntermediateColumnLayout(
           currentContext: currentContext, UUID: Uuid().v4()),
-      'row': PBIntermediateRowLayout(currentContext: currentContext, UUID: Uuid().v4()),
-      'stack': PBIntermediateStackLayout(currentContext: currentContext, UUID: Uuid().v4()),
+      'row':
+          PBIntermediateRowLayout(Uuid().v4(), currentContext: currentContext),
+      'stack': PBIntermediateStackLayout(Uuid().v4(),
+          currentContext: currentContext),
     };
 
-    for (var layoutType in currentContext.configuration.layoutPrecedence ?? ['column']) {
+    for (var layoutType
+        in currentContext.configuration.layoutPrecedence ?? ['column']) {
       layoutType = layoutType.toLowerCase();
       if (layoutHandlers.containsKey(layoutType)) {
         _availableLayouts.add(layoutHandlers[layoutType]);
diff --git a/pubspec.yaml b/pubspec.yaml
index 6642c94c..3deea9d7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   archive: ^2.0.11
   json_serializable: ^3.5.0
-  # build_runner: ^1.10.0
+  build_runner: ^1.10.0
   mockito: ^4.1.1
   hex: ^0.1.2
   build: ^1.3.0