From 4d1d75a0338362519fda662e8f5d09712bcaf45d Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 13 May 2022 13:43:52 -0500 Subject: [PATCH 01/55] Added logic to manage custom on components for proper alignment --- .../pb_layout_generation_service.dart | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) 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 058d69f2..9b7a2d16 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -16,6 +16,7 @@ import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_layo import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_visual_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/pb_intermediate_node_tree.dart'; +import 'package:parabeac_core/tags/custom_tag/custom_tag.dart'; import 'package:sentry/sentry.dart'; /// PBLayoutGenerationService: @@ -92,25 +93,38 @@ class PBLayoutGenerationService extends AITHandler { /// a stack to ensure alignment. void _applyComponentRules( PBIntermediateTree tree, PBSharedMasterNode component) { - if (tree.childrenOf(component).length == 1 && - tree.childrenOf(component).first is! Group) { - var child = tree.childrenOf(component).first; + var firstChild = tree.childrenOf(component).first; + if (firstChild is CustomTag && + tree.childrenOf(firstChild).length == 1 && + tree.childrenOf(firstChild).first is! Group) { + /// Get child's child + var grandChild = tree.childrenOf(firstChild).first; - /// TODO: Improve the way we create Stacks - var stack = PBIntermediateStackLayout( - name: component.name, - constraints: component.constraints.copyWith(), - ) - ..auxiliaryData = component.auxiliaryData - ..frame = component.frame.copyWith() - ..layoutCrossAxisSizing = component.layoutCrossAxisSizing - ..layoutMainAxisSizing = component.layoutMainAxisSizing; - - /// Insert the stack below the component. - tree.injectBetween(insertee: stack, parent: component, child: child); + _addStack(tree, firstChild, grandChild); + } else if (tree.childrenOf(component).length == 1 && firstChild is! Group) { + _addStack(tree, component, firstChild); } } + void _addStack( + PBIntermediateTree tree, + PBIntermediateNode parent, + PBIntermediateNode child, + ) { + /// TODO: Improve the way we create Stacks + var stack = PBIntermediateStackLayout( + name: parent.name, + constraints: parent.constraints.copyWith(), + ) + ..auxiliaryData = parent.auxiliaryData + ..frame = parent.frame.copyWith() + ..layoutCrossAxisSizing = parent.layoutCrossAxisSizing + ..layoutMainAxisSizing = parent.layoutMainAxisSizing; + + /// Insert the stack below the component. + tree.injectBetween(insertee: stack, parent: parent, child: child); + } + void _wrapLayout(PBIntermediateTree tree, PBContext context) { // Get all the LayoutIntermediateNodes from the tree tree.whereType().forEach((tempGroup) { From 0aa2a1928c43470204508404fb68dce61f11a26e Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 17 May 2022 13:27:59 -0500 Subject: [PATCH 02/55] Cleaned size and container generator --- .../attribute-helper/pb_size_helper.dart | 108 +++++++++--------- .../visual-widgets/pb_container_gen.dart | 50 +++++--- 2 files changed, 85 insertions(+), 73 deletions(-) diff --git a/lib/generation/generators/attribute-helper/pb_size_helper.dart b/lib/generation/generators/attribute-helper/pb_size_helper.dart index 1302f75f..eac0cd98 100644 --- a/lib/generation/generators/attribute-helper/pb_size_helper.dart +++ b/lib/generation/generators/attribute-helper/pb_size_helper.dart @@ -1,7 +1,5 @@ import 'package:parabeac_core/generation/generators/attribute-helper/pb_attribute_gen_helper.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/container.dart'; -import 'package:parabeac_core/interpret_and_optimize/entities/inherited_container.dart'; -import 'package:parabeac_core/interpret_and_optimize/entities/injected_container.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; @@ -15,83 +13,85 @@ class PBSizeHelper extends PBAttributesHelper { return ''; } - String heightString, widthString; final buffer = StringBuffer(); - double relativeHeight = source.frame.height; - double relativeWidth = source.frame.width; + buffer.write(getSize(source, context, DIMENTIONS.Width)); + buffer.write(getSize(source, context, DIMENTIONS.Height)); - //Add relative sizing if the widget has context - var screenWidth; - var screenHeight; + return buffer.toString(); + } + + String getSize( + PBIntermediateNode source, PBContext context, DIMENTIONS dimention) { + var isHeight = dimention == DIMENTIONS.Height; + var dimentionString = dimention.toShortString(); + var lowerCaseDimentionString = dimentionString.toLowerCase(); + String sizeString; + final buffer = StringBuffer(); + + double relativeSize = isHeight ? source.frame.height : source.frame.width; + + // Add relative sizing if the widget has context + num screenSize; if (context.screenFrame != null) { - screenWidth = context.screenFrame.width; - screenHeight = context.screenFrame.height; + screenSize = + isHeight ? context.screenFrame.height : context.screenFrame.width; } if (context.sizingContext == SizingValueContext.ScaleValue) { // Size for scalevalue - relativeHeight = - (relativeHeight != null && screenHeight != null && screenHeight > 0.0) - ? relativeHeight / screenHeight - : relativeHeight; - relativeWidth = - (relativeWidth != null && screenWidth != null && screenWidth > 0.0) - ? relativeWidth / screenWidth - : relativeWidth; - var height = source.constraints.fixedHeight - ? source.frame.height.toStringAsFixed(3) - : 'MediaQuery.of(context).size.height * ${relativeHeight.toStringAsFixed(3)}'; - var width = source.constraints.fixedWidth - ? source.frame.width.toStringAsFixed(3) - : 'MediaQuery.of(context).size.width * ${relativeWidth.toStringAsFixed(3)}'; - - heightString = 'height: $height,'; - - widthString = 'width: $width,'; + relativeSize = + (relativeSize != null && screenSize != null && screenSize > 0.0) + ? relativeSize / screenSize + : relativeSize; + + var size = (isHeight + ? source.constraints.fixedHeight + : source.constraints.fixedWidth) + ? (isHeight + ? source.frame.height.toStringAsFixed(3) + : source.frame.width.toStringAsFixed(3)) + : 'MediaQuery.of(context).size.$lowerCaseDimentionString * ${relativeSize.toStringAsFixed(3)}'; + + sizeString = '$lowerCaseDimentionString: $size,'; } else if (context.sizingContext == SizingValueContext.LayoutBuilderValue) { - relativeWidth = relativeWidth / screenWidth; - relativeHeight = relativeHeight / screenHeight; + relativeSize = relativeSize / screenSize; // Size for LayoutBuilder - widthString = - 'width: constraints.maxWidth * ${relativeWidth.toStringAsFixed(3)},'; - - heightString = - 'height: constraints.maxHeight * ${relativeHeight.toStringAsFixed(3)},'; + sizeString = + '$lowerCaseDimentionString: constraints.max$dimentionString * ${relativeSize.toStringAsFixed(3)},'; } else if (context.sizingContext == SizingValueContext.LayoutBuilderStatefulValue) { - relativeWidth = relativeWidth / screenWidth; - relativeHeight = relativeHeight / screenHeight; + relativeSize = relativeSize / screenSize; // Size for LayoutBuilder - widthString = - 'width: widget.constraints.maxWidth * ${relativeWidth.toStringAsFixed(3)},'; - - heightString = - 'height: widget.constraints.maxHeight * ${relativeHeight.toStringAsFixed(3)},'; + sizeString = + '$lowerCaseDimentionString: widget.constraints.max$dimentionString * ${relativeSize.toStringAsFixed(3)},'; } else { // Size for constants value - widthString = 'width: ${relativeWidth.toStringAsFixed(3)},'; - - heightString = 'height: ${relativeHeight.toStringAsFixed(3)},'; + sizeString = + '$lowerCaseDimentionString: ${relativeSize.toStringAsFixed(3)},'; } // Determine if it is going to show width and height - var showWidth = true; - var showHeight = true; + var show = true; if (source is PBContainer) { - showWidth = source.showWidth; - showHeight = source.showHeight; - } - if (relativeWidth != null && relativeWidth > 0 && showWidth) { - buffer.write(widthString); + show = isHeight ? source.showHeight : source.showWidth; } - if (relativeHeight != null && relativeHeight > 0 && showHeight) { - buffer.write(heightString); + + if (relativeSize != null && relativeSize > 0 && show) { + buffer.write(sizeString); } return buffer.toString(); } } + +enum DIMENTIONS { Height, Width } + +extension DimentionToString on DIMENTIONS { + String toShortString() { + return this.toString().split('.').last; + } +} diff --git a/lib/generation/generators/visual-widgets/pb_container_gen.dart b/lib/generation/generators/visual-widgets/pb_container_gen.dart index d77ddd0c..f3617491 100644 --- a/lib/generation/generators/visual-widgets/pb_container_gen.dart +++ b/lib/generation/generators/visual-widgets/pb_container_gen.dart @@ -27,48 +27,53 @@ class PBContainerGenerator extends PBGenerator { buffer.write('clipBehavior: Clip.hardEdge,'); } + /// Write container padding + if (source.padding != null) { + buffer.write(getPadding(source.padding)); + } + //TODO(ivanV): please clean my if statement :( if (source is InjectedContainer) { - if (source.padding != null) { - buffer.write(getPadding(source.padding)); - } if (source.pointValueHeight && source.frame.height > 0 && source.showHeight) { buffer.write('height: ${source.frame.height},'); + } else if (!source.pointValueHeight) { + buffer.write( + PBSizeHelper().getSize(source, context, DIMENTIONS.Height)); } + if (source.pointValueWidth && source.frame.width > 0 && source.showWidth) { buffer.write('width: ${source.frame.width},'); + } else if (!source.pointValueWidth) { + buffer + .write(PBSizeHelper().getSize(source, context, DIMENTIONS.Width)); } - if (!source.pointValueHeight && !source.pointValueWidth) { - buffer.write(PBSizeHelper().generate(source, context)); - } - } else if (source is InheritedContainer) { - if (source.padding != null) { - buffer.write(getPadding(source.padding)); - } + } + + /// If source is [InheritedContainer] get both width and heigt + else if (source is InheritedContainer) { buffer.write(PBSizeHelper().generate(source, context)); } + /// If border info exists, use box decoration for auxiliary data if (source.auxiliaryData.borderInfo != null) { buffer.write(PBBoxDecorationHelper().generate(source, context)); - } else { + } + + /// Else assing the color through the container + else { buffer.write(PBColorGenHelper().generate(source, context)); } - // if (source.auxiliaryData.alignment != null) { - // buffer.write( - // 'alignment: Alignment(${(source.auxiliaryData.alignment['alignX'] as double).toStringAsFixed(2)}, ${(source.auxiliaryData.alignment['alignY'] as double).toStringAsFixed(2)}),'); - // } + /// Check if container has a child var child = sourceChildren.isEmpty ? null : sourceChildren.first; if (child != null) { child.frame = source.frame; - // source.child.currentContext = source.currentContext; - var statement = child != null - ? 'child: ${child.generator.generate(child, context)}' - : ''; + var statement = 'child: ${child.generator.generate(child, context)}'; + buffer.write(statement); } buffer.write(')'); @@ -78,6 +83,13 @@ class PBContainerGenerator extends PBGenerator { } String getPadding(InjectedPadding padding) { + /// If there are no paddings to write, do not write any padding + if ((padding.left == null) && + (padding.right == null) && + (padding.top == null) && + (padding.bottom == null)) { + return ''; + } var buffer = StringBuffer(); buffer.write('padding: EdgeInsets.only('); From a7180edf9ee8abb4541a786385505586d1d48127 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 17 May 2022 13:28:18 -0500 Subject: [PATCH 03/55] Sort children before add spacing --- .../entities/layouts/auto_layout_align_strategy.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart index 97bbb977..66fc2442 100644 --- a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart +++ b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart @@ -14,6 +14,10 @@ import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; import '../injected_sized_box.dart'; class AutoLayoutAlignStrategy extends AlignStrategy { + ///Sort children + void sortChildren(List children) => children.sort( + (child0, child1) => child0.frame.topLeft.compareTo(child1.frame.topLeft)); + @override void align(PBContext context, node) { // TODO: Look for a way to not have to check if it is a col or row @@ -21,6 +25,7 @@ class AutoLayoutAlignStrategy extends AlignStrategy { // New children list var spacedChildren = []; var children = context.tree.childrenOf(node); + sortChildren(children); var isVertical = true; num space; From bd5d331e0f8b659e8a347c8035cffe87480084c2 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 17 May 2022 13:29:32 -0500 Subject: [PATCH 04/55] Verify there is a child --- .../services/pb_layout_generation_service.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 9b7a2d16..40e5948f 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -93,7 +93,9 @@ class PBLayoutGenerationService extends AITHandler { /// a stack to ensure alignment. void _applyComponentRules( PBIntermediateTree tree, PBSharedMasterNode component) { - var firstChild = tree.childrenOf(component).first; + /// Check that children is not an empty list + var children = tree.childrenOf(component); + var firstChild = children.isNotEmpty ? children.first : null; if (firstChild is CustomTag && tree.childrenOf(firstChild).length == 1 && tree.childrenOf(firstChild).first is! Group) { From 8d1dd75193c9ed2a00e0923c67dc00a017c7f1b5 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 17 May 2022 13:34:45 -0500 Subject: [PATCH 05/55] Clening code --- .../entities/layouts/auto_layout_align_strategy.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart index 66fc2442..caa40fd3 100644 --- a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart +++ b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart @@ -14,10 +14,6 @@ import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; import '../injected_sized_box.dart'; class AutoLayoutAlignStrategy extends AlignStrategy { - ///Sort children - void sortChildren(List children) => children.sort( - (child0, child1) => child0.frame.topLeft.compareTo(child1.frame.topLeft)); - @override void align(PBContext context, node) { // TODO: Look for a way to not have to check if it is a col or row @@ -82,6 +78,10 @@ class AutoLayoutAlignStrategy extends AlignStrategy { context.tree.replaceChildrenOf(node, spacedChildren); } + ///Sort children + void sortChildren(List children) => children.sort( + (child0, child1) => child0.frame.topLeft.compareTo(child1.frame.topLeft)); + /// Checks if child is a [PBLayoutIntermediateNode] /// and adds a container on top of it PBIntermediateNode _needsContainer( From a44479cd727f7a1ef2411c3a8e9adfaf9011b979 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 17 May 2022 13:56:07 -0500 Subject: [PATCH 06/55] Updated golden file --- test/golden/golden_files/styling/styling.golden | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/golden/golden_files/styling/styling.golden b/test/golden/golden_files/styling/styling.golden index 9faf6123..cf31a26c 100644 --- a/test/golden/golden_files/styling/styling.golden +++ b/test/golden/golden_files/styling/styling.golden @@ -308,8 +308,8 @@ class _StylingScreen extends State { height: 118.0, child: Container( clipBehavior: Clip.hardEdge, - width: 154.000, height: 118.000, + width: 154.000, decoration: BoxDecoration( color: Color(0x99cd4900), ), @@ -343,8 +343,8 @@ class _StylingScreen extends State { height: 118.0, child: Container( clipBehavior: Clip.hardEdge, - width: 154.000, height: 118.000, + width: 154.000, decoration: BoxDecoration( gradient: LinearGradient( begin: Alignment(0.0, -1.0), From 4e7ebc45184c3de606d4e4c438e6631453a63436 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 30 May 2022 17:03:51 -0600 Subject: [PATCH 07/55] Run dart build --- lib/interpret_and_optimize/entities/inherited_circle.g.dart | 2 -- .../entities/inherited_container.g.dart | 2 -- lib/interpret_and_optimize/entities/inherited_material.g.dart | 2 -- lib/interpret_and_optimize/entities/inherited_scaffold.g.dart | 2 -- lib/interpret_and_optimize/entities/inherited_star.g.dart | 2 -- lib/interpret_and_optimize/entities/inherited_text.g.dart | 2 -- lib/interpret_and_optimize/entities/inherited_triangle.g.dart | 2 -- lib/interpret_and_optimize/entities/injected_container.g.dart | 2 -- lib/interpret_and_optimize/entities/layouts/column.g.dart | 4 ++++ .../entities/layouts/group/base_group.g.dart | 4 ++++ 10 files changed, 8 insertions(+), 16 deletions(-) diff --git a/lib/interpret_and_optimize/entities/inherited_circle.g.dart b/lib/interpret_and_optimize/entities/inherited_circle.g.dart index 34d31b8b..998f7e66 100644 --- a/lib/interpret_and_optimize/entities/inherited_circle.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_circle.g.dart @@ -18,7 +18,6 @@ InheritedCircle _$InheritedCircleFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) - ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -32,7 +31,6 @@ InheritedCircle _$InheritedCircleFromJson(Map json) { Map _$InheritedCircleToJson(InheritedCircle instance) => { - 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_container.g.dart b/lib/interpret_and_optimize/entities/inherited_container.g.dart index 8b56989a..307ea9ab 100644 --- a/lib/interpret_and_optimize/entities/inherited_container.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_container.g.dart @@ -19,7 +19,6 @@ InheritedContainer _$InheritedContainerFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) - ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -33,7 +32,6 @@ InheritedContainer _$InheritedContainerFromJson(Map json) { Map _$InheritedContainerToJson(InheritedContainer instance) => { - 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_material.g.dart b/lib/interpret_and_optimize/entities/inherited_material.g.dart index 59775aad..57eb1116 100644 --- a/lib/interpret_and_optimize/entities/inherited_material.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_material.g.dart @@ -17,7 +17,6 @@ InheritedMaterial _$InheritedMaterialFromJson(Map json) { json['prototypeNodeUUID'] as String), constraints: json['constraints'], ) - ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -31,7 +30,6 @@ InheritedMaterial _$InheritedMaterialFromJson(Map json) { Map _$InheritedMaterialToJson(InheritedMaterial instance) => { - 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_scaffold.g.dart b/lib/interpret_and_optimize/entities/inherited_scaffold.g.dart index c558535e..7ea77c08 100644 --- a/lib/interpret_and_optimize/entities/inherited_scaffold.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_scaffold.g.dart @@ -20,7 +20,6 @@ InheritedScaffold _$InheritedScaffoldFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) - ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -34,7 +33,6 @@ InheritedScaffold _$InheritedScaffoldFromJson(Map json) { Map _$InheritedScaffoldToJson(InheritedScaffold instance) => { - 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_star.g.dart b/lib/interpret_and_optimize/entities/inherited_star.g.dart index d2817b62..df976688 100644 --- a/lib/interpret_and_optimize/entities/inherited_star.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_star.g.dart @@ -18,7 +18,6 @@ InheritedStar _$InheritedStarFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) - ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -32,7 +31,6 @@ InheritedStar _$InheritedStarFromJson(Map json) { Map _$InheritedStarToJson(InheritedStar instance) => { - 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_text.g.dart b/lib/interpret_and_optimize/entities/inherited_text.g.dart index 71cea453..886e3adc 100644 --- a/lib/interpret_and_optimize/entities/inherited_text.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_text.g.dart @@ -16,7 +16,6 @@ InheritedText _$InheritedTextFromJson(Map json) { json['prototypeNodeUUID'] as String), text: json['content'] as String, ) - ..subsemantic = json['subsemantic'] as String ..constraints = json['constraints'] == null ? null : PBIntermediateConstraints.fromJson( @@ -34,7 +33,6 @@ InheritedText _$InheritedTextFromJson(Map json) { Map _$InheritedTextToJson(InheritedText instance) => { - 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_triangle.g.dart b/lib/interpret_and_optimize/entities/inherited_triangle.g.dart index fc9e3590..b35d1ef8 100644 --- a/lib/interpret_and_optimize/entities/inherited_triangle.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_triangle.g.dart @@ -18,7 +18,6 @@ InheritedTriangle _$InheritedTriangleFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) - ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -32,7 +31,6 @@ InheritedTriangle _$InheritedTriangleFromJson(Map json) { Map _$InheritedTriangleToJson(InheritedTriangle instance) => { - 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/injected_container.g.dart b/lib/interpret_and_optimize/entities/injected_container.g.dart index 35e8ad6b..18137ab3 100644 --- a/lib/interpret_and_optimize/entities/injected_container.g.dart +++ b/lib/interpret_and_optimize/entities/injected_container.g.dart @@ -23,7 +23,6 @@ InjectedContainer _$InjectedContainerFromJson(Map json) { showWidth: json['showWidth'] as bool, showHeight: json['showHeight'] as bool, ) - ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -36,7 +35,6 @@ InjectedContainer _$InjectedContainerFromJson(Map json) { Map _$InjectedContainerToJson(InjectedContainer instance) => { - 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/layouts/column.g.dart b/lib/interpret_and_optimize/entities/layouts/column.g.dart index cb5a0022..16df64d6 100644 --- a/lib/interpret_and_optimize/entities/layouts/column.g.dart +++ b/lib/interpret_and_optimize/entities/layouts/column.g.dart @@ -12,6 +12,7 @@ PBIntermediateColumnLayout _$PBIntermediateColumnLayoutFromJson( Rectangle3D.fromJson(json['boundaryRectangle'] as Map), name: json['name'] as String, ) + ..subsemantic = json['subsemantic'] as String ..constraints = json['constraints'] == null ? null : PBIntermediateConstraints.fromJson( @@ -27,6 +28,7 @@ PBIntermediateColumnLayout _$PBIntermediateColumnLayoutFromJson( ..prototypeNode = json['prototypeNode'] == null ? null : PrototypeNode.fromJson(json['prototypeNode'] as Map) + ..alignment = json['alignment'] as Map ..layoutProperties = json['autoLayoutOptions'] == null ? null : LayoutProperties.fromJson( @@ -37,6 +39,7 @@ PBIntermediateColumnLayout _$PBIntermediateColumnLayoutFromJson( Map _$PBIntermediateColumnLayoutToJson( PBIntermediateColumnLayout instance) => { + 'subsemantic': instance.subsemantic, 'constraints': instance.constraints, 'layoutMainAxisSizing': _$ParentLayoutSizingEnumMap[instance.layoutMainAxisSizing], @@ -46,6 +49,7 @@ Map _$PBIntermediateColumnLayoutToJson( 'style': instance.auxiliaryData, 'name': instance.name, 'prototypeNode': instance.prototypeNode, + 'alignment': instance.alignment, 'autoLayoutOptions': instance.layoutProperties, 'type': instance.type, }; diff --git a/lib/interpret_and_optimize/entities/layouts/group/base_group.g.dart b/lib/interpret_and_optimize/entities/layouts/group/base_group.g.dart index 2588e70e..23fc0dec 100644 --- a/lib/interpret_and_optimize/entities/layouts/group/base_group.g.dart +++ b/lib/interpret_and_optimize/entities/layouts/group/base_group.g.dart @@ -18,6 +18,7 @@ BaseGroup _$BaseGroupFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -26,10 +27,12 @@ BaseGroup _$BaseGroupFromJson(Map json) { ? null : IntermediateAuxiliaryData.fromJson( json['style'] as Map) + ..alignment = json['alignment'] as Map ..type = json['type'] as String; } Map _$BaseGroupToJson(BaseGroup instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': @@ -39,6 +42,7 @@ Map _$BaseGroupToJson(BaseGroup instance) => { 'boundaryRectangle': Rectangle3D.toJson(instance.frame), 'style': instance.auxiliaryData, 'name': instance.name, + 'alignment': instance.alignment, 'prototypeNodeUUID': instance.prototypeNode, 'type': instance.type, }; From bb6d3f7aaa72cf1c1e0d9ca28a1652dc8930fa53 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 30 May 2022 17:04:26 -0600 Subject: [PATCH 08/55] Changed AxisSizing to ParentSizing --- .../services/pb_layout_generation_service.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 40e5948f..76233690 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -156,10 +156,10 @@ class PBLayoutGenerationService extends AITHandler { constraints: tempLayout.constraints.copyWith(), // Let the Container know if it is going to show // the width or height on the generation process - showHeight: tempLayout.layoutProperties.primaryAxisAlignment == - IntermediateAxisMode.FIXED, - showWidth: tempLayout.layoutProperties.crossAxisSizing == - IntermediateAxisMode.FIXED, + showHeight: + tempLayout.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, + showWidth: + tempLayout.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT, ) ..layoutCrossAxisSizing = tempLayout.layoutCrossAxisSizing ..layoutMainAxisSizing = tempLayout.layoutMainAxisSizing From fdc677011a1a98d245647ad56524936c72dfaca3 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 1 Jun 2022 15:46:37 -0600 Subject: [PATCH 09/55] Removed 3 poins fix after zero --- .../generators/attribute-helper/pb_size_helper.dart | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/generation/generators/attribute-helper/pb_size_helper.dart b/lib/generation/generators/attribute-helper/pb_size_helper.dart index eac0cd98..374aaf6b 100644 --- a/lib/generation/generators/attribute-helper/pb_size_helper.dart +++ b/lib/generation/generators/attribute-helper/pb_size_helper.dart @@ -50,9 +50,9 @@ class PBSizeHelper extends PBAttributesHelper { ? source.constraints.fixedHeight : source.constraints.fixedWidth) ? (isHeight - ? source.frame.height.toStringAsFixed(3) - : source.frame.width.toStringAsFixed(3)) - : 'MediaQuery.of(context).size.$lowerCaseDimentionString * ${relativeSize.toStringAsFixed(3)}'; + ? source.frame.height.toString() + : source.frame.width.toString()) + : 'MediaQuery.of(context).size.$lowerCaseDimentionString * ${relativeSize.toString()}'; sizeString = '$lowerCaseDimentionString: $size,'; } else if (context.sizingContext == SizingValueContext.LayoutBuilderValue) { @@ -60,18 +60,17 @@ class PBSizeHelper extends PBAttributesHelper { // Size for LayoutBuilder sizeString = - '$lowerCaseDimentionString: constraints.max$dimentionString * ${relativeSize.toStringAsFixed(3)},'; + '$lowerCaseDimentionString: constraints.max$dimentionString * ${relativeSize.toString()},'; } else if (context.sizingContext == SizingValueContext.LayoutBuilderStatefulValue) { relativeSize = relativeSize / screenSize; // Size for LayoutBuilder sizeString = - '$lowerCaseDimentionString: widget.constraints.max$dimentionString * ${relativeSize.toStringAsFixed(3)},'; + '$lowerCaseDimentionString: widget.constraints.max$dimentionString * ${relativeSize.toString()},'; } else { // Size for constants value - sizeString = - '$lowerCaseDimentionString: ${relativeSize.toStringAsFixed(3)},'; + sizeString = '$lowerCaseDimentionString: ${relativeSize.toString()},'; } // Determine if it is going to show width and height From e1032d2c8eea86670e0f2c08c67fe39a50009f6b Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 1 Jun 2022 15:46:52 -0600 Subject: [PATCH 10/55] Simplify if statement --- .../entities/layouts/auto_layout_align_strategy.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart index caa40fd3..53dc88f7 100644 --- a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart +++ b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart @@ -86,7 +86,7 @@ class AutoLayoutAlignStrategy extends AlignStrategy { /// and adds a container on top of it PBIntermediateNode _needsContainer( child, bool isVertical, PBContext context) { - if (child is! InheritedContainer || child is! InjectedContainer) { + if (child is! PBContainer) { // Creates container var wrapper = InjectedContainer( null, From 7a5ab558b1bebc4a3504b103f093119843ec3ccb Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 1 Jun 2022 15:47:13 -0600 Subject: [PATCH 11/55] Added missing fields --- .../services/pb_layout_generation_service.dart | 7 +++++++ 1 file changed, 7 insertions(+) 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 76233690..6e26fd1e 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -216,11 +216,18 @@ class PBLayoutGenerationService extends AITHandler { ); if (tempGroup.auxiliaryData.colors != null) { + var isVertical = tempGroup.parent is PBIntermediateColumnLayout; var tempContainer = InjectedContainer( null, tempGroup.frame.copyWith(), constraints: tempGroup.constraints.copyWith(), name: tempGroup.name, + pointValueHeight: isVertical + ? tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT + : tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT, + pointValueWidth: isVertical + ? tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT + : tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, ) ..auxiliaryData = tempGroup.auxiliaryData ..layoutCrossAxisSizing = tempGroup.layoutCrossAxisSizing From 41998fa4b9f5e54d6e4301d6310823268c3f2b6a Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 1 Jun 2022 16:11:51 -0600 Subject: [PATCH 12/55] Update auto layout golden tests --- .../auto_layout/col_hz_fx_vr_fx_sp_pk1.golden | 84 +++++++++---------- .../auto_layout/col_hz_fx_vr_fx_sp_pk2.golden | 84 +++++++++---------- .../auto_layout/col_hz_fx_vr_fx_sp_pk3.golden | 84 +++++++++---------- .../auto_layout/col_hz_fx_vr_fx_sp_pk4.golden | 84 +++++++++---------- .../auto_layout/col_hz_fx_vr_fx_sp_pk5.golden | 84 +++++++++---------- .../auto_layout/col_hz_fx_vr_fx_sp_pk6.golden | 84 +++++++++---------- .../auto_layout/col_hz_fx_vr_fx_sp_pk7.golden | 84 +++++++++---------- .../auto_layout/col_hz_fx_vr_fx_sp_pk8.golden | 84 +++++++++---------- .../auto_layout/col_hz_fx_vr_fx_sp_pk9.golden | 84 +++++++++---------- .../col_hz_fx_vr_fx_sp_sb147.golden | 84 +++++++++---------- .../col_hz_fx_vr_fx_sp_sb258.golden | 84 +++++++++---------- .../col_hz_fx_vr_fx_sp_sb369.golden | 84 +++++++++---------- .../col_hz_fx_vr_hg_sp_pk147.golden | 84 +++++++++---------- .../col_hz_fx_vr_hg_sp_pk258.golden | 84 +++++++++---------- .../col_hz_fx_vr_hg_sp_pk369.golden | 84 +++++++++---------- .../auto_layout/col_hz_hg_vr_fx_sp_pk1.golden | 83 +++++++++--------- .../auto_layout/col_hz_hg_vr_fx_sp_pk2.golden | 83 +++++++++--------- .../auto_layout/col_hz_hg_vr_fx_sp_pk3.golden | 83 +++++++++--------- .../auto_layout/col_hz_hg_vr_fx_sp_pk4.golden | 83 +++++++++--------- .../auto_layout/col_hz_hg_vr_fx_sp_pk5.golden | 83 +++++++++--------- .../auto_layout/col_hz_hg_vr_fx_sp_pk6.golden | 83 +++++++++--------- .../auto_layout/col_hz_hg_vr_fx_sp_pk7.golden | 83 +++++++++--------- .../auto_layout/col_hz_hg_vr_fx_sp_pk8.golden | 83 +++++++++--------- .../auto_layout/col_hz_hg_vr_fx_sp_pk9.golden | 83 +++++++++--------- .../col_hz_hg_vr_fx_sp_sb147.golden | 83 +++++++++--------- .../col_hz_hg_vr_fx_sp_sb258.golden | 83 +++++++++--------- .../col_hz_hg_vr_fx_sp_sb369.golden | 83 +++++++++--------- .../col_hz_hg_vr_hg_sp_pk123456789.golden | 83 +++++++++--------- ...pace_col_hz_hg_vr_hg_sp_pk123456789.golden | 83 +++++++++--------- ...pace_row_hz_hg_vr_hg_sp_pk123456789.golden | 83 +++++++++--------- .../auto_layout/row_hz_fx_vr_fx_sp_pk1.golden | 84 +++++++++---------- .../auto_layout/row_hz_fx_vr_fx_sp_pk2.golden | 84 +++++++++---------- .../auto_layout/row_hz_fx_vr_fx_sp_pk3.golden | 84 +++++++++---------- .../auto_layout/row_hz_fx_vr_fx_sp_pk4.golden | 84 +++++++++---------- .../auto_layout/row_hz_fx_vr_fx_sp_pk5.golden | 84 +++++++++---------- .../auto_layout/row_hz_fx_vr_fx_sp_pk6.golden | 84 +++++++++---------- .../auto_layout/row_hz_fx_vr_fx_sp_pk7.golden | 84 +++++++++---------- .../auto_layout/row_hz_fx_vr_fx_sp_pk8.golden | 84 +++++++++---------- .../auto_layout/row_hz_fx_vr_fx_sp_pk9.golden | 84 +++++++++---------- .../row_hz_fx_vr_fx_sp_sb123.golden | 84 +++++++++---------- .../row_hz_fx_vr_fx_sp_sb456.golden | 84 +++++++++---------- .../row_hz_fx_vr_fx_sp_sb789.golden | 84 +++++++++---------- .../row_hz_fx_vr_hg_sp_pk147.golden | 83 +++++++++--------- .../row_hz_fx_vr_hg_sp_pk258.golden | 83 +++++++++--------- .../row_hz_fx_vr_hg_sp_pk369.golden | 83 +++++++++--------- .../row_hz_fx_vr_hg_sp_sb123456789.golden | 83 +++++++++--------- .../row_hz_hg_vr_fx_sp_pk147.golden | 84 +++++++++---------- .../row_hz_hg_vr_fx_sp_pk258.golden | 84 +++++++++---------- .../row_hz_hg_vr_fx_sp_pk369.golden | 84 +++++++++---------- .../row_hz_hg_vr_hg_sp_pk123456789.golden | 83 +++++++++--------- 50 files changed, 1900 insertions(+), 2280 deletions(-) diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden index 69eb0c19..6dd12d59 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk1 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk1 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden index 8607ba38..e45990bf 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk2 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk2 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden index 5db0656c..e8062e95 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk3 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk3 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden index ec5de28b..d09feed5 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk4 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk4 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden index bce09c77..aace4754 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk5 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk5 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden index 602d1f93..a71ee2af 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk6 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk6 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden index 92b7de93..2d9a46f9 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk7 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk7 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden index bcfc1085..a7898a41 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk8 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk8 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden index 89ec1e06..74eb2d4b 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpPk9 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _ColHzFxVrFxSpPk9 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden index ea79a9ca..d65c1290 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpSb147 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,56 +45,47 @@ class _ColHzFxVrFxSpSb147 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden index 22432a58..a5fc5bcd 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpSb258 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,56 +45,47 @@ class _ColHzFxVrFxSpSb258 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden index 8406354e..ae22bb56 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden @@ -35,7 +35,8 @@ class _ColHzFxVrFxSpSb369 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 200.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,56 +45,47 @@ class _ColHzFxVrFxSpSb369 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden index ded165a2..bf414095 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden @@ -35,7 +35,8 @@ class _ColHzFxVrHgSpPk147 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 85.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -45,62 +46,53 @@ class _ColHzFxVrHgSpPk147 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden index 2ee7c82f..6cdc8622 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden @@ -35,7 +35,8 @@ class _ColHzFxVrHgSpPk258 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 85.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -45,62 +46,53 @@ class _ColHzFxVrHgSpPk258 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden index 9ad7c795..5a5595ef 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden @@ -35,7 +35,8 @@ class _ColHzFxVrHgSpPk369 extends State { top: 10.0, bottom: 10.0, ), - width: 326.000, + height: 85.0, + width: 326.0, decoration: BoxDecoration( color: Colors.black, ), @@ -45,62 +46,53 @@ class _ColHzFxVrHgSpPk369 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden index 1ad49a10..e4629668 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk1 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk1 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden index 26889cfc..0476c15c 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk2 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk2 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden index a94b7c36..33b95dc8 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk3 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk3 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden index 62775caf..ce023ede 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk4 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk4 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden index 9d87537a..164bd767 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk5 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk5 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden index 7c78850a..be976939 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk6 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk6 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden index a7c0db6e..cbb08793 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk7 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk7 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden index 2abe8cf3..8403d0a4 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk8 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk8 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden index 9ab7df7e..78280989 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpPk9 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _ColHzHgVrFxSpPk9 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden index d3ebf9d7..dc6ecb7b 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpSb147 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,56 +45,47 @@ class _ColHzHgVrFxSpSb147 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden index 4133206e..44bfd8a1 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpSb258 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,56 +45,47 @@ class _ColHzHgVrFxSpSb258 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden index 25894eff..2f1809ac 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden @@ -35,6 +35,8 @@ class _ColHzHgVrFxSpSb369 extends State { top: 10.0, bottom: 10.0, ), + height: 200.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,56 +45,47 @@ class _ColHzHgVrFxSpSb369 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden index 05f30d82..94d17c90 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden @@ -35,6 +35,8 @@ class _ColHzHgVrHgSpPk123456789 extends State { top: 10.0, bottom: 10.0, ), + height: 85.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +46,53 @@ class _ColHzHgVrHgSpPk123456789 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( height: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden index 006a2a17..c1b8a390 100644 --- a/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden @@ -37,6 +37,8 @@ class _NoSpaceColHzHgVrHgSpPk123456789 top: 10.0, bottom: 10.0, ), + height: 65.0, + width: 59.0, decoration: BoxDecoration( color: Colors.black, ), @@ -46,56 +48,47 @@ class _NoSpaceColHzHgVrHgSpPk123456789 mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden index 6237a27b..ffb8a254 100644 --- a/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden @@ -37,6 +37,8 @@ class _NoSpaceRowHzHgVrHgSpPk123456789 top: 10.0, bottom: 10.0, ), + height: 35.0, + width: 114.0, decoration: BoxDecoration( color: Colors.black, ), @@ -46,56 +48,47 @@ class _NoSpaceRowHzHgVrHgSpPk123456789 mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden index 8092e273..9a00fd3b 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk1 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk1 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden index 36b39e46..0343eefa 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk2 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk2 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden index 13bd041a..4da76784 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk3 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk3 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden index ee995c15..b2d06f33 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk4 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk4 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden index 18761fbc..3158fbcb 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk5 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk5 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden index 7f644c50..ade51037 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk6 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk6 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden index b40d48e6..df85510e 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk7 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk7 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden index f05ace8b..48cbe48f 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk8 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk8 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden index 96031be0..e57bd13b 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpPk9 extends State { top: 10.0, bottom: 10.0, ), - width: 200.000, + height: 60.0, + width: 200.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +45,53 @@ class _RowHzFxVrFxSpPk9 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden index aa8a1dc5..dd70ef40 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpSb123 extends State { top: 10.0, bottom: 10.0, ), - width: 322.000, + height: 50.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,56 +45,47 @@ class _RowHzFxVrFxSpSb123 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden index 8c7e9dd4..ebd113b4 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpSb456 extends State { top: 10.0, bottom: 10.0, ), - width: 322.000, + height: 50.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,56 +45,47 @@ class _RowHzFxVrFxSpSb456 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden index 2fe7ec38..e69d9c41 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden @@ -35,7 +35,8 @@ class _RowHzFxVrFxSpSb789 extends State { top: 10.0, bottom: 10.0, ), - width: 322.000, + height: 50.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,56 +45,47 @@ class _RowHzFxVrFxSpSb789 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden index 6a49b402..28dbf027 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden @@ -35,6 +35,8 @@ class _RowHzFxVrHgSpPk147 extends State { top: 10.0, bottom: 10.0, ), + height: 35.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _RowHzFxVrHgSpPk147 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden index 309d5bcc..81680d9f 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden @@ -35,6 +35,8 @@ class _RowHzFxVrHgSpPk258 extends State { top: 10.0, bottom: 10.0, ), + height: 35.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _RowHzFxVrHgSpPk258 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden index 16f35caf..a65b38c1 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden @@ -35,6 +35,8 @@ class _RowHzFxVrHgSpPk369 extends State { top: 10.0, bottom: 10.0, ), + height: 35.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,62 +45,53 @@ class _RowHzFxVrHgSpPk369 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden index bc7cae97..a4548568 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden @@ -35,6 +35,8 @@ class _RowHzFxVrHgSpSb123456789 extends State { top: 10.0, bottom: 10.0, ), + height: 35.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), @@ -43,56 +45,47 @@ class _RowHzFxVrHgSpSb123456789 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), - Container( height: 15.0, - width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), Container( + width: 39.0, height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), + Container( width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden index 00cfbc66..81908d3a 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden @@ -35,7 +35,8 @@ class _RowHzHgVrFxSpPk147 extends State { top: 10.0, bottom: 10.0, ), - width: 134.000, + height: 100.0, + width: 134.0, decoration: BoxDecoration( color: Colors.black, ), @@ -45,62 +46,53 @@ class _RowHzHgVrFxSpPk147 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden index a4f14882..edab3ac1 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden @@ -35,7 +35,8 @@ class _RowHzHgVrFxSpPk258 extends State { top: 10.0, bottom: 10.0, ), - width: 134.000, + height: 100.0, + width: 134.0, decoration: BoxDecoration( color: Colors.black, ), @@ -45,62 +46,53 @@ class _RowHzHgVrFxSpPk258 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden index da0a7788..c034e961 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden @@ -35,7 +35,8 @@ class _RowHzHgVrFxSpPk369 extends State { top: 10.0, bottom: 10.0, ), - width: 134.000, + height: 100.0, + width: 134.0, decoration: BoxDecoration( color: Colors.black, ), @@ -45,62 +46,53 @@ class _RowHzHgVrFxSpPk369 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden index 6f01ccc4..75045a9c 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden @@ -35,6 +35,8 @@ class _RowHzHgVrHgSpPk123456789 extends State { top: 10.0, bottom: 10.0, ), + height: 35.0, + width: 134.0, decoration: BoxDecoration( color: Colors.black, ), @@ -44,62 +46,53 @@ class _RowHzHgVrHgSpPk123456789 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 15.0, width: 24.0, - child: Container( - width: 24.000, - height: 15.000, - child: AutoSizeText( - 'Left', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Left', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 39.0, - child: Container( - width: 39.000, - height: 15.000, - child: AutoSizeText( - 'Middle', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Middle', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), SizedBox( width: 10.0, ), Container( - height: 15.0, width: 31.0, - child: Container( - width: 31.000, - height: 15.000, - child: AutoSizeText( - 'Right', - style: TextStyle( - fontFamily: 'Sanchez', - fontSize: 12.0, - fontWeight: FontWeight.w400, - letterSpacing: 0.0, - color: Colors.white, - ), - textAlign: TextAlign.left, - ))), + height: 15.0, + child: AutoSizeText( + 'Right', + style: TextStyle( + fontFamily: 'Sanchez', + fontSize: 12.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.0, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ])), ), ]), From ff2bf6825c271ef6bcab3c2614a12f45ffdf72b4 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 1 Jun 2022 16:12:00 -0600 Subject: [PATCH 13/55] Update styling tests --- .../golden_files/styling/helloworld.golden | 4 +- .../styling/primary_button.golden | 4 +- .../styling/primary_button_rect.golden | 8 +- .../styling/secondary_button.golden | 4 +- .../golden_files/styling/styling.golden | 96 +++++++++---------- 5 files changed, 58 insertions(+), 58 deletions(-) diff --git a/test/golden/golden_files/styling/helloworld.golden b/test/golden/golden_files/styling/helloworld.golden index 62e976ae..51e9dcc9 100644 --- a/test/golden/golden_files/styling/helloworld.golden +++ b/test/golden/golden_files/styling/helloworld.golden @@ -33,8 +33,8 @@ class _Helloworld extends State { top: widget.constraints.maxHeight * 0.345, height: widget.constraints.maxHeight * 0.221, child: Container( - width: widget.constraints.maxWidth * 0.410, - height: widget.constraints.maxHeight * 0.221, + width: widget.constraints.maxWidth * 0.40963855421686746, + height: widget.constraints.maxHeight * 0.22123893805309736, child: AutoSizeText( widget.ovrHelloworld ?? 'Hello world', style: TextStyle( diff --git a/test/golden/golden_files/styling/primary_button.golden b/test/golden/golden_files/styling/primary_button.golden index 11f40f38..fc8cc303 100644 --- a/test/golden/golden_files/styling/primary_button.golden +++ b/test/golden/golden_files/styling/primary_button.golden @@ -36,8 +36,8 @@ class _PrimaryButton extends State { top: widget.constraints.maxHeight * 0.39, height: widget.constraints.maxHeight * 0.23, child: Container( - width: widget.constraints.maxWidth * 0.328, - height: widget.constraints.maxHeight * 0.230, + width: widget.constraints.maxWidth * 0.3276595744680851, + height: widget.constraints.maxHeight * 0.23, child: AutoSizeText( widget.ovrClickMe ?? 'Click Me', style: TextStyle( diff --git a/test/golden/golden_files/styling/primary_button_rect.golden b/test/golden/golden_files/styling/primary_button_rect.golden index 27a88056..37f397fd 100644 --- a/test/golden/golden_files/styling/primary_button_rect.golden +++ b/test/golden/golden_files/styling/primary_button_rect.golden @@ -41,8 +41,8 @@ class _PrimaryButtonRect extends State { top: 0, height: 100.0, child: Container( - width: widget.constraints.maxWidth * 1.000, - height: widget.constraints.maxHeight * 1.000, + width: widget.constraints.maxWidth * 1.0, + height: widget.constraints.maxHeight * 1.0, decoration: BoxDecoration( color: Color(0xff59afff), borderRadius: BorderRadius.all(Radius.circular(20.0)), @@ -55,8 +55,8 @@ class _PrimaryButtonRect extends State { top: widget.constraints.maxHeight * 0.39, height: widget.constraints.maxHeight * 0.23, child: Container( - width: widget.constraints.maxWidth * 0.328, - height: widget.constraints.maxHeight * 0.230, + width: widget.constraints.maxWidth * 0.3276595744680851, + height: widget.constraints.maxHeight * 0.23, child: AutoSizeText( widget.ovrClickMe ?? 'Click Me', style: TextStyle( diff --git a/test/golden/golden_files/styling/secondary_button.golden b/test/golden/golden_files/styling/secondary_button.golden index 6b0e1f23..e7d4dd0f 100644 --- a/test/golden/golden_files/styling/secondary_button.golden +++ b/test/golden/golden_files/styling/secondary_button.golden @@ -40,8 +40,8 @@ class _SecondaryButton extends State { top: widget.constraints.maxHeight * 0.39, height: widget.constraints.maxHeight * 0.23, child: Container( - width: widget.constraints.maxWidth * 0.328, - height: widget.constraints.maxHeight * 0.230, + width: widget.constraints.maxWidth * 0.3276595744680851, + height: widget.constraints.maxHeight * 0.23, child: AutoSizeText( widget.ovrClickMe ?? 'Click Me', style: TextStyle( diff --git a/test/golden/golden_files/styling/styling.golden b/test/golden/golden_files/styling/styling.golden index cf31a26c..1c37027d 100644 --- a/test/golden/golden_files/styling/styling.golden +++ b/test/golden/golden_files/styling/styling.golden @@ -30,8 +30,8 @@ class _StylingScreen extends State { top: 0, height: 124.0, child: Container( - width: 197.000, - height: 124.000, + width: 197.0, + height: 124.0, decoration: BoxDecoration( gradient: LinearGradient( begin: Alignment(1.0000000596046466, -0.999999849557967), @@ -55,8 +55,8 @@ class _StylingScreen extends State { top: 154.0, height: 120.0, child: Container( - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, decoration: BoxDecoration( color: Color(0x70991d66), ), @@ -70,8 +70,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/circleradius.png', package: 'golden_testing_project', - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -83,8 +83,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/diamond.png', package: 'golden_testing_project', - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -94,8 +94,8 @@ class _StylingScreen extends State { top: 604.0, height: 120.0, child: Container( - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, decoration: BoxDecoration( color: Color(0x99b63a4c), ), @@ -107,8 +107,8 @@ class _StylingScreen extends State { top: 754.0, height: 120.0, child: Container( - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -124,8 +124,8 @@ class _StylingScreen extends State { top: 754.0, height: 120.0, child: Container( - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -151,8 +151,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/2stroke.png', package: 'golden_testing_project', - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -162,8 +162,8 @@ class _StylingScreen extends State { top: 454.0, height: 120.0, child: Container( - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -179,8 +179,8 @@ class _StylingScreen extends State { top: 304.0, height: 120.0, child: Container( - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -206,8 +206,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/imagewithtint.png', package: 'golden_testing_project', - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -217,8 +217,8 @@ class _StylingScreen extends State { top: 4.0, height: 120.0, child: Container( - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -244,8 +244,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/ellipse1.png', package: 'golden_testing_project', - width: 133.000, - height: 124.000, + width: 133.0, + height: 124.0, fit: BoxFit.none, ), ), @@ -257,8 +257,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/polygon1.svg', package: 'golden_testing_project', - width: 142.000, - height: 120.000, + width: 142.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -270,8 +270,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/star1.svg', package: 'golden_testing_project', - width: 110.000, - height: 126.000, + width: 110.0, + height: 126.0, fit: BoxFit.none, ), ), @@ -283,8 +283,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/vector1.svg', package: 'golden_testing_project', - width: 109.500, - height: 102.500, + width: 109.5, + height: 102.5, fit: BoxFit.none, ), ), @@ -296,8 +296,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/emptyframe.svg', package: 'golden_testing_project', - width: 154.000, - height: 118.000, + width: 154.0, + height: 118.0, fit: BoxFit.none, ), ), @@ -308,8 +308,8 @@ class _StylingScreen extends State { height: 118.0, child: Container( clipBehavior: Clip.hardEdge, - height: 118.000, - width: 154.000, + height: 118.0, + width: 154.0, decoration: BoxDecoration( color: Color(0x99cd4900), ), @@ -320,8 +320,8 @@ class _StylingScreen extends State { top: 42.0, height: 42.0, child: Container( - width: 67.000, - height: 42.000, + width: 67.0, + height: 42.0, child: AutoSizeText( 'Howdy', style: TextStyle( @@ -343,8 +343,8 @@ class _StylingScreen extends State { height: 118.0, child: Container( clipBehavior: Clip.hardEdge, - height: 118.000, - width: 154.000, + height: 118.0, + width: 154.0, decoration: BoxDecoration( gradient: LinearGradient( begin: Alignment(0.0, -1.0), @@ -367,8 +367,8 @@ class _StylingScreen extends State { top: 42.0, height: 42.0, child: Container( - width: 67.000, - height: 42.000, + width: 67.0, + height: 42.0, child: AutoSizeText( 'Howdy', style: TextStyle( @@ -391,8 +391,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/line1.svg', package: 'golden_testing_project', - width: 1.000, - height: 77.007, + width: 1.0, + height: 77.00650024414062, fit: BoxFit.none, ), ), @@ -404,8 +404,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/line2.svg', package: 'golden_testing_project', - width: 1.000, - height: 89.000, + width: 1.0, + height: 89.0, fit: BoxFit.none, ), ), @@ -417,8 +417,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/rectangle1.png', package: 'golden_testing_project', - width: 176.000, - height: 127.000, + width: 176.0, + height: 127.0, fit: BoxFit.none, ), ), From 08f8d71218fe04588af6cb0f15a83b4058eaa3cf Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 6 Jun 2022 16:56:59 -0600 Subject: [PATCH 14/55] Added constraints field to custom text form field --- .../helpers/pb_plugin_list_helper.dart | 2 +- .../services/pb_layout_generation_service.dart | 4 ++++ lib/tags/custom_text_form_field.dart | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/pb_plugin_list_helper.dart b/lib/interpret_and_optimize/helpers/pb_plugin_list_helper.dart index cd071ca4..ded918dd 100644 --- a/lib/interpret_and_optimize/helpers/pb_plugin_list_helper.dart +++ b/lib/interpret_and_optimize/helpers/pb_plugin_list_helper.dart @@ -33,7 +33,7 @@ class PBPluginListHelper { '', ), '': CustomTag(null, null, ''), - '': CustomTextFormField(null, null, ''), + '': CustomTextFormField(null, null, '', null), }; } 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 6e26fd1e..deb1be7b 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -228,6 +228,10 @@ class PBLayoutGenerationService extends AITHandler { pointValueWidth: isVertical ? tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT : tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, + showHeight: + tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, + showWidth: + tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT, ) ..auxiliaryData = tempGroup.auxiliaryData ..layoutCrossAxisSizing = tempGroup.layoutCrossAxisSizing diff --git a/lib/tags/custom_text_form_field.dart b/lib/tags/custom_text_form_field.dart index 9a44b58f..2c11b2d8 100644 --- a/lib/tags/custom_text_form_field.dart +++ b/lib/tags/custom_text_form_field.dart @@ -9,6 +9,7 @@ import 'package:parabeac_core/generation/generators/value_objects/file_structure import 'package:parabeac_core/generation/generators/visual-widgets/pb_text_gen.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/inherited_text.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/pb_shared_master_node.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_constraints.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/child_strategy.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart'; @@ -25,13 +26,15 @@ class CustomTextFormField extends PBTag { CustomTextFormField( String UUID, Rectangle3D frame, - String name, { + String name, + PBIntermediateConstraints constraints, { IntermediateAuxiliaryData auxiliaryData, }) : super( UUID, frame, name, auxiliaryData: auxiliaryData, + contraints: constraints, ) { generator = CustomTextFormFieldGenerator(); childrenStrategy = MultipleChildStrategy('children'); @@ -59,6 +62,7 @@ class CustomTextFormField extends PBTag { null, frame.copyWith(), originalRef.name.replaceAll(semanticName, '').pascalCase, + originalRef.constraints.copyWith(), auxiliaryData: originalRef.auxiliaryData.copyWith(), ); } From 78a61d2251e1270c1007fc1465760c864d7fa1a0 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 13 Jun 2022 16:31:35 -0600 Subject: [PATCH 15/55] Specify constraints type --- lib/interpret_and_optimize/entities/layouts/stack.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/interpret_and_optimize/entities/layouts/stack.dart b/lib/interpret_and_optimize/entities/layouts/stack.dart index 7890cc30..7e489802 100644 --- a/lib/interpret_and_optimize/entities/layouts/stack.dart +++ b/lib/interpret_and_optimize/entities/layouts/stack.dart @@ -2,6 +2,7 @@ import 'package:parabeac_core/generation/generators/layouts/pb_stack_gen.dart'; import 'package:parabeac_core/generation/prototyping/pb_prototype_node.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/layouts/rules/axis_comparison_rules.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/layouts/rules/layout_rule.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_constraints.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_layout_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/align_strategy.dart'; @@ -20,7 +21,7 @@ class PBIntermediateStackLayout extends PBLayoutIntermediateNode { PBIntermediateStackLayout({ String name, - constraints, + PBIntermediateConstraints constraints, }) : super(null, null, STACK_RULES, [], name, constraints: constraints) { generator = PBStackGenerator(); alignStrategy = PositionedAlignment(); From 5a4119d2cf74d7146350610b567ace0d1a746f89 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 13 Jun 2022 16:31:58 -0600 Subject: [PATCH 16/55] Do not modify pin elements --- .../services/pb_alignment_generation_service.dart | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/interpret_and_optimize/services/pb_alignment_generation_service.dart b/lib/interpret_and_optimize/services/pb_alignment_generation_service.dart index de823a7a..2b5cf525 100644 --- a/lib/interpret_and_optimize/services/pb_alignment_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_alignment_generation_service.dart @@ -24,18 +24,10 @@ class PBAlignGenerationService extends AITHandler { if (element is PBIntermediateNode && (element.parent?.constraints?.fixedHeight ?? false)) { element.constraints.fixedHeight = true; - if (!element.constraints.pinTop && !element.constraints.pinBottom) { - element.constraints.pinTop = true; - element.constraints.pinBottom = false; - } } if (element is PBIntermediateNode && (element.parent?.constraints?.fixedWidth ?? false)) { element.constraints.fixedWidth = true; - if (!element.constraints.pinLeft && !element.constraints.pinRight) { - element.constraints.pinLeft = true; - element.constraints.pinRight = false; - } } }); tree.rootNode.align(context); From ce2e4d1a291aab88deffc224f3cb760ce860a9a5 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 13 Jun 2022 16:32:13 -0600 Subject: [PATCH 17/55] Set component isolation to default none --- lib/configurations/configurations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configurations/configurations.json b/lib/configurations/configurations.json index 71bda2b8..0702fd74 100644 --- a/lib/configurations/configurations.json +++ b/lib/configurations/configurations.json @@ -4,6 +4,6 @@ "tablet": 600, "desktop": 1280 }, - "componentIsolation": "widgetbook", + "componentIsolation": "none", "folderArchitecture": "domain" } From 88386556ee324c78b6ade4a6969b94678d5bf952 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 15 Jun 2022 16:03:26 -0600 Subject: [PATCH 18/55] Undo changes on constraints --- .../services/pb_layout_generation_service.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 deb1be7b..60eb8dca 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -156,10 +156,10 @@ class PBLayoutGenerationService extends AITHandler { constraints: tempLayout.constraints.copyWith(), // Let the Container know if it is going to show // the width or height on the generation process - showHeight: - tempLayout.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, - showWidth: - tempLayout.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT, + showHeight: tempLayout.layoutProperties.primaryAxisAligment == + IntermediateAxisMode.FIXED, + showWidth: tempLayout.layoutProperties.crossAxisSizing == + IntermediateAxisMode.FIXED, ) ..layoutCrossAxisSizing = tempLayout.layoutCrossAxisSizing ..layoutMainAxisSizing = tempLayout.layoutMainAxisSizing From e658e2fdec5c51afba37ca8ca28d400b8b067bb7 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 15 Jun 2022 16:17:08 -0600 Subject: [PATCH 19/55] Corrected misspelled word --- .../services/pb_layout_generation_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 60eb8dca..6fab0d09 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -156,7 +156,7 @@ class PBLayoutGenerationService extends AITHandler { constraints: tempLayout.constraints.copyWith(), // Let the Container know if it is going to show // the width or height on the generation process - showHeight: tempLayout.layoutProperties.primaryAxisAligment == + showHeight: tempLayout.layoutProperties.primaryAxisAlignment == IntermediateAxisMode.FIXED, showWidth: tempLayout.layoutProperties.crossAxisSizing == IntermediateAxisMode.FIXED, From 748c18dbb4c3a5135757b471b032518d656db2da Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 20 Jun 2022 17:31:47 -0600 Subject: [PATCH 20/55] Cleaned code --- .../generators/layouts/pb_layout_gen.dart | 2 +- .../entities/layouts/group/frame_group.dart | 20 --- .../pb_constraint_generation_service.dart | 116 ------------------ .../pb_layout_generation_service.dart | 24 ---- 4 files changed, 1 insertion(+), 161 deletions(-) diff --git a/lib/generation/generators/layouts/pb_layout_gen.dart b/lib/generation/generators/layouts/pb_layout_gen.dart index 0a925edf..f9e217e1 100644 --- a/lib/generation/generators/layouts/pb_layout_gen.dart +++ b/lib/generation/generators/layouts/pb_layout_gen.dart @@ -13,7 +13,7 @@ abstract class PBLayoutGenerator extends PBGenerator { var buffer = StringBuffer(); var children = context.tree.childrenOf(source); // Write the type of Layout, Column or Row - buffer.write('${type}('); + buffer.write('$type('); if (children.isNotEmpty) { var layoutProperties = source.layoutProperties; diff --git a/lib/interpret_and_optimize/entities/layouts/group/frame_group.dart b/lib/interpret_and_optimize/entities/layouts/group/frame_group.dart index e30c5058..74893e80 100644 --- a/lib/interpret_and_optimize/entities/layouts/group/frame_group.dart +++ b/lib/interpret_and_optimize/entities/layouts/group/frame_group.dart @@ -35,28 +35,8 @@ class FrameGroup extends Group PBIntermediateNode createIntermediateNode(Map json, PBIntermediateNode parent, PBIntermediateTree tree) { var tempFrame = _$FrameGroupFromJson(json); - - // var tempChild = injectAContainer(json, tempFrame.frame); - - // if (tempChild != null) { - // tempChild.constraints = tempFrame.constraints.copyWith(); - // tree.addEdges(tempFrame, [tempChild]); - // } return tempFrame ..mapRawChildren(json, tree) ..originalRef = json; } - - // PBIntermediateNode injectAContainer( - // Map json, Rectangle3D parentFrame) { - // var tempChild = InjectedContainer( - // null, - // Rectangle3D(parentFrame.left, parentFrame.top, parentFrame.width, - // parentFrame.height, 0), - // name: json['name'], - // ); - // var gateKeeper = false; - - // return gateKeeper ? tempChild : null; - // } } diff --git a/lib/interpret_and_optimize/services/pb_constraint_generation_service.dart b/lib/interpret_and_optimize/services/pb_constraint_generation_service.dart index 135ceca8..19caa28b 100644 --- a/lib/interpret_and_optimize/services/pb_constraint_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_constraint_generation_service.dart @@ -37,122 +37,6 @@ class PBConstraintGenerationService extends AITHandler { return Future.value(tree); } - /// Go through children and find out if there's a node that will overlap another node when scaling. - /// @deprecated - remove with PR to dev/stable. - // bool _shouldLayoutBeStack(PBLayoutIntermediateNode node) { - // if (node is PBIntermediateStackLayout) { - // return false; - // } else if (node is PBIntermediateColumnLayout) { - // var res = _isVerticalOverlap(node); - // print(res); - // return res; - // } else if (node is PBIntermediateRowLayout) { - // var res = _isHorizontalOverlap(node); - // print(res); - // return res; - // } else { - // print( - // 'This constraint generation service does not support this layout: ${node.runtimeType}'); - // return false; - // } - // } - - /// @deprecated - remove with PR to dev/stable. - // bool _isHorizontalOverlap(PBLayoutIntermediateNode node) { - // var lastLeftPinIndex = -1; - // var lastRightPinIndex = -1; - // var isOverlap = false; - // node.children.asMap().forEach((key, value) { - // if (value.constraints.pinLeft) { - // if (key - 1 != lastLeftPinIndex) { - // isOverlap = true; - // } else { - // lastLeftPinIndex = key; - // } - // } - // }); - - // if (isOverlap) { - // return isOverlap; - // } - - // node.children.reversed.toList().asMap().forEach((key, value) { - // /// Needs to be reversed. - // if (value.constraints.pinRight) { - // if (key - 1 != lastRightPinIndex) { - // isOverlap = true; - // } else { - // lastRightPinIndex = key; - // } - // } - // }); - // return isOverlap; - // } - - /// @deprecated - remove with PR to dev/stable. - // bool _isVerticalOverlap(PBLayoutIntermediateNode node) { - // var lastTopPinIndex = -1; - // var lastBottomPinIndex = -1; - // var isOverlap = false; - // node.children.asMap().forEach((key, value) { - // if (value.constraints.pinTop) { - // if (key - 1 != lastTopPinIndex) { - // isOverlap = true; - // } else { - // lastTopPinIndex = key; - // } - // } - // }); - - // if (isOverlap) { - // return isOverlap; - // } - - // node.children.reversed.toList().asMap().forEach((key, value) { - // if (value.constraints.pinBottom) { - // if (key - 1 != lastBottomPinIndex) { - // isOverlap = true; - // } else { - // lastBottomPinIndex = key; - // } - // } - // }); - // return isOverlap; - // } - - /// @deprecated - remove with PR to dev/stable. - PBIntermediateConstraints _inheritConstraintsFromChild( - {PBIntermediateConstraints constraints, - PBIntermediateConstraints childConstraints}) { - // if (childConstraints.pinLeft) { - // constraints.pinLeft = true; - // } - // if (childConstraints.pinRight) { - // constraints.pinRight = true; - // } - // if (childConstraints.pinTop) { - // constraints.pinTop = true; - // } - // if (childConstraints.pinBottom) { - // constraints.pinBottom = true; - // } - // if (childConstraints.fixedHeight != null) { - // if (constraints.fixedHeight == null) { - // constraints.fixedHeight = childConstraints.fixedHeight; - // } else if (constraints.fixedHeight < childConstraints.fixedHeight) { - // constraints.fixedHeight = childConstraints.fixedHeight; - // } - // } - // if (childConstraints.fixedWidth != null) { - // if (constraints.fixedWidth == null) { - // constraints.fixedWidth = childConstraints.fixedWidth; - // } else if (constraints.fixedWidth < childConstraints.fixedWidth) { - // constraints.fixedWidth = childConstraints.fixedWidth; - // } - // } - // return constraints; - } - @override Future handleTree( PBContext context, PBIntermediateTree tree) { 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 6fab0d09..080d3f7b 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -173,30 +173,6 @@ class PBLayoutGenerationService extends AITHandler { }); } - /// If this node is an unecessary [Group], from the [tree] - /// - /// Ex: Designer put a group with one child that was a group - /// and that group contained the visual nodes. - void _removingMeaninglessGroup(PBIntermediateTree tree) { - tree - .where((node) => node is Group && tree.childrenOf(node).length <= 1) - .cast() - .forEach((tempGroup) { - var tempChildren = tree.childrenOf(tempGroup); - tree.replaceNode( - tempGroup, - tempChildren.isNotEmpty - ? _replaceNode(tempGroup, tempChildren.first) - : _replaceNode( - tempGroup, - InjectedContainer( - tempGroup.UUID, tempGroup.frame, - name: tempGroup.name, - // constraints: tempGroup.constraints - ))); - }); - } - /// Transforming the [Group] into regular [PBLayoutIntermediateNode] void _transformGroup(PBIntermediateTree tree) { tree.whereType().forEach((tempGroup) { From 887be9d58d1485bad7763b90c9caad3c498020a9 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 21 Jun 2022 13:18:52 -0600 Subject: [PATCH 21/55] WIP moving function from generation service to align strategy --- .../helpers/align_strategy.dart | 19 +++++++++++++++++++ .../pb_alignment_generation_service.dart | 14 ++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index 3711705e..c6218e09 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -142,4 +142,23 @@ class PositionedAlignment extends AlignStrategy { tree.replaceChildrenOf(node, alignedChildren); // super.setConstraints(context, node); } + + // tree.topologicalOrdering.forEach((element) { + // if (element is PBIntermediateNode && + // (element.parent?.constraints?.fixedHeight ?? false)) { + // element.constraints.fixedHeight = true; + // if (!element.constraints.pinTop && !element.constraints.pinBottom) { + // element.constraints.pinTop = true; + // element.constraints.pinBottom = false; + // } + // } + // if (element is PBIntermediateNode && + // (element.parent?.constraints?.fixedWidth ?? false)) { + // element.constraints.fixedWidth = true; + // if (!element.constraints.pinLeft && !element.constraints.pinRight) { + // element.constraints.pinLeft = true; + // element.constraints.pinRight = false; + // } + // } + // }); } diff --git a/lib/interpret_and_optimize/services/pb_alignment_generation_service.dart b/lib/interpret_and_optimize/services/pb_alignment_generation_service.dart index 2b5cf525..122b216a 100644 --- a/lib/interpret_and_optimize/services/pb_alignment_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_alignment_generation_service.dart @@ -14,22 +14,12 @@ class PBAlignGenerationService extends AITHandler { /// Should find all layout nodes Future addAlignmentToLayouts( PBIntermediateTree tree, PBContext context) { - var originalRoot = tree.rootNode; - if (originalRoot == null) { + if (tree.rootNode == null) { logger.warning( '[PBAlignmentGenerationService] generate() attempted to generate a non-existing tree'); return null; } - tree.topologicalOrdering.forEach((element) { - if (element is PBIntermediateNode && - (element.parent?.constraints?.fixedHeight ?? false)) { - element.constraints.fixedHeight = true; - } - if (element is PBIntermediateNode && - (element.parent?.constraints?.fixedWidth ?? false)) { - element.constraints.fixedWidth = true; - } - }); + tree.rootNode.align(context); return Future.value(tree); From cfaa5bf82a65d5eff94371473f4420e095876f8c Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 21 Jun 2022 16:23:46 -0600 Subject: [PATCH 22/55] Integrated logic into positioned aligment --- .../helpers/align_strategy.dart | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index c6218e09..7c1d7375 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -86,6 +86,7 @@ class PositionedAlignment extends AlignStrategy { var alignedChildren = []; var tree = context.tree; var nodeChildren = context.tree.childrenOf(node); + nodeChildren.forEach((child) { var centerY = false; var centerX = false; @@ -102,13 +103,16 @@ class PositionedAlignment extends AlignStrategy { width: child.frame.width, height: child.frame.height), ); + + // Checks if child's parent has fixed height and width + // or child has fixed height and width to determine the positioned constraints if ((!child.constraints.pinLeft && !child.constraints.pinRight) && - child.constraints.fixedWidth) { + (node.constraints.fixedWidth || child.constraints.fixedWidth)) { injectedPositioned.constraints.fixedWidth = false; centerX = true; } if ((!child.constraints.pinTop && !child.constraints.pinBottom) && - child.constraints.fixedHeight) { + (node.constraints.fixedHeight || child.constraints.fixedHeight)) { injectedPositioned.constraints.fixedHeight = false; centerY = true; } @@ -142,23 +146,4 @@ class PositionedAlignment extends AlignStrategy { tree.replaceChildrenOf(node, alignedChildren); // super.setConstraints(context, node); } - - // tree.topologicalOrdering.forEach((element) { - // if (element is PBIntermediateNode && - // (element.parent?.constraints?.fixedHeight ?? false)) { - // element.constraints.fixedHeight = true; - // if (!element.constraints.pinTop && !element.constraints.pinBottom) { - // element.constraints.pinTop = true; - // element.constraints.pinBottom = false; - // } - // } - // if (element is PBIntermediateNode && - // (element.parent?.constraints?.fixedWidth ?? false)) { - // element.constraints.fixedWidth = true; - // if (!element.constraints.pinLeft && !element.constraints.pinRight) { - // element.constraints.pinLeft = true; - // element.constraints.pinRight = false; - // } - // } - // }); } From 3cc26058d471675890a066916cccf8d0d7bdc1f5 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 22 Jun 2022 14:41:03 -0600 Subject: [PATCH 23/55] Cleaned code --- .../pb_layout_intermediate_node.dart | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/lib/interpret_and_optimize/entities/subclasses/pb_layout_intermediate_node.dart b/lib/interpret_and_optimize/entities/subclasses/pb_layout_intermediate_node.dart index 71dcf5b2..7040e6a8 100644 --- a/lib/interpret_and_optimize/entities/subclasses/pb_layout_intermediate_node.dart +++ b/lib/interpret_and_optimize/entities/subclasses/pb_layout_intermediate_node.dart @@ -93,45 +93,4 @@ abstract class PBLayoutIntermediateNode extends PBIntermediateNode ///NOTE: make sure that the children that are going to be added satisfy the reles of the [PBLayoutIntermediateNode] PBLayoutIntermediateNode generateLayout( List children, PBContext currentContext, String name); - - void checkCrossAxisAlignment() { - // if (attributes.first.attributeNode != null) { - // var attributesTopLeft = attributes.first.attributeNode.frame.topLeft; - - // var attributesBottomRight = - // attributes.last.attributeNode.frame.bottomRight; - - // var leftDifference = (frame.topLeft.x - attributesTopLeft.x).abs(); - - // var rightDifference = - // (frame.bottomRight.x - attributesBottomRight.x).abs(); - - // var topDifference = (frame.topLeft.y - attributesTopLeft.y).abs(); - - // var bottomDifference = - // (frame.bottomRight.y - attributesBottomRight.y).abs(); - - // if (leftDifference < rightDifference) { - // alignment['mainAxisAlignment'] = - // 'mainAxisAlignment: MainAxisAlignment.start,'; - // } else if (leftDifference > rightDifference) { - // alignment['mainAxisAlignment'] = - // 'mainAxisAlignment: MainAxisAlignment.end,'; - // } else { - // alignment['mainAxisAlignment'] = - // 'mainAxisAlignment: MainAxisAlignment.center,'; - // } - - // if (topDifference < bottomDifference) { - // alignment['crossAxisAlignment'] = - // 'crossAxisAlignment: CrossAxisAlignment.start,'; - // } else if (topDifference > bottomDifference) { - // alignment['crossAxisAlignment'] = - // 'crossAxisAlignment: CrossAxisAlignment.end,'; - // } else { - // alignment['crossAxisAlignment'] = - // 'crossAxisAlignment: CrossAxisAlignment.center,'; - // } - // } - } } From b9767b05aa0ac1de8362db46e0e961405fd498a4 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 15:52:57 -0600 Subject: [PATCH 24/55] Corrected layoutProperty --- .../services/pb_layout_generation_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 080d3f7b..547fa4f2 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -156,7 +156,7 @@ class PBLayoutGenerationService extends AITHandler { constraints: tempLayout.constraints.copyWith(), // Let the Container know if it is going to show // the width or height on the generation process - showHeight: tempLayout.layoutProperties.primaryAxisAlignment == + showHeight: tempLayout.layoutProperties.primaryAxisSizing == IntermediateAxisMode.FIXED, showWidth: tempLayout.layoutProperties.crossAxisSizing == IntermediateAxisMode.FIXED, From 22e718b5ccd0e0156508ea7404f8c37993aaa4df Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 15:53:34 -0600 Subject: [PATCH 25/55] Added a case for non point value when inside a layoutbuilder --- .../attribute-helper/pb_size_helper.dart | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/lib/generation/generators/attribute-helper/pb_size_helper.dart b/lib/generation/generators/attribute-helper/pb_size_helper.dart index 374aaf6b..64773253 100644 --- a/lib/generation/generators/attribute-helper/pb_size_helper.dart +++ b/lib/generation/generators/attribute-helper/pb_size_helper.dart @@ -1,5 +1,6 @@ import 'package:parabeac_core/generation/generators/attribute-helper/pb_attribute_gen_helper.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/container.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/injected_container.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; @@ -63,11 +64,23 @@ class PBSizeHelper extends PBAttributesHelper { '$lowerCaseDimentionString: constraints.max$dimentionString * ${relativeSize.toString()},'; } else if (context.sizingContext == SizingValueContext.LayoutBuilderStatefulValue) { - relativeSize = relativeSize / screenSize; - - // Size for LayoutBuilder - sizeString = - '$lowerCaseDimentionString: widget.constraints.max$dimentionString * ${relativeSize.toString()},'; + // Add Container case where width and/or height is static + var isPointValue = false; + if (source is InjectedContainer) { + isPointValue = + isHeight ? source.pointValueHeight : source.pointValueWidth; + } + + if (!isPointValue) { + // Size for constants value + sizeString = '$lowerCaseDimentionString: ${relativeSize.toString()},'; + } else { + relativeSize = relativeSize / screenSize; + + // Size for LayoutBuilder + sizeString = + '$lowerCaseDimentionString: widget.constraints.max$dimentionString * ${relativeSize.toString()},'; + } } else { // Size for constants value sizeString = '$lowerCaseDimentionString: ${relativeSize.toString()},'; From 53acb8c95c3ca63776bac4f76749f936f83e6482 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 15:53:54 -0600 Subject: [PATCH 26/55] Cleaned code --- .../layouts/auto_layout_align_strategy.dart | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart index 53dc88f7..5236345d 100644 --- a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart +++ b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart @@ -72,6 +72,8 @@ class AutoLayoutAlignStrategy extends AlignStrategy { var newChild = _needsContainer(child, isVertical, context); /// Add new child + /// and _handleLayoutChild removes the crossAxisSizing of children + /// in case the parent is fill on the cross axis spacedChildren.add(_handleLayoutChild(newChild, isVertical, context)); } @@ -85,7 +87,7 @@ class AutoLayoutAlignStrategy extends AlignStrategy { /// Checks if child is a [PBLayoutIntermediateNode] /// and adds a container on top of it PBIntermediateNode _needsContainer( - child, bool isVertical, PBContext context) { + PBIntermediateNode child, bool isVertical, PBContext context) { if (child is! PBContainer) { // Creates container var wrapper = InjectedContainer( @@ -145,22 +147,4 @@ class AutoLayoutAlignStrategy extends AlignStrategy { return child; } - - // // Replace children with new children in case boxes were added - // void _insertBoxes(PBContext context, node, bool isVertical) { - // var children = context.tree.childrenOf(node); - - // var newChildren = - // _addBoxes(children, isVertical, node.layoutProperties.spacing); - - // context.tree.replaceChildrenOf(node, newChildren); - // } - - // // Add boxes between children - // List _addBoxes( - // List children, bool isVertical, num space) { - // var spacedChildren = []; - - // return spacedChildren; - // } } From ebcbba6b66ffa44f490ec1a583f39cf803682752 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 16:13:32 -0600 Subject: [PATCH 27/55] Added point value properties higher on the container tree --- lib/interpret_and_optimize/entities/container.dart | 2 ++ .../entities/inherited_container.dart | 8 ++++++++ .../entities/injected_container.dart | 2 ++ 3 files changed, 12 insertions(+) diff --git a/lib/interpret_and_optimize/entities/container.dart b/lib/interpret_and_optimize/entities/container.dart index 02ea6481..2c81f706 100644 --- a/lib/interpret_and_optimize/entities/container.dart +++ b/lib/interpret_and_optimize/entities/container.dart @@ -5,6 +5,8 @@ import 'injected_container.dart'; class PBContainer extends PBIntermediateNode { bool showWidth; bool showHeight; + bool pointValueHeight; + bool pointValueWidth; InjectedPadding padding; PBContainer({String UUID, Rectangle3D frame, String name}) diff --git a/lib/interpret_and_optimize/entities/inherited_container.dart b/lib/interpret_and_optimize/entities/inherited_container.dart index 0cf1a980..f7ff609d 100644 --- a/lib/interpret_and_optimize/entities/inherited_container.dart +++ b/lib/interpret_and_optimize/entities/inherited_container.dart @@ -56,6 +56,8 @@ class InheritedContainer extends PBVisualIntermediateNode this.prototypeNode, this.showWidth = true, this.showHeight = true, + this.pointValueHeight = false, + this.pointValueWidth = false, PBIntermediateConstraints constraints, }) : super(UUID, frame, name, constraints: constraints) { generator = PBContainerGenerator(); @@ -78,4 +80,10 @@ class InheritedContainer extends PBVisualIntermediateNode PBIntermediateNode parent, PBIntermediateTree tree) { return InheritedContainer.fromJson(json)..mapRawChildren(json, tree); } + + @override + bool pointValueHeight; + + @override + bool pointValueWidth; } diff --git a/lib/interpret_and_optimize/entities/injected_container.dart b/lib/interpret_and_optimize/entities/injected_container.dart index 38676375..e09983fd 100644 --- a/lib/interpret_and_optimize/entities/injected_container.dart +++ b/lib/interpret_and_optimize/entities/injected_container.dart @@ -30,7 +30,9 @@ class InjectedContainer extends PBVisualIntermediateNode @JsonKey() String type = 'injected_container'; + @override bool pointValueWidth; + @override bool pointValueHeight; @override From 75a87734ac302a42f314ca6fac9e7275636cdd3b Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 16:13:48 -0600 Subject: [PATCH 28/55] Use PBContainer instead of specific container --- lib/generation/generators/attribute-helper/pb_size_helper.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generation/generators/attribute-helper/pb_size_helper.dart b/lib/generation/generators/attribute-helper/pb_size_helper.dart index 64773253..091614c5 100644 --- a/lib/generation/generators/attribute-helper/pb_size_helper.dart +++ b/lib/generation/generators/attribute-helper/pb_size_helper.dart @@ -66,7 +66,7 @@ class PBSizeHelper extends PBAttributesHelper { SizingValueContext.LayoutBuilderStatefulValue) { // Add Container case where width and/or height is static var isPointValue = false; - if (source is InjectedContainer) { + if (source is PBContainer) { isPointValue = isHeight ? source.pointValueHeight : source.pointValueWidth; } From 8d66235bc281e6a9636ddc8fe32e0ea9dd3676d6 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 16:32:16 -0600 Subject: [PATCH 29/55] Ran dart builder --- lib/interpret_and_optimize/entities/inherited_circle.g.dart | 2 ++ .../entities/inherited_container.g.dart | 2 ++ .../entities/inherited_material.g.dart | 2 ++ .../entities/inherited_polygon.g.dart | 2 ++ .../entities/inherited_scaffold.g.dart | 2 ++ .../entities/inherited_shape_group.g.dart | 2 ++ .../entities/inherited_shape_path.g.dart | 2 ++ lib/interpret_and_optimize/entities/inherited_star.g.dart | 2 ++ lib/interpret_and_optimize/entities/inherited_text.g.dart | 2 ++ .../entities/inherited_triangle.g.dart | 2 ++ .../entities/injected_container.g.dart | 6 ++---- .../entities/layouts/group/frame_group.g.dart | 2 ++ lib/interpret_and_optimize/entities/layouts/row.g.dart | 2 ++ .../entities/pb_shared_instance.g.dart | 2 ++ .../entities/pb_shared_master_node.g.dart | 2 ++ .../entities/subclasses/pb_intermediate_node.g.dart | 3 +++ 16 files changed, 33 insertions(+), 4 deletions(-) diff --git a/lib/interpret_and_optimize/entities/inherited_circle.g.dart b/lib/interpret_and_optimize/entities/inherited_circle.g.dart index 998f7e66..34d31b8b 100644 --- a/lib/interpret_and_optimize/entities/inherited_circle.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_circle.g.dart @@ -18,6 +18,7 @@ InheritedCircle _$InheritedCircleFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -31,6 +32,7 @@ InheritedCircle _$InheritedCircleFromJson(Map json) { Map _$InheritedCircleToJson(InheritedCircle instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_container.g.dart b/lib/interpret_and_optimize/entities/inherited_container.g.dart index 307ea9ab..8b56989a 100644 --- a/lib/interpret_and_optimize/entities/inherited_container.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_container.g.dart @@ -19,6 +19,7 @@ InheritedContainer _$InheritedContainerFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -32,6 +33,7 @@ InheritedContainer _$InheritedContainerFromJson(Map json) { Map _$InheritedContainerToJson(InheritedContainer instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_material.g.dart b/lib/interpret_and_optimize/entities/inherited_material.g.dart index 57eb1116..59775aad 100644 --- a/lib/interpret_and_optimize/entities/inherited_material.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_material.g.dart @@ -17,6 +17,7 @@ InheritedMaterial _$InheritedMaterialFromJson(Map json) { json['prototypeNodeUUID'] as String), constraints: json['constraints'], ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -30,6 +31,7 @@ InheritedMaterial _$InheritedMaterialFromJson(Map json) { Map _$InheritedMaterialToJson(InheritedMaterial instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_polygon.g.dart b/lib/interpret_and_optimize/entities/inherited_polygon.g.dart index 59f2140d..798efeb3 100644 --- a/lib/interpret_and_optimize/entities/inherited_polygon.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_polygon.g.dart @@ -18,6 +18,7 @@ InheritedPolygon _$InheritedPolygonFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -31,6 +32,7 @@ InheritedPolygon _$InheritedPolygonFromJson(Map json) { Map _$InheritedPolygonToJson(InheritedPolygon instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_scaffold.g.dart b/lib/interpret_and_optimize/entities/inherited_scaffold.g.dart index 7ea77c08..c558535e 100644 --- a/lib/interpret_and_optimize/entities/inherited_scaffold.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_scaffold.g.dart @@ -20,6 +20,7 @@ InheritedScaffold _$InheritedScaffoldFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -33,6 +34,7 @@ InheritedScaffold _$InheritedScaffoldFromJson(Map json) { Map _$InheritedScaffoldToJson(InheritedScaffold instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_shape_group.g.dart b/lib/interpret_and_optimize/entities/inherited_shape_group.g.dart index 2d3fb3ad..7e24a31d 100644 --- a/lib/interpret_and_optimize/entities/inherited_shape_group.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_shape_group.g.dart @@ -18,6 +18,7 @@ InheritedShapeGroup _$InheritedShapeGroupFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -32,6 +33,7 @@ InheritedShapeGroup _$InheritedShapeGroupFromJson(Map json) { Map _$InheritedShapeGroupToJson( InheritedShapeGroup instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_shape_path.g.dart b/lib/interpret_and_optimize/entities/inherited_shape_path.g.dart index aae1786f..3eca3d4c 100644 --- a/lib/interpret_and_optimize/entities/inherited_shape_path.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_shape_path.g.dart @@ -18,6 +18,7 @@ InheritedShapePath _$InheritedShapePathFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -31,6 +32,7 @@ InheritedShapePath _$InheritedShapePathFromJson(Map json) { Map _$InheritedShapePathToJson(InheritedShapePath instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_star.g.dart b/lib/interpret_and_optimize/entities/inherited_star.g.dart index df976688..d2817b62 100644 --- a/lib/interpret_and_optimize/entities/inherited_star.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_star.g.dart @@ -18,6 +18,7 @@ InheritedStar _$InheritedStarFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -31,6 +32,7 @@ InheritedStar _$InheritedStarFromJson(Map json) { Map _$InheritedStarToJson(InheritedStar instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_text.g.dart b/lib/interpret_and_optimize/entities/inherited_text.g.dart index 886e3adc..71cea453 100644 --- a/lib/interpret_and_optimize/entities/inherited_text.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_text.g.dart @@ -16,6 +16,7 @@ InheritedText _$InheritedTextFromJson(Map json) { json['prototypeNodeUUID'] as String), text: json['content'] as String, ) + ..subsemantic = json['subsemantic'] as String ..constraints = json['constraints'] == null ? null : PBIntermediateConstraints.fromJson( @@ -33,6 +34,7 @@ InheritedText _$InheritedTextFromJson(Map json) { Map _$InheritedTextToJson(InheritedText instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/inherited_triangle.g.dart b/lib/interpret_and_optimize/entities/inherited_triangle.g.dart index b35d1ef8..fc9e3590 100644 --- a/lib/interpret_and_optimize/entities/inherited_triangle.g.dart +++ b/lib/interpret_and_optimize/entities/inherited_triangle.g.dart @@ -18,6 +18,7 @@ InheritedTriangle _$InheritedTriangleFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -31,6 +32,7 @@ InheritedTriangle _$InheritedTriangleFromJson(Map json) { Map _$InheritedTriangleToJson(InheritedTriangle instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/injected_container.g.dart b/lib/interpret_and_optimize/entities/injected_container.g.dart index 18137ab3..499de684 100644 --- a/lib/interpret_and_optimize/entities/injected_container.g.dart +++ b/lib/interpret_and_optimize/entities/injected_container.g.dart @@ -14,8 +14,6 @@ InjectedContainer _$InjectedContainerFromJson(Map json) { prototypeNode: PrototypeNode.prototypeNodeFromJson(json['prototypeNode'] as String), type: json['type'] as String, - pointValueHeight: json['pointValueHeight'] as bool, - pointValueWidth: json['pointValueWidth'] as bool, constraints: json['constraints'] == null ? null : PBIntermediateConstraints.fromJson( @@ -23,6 +21,7 @@ InjectedContainer _$InjectedContainerFromJson(Map json) { showWidth: json['showWidth'] as bool, showHeight: json['showHeight'] as bool, ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -35,6 +34,7 @@ InjectedContainer _$InjectedContainerFromJson(Map json) { Map _$InjectedContainerToJson(InjectedContainer instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': @@ -46,8 +46,6 @@ Map _$InjectedContainerToJson(InjectedContainer instance) => 'name': instance.name, 'prototypeNode': instance.prototypeNode, 'type': instance.type, - 'pointValueWidth': instance.pointValueWidth, - 'pointValueHeight': instance.pointValueHeight, 'showWidth': instance.showWidth, 'showHeight': instance.showHeight, }; diff --git a/lib/interpret_and_optimize/entities/layouts/group/frame_group.g.dart b/lib/interpret_and_optimize/entities/layouts/group/frame_group.g.dart index f9c363e8..12844a62 100644 --- a/lib/interpret_and_optimize/entities/layouts/group/frame_group.g.dart +++ b/lib/interpret_and_optimize/entities/layouts/group/frame_group.g.dart @@ -18,6 +18,7 @@ FrameGroup _$FrameGroupFromJson(Map json) { : PBIntermediateConstraints.fromJson( json['constraints'] as Map), ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -31,6 +32,7 @@ FrameGroup _$FrameGroupFromJson(Map json) { Map _$FrameGroupToJson(FrameGroup instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints, 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/layouts/row.g.dart b/lib/interpret_and_optimize/entities/layouts/row.g.dart index ec5de067..2cc89cb5 100644 --- a/lib/interpret_and_optimize/entities/layouts/row.g.dart +++ b/lib/interpret_and_optimize/entities/layouts/row.g.dart @@ -11,6 +11,7 @@ PBIntermediateRowLayout _$PBIntermediateRowLayoutFromJson( return PBIntermediateRowLayout( name: json['name'] as String, ) + ..subsemantic = json['subsemantic'] as String ..constraints = json['constraints'] == null ? null : PBIntermediateConstraints.fromJson( @@ -38,6 +39,7 @@ PBIntermediateRowLayout _$PBIntermediateRowLayoutFromJson( Map _$PBIntermediateRowLayoutToJson( PBIntermediateRowLayout instance) => { + 'subsemantic': instance.subsemantic, 'constraints': instance.constraints, 'layoutMainAxisSizing': _$ParentLayoutSizingEnumMap[instance.layoutMainAxisSizing], diff --git a/lib/interpret_and_optimize/entities/pb_shared_instance.g.dart b/lib/interpret_and_optimize/entities/pb_shared_instance.g.dart index 9350ec79..8f10c6e8 100644 --- a/lib/interpret_and_optimize/entities/pb_shared_instance.g.dart +++ b/lib/interpret_and_optimize/entities/pb_shared_instance.g.dart @@ -22,6 +22,7 @@ PBSharedInstanceIntermediateNode _$PBSharedInstanceIntermediateNodeFromJson( name: json['name'] as String, sharedNodeSetID: json['sharedNodeSetID'] as String, ) + ..subsemantic = json['subsemantic'] as String ..constraints = json['constraints'] == null ? null : PBIntermediateConstraints.fromJson( @@ -40,6 +41,7 @@ PBSharedInstanceIntermediateNode _$PBSharedInstanceIntermediateNodeFromJson( Map _$PBSharedInstanceIntermediateNodeToJson( PBSharedInstanceIntermediateNode instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints?.toJson(), 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/pb_shared_master_node.g.dart b/lib/interpret_and_optimize/entities/pb_shared_master_node.g.dart index 01efd6ab..916940ab 100644 --- a/lib/interpret_and_optimize/entities/pb_shared_master_node.g.dart +++ b/lib/interpret_and_optimize/entities/pb_shared_master_node.g.dart @@ -21,6 +21,7 @@ PBSharedMasterNode _$PBSharedMasterNodeFromJson(Map json) { componentSetName: json['componentSetName'] as String, sharedNodeSetID: json['sharedNodeSetID'] as String, ) + ..subsemantic = json['subsemantic'] as String ..layoutMainAxisSizing = _$enumDecodeNullable( _$ParentLayoutSizingEnumMap, json['layoutMainAxisSizing']) ..layoutCrossAxisSizing = _$enumDecodeNullable( @@ -34,6 +35,7 @@ PBSharedMasterNode _$PBSharedMasterNodeFromJson(Map json) { Map _$PBSharedMasterNodeToJson(PBSharedMasterNode instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints?.toJson(), 'layoutMainAxisSizing': diff --git a/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.g.dart b/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.g.dart index 671d8efd..2d452eca 100644 --- a/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.g.dart +++ b/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.g.dart @@ -8,6 +8,7 @@ part of 'pb_intermediate_node.dart'; Map _$PBIntermediateNodeToJson(PBIntermediateNode instance) => { + 'subsemantic': instance.subsemantic, 'UUID': instance.UUID, 'constraints': instance.constraints?.toJson(), 'layoutMainAxisSizing': @@ -17,6 +18,8 @@ Map _$PBIntermediateNodeToJson(PBIntermediateNode instance) => 'boundaryRectangle': Rectangle3D.toJson(instance.frame), 'style': instance.auxiliaryData?.toJson(), 'name': instance.name, + 'hashCode': instance.hashCode, + 'id': instance.id, }; const _$ParentLayoutSizingEnumMap = { From c3924c6087428dc64bf8c5f34183c3ee82d280f9 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 16:32:36 -0600 Subject: [PATCH 30/55] Made the case less specific --- .../generators/attribute-helper/pb_size_helper.dart | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/generation/generators/attribute-helper/pb_size_helper.dart b/lib/generation/generators/attribute-helper/pb_size_helper.dart index 091614c5..1cb38c93 100644 --- a/lib/generation/generators/attribute-helper/pb_size_helper.dart +++ b/lib/generation/generators/attribute-helper/pb_size_helper.dart @@ -64,14 +64,12 @@ class PBSizeHelper extends PBAttributesHelper { '$lowerCaseDimentionString: constraints.max$dimentionString * ${relativeSize.toString()},'; } else if (context.sizingContext == SizingValueContext.LayoutBuilderStatefulValue) { - // Add Container case where width and/or height is static - var isPointValue = false; - if (source is PBContainer) { - isPointValue = - isHeight ? source.pointValueHeight : source.pointValueWidth; - } + // Add case where width and/or height is static + var isFixed = isHeight + ? source.constraints.fixedHeight + : source.constraints.fixedWidth; - if (!isPointValue) { + if (isFixed) { // Size for constants value sizeString = '$lowerCaseDimentionString: ${relativeSize.toString()},'; } else { From 5ccc07f7f1b7545cd74d53b674693df07f9315cf Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 16:38:51 -0600 Subject: [PATCH 31/55] Removed pointValue properties, since it was repetitive from fixed size --- .../generators/visual-widgets/pb_container_gen.dart | 9 +++++---- lib/interpret_and_optimize/entities/container.dart | 2 -- .../entities/inherited_container.dart | 8 -------- .../entities/injected_container.dart | 7 ------- .../entities/layouts/auto_layout_align_strategy.dart | 6 ------ lib/interpret_and_optimize/helpers/align_strategy.dart | 2 -- .../services/pb_layout_generation_service.dart | 7 ------- 7 files changed, 5 insertions(+), 36 deletions(-) diff --git a/lib/generation/generators/visual-widgets/pb_container_gen.dart b/lib/generation/generators/visual-widgets/pb_container_gen.dart index f3617491..3997850a 100644 --- a/lib/generation/generators/visual-widgets/pb_container_gen.dart +++ b/lib/generation/generators/visual-widgets/pb_container_gen.dart @@ -19,6 +19,7 @@ class PBContainerGenerator extends PBGenerator { if (source is PBContainer) { var sourceChildren = context.tree.childrenOf(source); var buffer = StringBuffer(); + // buffer.write('\n \/* ${source.name} *\/ \n'); buffer.write('Container('); /// Add clip behavior in case children needs to be clipped @@ -34,20 +35,20 @@ class PBContainerGenerator extends PBGenerator { //TODO(ivanV): please clean my if statement :( if (source is InjectedContainer) { - if (source.pointValueHeight && + if (source.constraints.fixedHeight && source.frame.height > 0 && source.showHeight) { buffer.write('height: ${source.frame.height},'); - } else if (!source.pointValueHeight) { + } else if (!source.constraints.fixedHeight) { buffer.write( PBSizeHelper().getSize(source, context, DIMENTIONS.Height)); } - if (source.pointValueWidth && + if (source.constraints.fixedWidth && source.frame.width > 0 && source.showWidth) { buffer.write('width: ${source.frame.width},'); - } else if (!source.pointValueWidth) { + } else if (!source.constraints.fixedWidth) { buffer .write(PBSizeHelper().getSize(source, context, DIMENTIONS.Width)); } diff --git a/lib/interpret_and_optimize/entities/container.dart b/lib/interpret_and_optimize/entities/container.dart index 2c81f706..02ea6481 100644 --- a/lib/interpret_and_optimize/entities/container.dart +++ b/lib/interpret_and_optimize/entities/container.dart @@ -5,8 +5,6 @@ import 'injected_container.dart'; class PBContainer extends PBIntermediateNode { bool showWidth; bool showHeight; - bool pointValueHeight; - bool pointValueWidth; InjectedPadding padding; PBContainer({String UUID, Rectangle3D frame, String name}) diff --git a/lib/interpret_and_optimize/entities/inherited_container.dart b/lib/interpret_and_optimize/entities/inherited_container.dart index f7ff609d..0cf1a980 100644 --- a/lib/interpret_and_optimize/entities/inherited_container.dart +++ b/lib/interpret_and_optimize/entities/inherited_container.dart @@ -56,8 +56,6 @@ class InheritedContainer extends PBVisualIntermediateNode this.prototypeNode, this.showWidth = true, this.showHeight = true, - this.pointValueHeight = false, - this.pointValueWidth = false, PBIntermediateConstraints constraints, }) : super(UUID, frame, name, constraints: constraints) { generator = PBContainerGenerator(); @@ -80,10 +78,4 @@ class InheritedContainer extends PBVisualIntermediateNode PBIntermediateNode parent, PBIntermediateTree tree) { return InheritedContainer.fromJson(json)..mapRawChildren(json, tree); } - - @override - bool pointValueHeight; - - @override - bool pointValueWidth; } diff --git a/lib/interpret_and_optimize/entities/injected_container.dart b/lib/interpret_and_optimize/entities/injected_container.dart index e09983fd..238a8f9f 100644 --- a/lib/interpret_and_optimize/entities/injected_container.dart +++ b/lib/interpret_and_optimize/entities/injected_container.dart @@ -30,11 +30,6 @@ class InjectedContainer extends PBVisualIntermediateNode @JsonKey() String type = 'injected_container'; - @override - bool pointValueWidth; - @override - bool pointValueHeight; - @override bool showWidth; @override @@ -53,8 +48,6 @@ class InjectedContainer extends PBVisualIntermediateNode String color, this.prototypeNode, this.type, - this.pointValueHeight = false, - this.pointValueWidth = false, PBIntermediateConstraints constraints, this.showWidth = true, this.showHeight = true, diff --git a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart index 5236345d..feca5124 100644 --- a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart +++ b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart @@ -94,12 +94,6 @@ class AutoLayoutAlignStrategy extends AlignStrategy { null, child.frame, name: child.name, - pointValueHeight: isVertical - ? child.layoutMainAxisSizing == ParentLayoutSizing.INHERIT - : child.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT, - pointValueWidth: isVertical - ? child.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT - : child.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, constraints: child.constraints.copyWith(), ) ..layoutCrossAxisSizing = child.layoutCrossAxisSizing diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index 7c1d7375..13fec0a8 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -130,8 +130,6 @@ class PositionedAlignment extends AlignStrategy { null, child.frame.boundingBox(child.frame), name: child.name, - pointValueHeight: centerY, - pointValueWidth: centerX, constraints: child.constraints.copyWith(), ); tree.addEdges(container, [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 547fa4f2..9f07d2d3 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -192,18 +192,11 @@ class PBLayoutGenerationService extends AITHandler { ); if (tempGroup.auxiliaryData.colors != null) { - var isVertical = tempGroup.parent is PBIntermediateColumnLayout; var tempContainer = InjectedContainer( null, tempGroup.frame.copyWith(), constraints: tempGroup.constraints.copyWith(), name: tempGroup.name, - pointValueHeight: isVertical - ? tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT - : tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT, - pointValueWidth: isVertical - ? tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT - : tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, showHeight: tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, showWidth: From 881c4f73fbcd78b04a4631dc3458f0841e15a67b Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 17:11:35 -0600 Subject: [PATCH 32/55] Re arrange if statements to match better the constraints --- .../generators/visual-widgets/pb_positioned_gen.dart | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/generation/generators/visual-widgets/pb_positioned_gen.dart b/lib/generation/generators/visual-widgets/pb_positioned_gen.dart index 7047750b..f5db9ec3 100644 --- a/lib/generation/generators/visual-widgets/pb_positioned_gen.dart +++ b/lib/generation/generators/visual-widgets/pb_positioned_gen.dart @@ -73,6 +73,10 @@ class PBPositionedGenerator extends PBGenerator { /// Getting the boilerplate needed to fill in the generation depending on the [sizingValueContext]. String _getBoilerplate(SizingValueContext sizingValueContext, _PositionedValue _positionedValue) { + if (_positionedValue.remainPointValue) { + return ''; + } + if (sizingValueContext == SizingValueContext.LayoutBuilderValue) { if (_positionedValue.isXAxis) { return 'constraints.maxWidth *'; @@ -88,11 +92,6 @@ class PBPositionedGenerator extends PBGenerator { } } - if (_positionedValue.remainPointValue || - sizingValueContext != SizingValueContext.ScaleValue) { - return ''; - } - if (_positionedValue.isXAxis) { return '${PBGenerator.MEDIAQUERY_HORIZONTAL_BOILERPLATE} * '; } else { From 1f4a93da91054d18c234a8774a0518ef85bc805d Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 17:27:55 -0600 Subject: [PATCH 33/55] Updated styling tests --- .../styling/primary_button_rect.golden | 4 +- .../golden_files/styling/styling.golden | 48 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/golden/golden_files/styling/primary_button_rect.golden b/test/golden/golden_files/styling/primary_button_rect.golden index 37f397fd..677f2d08 100644 --- a/test/golden/golden_files/styling/primary_button_rect.golden +++ b/test/golden/golden_files/styling/primary_button_rect.golden @@ -41,8 +41,8 @@ class _PrimaryButtonRect extends State { top: 0, height: 100.0, child: Container( - width: widget.constraints.maxWidth * 1.0, - height: widget.constraints.maxHeight * 1.0, + width: 235.0, + height: 100.0, decoration: BoxDecoration( color: Color(0xff59afff), borderRadius: BorderRadius.all(Radius.circular(20.0)), diff --git a/test/golden/golden_files/styling/styling.golden b/test/golden/golden_files/styling/styling.golden index 3da089e9..ca1665b3 100644 --- a/test/golden/golden_files/styling/styling.golden +++ b/test/golden/golden_files/styling/styling.golden @@ -70,8 +70,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/circleradius.png', package: 'styling_golden_testing_project', - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -83,8 +83,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/diamond.png', package: 'styling_golden_testing_project', - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -151,8 +151,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/2stroke.png', package: 'styling_golden_testing_project', - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -206,8 +206,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/imagewithtint.png', package: 'styling_golden_testing_project', - width: 197.000, - height: 120.000, + width: 197.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -244,8 +244,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/ellipse1.png', package: 'styling_golden_testing_project', - width: 133.000, - height: 124.000, + width: 133.0, + height: 124.0, fit: BoxFit.none, ), ), @@ -257,8 +257,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/polygon1.svg', package: 'styling_golden_testing_project', - width: 142.000, - height: 120.000, + width: 142.0, + height: 120.0, fit: BoxFit.none, ), ), @@ -270,8 +270,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/star1.svg', package: 'styling_golden_testing_project', - width: 110.000, - height: 126.000, + width: 110.0, + height: 126.0, fit: BoxFit.none, ), ), @@ -283,8 +283,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/vector1.svg', package: 'styling_golden_testing_project', - width: 109.500, - height: 102.500, + width: 109.5, + height: 102.5, fit: BoxFit.none, ), ), @@ -296,8 +296,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/emptyframe.svg', package: 'styling_golden_testing_project', - width: 154.000, - height: 118.000, + width: 154.0, + height: 118.0, fit: BoxFit.none, ), ), @@ -391,8 +391,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/line1.svg', package: 'styling_golden_testing_project', - width: 1.000, - height: 77.007, + width: 1.0, + height: 77.00650024414062, fit: BoxFit.none, ), ), @@ -404,8 +404,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/line2.svg', package: 'styling_golden_testing_project', - width: 1.000, - height: 89.000, + width: 1.0, + height: 89.0, fit: BoxFit.none, ), ), @@ -417,8 +417,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/rectangle1.png', package: 'styling_golden_testing_project', - width: 176.000, - height: 127.000, + width: 176.0, + height: 127.0, fit: BoxFit.none, ), ), From bf62dc4c4601c13bb6f739cbb2945866fdc66051 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 24 Jun 2022 17:38:48 -0600 Subject: [PATCH 34/55] Updated auto layout tests --- .../golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden | 1 - .../golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden | 1 - .../golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden | 1 - .../golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden | 1 - .../auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden | 2 -- .../auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden | 2 -- .../auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden | 2 -- .../golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden | 1 - .../golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden | 1 - .../golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden | 1 - .../auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden | 1 - .../golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden | 1 - .../golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden | 1 - .../golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden | 1 - .../auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden | 2 -- 26 files changed, 30 deletions(-) diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden index bf414095..9aa911e1 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden @@ -35,7 +35,6 @@ class _ColHzFxVrHgSpPk147 extends State { top: 10.0, bottom: 10.0, ), - height: 85.0, width: 326.0, decoration: BoxDecoration( color: Colors.black, diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden index 6cdc8622..d84c1847 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden @@ -35,7 +35,6 @@ class _ColHzFxVrHgSpPk258 extends State { top: 10.0, bottom: 10.0, ), - height: 85.0, width: 326.0, decoration: BoxDecoration( color: Colors.black, diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden index 5a5595ef..7cbcab45 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden @@ -35,7 +35,6 @@ class _ColHzFxVrHgSpPk369 extends State { top: 10.0, bottom: 10.0, ), - height: 85.0, width: 326.0, decoration: BoxDecoration( color: Colors.black, diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden index e4629668..b1d8e681 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk1 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden index 0476c15c..d012cbe8 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk2 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden index 33b95dc8..9e0dece9 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk3 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden index ce023ede..2c0561f7 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk4 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden index 164bd767..3ceb8f60 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk5 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden index be976939..6163b31d 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk6 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden index cbb08793..3c701111 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk7 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden index 8403d0a4..0c393f27 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk8 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden index 78280989..efb33efb 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpPk9 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden index dc6ecb7b..b344fdc8 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpSb147 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden index 44bfd8a1..f7cd5138 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpSb258 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden index 2f1809ac..ef9c83dd 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden @@ -36,7 +36,6 @@ class _ColHzHgVrFxSpSb369 extends State { bottom: 10.0, ), height: 200.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden index 94d17c90..47cf6699 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden @@ -35,8 +35,6 @@ class _ColHzHgVrHgSpPk123456789 extends State { top: 10.0, bottom: 10.0, ), - height: 85.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden index c1b8a390..a48c5087 100644 --- a/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden @@ -37,8 +37,6 @@ class _NoSpaceColHzHgVrHgSpPk123456789 top: 10.0, bottom: 10.0, ), - height: 65.0, - width: 59.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden index ffb8a254..b583ece4 100644 --- a/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden @@ -37,8 +37,6 @@ class _NoSpaceRowHzHgVrHgSpPk123456789 top: 10.0, bottom: 10.0, ), - height: 35.0, - width: 114.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden index 28dbf027..22e8cf2c 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden @@ -36,7 +36,6 @@ class _RowHzFxVrHgSpPk147 extends State { bottom: 10.0, ), height: 35.0, - width: 322.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden index 81680d9f..9c16fe9e 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden @@ -36,7 +36,6 @@ class _RowHzFxVrHgSpPk258 extends State { bottom: 10.0, ), height: 35.0, - width: 322.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden index a65b38c1..64c77a6b 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden @@ -36,7 +36,6 @@ class _RowHzFxVrHgSpPk369 extends State { bottom: 10.0, ), height: 35.0, - width: 322.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden index a4548568..b585e49d 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden @@ -36,7 +36,6 @@ class _RowHzFxVrHgSpSb123456789 extends State { bottom: 10.0, ), height: 35.0, - width: 322.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden index 81908d3a..cd99269d 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden @@ -35,7 +35,6 @@ class _RowHzHgVrFxSpPk147 extends State { top: 10.0, bottom: 10.0, ), - height: 100.0, width: 134.0, decoration: BoxDecoration( color: Colors.black, diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden index edab3ac1..724ebc9e 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden @@ -35,7 +35,6 @@ class _RowHzHgVrFxSpPk258 extends State { top: 10.0, bottom: 10.0, ), - height: 100.0, width: 134.0, decoration: BoxDecoration( color: Colors.black, diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden index c034e961..85912fd0 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden @@ -35,7 +35,6 @@ class _RowHzHgVrFxSpPk369 extends State { top: 10.0, bottom: 10.0, ), - height: 100.0, width: 134.0, decoration: BoxDecoration( color: Colors.black, diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden index 75045a9c..9d7393c1 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden @@ -35,8 +35,6 @@ class _RowHzHgVrHgSpPk123456789 extends State { top: 10.0, bottom: 10.0, ), - height: 35.0, - width: 134.0, decoration: BoxDecoration( color: Colors.black, ), From 9da68dee2cefac03b95bb539fe4185897ad6cd0f Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 27 Jun 2022 15:24:04 -0600 Subject: [PATCH 35/55] Set widgetbook default --- lib/configurations/configurations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configurations/configurations.json b/lib/configurations/configurations.json index 0702fd74..71bda2b8 100644 --- a/lib/configurations/configurations.json +++ b/lib/configurations/configurations.json @@ -4,6 +4,6 @@ "tablet": 600, "desktop": 1280 }, - "componentIsolation": "none", + "componentIsolation": "widgetbook", "folderArchitecture": "domain" } From 5e776e14b82f895f5d9a6c096c5771b0b6868dba Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 27 Jun 2022 15:24:21 -0600 Subject: [PATCH 36/55] Replace enum for boolean --- .../attribute-helper/pb_size_helper.dart | 18 ++++-------------- .../visual-widgets/pb_container_gen.dart | 6 ++---- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/generation/generators/attribute-helper/pb_size_helper.dart b/lib/generation/generators/attribute-helper/pb_size_helper.dart index 1cb38c93..541b8361 100644 --- a/lib/generation/generators/attribute-helper/pb_size_helper.dart +++ b/lib/generation/generators/attribute-helper/pb_size_helper.dart @@ -16,16 +16,14 @@ class PBSizeHelper extends PBAttributesHelper { final buffer = StringBuffer(); - buffer.write(getSize(source, context, DIMENTIONS.Width)); - buffer.write(getSize(source, context, DIMENTIONS.Height)); + buffer.write(getSize(source, context, false)); + buffer.write(getSize(source, context, true)); return buffer.toString(); } - String getSize( - PBIntermediateNode source, PBContext context, DIMENTIONS dimention) { - var isHeight = dimention == DIMENTIONS.Height; - var dimentionString = dimention.toShortString(); + String getSize(PBIntermediateNode source, PBContext context, bool isHeight) { + var dimentionString = isHeight ? 'Height' : 'Width'; var lowerCaseDimentionString = dimentionString.toLowerCase(); String sizeString; final buffer = StringBuffer(); @@ -97,11 +95,3 @@ class PBSizeHelper extends PBAttributesHelper { return buffer.toString(); } } - -enum DIMENTIONS { Height, Width } - -extension DimentionToString on DIMENTIONS { - String toShortString() { - return this.toString().split('.').last; - } -} diff --git a/lib/generation/generators/visual-widgets/pb_container_gen.dart b/lib/generation/generators/visual-widgets/pb_container_gen.dart index 3997850a..54900ee2 100644 --- a/lib/generation/generators/visual-widgets/pb_container_gen.dart +++ b/lib/generation/generators/visual-widgets/pb_container_gen.dart @@ -40,8 +40,7 @@ class PBContainerGenerator extends PBGenerator { source.showHeight) { buffer.write('height: ${source.frame.height},'); } else if (!source.constraints.fixedHeight) { - buffer.write( - PBSizeHelper().getSize(source, context, DIMENTIONS.Height)); + buffer.write(PBSizeHelper().getSize(source, context, true)); } if (source.constraints.fixedWidth && @@ -49,8 +48,7 @@ class PBContainerGenerator extends PBGenerator { source.showWidth) { buffer.write('width: ${source.frame.width},'); } else if (!source.constraints.fixedWidth) { - buffer - .write(PBSizeHelper().getSize(source, context, DIMENTIONS.Width)); + buffer.write(PBSizeHelper().getSize(source, context, false)); } } From 77f86ed5840d2f2dfc4d28b8a4e09d932946a070 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 27 Jun 2022 16:26:45 -0600 Subject: [PATCH 37/55] Added check if the parent layout sizing is inherit --- lib/interpret_and_optimize/helpers/align_strategy.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index 13fec0a8..855baf14 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -106,16 +106,19 @@ class PositionedAlignment extends AlignStrategy { // Checks if child's parent has fixed height and width // or child has fixed height and width to determine the positioned constraints - if ((!child.constraints.pinLeft && !child.constraints.pinRight) && + if (node.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT && + (!child.constraints.pinLeft && !child.constraints.pinRight) && (node.constraints.fixedWidth || child.constraints.fixedWidth)) { injectedPositioned.constraints.fixedWidth = false; centerX = true; } - if ((!child.constraints.pinTop && !child.constraints.pinBottom) && + if (node.layoutMainAxisSizing == ParentLayoutSizing.INHERIT && + (!child.constraints.pinTop && !child.constraints.pinBottom) && (node.constraints.fixedHeight || child.constraints.fixedHeight)) { injectedPositioned.constraints.fixedHeight = false; centerY = true; } + alignedChildren.add(injectedPositioned); if (!(centerX || centerY)) { /// we are no center, since there is no need in either axis From 10d33f43749ee0b4f0f43f148ad09be3008a8287 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Mon, 27 Jun 2022 17:10:30 -0600 Subject: [PATCH 38/55] Added orca city screen for autolayout with non autolayout frames --- .../admin_city_section_edit_screen.golden | 544 ++++++++++++++++++ .../auto_layout/auto_layout_file_names.txt | 3 +- 2 files changed, 546 insertions(+), 1 deletion(-) create mode 100644 test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden diff --git a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden new file mode 100644 index 00000000..6a55fd53 --- /dev/null +++ b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden @@ -0,0 +1,544 @@ +// ********************************************************************************* +// PARABEAC-GENERATED CODE. DO NOT MODIFY. +// +// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com +// ********************************************************************************* + +import 'package:flutter/material.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/admin_city_section_scroll_view_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/section_description_title_custom.dart'; +import 'package:auto_size_text/auto_size_text.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/tag_section_title_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/add_tag_button_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/current_tags_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/edit_main_image_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/main_image_section_title_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/additional_images_section_title_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/add_additional_image_button_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/additional_images_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/save_button_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/orca_city_admin_header.g.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/full_article.g.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/label_button.g.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/edit_main_image.g.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/circle_actions_close.g.dart'; + +class AdminCitySectionEditScreen extends StatefulWidget { + const AdminCitySectionEditScreen({ + Key? key, + }) : super(key: key); + @override + _AdminCitySectionEditScreen createState() => _AdminCitySectionEditScreen(); +} + +class _AdminCitySectionEditScreen extends State { + _AdminCitySectionEditScreen(); + + @override + Widget build(BuildContext context) { + return Material( + color: Color(0xfff7f7fc), + child: Stack(children: [ + Positioned( + left: 46.0, + right: 44.0, + top: 0, + height: 280.0, + child: LayoutBuilder(builder: (context, constraints) { + return OrcaCityAdminHeader( + constraints, + ); + }), + ), + Positioned( + left: 36.0, + right: 34.0, + top: 280.0, + bottom: 0, + child: AdminCitySectionScrollViewCustom( + child: Container( + height: + MediaQuery.of(context).size.height * 2.110997963340122, + width: MediaQuery.of(context).size.width * 0.9599313108185461, + decoration: BoxDecoration(), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 419.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 9.0, + width: 1066.0, + top: 0, + height: 64.0, + child: SectionDescriptionTitleCustom( + child: AutoSizeText( + 'Present the Unique Values Your City Has', + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 50.0, + fontWeight: FontWeight.w700, + letterSpacing: 0.9999998807907104, + color: Color(0xff14142b), + ), + textAlign: TextAlign.left, + )), + ), + Positioned( + left: 0, + right: 0, + top: 84.0, + height: 335.0, + child: LayoutBuilder( + builder: (context, constraints) { + return FullArticle( + constraints, + ); + }), + ), + ])), + SizedBox( + height: 32.0, + ), + Container( + decoration: BoxDecoration(), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 72.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context) + .size + .width * + 0.793, + top: 0, + height: MediaQuery.of(context) + .size + .height * + 0.065, + child: Center( + child: Container( + height: MediaQuery.of(context) + .size + .height * + 0.06517311608961303, + width: MediaQuery.of(context) + .size + .width * + 0.7931922078473812, + child: TagSectionTitleCustom( + child: AutoSizeText( + 'Experience Your City’s Unique Values ', + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 50.0, + fontWeight: + FontWeight.w700, + letterSpacing: + 0.9999998807907104, + color: Color(0xff14142b), + ), + textAlign: TextAlign.left, + )))), + ), + Positioned( + right: 0, + width: 143.948, + top: 0, + height: MediaQuery.of(context) + .size + .height * + 0.073, + child: Center( + child: Container( + height: 72.0, + width: 143.947509765625, + child: AddTagButtonCustom( + child: Container( + padding: + EdgeInsets.only( + left: 32.0, + right: 32.0, + top: 19.0, + bottom: 19.0, + ), + height: 72.0, + decoration: + BoxDecoration( + color: Color( + 0xff00497b), + borderRadius: + BorderRadius.all( + Radius.circular( + 16.0)), + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment + .center, + crossAxisAlignment: + CrossAxisAlignment + .center, + children: [ + Container( + width: MediaQuery.of(context) + .size + .width * + 0.0412135088723526, + height: MediaQuery.of(context) + .size + .height * + 0.034623217922606926, + child: + AutoSizeText( + 'Add (+)', + style: + TextStyle( + fontFamily: + 'Poppins', + fontSize: + 17.0, + fontWeight: + FontWeight.w600, + letterSpacing: + 0.75, + color: Color( + 0xfffcfcfc), + ), + textAlign: + TextAlign + .center, + )), + ]))))), + ), + ])), + SizedBox( + height: 32.0, + ), + Container( + height: 75.0, + width: MediaQuery.of(context).size.width * + 0.813966800228964, + child: CurrentTagsCustom( + child: Container( + height: 75.0, + width: MediaQuery.of(context) + .size + .width * + 0.813966800228964, + decoration: BoxDecoration(), + child: Row( + mainAxisAlignment: + MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Container( + height: 75.0, + width: 75.0, + child: LayoutBuilder( + builder: (context, + constraints) { + return LabelButton( + constraints, + ); + })), + SizedBox( + width: 16.0, + ), + Container( + height: 75.0, + width: 75.0, + child: LayoutBuilder( + builder: (context, + constraints) { + return LabelButton( + constraints, + ); + })), + SizedBox( + width: 16.0, + ), + Container( + height: 75.0, + width: 75.0, + child: LayoutBuilder( + builder: (context, + constraints) { + return LabelButton( + constraints, + ); + })), + ])))), + ])), + SizedBox( + height: 32.0, + ), + Container( + height: 389.75, + width: 678.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 540.0, + top: 86.0, + height: 303.75, + child: EditMainImageCustom( + child: Container( + height: 303.75, + width: 540.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 540.0, + top: 0, + height: 303.75, + child: LayoutBuilder(builder: + (context, constraints) { + return EditMainImage( + constraints, + ); + }), + ), + ]))), + ), + Positioned( + left: 0, + width: 678.0, + top: 0, + height: 64.0, + child: MainImageSectionTitleCustom( + child: AutoSizeText( + 'Upload Image For Section', + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 50.0, + fontWeight: FontWeight.w700, + letterSpacing: 0.9999998807907104, + color: Color(0xff14142b), + ), + textAlign: TextAlign.left, + )), + ), + ])), + SizedBox( + height: 32.0, + ), + Container( + decoration: BoxDecoration(), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 72.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 843.0, + top: 0, + height: 64.0, + child: + AdditionalImagesSectionTitleCustom( + child: AutoSizeText( + 'Upload Additional Images/Data', + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 50.0, + fontWeight: FontWeight.w700, + letterSpacing: 0.9999998807907104, + color: Color(0xff14142b), + ), + textAlign: TextAlign.left, + )), + ), + Positioned( + right: 0.052, + width: 143.948, + top: 0, + height: MediaQuery.of(context) + .size + .height * + 0.073, + child: Center( + child: Container( + height: 72.0, + width: 143.947509765625, + child: + AddAdditionalImageButtonCustom( + child: Container( + padding: + EdgeInsets + .only( + left: 32.0, + right: 32.0, + top: 19.0, + bottom: 19.0, + ), + height: 72.0, + decoration: + BoxDecoration( + color: Color( + 0xff00497b), + borderRadius: BorderRadius + .all(Radius + .circular( + 16.0)), + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment + .center, + crossAxisAlignment: + CrossAxisAlignment + .center, + children: [ + Container( + width: MediaQuery.of(context).size.width * + 0.0412135088723526, + height: MediaQuery.of(context).size.height * + 0.034623217922606926, + child: + AutoSizeText( + 'Add (+)', + style: + TextStyle( + fontFamily: + 'Poppins', + fontSize: + 17.0, + fontWeight: + FontWeight.w600, + letterSpacing: + 0.75, + color: + Color(0xfffcfcfc), + ), + textAlign: + TextAlign.center, + )), + ]))))), + ), + ])), + SizedBox( + height: 19.0, + ), + Container( + height: 689.0, + child: AdditionalImagesCustom( + child: Container( + height: 689.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 540.0, + top: 0, + height: 335.0, + child: LayoutBuilder(builder: + (context, constraints) { + return DeleteImageComponent( + constraints, + ); + }), + ), + Positioned( + left: 0, + width: 540.0, + top: 354.0, + height: 335.0, + child: LayoutBuilder(builder: + (context, constraints) { + return DeleteImageComponent( + constraints, + ); + }), + ), + ])))), + ])), + SizedBox( + height: 32.0, + ), + Container( + height: 72.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: MediaQuery.of(context).size.width * 0.191, + width: + MediaQuery.of(context).size.width * 0.579, + bottom: 0, + height: 72.0, + child: SaveButtonCustom( + child: Container( + height: 72.0, + width: + MediaQuery.of(context).size.width * + 0.5792399833866986, + decoration: BoxDecoration( + color: Color(0xff00497b), + borderRadius: BorderRadius.all( + Radius.circular(16.0)), + ), + child: Stack(children: [ + Positioned( + left: MediaQuery.of(context) + .size + .width * + 0.269, + width: MediaQuery.of(context) + .size + .width * + 0.042, + top: 19.25, + bottom: 18.75, + child: Center( + child: Container( + width: 74.0, + height: MediaQuery.of( + context) + .size + .height * + 0.034623217922606926, + child: AutoSizeText( + 'Save', + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 17.0, + fontWeight: + FontWeight.w600, + letterSpacing: 0.75, + color: + Color(0xfffcfcfc), + ), + textAlign: + TextAlign.center, + ))), + ), + ]))), + ), + ])), + ]))), + ), + ]), + ); + } + + @override + void dispose() { + super.dispose(); + } +} diff --git a/test/golden/golden_files/auto_layout/auto_layout_file_names.txt b/test/golden/golden_files/auto_layout/auto_layout_file_names.txt index c7b1fdb5..e7f0649b 100644 --- a/test/golden/golden_files/auto_layout/auto_layout_file_names.txt +++ b/test/golden/golden_files/auto_layout/auto_layout_file_names.txt @@ -47,4 +47,5 @@ row_hz_fx_vr_hg_sp_sb123456789 row_hz_hg_vr_fx_sp_pk147 row_hz_hg_vr_fx_sp_pk258 row_hz_hg_vr_fx_sp_pk369 -row_hz_hg_vr_hg_sp_pk123456789 \ No newline at end of file +row_hz_hg_vr_hg_sp_pk123456789 +admin_city_section_edit_screen \ No newline at end of file From e6d35038431f7393640b59841a356b518280070c Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 28 Jun 2022 02:19:30 -0600 Subject: [PATCH 39/55] Re structured align strategy if statements --- .../helpers/align_strategy.dart | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index 855baf14..c2d76a14 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -104,17 +104,33 @@ class PositionedAlignment extends AlignStrategy { height: child.frame.height), ); + if (node.constraints.fixedHeight) { + child.constraints.fixedHeight = true; + if (!child.constraints.pinTop && !child.constraints.pinBottom) { + child.constraints.pinTop = true; + child.constraints.pinBottom = false; + } + } + if (node.constraints.fixedWidth) { + child.constraints.fixedWidth = true; + if (!child.constraints.pinLeft && !child.constraints.pinRight) { + child.constraints.pinLeft = true; + child.constraints.pinRight = false; + } + } + // Checks if child's parent has fixed height and width // or child has fixed height and width to determine the positioned constraints - if (node.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT && + if (node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH && (!child.constraints.pinLeft && !child.constraints.pinRight) && - (node.constraints.fixedWidth || child.constraints.fixedWidth)) { + child.constraints.fixedWidth) { injectedPositioned.constraints.fixedWidth = false; + centerX = true; } - if (node.layoutMainAxisSizing == ParentLayoutSizing.INHERIT && + if (node.layoutMainAxisSizing != ParentLayoutSizing.STRETCH && (!child.constraints.pinTop && !child.constraints.pinBottom) && - (node.constraints.fixedHeight || child.constraints.fixedHeight)) { + child.constraints.fixedHeight) { injectedPositioned.constraints.fixedHeight = false; centerY = true; } From 4cb9c6c85728c1dca18f09a9de40f50b06a79cc5 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 28 Jun 2022 02:20:25 -0600 Subject: [PATCH 40/55] Fixed issue that was not considering the fact of a Layout being vertical or horizontal --- .../pb_layout_generation_service.dart | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) 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 9f07d2d3..1a142498 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -135,10 +135,12 @@ class PBLayoutGenerationService extends AITHandler { if (tempGroup is! PBIntermediateStackLayout) { // Let tempLayout be Column or Row var tempLayout; + var isVertical = true; if (tempGroup is PBIntermediateColumnLayout) { tempLayout = tempGroup; } else if (tempGroup is PBIntermediateRowLayout) { tempLayout = tempGroup; + isVertical = false; } if (tempLayout.layoutProperties != null) { // Create the injected container to wrap the layout @@ -156,10 +158,18 @@ class PBLayoutGenerationService extends AITHandler { constraints: tempLayout.constraints.copyWith(), // Let the Container know if it is going to show // the width or height on the generation process - showHeight: tempLayout.layoutProperties.primaryAxisSizing == - IntermediateAxisMode.FIXED, - showWidth: tempLayout.layoutProperties.crossAxisSizing == - IntermediateAxisMode.FIXED, + // showHeight: shouldBeShown(tempLayout, true, isVertical), + // showWidth: shouldBeShown(tempLayout, false, isVertical), + showHeight: isVertical + ? tempLayout.layoutProperties.primaryAxisSizing == + IntermediateAxisMode.FIXED + : tempLayout.layoutProperties.crossAxisSizing == + IntermediateAxisMode.FIXED, + showWidth: isVertical + ? tempLayout.layoutProperties.crossAxisSizing == + IntermediateAxisMode.FIXED + : tempLayout.layoutProperties.crossAxisSizing == + IntermediateAxisMode.FIXED, ) ..layoutCrossAxisSizing = tempLayout.layoutCrossAxisSizing ..layoutMainAxisSizing = tempLayout.layoutMainAxisSizing @@ -192,15 +202,21 @@ class PBLayoutGenerationService extends AITHandler { ); if (tempGroup.auxiliaryData.colors != null) { + var isVertical = true; + if (tempGroup is PBIntermediateRowLayout) { + isVertical = false; + } var tempContainer = InjectedContainer( null, tempGroup.frame.copyWith(), constraints: tempGroup.constraints.copyWith(), name: tempGroup.name, - showHeight: - tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, - showWidth: - tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT, + showHeight: isVertical + ? tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT + : tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT, + showWidth: isVertical + ? tempGroup.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT + : tempGroup.layoutMainAxisSizing == ParentLayoutSizing.INHERIT, ) ..auxiliaryData = tempGroup.auxiliaryData ..layoutCrossAxisSizing = tempGroup.layoutCrossAxisSizing From 6a3b9ebe7836eab7f56bd93c421d9cf71fed8978 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 28 Jun 2022 02:20:53 -0600 Subject: [PATCH 41/55] Special case for constraints on bitmaps --- .../layouts/auto_layout_align_strategy.dart | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart index feca5124..4b5c1945 100644 --- a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart +++ b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart @@ -1,11 +1,13 @@ import 'package:parabeac_core/interpret_and_optimize/entities/alignments/expanded.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/container.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/inherited_bitmap.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/inherited_container.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/injected_container.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/layouts/column.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/layouts/layout_properties.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/layouts/row.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/pb_shared_instance.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_constraints.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_layout_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/align_strategy.dart'; @@ -94,7 +96,7 @@ class AutoLayoutAlignStrategy extends AlignStrategy { null, child.frame, name: child.name, - constraints: child.constraints.copyWith(), + constraints: _getConstraints(child, isVertical), ) ..layoutCrossAxisSizing = child.layoutCrossAxisSizing ..layoutMainAxisSizing = child.layoutMainAxisSizing; @@ -104,6 +106,33 @@ class AutoLayoutAlignStrategy extends AlignStrategy { return child; } + PBIntermediateConstraints _getConstraints( + PBIntermediateNode node, bool isVertical) { + PBIntermediateConstraints newConstraints = node.constraints.copyWith(); + if (node is InheritedBitmap) { + if (isVertical) { + if (!node.constraints.fixedHeight && + node.layoutMainAxisSizing != ParentLayoutSizing.STRETCH) { + newConstraints.fixedHeight = true; + } + if (!node.constraints.fixedWidth && + node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH) { + newConstraints.fixedWidth = true; + } + } else { + if (!node.constraints.fixedHeight && + node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH) { + newConstraints.fixedHeight = true; + } + if (!node.constraints.fixedWidth && + node.layoutMainAxisSizing != ParentLayoutSizing.STRETCH) { + newConstraints.fixedWidth = true; + } + } + } + return newConstraints.copyWith(); + } + // This boolean let us know if the layout needs boxes or not bool needsSpacing(node) => node.layoutProperties.spacing != null && From 33af7d62bca29b7d0b8e9a11fb8cf2e5ef22c900 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 28 Jun 2022 02:45:18 -0600 Subject: [PATCH 42/55] Added a case if the pins are set on both sides of width or height do not show it --- .../pb_layout_generation_service.dart | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) 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 1a142498..fc9b784b 100644 --- a/lib/interpret_and_optimize/services/pb_layout_generation_service.dart +++ b/lib/interpret_and_optimize/services/pb_layout_generation_service.dart @@ -158,18 +158,8 @@ class PBLayoutGenerationService extends AITHandler { constraints: tempLayout.constraints.copyWith(), // Let the Container know if it is going to show // the width or height on the generation process - // showHeight: shouldBeShown(tempLayout, true, isVertical), - // showWidth: shouldBeShown(tempLayout, false, isVertical), - showHeight: isVertical - ? tempLayout.layoutProperties.primaryAxisSizing == - IntermediateAxisMode.FIXED - : tempLayout.layoutProperties.crossAxisSizing == - IntermediateAxisMode.FIXED, - showWidth: isVertical - ? tempLayout.layoutProperties.crossAxisSizing == - IntermediateAxisMode.FIXED - : tempLayout.layoutProperties.crossAxisSizing == - IntermediateAxisMode.FIXED, + showHeight: _shouldBeShown(tempLayout, true, isVertical), + showWidth: _shouldBeShown(tempLayout, false, isVertical), ) ..layoutCrossAxisSizing = tempLayout.layoutCrossAxisSizing ..layoutMainAxisSizing = tempLayout.layoutMainAxisSizing @@ -183,6 +173,30 @@ class PBLayoutGenerationService extends AITHandler { }); } + bool _shouldBeShown(dynamic node, bool isHeight, bool isVertical) { + PBIntermediateConstraints constraints = node.constraints; + // TODO: Expand cases + if (isHeight && constraints.pinBottom && constraints.pinTop) { + return false; + } else if (!isHeight && constraints.pinRight && constraints.pinLeft) { + return false; + } else { + if (isVertical) { + return isHeight + ? node.layoutProperties.primaryAxisSizing == + IntermediateAxisMode.FIXED + : node.layoutProperties.crossAxisSizing == + IntermediateAxisMode.FIXED; + } else { + return isHeight + ? node.layoutProperties.crossAxisSizing == + IntermediateAxisMode.FIXED + : node.layoutProperties.primaryAxisSizing == + IntermediateAxisMode.FIXED; + } + } + } + /// Transforming the [Group] into regular [PBLayoutIntermediateNode] void _transformGroup(PBIntermediateTree tree) { tree.whereType().forEach((tempGroup) { From f2bc1c72a25cd41df018756557ea1febb10bd02a Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 28 Jun 2022 16:38:20 -0600 Subject: [PATCH 43/55] Updated auto layout golden tests --- .../admin_city_section_edit_screen.golden | 272 ++++++++---------- .../row_hz_fx_vr_hg_sp_pk147.golden | 2 +- .../row_hz_fx_vr_hg_sp_pk258.golden | 2 +- .../row_hz_fx_vr_hg_sp_pk369.golden | 2 +- .../row_hz_fx_vr_hg_sp_sb123456789.golden | 2 +- .../row_hz_hg_vr_fx_sp_pk147.golden | 2 +- .../row_hz_hg_vr_fx_sp_pk258.golden | 2 +- .../row_hz_hg_vr_fx_sp_pk369.golden | 2 +- 8 files changed, 123 insertions(+), 163 deletions(-) diff --git a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden index 6a55fd53..50d9a211 100644 --- a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden +++ b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden @@ -57,9 +57,6 @@ class _AdminCitySectionEditScreen extends State { bottom: 0, child: AdminCitySectionScrollViewCustom( child: Container( - height: - MediaQuery.of(context).size.height * 2.110997963340122, - width: MediaQuery.of(context).size.width * 0.9599313108185461, decoration: BoxDecoration(), child: Column( mainAxisAlignment: MainAxisAlignment.start, @@ -125,100 +122,78 @@ class _AdminCitySectionEditScreen extends State { .size .height * 0.065, - child: Center( - child: Container( - height: MediaQuery.of(context) - .size - .height * - 0.06517311608961303, - width: MediaQuery.of(context) - .size - .width * - 0.7931922078473812, - child: TagSectionTitleCustom( - child: AutoSizeText( - 'Experience Your City’s Unique Values ', - style: TextStyle( - fontFamily: 'Poppins', - fontSize: 50.0, - fontWeight: - FontWeight.w700, - letterSpacing: - 0.9999998807907104, - color: Color(0xff14142b), - ), - textAlign: TextAlign.left, - )))), + child: TagSectionTitleCustom( + child: AutoSizeText( + 'Experience Your City’s Unique Values ', + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 50.0, + fontWeight: FontWeight.w700, + letterSpacing: 0.9999998807907104, + color: Color(0xff14142b), + ), + textAlign: TextAlign.left, + )), ), Positioned( right: 0, width: 143.948, top: 0, - height: MediaQuery.of(context) - .size - .height * - 0.073, - child: Center( + height: 72.0, + child: AddTagButtonCustom( child: Container( - height: 72.0, + padding: EdgeInsets.only( + left: 32.0, + right: 32.0, + top: 19.0, + bottom: 19.0, + ), width: 143.947509765625, - child: AddTagButtonCustom( - child: Container( - padding: - EdgeInsets.only( - left: 32.0, - right: 32.0, - top: 19.0, - bottom: 19.0, - ), - height: 72.0, - decoration: - BoxDecoration( - color: Color( - 0xff00497b), - borderRadius: - BorderRadius.all( - Radius.circular( - 16.0)), - ), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .center, - crossAxisAlignment: - CrossAxisAlignment + decoration: BoxDecoration( + color: Color(0xff00497b), + borderRadius: + BorderRadius.all( + Radius.circular( + 16.0)), + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment + .center, + crossAxisAlignment: + CrossAxisAlignment + .center, + children: [ + Container( + width: MediaQuery.of( + context) + .size + .width * + 0.0412135088723526, + height: MediaQuery.of( + context) + .size + .height * + 0.034623217922606926, + child: AutoSizeText( + 'Add (+)', + style: TextStyle( + fontFamily: + 'Poppins', + fontSize: 17.0, + fontWeight: + FontWeight + .w600, + letterSpacing: + 0.75, + color: Color( + 0xfffcfcfc), + ), + textAlign: + TextAlign .center, - children: [ - Container( - width: MediaQuery.of(context) - .size - .width * - 0.0412135088723526, - height: MediaQuery.of(context) - .size - .height * - 0.034623217922606926, - child: - AutoSizeText( - 'Add (+)', - style: - TextStyle( - fontFamily: - 'Poppins', - fontSize: - 17.0, - fontWeight: - FontWeight.w600, - letterSpacing: - 0.75, - color: Color( - 0xfffcfcfc), - ), - textAlign: - TextAlign - .center, - )), - ]))))), + )), + ]))), ), ])), SizedBox( @@ -231,10 +206,6 @@ class _AdminCitySectionEditScreen extends State { child: CurrentTagsCustom( child: Container( height: 75.0, - width: MediaQuery.of(context) - .size - .width * - 0.813966800228964, decoration: BoxDecoration(), child: Row( mainAxisAlignment: @@ -369,68 +340,61 @@ class _AdminCitySectionEditScreen extends State { right: 0.052, width: 143.948, top: 0, - height: MediaQuery.of(context) - .size - .height * - 0.073, - child: Center( + height: 72.0, + child: AddAdditionalImageButtonCustom( child: Container( - height: 72.0, + padding: EdgeInsets.only( + left: 32.0, + right: 32.0, + top: 19.0, + bottom: 19.0, + ), width: 143.947509765625, - child: - AddAdditionalImageButtonCustom( - child: Container( - padding: - EdgeInsets - .only( - left: 32.0, - right: 32.0, - top: 19.0, - bottom: 19.0, - ), - height: 72.0, - decoration: - BoxDecoration( + decoration: BoxDecoration( + color: Color(0xff00497b), + borderRadius: + BorderRadius.all( + Radius.circular( + 16.0)), + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment + .center, + crossAxisAlignment: + CrossAxisAlignment + .center, + children: [ + Container( + width: MediaQuery.of( + context) + .size + .width * + 0.0412135088723526, + height: MediaQuery.of( + context) + .size + .height * + 0.034623217922606926, + child: AutoSizeText( + 'Add (+)', + style: TextStyle( + fontFamily: + 'Poppins', + fontSize: 17.0, + fontWeight: + FontWeight + .w600, + letterSpacing: + 0.75, color: Color( - 0xff00497b), - borderRadius: BorderRadius - .all(Radius - .circular( - 16.0)), + 0xfffcfcfc), ), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .center, - crossAxisAlignment: - CrossAxisAlignment - .center, - children: [ - Container( - width: MediaQuery.of(context).size.width * - 0.0412135088723526, - height: MediaQuery.of(context).size.height * - 0.034623217922606926, - child: - AutoSizeText( - 'Add (+)', - style: - TextStyle( - fontFamily: - 'Poppins', - fontSize: - 17.0, - fontWeight: - FontWeight.w600, - letterSpacing: - 0.75, - color: - Color(0xfffcfcfc), - ), - textAlign: - TextAlign.center, - )), - ]))))), + textAlign: + TextAlign + .center, + )), + ]))), ), ])), SizedBox( @@ -508,11 +472,7 @@ class _AdminCitySectionEditScreen extends State { child: Center( child: Container( width: 74.0, - height: MediaQuery.of( - context) - .size - .height * - 0.034623217922606926, + height: 34.0, child: AutoSizeText( 'Save', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden index 22e8cf2c..9ab2dd72 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden @@ -35,7 +35,7 @@ class _RowHzFxVrHgSpPk147 extends State { top: 10.0, bottom: 10.0, ), - height: 35.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden index 9c16fe9e..c3743229 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden @@ -35,7 +35,7 @@ class _RowHzFxVrHgSpPk258 extends State { top: 10.0, bottom: 10.0, ), - height: 35.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden index 64c77a6b..96e53bf7 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden @@ -35,7 +35,7 @@ class _RowHzFxVrHgSpPk369 extends State { top: 10.0, bottom: 10.0, ), - height: 35.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden index b585e49d..715e5570 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden @@ -35,7 +35,7 @@ class _RowHzFxVrHgSpSb123456789 extends State { top: 10.0, bottom: 10.0, ), - height: 35.0, + width: 322.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden index cd99269d..64b85565 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden @@ -35,7 +35,7 @@ class _RowHzHgVrFxSpPk147 extends State { top: 10.0, bottom: 10.0, ), - width: 134.0, + height: 100.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden index 724ebc9e..bddc7db8 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden @@ -35,7 +35,7 @@ class _RowHzHgVrFxSpPk258 extends State { top: 10.0, bottom: 10.0, ), - width: 134.0, + height: 100.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden index 85912fd0..0562f317 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden @@ -35,7 +35,7 @@ class _RowHzHgVrFxSpPk369 extends State { top: 10.0, bottom: 10.0, ), - width: 134.0, + height: 100.0, decoration: BoxDecoration( color: Colors.black, ), From ab72edc31dd0a2cb6fd9d18c2dc614f7c74ac04d Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 28 Jun 2022 16:38:31 -0600 Subject: [PATCH 44/55] Created 2 new tests for auto layout --- .../auto_layout/auto_layout_file_names.txt | 4 +- .../auto_layout/custom_test_screen.golden | 1842 +++++++++++++++++ .../auto_layout/test_screen.golden | 1737 ++++++++++++++++ 3 files changed, 3582 insertions(+), 1 deletion(-) create mode 100644 test/golden/golden_files/auto_layout/custom_test_screen.golden create mode 100644 test/golden/golden_files/auto_layout/test_screen.golden diff --git a/test/golden/golden_files/auto_layout/auto_layout_file_names.txt b/test/golden/golden_files/auto_layout/auto_layout_file_names.txt index e7f0649b..3b898d5b 100644 --- a/test/golden/golden_files/auto_layout/auto_layout_file_names.txt +++ b/test/golden/golden_files/auto_layout/auto_layout_file_names.txt @@ -48,4 +48,6 @@ row_hz_hg_vr_fx_sp_pk147 row_hz_hg_vr_fx_sp_pk258 row_hz_hg_vr_fx_sp_pk369 row_hz_hg_vr_hg_sp_pk123456789 -admin_city_section_edit_screen \ No newline at end of file +admin_city_section_edit_screen +customTestScreen +testScreen \ No newline at end of file diff --git a/test/golden/golden_files/auto_layout/custom_test_screen.golden b/test/golden/golden_files/auto_layout/custom_test_screen.golden new file mode 100644 index 00000000..63bfe7ce --- /dev/null +++ b/test/golden/golden_files/auto_layout/custom_test_screen.golden @@ -0,0 +1,1842 @@ +// ********************************************************************************* +// PARABEAC-GENERATED CODE. DO NOT MODIFY. +// +// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com +// ********************************************************************************* + +import 'package:flutter/material.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case34_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case12_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case13_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case14_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case21_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case22_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case23_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case24_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case31_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case32_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case33_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case11_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case41_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case42_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case43_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case44_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case51_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case52_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case53_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case54_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case71_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case72_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case73_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case134_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case91_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case92_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case93_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case94_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case101_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case102_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case103_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case104_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case131_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case132_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case133_custom.dart'; +import 'package:golden_auto_layout_testing_project/widgets/auto_layout_permutations/custom/sub_frame_case74_custom.dart'; + +class CustomTestScreen extends StatefulWidget { + const CustomTestScreen({ + Key? key, + }) : super(key: key); + @override + _CustomTestScreen createState() => _CustomTestScreen(); +} + +class _CustomTestScreen extends State { + _CustomTestScreen(); + + @override + Widget build(BuildContext context) { + return Material( + color: Colors.white, + child: Stack(children: [ + Positioned( + left: 287.0, + width: 50.0, + top: 201.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: SubFrameCase34Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff05ff00), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 35.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: SubFrameCase12Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0000), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 35.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase13Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0000), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 35.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: SubFrameCase14Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0000), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 118.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase21Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 118.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: SubFrameCase22Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 118.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase23Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 118.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: SubFrameCase24Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 201.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase31Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff05ff00), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 201.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: SubFrameCase32Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff05ff00), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 201.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase33Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff05ff00), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 35.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + bottom: 0, + height: 50.0, + child: SubFrameCase11Custom( + child: Container( + height: 50.0, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0000), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 284.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase41Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 284.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: SubFrameCase42Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 284.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase43Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 284.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: SubFrameCase44Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 367.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase51Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffffd600), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 367.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase52Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffffd600), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 367.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase53Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffffd600), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 367.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase54Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffffd600), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 450.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase71Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Colors.black, + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 450.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: SubFrameCase72Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Colors.black, + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 450.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase73Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Colors.black, + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 699.0, + height: 50.0, + child: Container( + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: SubFrameCase134Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff6b00), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 533.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase91Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0099), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 533.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: SubFrameCase92Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0099), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 533.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase93Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0099), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 533.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: SubFrameCase94Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0099), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 616.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase101Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 616.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: SubFrameCase102Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 616.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase103Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 616.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: SubFrameCase104Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 699.0, + height: 50.0, + child: Container( + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase131Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff6b00), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 699.0, + height: 50.0, + child: Container( + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: SubFrameCase132Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff6b00), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 699.0, + height: 50.0, + child: Container( + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: SubFrameCase133Custom( + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff6b00), + ), + ), + ), + ]))), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 450.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: SubFrameCase74Custom( + child: Container( + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Colors.black, + ), + ), + ), + ]))), + ), + ])), + ])), + ), + ]), + ); + } + + @override + void dispose() { + super.dispose(); + } +} diff --git a/test/golden/golden_files/auto_layout/test_screen.golden b/test/golden/golden_files/auto_layout/test_screen.golden new file mode 100644 index 00000000..2cbf3c22 --- /dev/null +++ b/test/golden/golden_files/auto_layout/test_screen.golden @@ -0,0 +1,1737 @@ +// ********************************************************************************* +// PARABEAC-GENERATED CODE. DO NOT MODIFY. +// +// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com +// ********************************************************************************* + +import 'package:flutter/material.dart'; + +class TestScreen extends StatefulWidget { + const TestScreen({ + Key? key, + }) : super(key: key); + @override + _TestScreen createState() => _TestScreen(); +} + +class _TestScreen extends State { + _TestScreen(); + + @override + Widget build(BuildContext context) { + return Material( + color: Colors.white, + child: Stack(children: [ + Positioned( + left: 287.0, + width: 50.0, + top: 201.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff05ff00), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 35.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0000), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 35.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0000), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 35.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0000), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 118.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 118.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 118.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 118.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 201.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff05ff00), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 201.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff05ff00), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 201.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff05ff00), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 35.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + bottom: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0000), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 284.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 284.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 284.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 284.0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 367.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffffd600), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 367.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffffd600), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 367.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffffd600), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 367.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffffd600), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 450.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Colors.black, + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 450.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Colors.black, + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 450.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Colors.black, + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 699.0, + height: 50.0, + child: Container( + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff6b00), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 533.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0099), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 533.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0099), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 533.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0099), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 533.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff0099), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 616.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 616.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 616.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 616.0, + height: 50.0, + child: Container( + width: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 38.0, + width: 50.0, + top: 699.0, + height: 50.0, + child: Container( + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff6b00), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 121.0, + width: 50.0, + top: 699.0, + height: 50.0, + child: Container( + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff6b00), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 204.0, + width: 50.0, + top: 699.0, + height: 50.0, + child: Container( + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Color(0xffff6b00), + ), + ), + ), + ])), + ), + ])), + ])), + ), + Positioned( + left: 287.0, + width: 50.0, + top: 450.0, + height: 50.0, + child: Container( + height: 50.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: MediaQuery.of(context).size.width * 0.128, + top: 0, + height: MediaQuery.of(context).size.height * 0.059, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + color: Colors.black, + ), + ), + ), + ])), + ), + ])), + ])), + ), + ]), + ); + } + + @override + void dispose() { + super.dispose(); + } +} From 9b8ad55b834f56178629c6a8d8f0b2079c8c7a42 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Tue, 28 Jun 2022 17:11:08 -0600 Subject: [PATCH 45/55] Fixed new tests names --- .../golden_files/auto_layout/auto_layout_file_names.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/golden/golden_files/auto_layout/auto_layout_file_names.txt b/test/golden/golden_files/auto_layout/auto_layout_file_names.txt index 3b898d5b..99f82e5e 100644 --- a/test/golden/golden_files/auto_layout/auto_layout_file_names.txt +++ b/test/golden/golden_files/auto_layout/auto_layout_file_names.txt @@ -49,5 +49,5 @@ row_hz_hg_vr_fx_sp_pk258 row_hz_hg_vr_fx_sp_pk369 row_hz_hg_vr_hg_sp_pk123456789 admin_city_section_edit_screen -customTestScreen -testScreen \ No newline at end of file +custom_test_screen +test_screen \ No newline at end of file From 98dc0650b12e4e0066c6dedced16826683685b6e Mon Sep 17 00:00:00 2001 From: Ivan <42812006+ivan-015@users.noreply.github.com> Date: Tue, 28 Jun 2022 22:39:12 -0600 Subject: [PATCH 46/55] Corrected order of positioning. Previously, we were creating the positioned, and then modifying the children constraints, leaving the positioned with outdated constraints --- .../helpers/align_strategy.dart | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index c2d76a14..d21269fb 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -90,19 +90,6 @@ class PositionedAlignment extends AlignStrategy { nodeChildren.forEach((child) { var centerY = false; var centerX = false; - var injectedPositioned = InjectedPositioned( - child.name, - null, - child.frame, - constraints: child.constraints.copyWith(), - valueHolder: PositionedValueHolder( - top: child.frame.topLeft.y - node.frame.topLeft.y, - bottom: node.frame.bottomRight.y - child.frame.bottomRight.y, - left: child.frame.topLeft.x - node.frame.topLeft.x, - right: node.frame.bottomRight.x - child.frame.bottomRight.x, - width: child.frame.width, - height: child.frame.height), - ); if (node.constraints.fixedHeight) { child.constraints.fixedHeight = true; @@ -119,6 +106,20 @@ class PositionedAlignment extends AlignStrategy { } } + var injectedPositioned = InjectedPositioned( + child.name, + null, + child.frame, + constraints: child.constraints.copyWith(), + valueHolder: PositionedValueHolder( + top: child.frame.topLeft.y - node.frame.topLeft.y, + bottom: node.frame.bottomRight.y - child.frame.bottomRight.y, + left: child.frame.topLeft.x - node.frame.topLeft.x, + right: node.frame.bottomRight.x - child.frame.bottomRight.x, + width: child.frame.width, + height: child.frame.height), + ); + // Checks if child's parent has fixed height and width // or child has fixed height and width to determine the positioned constraints if (node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH && From ccf25c5b3389c39ca074a9d6b7b95a3fb0b1645b Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 29 Jun 2022 17:51:47 -0600 Subject: [PATCH 47/55] Change order of generating height then width --- lib/generation/generators/attribute-helper/pb_size_helper.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generation/generators/attribute-helper/pb_size_helper.dart b/lib/generation/generators/attribute-helper/pb_size_helper.dart index 541b8361..6a82fc66 100644 --- a/lib/generation/generators/attribute-helper/pb_size_helper.dart +++ b/lib/generation/generators/attribute-helper/pb_size_helper.dart @@ -16,8 +16,8 @@ class PBSizeHelper extends PBAttributesHelper { final buffer = StringBuffer(); - buffer.write(getSize(source, context, false)); buffer.write(getSize(source, context, true)); + buffer.write(getSize(source, context, false)); return buffer.toString(); } From 67f5475c042ac522d82eef5ae1692242fad92af0 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 29 Jun 2022 17:52:11 -0600 Subject: [PATCH 48/55] Added constraint rules for FrameGroup children --- .../subclasses/pb_intermediate_node.dart | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart b/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart index bbb19eed..cefa9971 100644 --- a/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart +++ b/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart @@ -3,6 +3,7 @@ import 'dart:math'; import 'package:directed_graph/directed_graph.dart'; import 'package:parabeac_core/generation/generators/pb_generator.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/layouts/group/frame_group.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_constraints.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/align_strategy.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/child_strategy.dart'; @@ -193,11 +194,30 @@ abstract class PBIntermediateNode void mapRawChildren(Map json, PBIntermediateTree tree) { var rawChildren = json['children'] as List; + var parentConstraints = json['constraints']; rawChildren?.forEach((rawChild) { if (rawChild != null) { + /// Child inherit Parent's constraints if they are fixed + /// on that axis + /// This rule was added for Auto Layouts since we will not be using + /// LayoutBuilder for the moment + if (this is FrameGroup) { + if (parentConstraints['fixedHeight']) { + rawChild['constraints']['fixedHeight'] = + parentConstraints['fixedHeight']; + rawChild['constraints']['pinTop'] = parentConstraints['pinTop']; + rawChild['constraints']['pinBottom'] = + parentConstraints['pinBottom']; + } + + if (parentConstraints['fixedWidth']) { + rawChild['constraints']['fixedWidth'] = + parentConstraints['fixedWidth']; + rawChild['constraints']['pinLeft'] = parentConstraints['pinLeft']; + rawChild['constraints']['pinRight'] = parentConstraints['pinRight']; + } + } PBIntermediateNode.fromJson(rawChild, this, tree); - // tree.addEdges(Vertex(rawChild), [Vertex(parent)]); - // addChild();PBIntermediateNode.fromJson(rawChild) } }); } From abc6d47c771b91ff0c3b66c7d7955b91ba402c00 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 29 Jun 2022 17:52:23 -0600 Subject: [PATCH 49/55] Updated styling tests --- .../golden_files/styling/helloworld.golden | 2 +- .../styling/primary_button.golden | 2 +- .../styling/primary_button_rect.golden | 4 +- .../styling/secondary_button.golden | 2 +- .../golden_files/styling/styling.golden | 44 +++++++++---------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/golden/golden_files/styling/helloworld.golden b/test/golden/golden_files/styling/helloworld.golden index 51e9dcc9..dc56d8ae 100644 --- a/test/golden/golden_files/styling/helloworld.golden +++ b/test/golden/golden_files/styling/helloworld.golden @@ -33,8 +33,8 @@ class _Helloworld extends State { top: widget.constraints.maxHeight * 0.345, height: widget.constraints.maxHeight * 0.221, child: Container( - width: widget.constraints.maxWidth * 0.40963855421686746, height: widget.constraints.maxHeight * 0.22123893805309736, + width: widget.constraints.maxWidth * 0.40963855421686746, child: AutoSizeText( widget.ovrHelloworld ?? 'Hello world', style: TextStyle( diff --git a/test/golden/golden_files/styling/primary_button.golden b/test/golden/golden_files/styling/primary_button.golden index fc8cc303..659d3fe2 100644 --- a/test/golden/golden_files/styling/primary_button.golden +++ b/test/golden/golden_files/styling/primary_button.golden @@ -36,8 +36,8 @@ class _PrimaryButton extends State { top: widget.constraints.maxHeight * 0.39, height: widget.constraints.maxHeight * 0.23, child: Container( - width: widget.constraints.maxWidth * 0.3276595744680851, height: widget.constraints.maxHeight * 0.23, + width: widget.constraints.maxWidth * 0.3276595744680851, child: AutoSizeText( widget.ovrClickMe ?? 'Click Me', style: TextStyle( diff --git a/test/golden/golden_files/styling/primary_button_rect.golden b/test/golden/golden_files/styling/primary_button_rect.golden index 677f2d08..3df313d8 100644 --- a/test/golden/golden_files/styling/primary_button_rect.golden +++ b/test/golden/golden_files/styling/primary_button_rect.golden @@ -41,8 +41,8 @@ class _PrimaryButtonRect extends State { top: 0, height: 100.0, child: Container( - width: 235.0, height: 100.0, + width: 235.0, decoration: BoxDecoration( color: Color(0xff59afff), borderRadius: BorderRadius.all(Radius.circular(20.0)), @@ -55,8 +55,8 @@ class _PrimaryButtonRect extends State { top: widget.constraints.maxHeight * 0.39, height: widget.constraints.maxHeight * 0.23, child: Container( - width: widget.constraints.maxWidth * 0.3276595744680851, height: widget.constraints.maxHeight * 0.23, + width: widget.constraints.maxWidth * 0.3276595744680851, child: AutoSizeText( widget.ovrClickMe ?? 'Click Me', style: TextStyle( diff --git a/test/golden/golden_files/styling/secondary_button.golden b/test/golden/golden_files/styling/secondary_button.golden index e7d4dd0f..c7ee1456 100644 --- a/test/golden/golden_files/styling/secondary_button.golden +++ b/test/golden/golden_files/styling/secondary_button.golden @@ -40,8 +40,8 @@ class _SecondaryButton extends State { top: widget.constraints.maxHeight * 0.39, height: widget.constraints.maxHeight * 0.23, child: Container( - width: widget.constraints.maxWidth * 0.3276595744680851, height: widget.constraints.maxHeight * 0.23, + width: widget.constraints.maxWidth * 0.3276595744680851, child: AutoSizeText( widget.ovrClickMe ?? 'Click Me', style: TextStyle( diff --git a/test/golden/golden_files/styling/styling.golden b/test/golden/golden_files/styling/styling.golden index ca1665b3..7cb15b5c 100644 --- a/test/golden/golden_files/styling/styling.golden +++ b/test/golden/golden_files/styling/styling.golden @@ -30,8 +30,8 @@ class _StylingScreen extends State { top: 0, height: 124.0, child: Container( - width: 197.0, height: 124.0, + width: 197.0, decoration: BoxDecoration( gradient: LinearGradient( begin: Alignment(1.0000000596046466, -0.999999849557967), @@ -55,8 +55,8 @@ class _StylingScreen extends State { top: 154.0, height: 120.0, child: Container( - width: 197.0, height: 120.0, + width: 197.0, decoration: BoxDecoration( color: Color(0x70991d66), ), @@ -70,8 +70,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/circleradius.png', package: 'styling_golden_testing_project', - width: 197.0, height: 120.0, + width: 197.0, fit: BoxFit.none, ), ), @@ -83,8 +83,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/diamond.png', package: 'styling_golden_testing_project', - width: 197.0, height: 120.0, + width: 197.0, fit: BoxFit.none, ), ), @@ -94,8 +94,8 @@ class _StylingScreen extends State { top: 604.0, height: 120.0, child: Container( - width: 197.0, height: 120.0, + width: 197.0, decoration: BoxDecoration( color: Color(0x99b63a4c), ), @@ -107,8 +107,8 @@ class _StylingScreen extends State { top: 754.0, height: 120.0, child: Container( - width: 197.0, height: 120.0, + width: 197.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -124,8 +124,8 @@ class _StylingScreen extends State { top: 754.0, height: 120.0, child: Container( - width: 197.0, height: 120.0, + width: 197.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -151,8 +151,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/2stroke.png', package: 'styling_golden_testing_project', - width: 197.0, height: 120.0, + width: 197.0, fit: BoxFit.none, ), ), @@ -162,8 +162,8 @@ class _StylingScreen extends State { top: 454.0, height: 120.0, child: Container( - width: 197.0, height: 120.0, + width: 197.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -179,8 +179,8 @@ class _StylingScreen extends State { top: 304.0, height: 120.0, child: Container( - width: 197.0, height: 120.0, + width: 197.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -206,8 +206,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/imagewithtint.png', package: 'styling_golden_testing_project', - width: 197.0, height: 120.0, + width: 197.0, fit: BoxFit.none, ), ), @@ -217,8 +217,8 @@ class _StylingScreen extends State { top: 4.0, height: 120.0, child: Container( - width: 197.0, height: 120.0, + width: 197.0, decoration: BoxDecoration( color: Color(0x99378c59), border: Border.all( @@ -244,8 +244,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/ellipse1.png', package: 'styling_golden_testing_project', - width: 133.0, height: 124.0, + width: 133.0, fit: BoxFit.none, ), ), @@ -257,8 +257,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/polygon1.svg', package: 'styling_golden_testing_project', - width: 142.0, height: 120.0, + width: 142.0, fit: BoxFit.none, ), ), @@ -270,8 +270,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/star1.svg', package: 'styling_golden_testing_project', - width: 110.0, height: 126.0, + width: 110.0, fit: BoxFit.none, ), ), @@ -283,8 +283,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/vector1.svg', package: 'styling_golden_testing_project', - width: 109.5, height: 102.5, + width: 109.5, fit: BoxFit.none, ), ), @@ -296,8 +296,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/emptyframe.svg', package: 'styling_golden_testing_project', - width: 154.0, height: 118.0, + width: 154.0, fit: BoxFit.none, ), ), @@ -320,8 +320,8 @@ class _StylingScreen extends State { top: 42.0, height: 42.0, child: Container( - width: 67.0, height: 42.0, + width: 67.0, child: AutoSizeText( 'Howdy', style: TextStyle( @@ -367,8 +367,8 @@ class _StylingScreen extends State { top: 42.0, height: 42.0, child: Container( - width: 67.0, height: 42.0, + width: 67.0, child: AutoSizeText( 'Howdy', style: TextStyle( @@ -391,8 +391,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/line1.svg', package: 'styling_golden_testing_project', - width: 1.0, height: 77.00650024414062, + width: 1.0, fit: BoxFit.none, ), ), @@ -404,8 +404,8 @@ class _StylingScreen extends State { child: SvgPicture.asset( 'assets/images/line2.svg', package: 'styling_golden_testing_project', - width: 1.0, height: 89.0, + width: 1.0, fit: BoxFit.none, ), ), @@ -417,8 +417,8 @@ class _StylingScreen extends State { child: Image.asset( 'assets/images/rectangle1.png', package: 'styling_golden_testing_project', - width: 176.0, height: 127.0, + width: 176.0, fit: BoxFit.none, ), ), From d787ffa97608946c4e1574b1109b0b3b4869ce3a Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Wed, 29 Jun 2022 18:02:30 -0600 Subject: [PATCH 50/55] Updated auto layout tests --- .../admin_city_section_edit_screen.golden | 93 +++---- .../auto_layout/col_hz_fx_vr_fx_sp_pk1.golden | 6 +- .../auto_layout/col_hz_fx_vr_fx_sp_pk2.golden | 6 +- .../auto_layout/col_hz_fx_vr_fx_sp_pk3.golden | 6 +- .../auto_layout/col_hz_fx_vr_fx_sp_pk4.golden | 6 +- .../auto_layout/col_hz_fx_vr_fx_sp_pk5.golden | 6 +- .../auto_layout/col_hz_fx_vr_fx_sp_pk6.golden | 6 +- .../auto_layout/col_hz_fx_vr_fx_sp_pk7.golden | 6 +- .../auto_layout/col_hz_fx_vr_fx_sp_pk8.golden | 6 +- .../auto_layout/col_hz_fx_vr_fx_sp_pk9.golden | 6 +- .../col_hz_fx_vr_fx_sp_sb147.golden | 6 +- .../col_hz_fx_vr_fx_sp_sb258.golden | 6 +- .../col_hz_fx_vr_fx_sp_sb369.golden | 6 +- .../col_hz_fx_vr_hg_sp_pk147.golden | 6 +- .../col_hz_fx_vr_hg_sp_pk258.golden | 6 +- .../col_hz_fx_vr_hg_sp_pk369.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk1.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk2.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk3.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk4.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk5.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk6.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk7.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk8.golden | 6 +- .../auto_layout/col_hz_hg_vr_fx_sp_pk9.golden | 6 +- .../col_hz_hg_vr_fx_sp_sb147.golden | 6 +- .../col_hz_hg_vr_fx_sp_sb258.golden | 6 +- .../col_hz_hg_vr_fx_sp_sb369.golden | 6 +- .../col_hz_hg_vr_hg_sp_pk123456789.golden | 6 +- .../auto_layout/custom_test_screen.golden | 239 ++++++++---------- ...pace_col_hz_hg_vr_hg_sp_pk123456789.golden | 6 +- ...pace_row_hz_hg_vr_hg_sp_pk123456789.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk1.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk2.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk3.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk4.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk5.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk6.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk7.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk8.golden | 6 +- .../auto_layout/row_hz_fx_vr_fx_sp_pk9.golden | 6 +- .../row_hz_fx_vr_fx_sp_sb123.golden | 6 +- .../row_hz_fx_vr_fx_sp_sb456.golden | 6 +- .../row_hz_fx_vr_fx_sp_sb789.golden | 6 +- .../row_hz_fx_vr_hg_sp_pk147.golden | 6 +- .../row_hz_fx_vr_hg_sp_pk258.golden | 6 +- .../row_hz_fx_vr_hg_sp_pk369.golden | 6 +- .../row_hz_fx_vr_hg_sp_sb123456789.golden | 6 +- .../row_hz_hg_vr_fx_sp_pk147.golden | 6 +- .../row_hz_hg_vr_fx_sp_pk258.golden | 6 +- .../row_hz_hg_vr_fx_sp_pk369.golden | 6 +- .../row_hz_hg_vr_hg_sp_pk123456789.golden | 6 +- .../auto_layout/test_screen.golden | 140 +++++----- 53 files changed, 360 insertions(+), 412 deletions(-) diff --git a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden index 50d9a211..420e5961 100644 --- a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden +++ b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden @@ -86,7 +86,7 @@ class _AdminCitySectionEditScreen extends State { ), Positioned( left: 0, - right: 0, + width: 1677.0, top: 84.0, height: 335.0, child: LayoutBuilder( @@ -113,15 +113,9 @@ class _AdminCitySectionEditScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context) - .size - .width * - 0.793, + width: 1385.707, top: 0, - height: MediaQuery.of(context) - .size - .height * - 0.065, + height: 64.0, child: TagSectionTitleCustom( child: AutoSizeText( 'Experience Your City’s Unique Values ', @@ -136,7 +130,7 @@ class _AdminCitySectionEditScreen extends State { )), ), Positioned( - right: 0, + left: 1533.052, width: 143.948, top: 0, height: 72.0, @@ -165,16 +159,16 @@ class _AdminCitySectionEditScreen extends State { .center, children: [ Container( - width: MediaQuery.of( - context) - .size - .width * - 0.0412135088723526, height: MediaQuery.of( context) .size .height * 0.034623217922606926, + width: MediaQuery.of( + context) + .size + .width * + 0.0412135088723526, child: AutoSizeText( 'Add (+)', style: TextStyle( @@ -337,9 +331,9 @@ class _AdminCitySectionEditScreen extends State { )), ), Positioned( - right: 0.052, + left: 1533.0, width: 143.948, - top: 0, + top: 0.25, height: 72.0, child: AddAdditionalImageButtonCustom( child: Container( @@ -366,16 +360,16 @@ class _AdminCitySectionEditScreen extends State { .center, children: [ Container( - width: MediaQuery.of( - context) - .size - .width * - 0.0412135088723526, height: MediaQuery.of( context) .size .height * 0.034623217922606926, + width: MediaQuery.of( + context) + .size + .width * + 0.0412135088723526, child: AutoSizeText( 'Add (+)', style: TextStyle( @@ -441,17 +435,14 @@ class _AdminCitySectionEditScreen extends State { decoration: BoxDecoration(), child: Stack(children: [ Positioned( - left: MediaQuery.of(context).size.width * 0.191, - width: - MediaQuery.of(context).size.width * 0.579, - bottom: 0, + left: 333.034, + width: 1011.932, + top: 0, height: 72.0, child: SaveButtonCustom( child: Container( height: 72.0, - width: - MediaQuery.of(context).size.width * - 0.5792399833866986, + width: 1011.9322509765625, decoration: BoxDecoration( color: Color(0xff00497b), borderRadius: BorderRadius.all( @@ -459,34 +450,24 @@ class _AdminCitySectionEditScreen extends State { ), child: Stack(children: [ Positioned( - left: MediaQuery.of(context) - .size - .width * - 0.269, - width: MediaQuery.of(context) - .size - .width * - 0.042, + left: 469.286, + width: 74.0, top: 19.25, - bottom: 18.75, - child: Center( - child: Container( - width: 74.0, - height: 34.0, - child: AutoSizeText( - 'Save', - style: TextStyle( - fontFamily: 'Poppins', - fontSize: 17.0, - fontWeight: - FontWeight.w600, - letterSpacing: 0.75, - color: - Color(0xfffcfcfc), - ), - textAlign: - TextAlign.center, - ))), + height: 34.0, + child: Container( + height: 34.0, + width: 74.0, + child: AutoSizeText( + 'Save', + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 17.0, + fontWeight: FontWeight.w600, + letterSpacing: 0.75, + color: Color(0xfffcfcfc), + ), + textAlign: TextAlign.center, + )), ), ]))), ), diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden index 6dd12d59..4d8aa40e 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk1.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk1 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk1 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk1 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden index e45990bf..cb4385af 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk2.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk2 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk2 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk2 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden index e8062e95..b989007c 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk3.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk3 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk3 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk3 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden index d09feed5..73d6718d 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk4.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk4 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk4 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk4 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden index aace4754..c093996b 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk5.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk5 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk5 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk5 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden index a71ee2af..5a2213ec 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk6.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk6 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk6 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk6 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden index 2d9a46f9..d32979d1 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk7.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk7 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk7 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk7 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden index a7898a41..2b27be69 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk8.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk8 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk8 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk8 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden index 74eb2d4b..7b27fffc 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_pk9.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpPk9 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrFxSpPk9 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrFxSpPk9 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden index d65c1290..a3d7f45c 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb147.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpSb147 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -59,8 +59,8 @@ class _ColHzFxVrFxSpSb147 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -73,8 +73,8 @@ class _ColHzFxVrFxSpSb147 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden index a5fc5bcd..bf1bc6d0 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb258.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpSb258 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -59,8 +59,8 @@ class _ColHzFxVrFxSpSb258 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -73,8 +73,8 @@ class _ColHzFxVrFxSpSb258 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden index ae22bb56..136bf900 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_fx_sp_sb369.golden @@ -45,8 +45,8 @@ class _ColHzFxVrFxSpSb369 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -59,8 +59,8 @@ class _ColHzFxVrFxSpSb369 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -73,8 +73,8 @@ class _ColHzFxVrFxSpSb369 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden index 9aa911e1..20f4aedd 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk147.golden @@ -45,8 +45,8 @@ class _ColHzFxVrHgSpPk147 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrHgSpPk147 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrHgSpPk147 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden index d84c1847..d91182dd 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk258.golden @@ -45,8 +45,8 @@ class _ColHzFxVrHgSpPk258 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrHgSpPk258 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrHgSpPk258 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden index 7cbcab45..1cdcdc1c 100644 --- a/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/col_hz_fx_vr_hg_sp_pk369.golden @@ -45,8 +45,8 @@ class _ColHzFxVrHgSpPk369 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _ColHzFxVrHgSpPk369 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _ColHzFxVrHgSpPk369 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden index b1d8e681..ab8d943d 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk1.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk1 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk1 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk1 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden index d012cbe8..8b08d77b 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk2.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk2 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk2 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk2 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden index 9e0dece9..6fc34af7 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk3.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk3 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk3 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk3 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden index 2c0561f7..9141fd98 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk4.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk4 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk4 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk4 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden index 3ceb8f60..b1b9888c 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk5.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk5 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk5 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk5 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden index 6163b31d..9cf584dd 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk6.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk6 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk6 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk6 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden index 3c701111..7bdb2d07 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk7.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk7 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk7 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk7 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden index 0c393f27..efef0d59 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk8.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk8 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk8 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk8 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden index efb33efb..4e811de0 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_pk9.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpPk9 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrFxSpPk9 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrFxSpPk9 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden index b344fdc8..7f08cc3b 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb147.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpSb147 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -58,8 +58,8 @@ class _ColHzHgVrFxSpSb147 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -72,8 +72,8 @@ class _ColHzHgVrFxSpSb147 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden index f7cd5138..5b26245d 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb258.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpSb258 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -58,8 +58,8 @@ class _ColHzHgVrFxSpSb258 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -72,8 +72,8 @@ class _ColHzHgVrFxSpSb258 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden index ef9c83dd..9ebb7746 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_fx_sp_sb369.golden @@ -44,8 +44,8 @@ class _ColHzHgVrFxSpSb369 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -58,8 +58,8 @@ class _ColHzHgVrFxSpSb369 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -72,8 +72,8 @@ class _ColHzHgVrFxSpSb369 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden index 47cf6699..ec75bbef 100644 --- a/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/col_hz_hg_vr_hg_sp_pk123456789.golden @@ -44,8 +44,8 @@ class _ColHzHgVrHgSpPk123456789 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _ColHzHgVrHgSpPk123456789 extends State { height: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _ColHzHgVrHgSpPk123456789 extends State { height: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/custom_test_screen.golden b/test/golden/golden_files/auto_layout/custom_test_screen.golden index 63bfe7ce..13806dde 100644 --- a/test/golden/golden_files/auto_layout/custom_test_screen.golden +++ b/test/golden/golden_files/auto_layout/custom_test_screen.golden @@ -80,15 +80,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: SubFrameCase34Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -97,8 +95,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff05ff00), ), @@ -131,15 +129,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: SubFrameCase12Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -148,8 +144,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0000), ), @@ -197,8 +193,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0000), ), @@ -231,15 +227,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: SubFrameCase14Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -248,8 +242,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0000), ), @@ -296,8 +290,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff2400ff), ), @@ -329,15 +323,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: SubFrameCase22Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -346,8 +338,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff2400ff), ), @@ -394,8 +386,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff2400ff), ), @@ -427,15 +419,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: SubFrameCase24Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -444,8 +434,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff2400ff), ), @@ -493,8 +483,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff05ff00), ), @@ -527,15 +517,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: SubFrameCase32Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -544,8 +532,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff05ff00), ), @@ -593,8 +581,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff05ff00), ), @@ -627,14 +615,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, - bottom: 0, + width: 50.0, + top: 0, height: 50.0, child: SubFrameCase11Custom( child: Container( height: 50.0, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -643,8 +630,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0000), ), @@ -691,8 +678,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffdb00ff), ), @@ -724,15 +711,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: SubFrameCase42Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -741,8 +726,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffdb00ff), ), @@ -789,8 +774,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffdb00ff), ), @@ -822,15 +807,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: SubFrameCase44Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -839,8 +822,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffdb00ff), ), @@ -887,8 +870,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffffd600), ), @@ -935,8 +918,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffffd600), ), @@ -983,8 +966,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffffd600), ), @@ -1031,8 +1014,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffffd600), ), @@ -1079,8 +1062,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Colors.black, ), @@ -1112,15 +1095,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: SubFrameCase72Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1129,8 +1110,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Colors.black, ), @@ -1177,8 +1158,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Colors.black, ), @@ -1210,15 +1191,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: SubFrameCase134Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1227,8 +1206,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff6b00), ), @@ -1276,8 +1255,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0099), ), @@ -1310,15 +1289,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: SubFrameCase92Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1327,8 +1304,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0099), ), @@ -1376,8 +1353,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0099), ), @@ -1410,15 +1387,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: SubFrameCase94Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1427,8 +1402,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0099), ), @@ -1475,8 +1450,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff929292), ), @@ -1508,15 +1483,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: SubFrameCase102Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1525,8 +1498,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff929292), ), @@ -1573,8 +1546,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff929292), ), @@ -1606,15 +1579,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: SubFrameCase104Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1623,8 +1594,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff929292), ), @@ -1671,8 +1642,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff6b00), ), @@ -1704,15 +1675,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: SubFrameCase132Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1721,8 +1690,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff6b00), ), @@ -1769,8 +1738,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff6b00), ), @@ -1802,15 +1771,13 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: SubFrameCase74Custom( child: Container( - height: MediaQuery.of(context).size.height * - 0.05924170616113744, - width: MediaQuery.of(context).size.width * - 0.1282051282051282, + height: 50.0, + width: 50.0, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1819,8 +1786,8 @@ class _CustomTestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Colors.black, ), diff --git a/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden index a48c5087..60800ffe 100644 --- a/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/no_space_col_hz_hg_vr_hg_sp_pk123456789.golden @@ -46,8 +46,8 @@ class _NoSpaceColHzHgVrHgSpPk123456789 mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -60,8 +60,8 @@ class _NoSpaceColHzHgVrHgSpPk123456789 textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -74,8 +74,8 @@ class _NoSpaceColHzHgVrHgSpPk123456789 textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden index b583ece4..6e0a96de 100644 --- a/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/no_space_row_hz_hg_vr_hg_sp_pk123456789.golden @@ -46,8 +46,8 @@ class _NoSpaceRowHzHgVrHgSpPk123456789 mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -60,8 +60,8 @@ class _NoSpaceRowHzHgVrHgSpPk123456789 textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -74,8 +74,8 @@ class _NoSpaceRowHzHgVrHgSpPk123456789 textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden index 9a00fd3b..727afd4f 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk1.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk1 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk1 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk1 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden index 0343eefa..eeace5a5 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk2.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk2 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk2 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk2 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden index 4da76784..239651bd 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk3.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk3 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk3 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk3 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden index b2d06f33..889846c4 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk4.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk4 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk4 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk4 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden index 3158fbcb..df4dd901 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk5.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk5 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk5 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk5 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden index ade51037..ea2c794a 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk6.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk6 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk6 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk6 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden index df85510e..ad7724e3 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk7.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk7 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk7 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk7 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden index 48cbe48f..e8f84b8c 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk8.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk8 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk8 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk8 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden index e57bd13b..72863692 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_pk9.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpPk9 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzFxVrFxSpPk9 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzFxVrFxSpPk9 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden index dd70ef40..06019edc 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb123.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpSb123 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -59,8 +59,8 @@ class _RowHzFxVrFxSpSb123 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -73,8 +73,8 @@ class _RowHzFxVrFxSpSb123 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden index ebd113b4..1a582934 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb456.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpSb456 extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -59,8 +59,8 @@ class _RowHzFxVrFxSpSb456 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -73,8 +73,8 @@ class _RowHzFxVrFxSpSb456 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden index e69d9c41..382b9b8a 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_fx_sp_sb789.golden @@ -45,8 +45,8 @@ class _RowHzFxVrFxSpSb789 extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -59,8 +59,8 @@ class _RowHzFxVrFxSpSb789 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -73,8 +73,8 @@ class _RowHzFxVrFxSpSb789 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden index 9ab2dd72..4931e65e 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk147.golden @@ -44,8 +44,8 @@ class _RowHzFxVrHgSpPk147 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _RowHzFxVrHgSpPk147 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _RowHzFxVrHgSpPk147 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden index c3743229..43241bc0 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk258.golden @@ -44,8 +44,8 @@ class _RowHzFxVrHgSpPk258 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _RowHzFxVrHgSpPk258 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _RowHzFxVrHgSpPk258 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden index 96e53bf7..07923480 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_pk369.golden @@ -44,8 +44,8 @@ class _RowHzFxVrHgSpPk369 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _RowHzFxVrHgSpPk369 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _RowHzFxVrHgSpPk369 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden index 715e5570..db0a6b71 100644 --- a/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_fx_vr_hg_sp_sb123456789.golden @@ -44,8 +44,8 @@ class _RowHzFxVrHgSpSb123456789 extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -58,8 +58,8 @@ class _RowHzFxVrHgSpSb123456789 extends State { textAlign: TextAlign.left, )), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -72,8 +72,8 @@ class _RowHzFxVrHgSpSb123456789 extends State { textAlign: TextAlign.left, )), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden index 64b85565..50803059 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk147.golden @@ -45,8 +45,8 @@ class _RowHzHgVrFxSpPk147 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzHgVrFxSpPk147 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzHgVrFxSpPk147 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden index bddc7db8..4602f044 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk258.golden @@ -45,8 +45,8 @@ class _RowHzHgVrFxSpPk258 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzHgVrFxSpPk258 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzHgVrFxSpPk258 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden index 0562f317..7b5e48de 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_fx_sp_pk369.golden @@ -45,8 +45,8 @@ class _RowHzHgVrFxSpPk369 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -62,8 +62,8 @@ class _RowHzHgVrFxSpPk369 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -79,8 +79,8 @@ class _RowHzHgVrFxSpPk369 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden b/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden index 9d7393c1..6739639c 100644 --- a/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden +++ b/test/golden/golden_files/auto_layout/row_hz_hg_vr_hg_sp_pk123456789.golden @@ -44,8 +44,8 @@ class _RowHzHgVrHgSpPk123456789 extends State { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 24.0, height: 15.0, + width: 24.0, child: AutoSizeText( 'Left', style: TextStyle( @@ -61,8 +61,8 @@ class _RowHzHgVrHgSpPk123456789 extends State { width: 10.0, ), Container( - width: 39.0, height: 15.0, + width: 39.0, child: AutoSizeText( 'Middle', style: TextStyle( @@ -78,8 +78,8 @@ class _RowHzHgVrHgSpPk123456789 extends State { width: 10.0, ), Container( - width: 31.0, height: 15.0, + width: 31.0, child: AutoSizeText( 'Right', style: TextStyle( diff --git a/test/golden/golden_files/auto_layout/test_screen.golden b/test/golden/golden_files/auto_layout/test_screen.golden index 2cbf3c22..0cb705e5 100644 --- a/test/golden/golden_files/auto_layout/test_screen.golden +++ b/test/golden/golden_files/auto_layout/test_screen.golden @@ -44,9 +44,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -58,8 +58,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff05ff00), ), @@ -92,9 +92,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -106,8 +106,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0000), ), @@ -154,8 +154,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0000), ), @@ -188,9 +188,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -202,8 +202,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0000), ), @@ -249,8 +249,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff2400ff), ), @@ -282,9 +282,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -296,8 +296,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff2400ff), ), @@ -343,8 +343,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff2400ff), ), @@ -376,9 +376,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -390,8 +390,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff2400ff), ), @@ -438,8 +438,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff05ff00), ), @@ -472,9 +472,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -486,8 +486,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff05ff00), ), @@ -534,8 +534,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff05ff00), ), @@ -568,8 +568,8 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, - bottom: 0, + width: 50.0, + top: 0, height: 50.0, child: Container( height: 50.0, @@ -582,8 +582,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0000), ), @@ -629,8 +629,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffdb00ff), ), @@ -662,9 +662,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -676,8 +676,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffdb00ff), ), @@ -723,8 +723,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffdb00ff), ), @@ -756,9 +756,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -770,8 +770,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffdb00ff), ), @@ -817,8 +817,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffffd600), ), @@ -864,8 +864,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffffd600), ), @@ -911,8 +911,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffffd600), ), @@ -958,8 +958,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffffd600), ), @@ -1005,8 +1005,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Colors.black, ), @@ -1038,9 +1038,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -1052,8 +1052,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Colors.black, ), @@ -1099,8 +1099,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Colors.black, ), @@ -1132,9 +1132,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -1146,8 +1146,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff6b00), ), @@ -1194,8 +1194,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0099), ), @@ -1228,9 +1228,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -1242,8 +1242,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0099), ), @@ -1290,8 +1290,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0099), ), @@ -1324,9 +1324,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -1338,8 +1338,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff0099), ), @@ -1385,8 +1385,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff929292), ), @@ -1418,9 +1418,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -1432,8 +1432,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff929292), ), @@ -1479,8 +1479,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff929292), ), @@ -1512,9 +1512,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -1526,8 +1526,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xff929292), ), @@ -1573,8 +1573,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff6b00), ), @@ -1606,9 +1606,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - right: 0, + width: 50.0, top: 0, - bottom: 0, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -1620,8 +1620,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff6b00), ), @@ -1667,8 +1667,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Color(0xffff6b00), ), @@ -1700,9 +1700,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: MediaQuery.of(context).size.width * 0.128, + width: 50.0, top: 0, - height: MediaQuery.of(context).size.height * 0.059, + height: 50.0, child: Container( height: 50.0, width: 50.0, @@ -1714,8 +1714,8 @@ class _TestScreen extends State { top: 0, height: 50.0, child: Container( - width: 50.0, height: 50.0, + width: 50.0, decoration: BoxDecoration( color: Colors.black, ), From f0a2b6cf8eb535876707892871dedf3cb4187171 Mon Sep 17 00:00:00 2001 From: Ivan <42812006+ivan-015@users.noreply.github.com> Date: Thu, 30 Jun 2022 18:06:02 -0600 Subject: [PATCH 51/55] Fixed positional rules --- .../layouts/auto_layout_align_strategy.dart | 29 +------------------ .../subclasses/pb_intermediate_node.dart | 21 -------------- .../helpers/align_strategy.dart | 24 +++++++-------- 3 files changed, 12 insertions(+), 62 deletions(-) diff --git a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart index 4b5c1945..ab4e9ece 100644 --- a/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart +++ b/lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart @@ -96,7 +96,7 @@ class AutoLayoutAlignStrategy extends AlignStrategy { null, child.frame, name: child.name, - constraints: _getConstraints(child, isVertical), + constraints: child.constraints.copyWith(), ) ..layoutCrossAxisSizing = child.layoutCrossAxisSizing ..layoutMainAxisSizing = child.layoutMainAxisSizing; @@ -106,33 +106,6 @@ class AutoLayoutAlignStrategy extends AlignStrategy { return child; } - PBIntermediateConstraints _getConstraints( - PBIntermediateNode node, bool isVertical) { - PBIntermediateConstraints newConstraints = node.constraints.copyWith(); - if (node is InheritedBitmap) { - if (isVertical) { - if (!node.constraints.fixedHeight && - node.layoutMainAxisSizing != ParentLayoutSizing.STRETCH) { - newConstraints.fixedHeight = true; - } - if (!node.constraints.fixedWidth && - node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH) { - newConstraints.fixedWidth = true; - } - } else { - if (!node.constraints.fixedHeight && - node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH) { - newConstraints.fixedHeight = true; - } - if (!node.constraints.fixedWidth && - node.layoutMainAxisSizing != ParentLayoutSizing.STRETCH) { - newConstraints.fixedWidth = true; - } - } - } - return newConstraints.copyWith(); - } - // This boolean let us know if the layout needs boxes or not bool needsSpacing(node) => node.layoutProperties.spacing != null && diff --git a/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart b/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart index cefa9971..5ecccb1e 100644 --- a/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart +++ b/lib/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart @@ -194,29 +194,8 @@ abstract class PBIntermediateNode void mapRawChildren(Map json, PBIntermediateTree tree) { var rawChildren = json['children'] as List; - var parentConstraints = json['constraints']; rawChildren?.forEach((rawChild) { if (rawChild != null) { - /// Child inherit Parent's constraints if they are fixed - /// on that axis - /// This rule was added for Auto Layouts since we will not be using - /// LayoutBuilder for the moment - if (this is FrameGroup) { - if (parentConstraints['fixedHeight']) { - rawChild['constraints']['fixedHeight'] = - parentConstraints['fixedHeight']; - rawChild['constraints']['pinTop'] = parentConstraints['pinTop']; - rawChild['constraints']['pinBottom'] = - parentConstraints['pinBottom']; - } - - if (parentConstraints['fixedWidth']) { - rawChild['constraints']['fixedWidth'] = - parentConstraints['fixedWidth']; - rawChild['constraints']['pinLeft'] = parentConstraints['pinLeft']; - rawChild['constraints']['pinRight'] = parentConstraints['pinRight']; - } - } PBIntermediateNode.fromJson(rawChild, this, tree); } }); diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index d21269fb..555a3673 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -1,15 +1,11 @@ -import 'package:directed_graph/directed_graph.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/alignments/injected_center.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/alignments/injected_positioned.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/alignments/padding.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/container.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/injected_container.dart'; -import 'package:parabeac_core/interpret_and_optimize/entities/layouts/column.dart'; -import 'package:parabeac_core/interpret_and_optimize/entities/layouts/row.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/layouts/stack.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; -import 'package:uuid/uuid.dart'; /// [AlignStrategy] uses the strategy pattern to define the alignment logic for /// the [PBIntermediateNode]. @@ -91,14 +87,19 @@ class PositionedAlignment extends AlignStrategy { var centerY = false; var centerX = false; - if (node.constraints.fixedHeight) { + /// Rule to inherit fixed height to children + if (node.constraints.fixedHeight && + node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH) { child.constraints.fixedHeight = true; if (!child.constraints.pinTop && !child.constraints.pinBottom) { child.constraints.pinTop = true; child.constraints.pinBottom = false; } } - if (node.constraints.fixedWidth) { + + /// Rule to inherit fixed width to children + if (node.constraints.fixedWidth && + node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH) { child.constraints.fixedWidth = true; if (!child.constraints.pinLeft && !child.constraints.pinRight) { child.constraints.pinLeft = true; @@ -120,17 +121,14 @@ class PositionedAlignment extends AlignStrategy { height: child.frame.height), ); - // Checks if child's parent has fixed height and width - // or child has fixed height and width to determine the positioned constraints - if (node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH && - (!child.constraints.pinLeft && !child.constraints.pinRight) && + /// Rules to center child horizontally + if ((!child.constraints.pinLeft && !child.constraints.pinRight) && child.constraints.fixedWidth) { injectedPositioned.constraints.fixedWidth = false; - centerX = true; } - if (node.layoutMainAxisSizing != ParentLayoutSizing.STRETCH && - (!child.constraints.pinTop && !child.constraints.pinBottom) && + /// Rules to center child vertically + if ((!child.constraints.pinTop && !child.constraints.pinBottom) && child.constraints.fixedHeight) { injectedPositioned.constraints.fixedHeight = false; centerY = true; From 86bfa6351034ede2b1edf137d16f89148bcfbf33 Mon Sep 17 00:00:00 2001 From: Ivan <42812006+ivan-015@users.noreply.github.com> Date: Fri, 1 Jul 2022 13:39:53 -0600 Subject: [PATCH 52/55] Map LayoutSizing depending on layout for constraints replacement --- .../helpers/align_strategy.dart | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index 555a3673..13609d8e 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -3,6 +3,8 @@ import 'package:parabeac_core/interpret_and_optimize/entities/alignments/injecte import 'package:parabeac_core/interpret_and_optimize/entities/alignments/padding.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/container.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/injected_container.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/layouts/column.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/layouts/row.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/layouts/stack.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; @@ -87,9 +89,22 @@ class PositionedAlignment extends AlignStrategy { var centerY = false; var centerX = false; + final parent = node.parent; + var heightLayoutSizing = ParentLayoutSizing.INHERIT; + var widthLayoutSizing = ParentLayoutSizing.INHERIT; + + /// Assign proper axis sizing for checking constraint replacements + if (parent is PBIntermediateColumnLayout) { + heightLayoutSizing = node.layoutMainAxisSizing; + widthLayoutSizing = node.layoutCrossAxisSizing; + } else if (parent is PBIntermediateRowLayout) { + heightLayoutSizing = node.layoutCrossAxisSizing; + widthLayoutSizing = node.layoutMainAxisSizing; + } + /// Rule to inherit fixed height to children if (node.constraints.fixedHeight && - node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH) { + heightLayoutSizing != ParentLayoutSizing.STRETCH) { child.constraints.fixedHeight = true; if (!child.constraints.pinTop && !child.constraints.pinBottom) { child.constraints.pinTop = true; @@ -99,7 +114,7 @@ class PositionedAlignment extends AlignStrategy { /// Rule to inherit fixed width to children if (node.constraints.fixedWidth && - node.layoutCrossAxisSizing != ParentLayoutSizing.STRETCH) { + widthLayoutSizing != ParentLayoutSizing.STRETCH) { child.constraints.fixedWidth = true; if (!child.constraints.pinLeft && !child.constraints.pinRight) { child.constraints.pinLeft = true; @@ -127,6 +142,7 @@ class PositionedAlignment extends AlignStrategy { injectedPositioned.constraints.fixedWidth = false; centerX = true; } + /// Rules to center child vertically if ((!child.constraints.pinTop && !child.constraints.pinBottom) && child.constraints.fixedHeight) { From a132424599a8da691a97dcd6c6e24aae8ff8b1b9 Mon Sep 17 00:00:00 2001 From: Ivan <42812006+ivan-015@users.noreply.github.com> Date: Fri, 1 Jul 2022 16:31:53 -0600 Subject: [PATCH 53/55] Make sure to find nearest parent layout --- .../helpers/align_strategy.dart | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index 13609d8e..cfb16e9b 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -7,6 +7,7 @@ import 'package:parabeac_core/interpret_and_optimize/entities/layouts/column.dar import 'package:parabeac_core/interpret_and_optimize/entities/layouts/row.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/layouts/stack.dart'; import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart'; +import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_layout_intermediate_node.dart'; import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart'; /// [AlignStrategy] uses the strategy pattern to define the alignment logic for @@ -89,15 +90,18 @@ class PositionedAlignment extends AlignStrategy { var centerY = false; var centerX = false; - final parent = node.parent; var heightLayoutSizing = ParentLayoutSizing.INHERIT; var widthLayoutSizing = ParentLayoutSizing.INHERIT; + var parentLayout = _findNearestParentLayout(node); + /// Assign proper axis sizing for checking constraint replacements - if (parent is PBIntermediateColumnLayout) { + + if (parentLayout != null && parentLayout is PBIntermediateColumnLayout) { heightLayoutSizing = node.layoutMainAxisSizing; widthLayoutSizing = node.layoutCrossAxisSizing; - } else if (parent is PBIntermediateRowLayout) { + } else if (parentLayout != null && + parentLayout is PBIntermediateRowLayout) { heightLayoutSizing = node.layoutCrossAxisSizing; widthLayoutSizing = node.layoutMainAxisSizing; } @@ -178,4 +182,25 @@ class PositionedAlignment extends AlignStrategy { tree.replaceChildrenOf(node, alignedChildren); // super.setConstraints(context, node); } + + /// Traverses [node] upwards and returns the first [PBLayoutIntermediateNode]. + /// + /// Returns [null] if there is none. + PBLayoutIntermediateNode _findNearestParentLayout(PBIntermediateNode node) { + //TODO: We could abstract this method to [PBIntermediateTree] to look for any type of node up the tree using generics. + if (node == null) { + return null; + } + var iter = node.parent; + + /// Go up the tree in search of a [PBLayoutIntermediateNode] + while (iter != null) { + if (iter is PBLayoutIntermediateNode) { + return iter; + } + iter = iter.parent; + } + + return null; + } } From c4ab42e07f45b4f72ab848a55e042c5a206dfcc9 Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 1 Jul 2022 17:37:48 -0600 Subject: [PATCH 54/55] Extended center case, if parent is strech child should be fixed, if parent is fixed child should be fill --- .../helpers/align_strategy.dart | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/interpret_and_optimize/helpers/align_strategy.dart b/lib/interpret_and_optimize/helpers/align_strategy.dart index cfb16e9b..8bc785e2 100644 --- a/lib/interpret_and_optimize/helpers/align_strategy.dart +++ b/lib/interpret_and_optimize/helpers/align_strategy.dart @@ -143,14 +143,22 @@ class PositionedAlignment extends AlignStrategy { /// Rules to center child horizontally if ((!child.constraints.pinLeft && !child.constraints.pinRight) && child.constraints.fixedWidth) { - injectedPositioned.constraints.fixedWidth = false; + if (widthLayoutSizing == ParentLayoutSizing.STRETCH) { + injectedPositioned.constraints.fixedWidth = true; + } else if (widthLayoutSizing == ParentLayoutSizing.INHERIT) { + injectedPositioned.constraints.fixedWidth = false; + } centerX = true; } /// Rules to center child vertically if ((!child.constraints.pinTop && !child.constraints.pinBottom) && child.constraints.fixedHeight) { - injectedPositioned.constraints.fixedHeight = false; + if (heightLayoutSizing == ParentLayoutSizing.STRETCH) { + injectedPositioned.constraints.fixedHeight = true; + } else if (heightLayoutSizing == ParentLayoutSizing.INHERIT) { + injectedPositioned.constraints.fixedHeight = false; + } centerY = true; } From b851221a047dd2be8cbc10f273782498a3e4e33c Mon Sep 17 00:00:00 2001 From: Bryan Figueroa Date: Fri, 1 Jul 2022 17:45:57 -0600 Subject: [PATCH 55/55] Update golden tests --- .../admin_city_section_edit_screen.golden | 66 +++-- .../auto_layout/custom_test_screen.golden | 247 +++++++++++------- .../auto_layout/test_screen.golden | 163 ++++++------ 3 files changed, 273 insertions(+), 203 deletions(-) diff --git a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden index 420e5961..38e9aec2 100644 --- a/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden +++ b/test/golden/golden_files/auto_layout/admin_city_section_edit_screen.golden @@ -86,7 +86,7 @@ class _AdminCitySectionEditScreen extends State { ), Positioned( left: 0, - width: 1677.0, + right: 0, top: 84.0, height: 335.0, child: LayoutBuilder( @@ -113,7 +113,10 @@ class _AdminCitySectionEditScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 1385.707, + width: MediaQuery.of(context) + .size + .width * + 0.793, top: 0, height: 64.0, child: TagSectionTitleCustom( @@ -130,7 +133,7 @@ class _AdminCitySectionEditScreen extends State { )), ), Positioned( - left: 1533.052, + right: 0, width: 143.948, top: 0, height: 72.0, @@ -331,7 +334,7 @@ class _AdminCitySectionEditScreen extends State { )), ), Positioned( - left: 1533.0, + right: 0.052, width: 143.948, top: 0.25, height: 72.0, @@ -435,14 +438,17 @@ class _AdminCitySectionEditScreen extends State { decoration: BoxDecoration(), child: Stack(children: [ Positioned( - left: 333.034, - width: 1011.932, - top: 0, + left: MediaQuery.of(context).size.width * 0.191, + width: + MediaQuery.of(context).size.width * 0.579, + bottom: 0, height: 72.0, child: SaveButtonCustom( child: Container( height: 72.0, - width: 1011.9322509765625, + width: + MediaQuery.of(context).size.width * + 0.5792399833866986, decoration: BoxDecoration( color: Color(0xff00497b), borderRadius: BorderRadius.all( @@ -450,24 +456,34 @@ class _AdminCitySectionEditScreen extends State { ), child: Stack(children: [ Positioned( - left: 469.286, - width: 74.0, + left: MediaQuery.of(context) + .size + .width * + 0.269, + width: MediaQuery.of(context) + .size + .width * + 0.042, top: 19.25, - height: 34.0, - child: Container( - height: 34.0, - width: 74.0, - child: AutoSizeText( - 'Save', - style: TextStyle( - fontFamily: 'Poppins', - fontSize: 17.0, - fontWeight: FontWeight.w600, - letterSpacing: 0.75, - color: Color(0xfffcfcfc), - ), - textAlign: TextAlign.center, - )), + bottom: 18.75, + child: Center( + child: Container( + height: 34.0, + width: 74.0, + child: AutoSizeText( + 'Save', + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 17.0, + fontWeight: + FontWeight.w600, + letterSpacing: 0.75, + color: + Color(0xfffcfcfc), + ), + textAlign: + TextAlign.center, + ))), ), ]))), ), diff --git a/test/golden/golden_files/auto_layout/custom_test_screen.golden b/test/golden/golden_files/auto_layout/custom_test_screen.golden index 13806dde..952e3860 100644 --- a/test/golden/golden_files/auto_layout/custom_test_screen.golden +++ b/test/golden/golden_files/auto_layout/custom_test_screen.golden @@ -85,8 +85,10 @@ class _CustomTestScreen extends State { height: 50.0, child: SubFrameCase34Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -129,13 +131,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: SubFrameCase12Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -232,8 +236,10 @@ class _CustomTestScreen extends State { height: 50.0, child: SubFrameCase14Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -323,13 +329,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: SubFrameCase22Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -374,26 +382,30 @@ class _CustomTestScreen extends State { width: 50.0, top: 0, height: 50.0, - child: SubFrameCase23Custom( + child: Center( child: Container( height: 50.0, width: 50.0, - decoration: BoxDecoration(), - child: Stack(children: [ - Positioned( - left: 0, - width: 50.0, - top: 0, - height: 50.0, + child: SubFrameCase23Custom( child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration( - color: Color(0xff2400ff), - ), - ), - ), - ]))), + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), + ), + ]))))), ), ])), ])), @@ -419,13 +431,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + width: MediaQuery.of(context).size.width * 0.128, top: 0, height: 50.0, child: SubFrameCase24Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -517,13 +531,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: SubFrameCase32Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -616,12 +632,13 @@ class _CustomTestScreen extends State { Positioned( left: 0, width: 50.0, - top: 0, + bottom: 0, height: 50.0, child: SubFrameCase11Custom( child: Container( height: 50.0, - width: 50.0, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -711,13 +728,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: SubFrameCase42Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -762,26 +781,30 @@ class _CustomTestScreen extends State { width: 50.0, top: 0, height: 50.0, - child: SubFrameCase43Custom( + child: Center( child: Container( height: 50.0, width: 50.0, - decoration: BoxDecoration(), - child: Stack(children: [ - Positioned( - left: 0, - width: 50.0, - top: 0, - height: 50.0, + child: SubFrameCase43Custom( child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration( - color: Color(0xffdb00ff), - ), - ), - ), - ]))), + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), + ), + ]))))), ), ])), ])), @@ -807,13 +830,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + width: MediaQuery.of(context).size.width * 0.128, top: 0, height: 50.0, child: SubFrameCase44Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1095,13 +1120,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: SubFrameCase72Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1196,8 +1223,10 @@ class _CustomTestScreen extends State { height: 50.0, child: SubFrameCase134Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1289,13 +1318,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: SubFrameCase92Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1392,8 +1423,10 @@ class _CustomTestScreen extends State { height: 50.0, child: SubFrameCase94Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1483,13 +1516,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: SubFrameCase102Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1534,26 +1569,30 @@ class _CustomTestScreen extends State { width: 50.0, top: 0, height: 50.0, - child: SubFrameCase103Custom( + child: Center( child: Container( height: 50.0, width: 50.0, - decoration: BoxDecoration(), - child: Stack(children: [ - Positioned( - left: 0, - width: 50.0, - top: 0, - height: 50.0, + child: SubFrameCase103Custom( child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration( - color: Color(0xff929292), - ), - ), - ), - ]))), + height: 50.0, + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), + ), + ]))))), ), ])), ])), @@ -1579,13 +1618,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + width: MediaQuery.of(context).size.width * 0.128, top: 0, height: 50.0, child: SubFrameCase104Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1675,13 +1716,15 @@ class _CustomTestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: SubFrameCase132Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1776,8 +1819,10 @@ class _CustomTestScreen extends State { height: 50.0, child: SubFrameCase74Custom( child: Container( - height: 50.0, - width: 50.0, + height: MediaQuery.of(context).size.height * + 0.05924170616113744, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( diff --git a/test/golden/golden_files/auto_layout/test_screen.golden b/test/golden/golden_files/auto_layout/test_screen.golden index 0cb705e5..22566da5 100644 --- a/test/golden/golden_files/auto_layout/test_screen.golden +++ b/test/golden/golden_files/auto_layout/test_screen.golden @@ -92,9 +92,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: Container( height: 50.0, width: 50.0, @@ -282,12 +282,13 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: Container( height: 50.0, - width: 50.0, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -332,25 +333,26 @@ class _TestScreen extends State { width: 50.0, top: 0, height: 50.0, - child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration(), - child: Stack(children: [ - Positioned( - left: 0, - width: 50.0, - top: 0, + child: Center( + child: Container( height: 50.0, - child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration( - color: Color(0xff2400ff), + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Color(0xff2400ff), + ), + ), ), - ), - ), - ])), + ]))), ), ])), ])), @@ -376,12 +378,13 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + width: MediaQuery.of(context).size.width * 0.128, top: 0, height: 50.0, child: Container( height: 50.0, - width: 50.0, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -472,9 +475,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: Container( height: 50.0, width: 50.0, @@ -569,7 +572,7 @@ class _TestScreen extends State { Positioned( left: 0, width: 50.0, - top: 0, + bottom: 0, height: 50.0, child: Container( height: 50.0, @@ -662,12 +665,13 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: Container( height: 50.0, - width: 50.0, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -712,25 +716,26 @@ class _TestScreen extends State { width: 50.0, top: 0, height: 50.0, - child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration(), - child: Stack(children: [ - Positioned( - left: 0, - width: 50.0, - top: 0, + child: Center( + child: Container( height: 50.0, - child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration( - color: Color(0xffdb00ff), + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Color(0xffdb00ff), + ), + ), ), - ), - ), - ])), + ]))), ), ])), ])), @@ -756,12 +761,13 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + width: MediaQuery.of(context).size.width * 0.128, top: 0, height: 50.0, child: Container( height: 50.0, - width: 50.0, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1038,9 +1044,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: Container( height: 50.0, width: 50.0, @@ -1228,9 +1234,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: Container( height: 50.0, width: 50.0, @@ -1418,12 +1424,13 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: Container( height: 50.0, - width: 50.0, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1468,25 +1475,26 @@ class _TestScreen extends State { width: 50.0, top: 0, height: 50.0, - child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration(), - child: Stack(children: [ - Positioned( - left: 0, - width: 50.0, - top: 0, + child: Center( + child: Container( height: 50.0, - child: Container( - height: 50.0, - width: 50.0, - decoration: BoxDecoration( - color: Color(0xff929292), + width: 50.0, + decoration: BoxDecoration(), + child: Stack(children: [ + Positioned( + left: 0, + width: 50.0, + top: 0, + height: 50.0, + child: Container( + height: 50.0, + width: 50.0, + decoration: BoxDecoration( + color: Color(0xff929292), + ), + ), ), - ), - ), - ])), + ]))), ), ])), ])), @@ -1512,12 +1520,13 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + width: MediaQuery.of(context).size.width * 0.128, top: 0, height: 50.0, child: Container( height: 50.0, - width: 50.0, + width: MediaQuery.of(context).size.width * + 0.1282051282051282, decoration: BoxDecoration(), child: Stack(children: [ Positioned( @@ -1606,9 +1615,9 @@ class _TestScreen extends State { child: Stack(children: [ Positioned( left: 0, - width: 50.0, + right: 0, top: 0, - height: 50.0, + bottom: 0, child: Container( height: 50.0, width: 50.0,