[3.3.3]

Author: thize

.gitignore

@@ -0,0 +1 @@
+.DS_Store

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [3.3.3] - 2021-02-19
+### Changed
+- fix Text Height
+- fix Export Artboard Color
+- fix Export All Colors
+- fix import app_colors.dart
+
+### Removed
+- Simple Type
+- Group Name Comment

main.js

@@ -27,14 +27,4 @@ TODO:
 ! Mask
 ! Repeat Grid
 ! List View
-
-TODO: Simple Type:
-* Text
-* Svg
-* Children
-* InkWell
-* Mask
-* Grid
-* Container
-! Text Rich
 */

manifest.json

@@ -42,5 +42,5 @@
       }
     }
   ],
-  "version": "3.3.2"
+  "version": "3.3.3"
 }

src/color.js

@@ -1,5 +1,6 @@
 const { getColor } = require("./widgets/util/color");
 const { exportDialog } = require("./ui/dialogs/dialogs");
+const { Artboard } = require("scenegraph");
 
 let clipboard = require("clipboard");
 let scenegraph = require("scenegraph")
@@ -31,7 +32,7 @@ async function exportColor() {
     withErro = null;
     color = null;
     const node = scenegraph.selection.items[0];
-    if (node.children.length > 1 || scenegraph.selection.items.length > 1) {
+    if ((node.children.length > 1 && !(node instanceof Artboard)) || scenegraph.selection.items.length > 1) {
         await exportDialog("Select only one item", 'Ok', 'Tap any key to close');
     } else {
         document.addEventListener('keydown', keydownFunc);

src/export_all.js

@@ -65,9 +65,9 @@ function exportAllColors() {
     let resColors = '';
     assetsColors.forEach((assetsColor, index) => {
         const name = assetsColor.name != null ? assetsColor.name : `color${index + 1}`;
-        const generatedColor = _isGradient(assetsColor) ? _gradientColorList(assetsColor) : getColor(assetsColor.color)
+        const generatedColor = _isGradient(assetsColor) ? _gradientColorList(assetsColor) : getColor(assetsColor.color, 1, false)
         const staticType = _isGradient(assetsColor) ? 'List<Color>' : 'Color';
-        const generatedStaticColor = `static ${staticType} get ${name} => ${generatedColor};`
+        const generatedStaticColor = `static const ${staticType} ${name} = ${generatedColor.replace('const ', '')};`
         resColors += generatedStaticColor + '\n';
     });
     if (resColors == '') {
@@ -110,13 +110,14 @@ function getImports(widget, componentsNames) {
     const googleFonts = widget.includes('GoogleFonts.') ? `import 'package:google_fonts/google_fonts.dart';\n` : '';
     const math = widget.includes('Transform.rotate') ? `import 'dart:math';\n` : '';
     const simplecode = widget.includes('sz(') ? `import 'package:simple_code/simple_code.dart';\n` : '';
+    const appColors = widget.includes('AppColors.') ? `import 'app_colors.dart';\n` : '';
     let importsComponents = '';
     componentsNames.forEach(c => {
         if (widget.includes(`const ${c}`) && !widget.includes(`class ${c}`)) {
             importsComponents += `import '${c}.dart';\n`;
         }
     });
-    return material + svg + googleFonts + math + simplecode + importsComponents + '\n';
+    return material + svg + googleFonts + math + simplecode + appColors + importsComponents + '\n';
 }
 
 function getImportsTextStyle(widget) {
@@ -187,7 +188,7 @@ function _isGradient(fill) {
 function _gradientColorList(gradient) {
     let colors = [];
     gradient.colorStops.forEach(colorStop => {
-        colors.push(dartColor(colorStop.color));
+        colors.push(getColor(colorStop.color, 1, false));
     });
     return `[${colors}]`;
 }

src/ui/components/export_with_checkboxs_ui.js

@@ -3,33 +3,14 @@ const { rowUi } = require("./util");
 function exportWithCheckBoxsUi() {
     const title = '<h1>Export with</h1>';
     const checkboxs =
-        prototypeInteractionsUi() +
-        // googleFontsUi() +
-        // simpleCodeUi() +
-        simpleTypeUi();
+        prototypeInteractionsUi();
     return title + checkboxs;
 }
 
 module.exports = {
     exportWithCheckBoxsUi: exportWithCheckBoxsUi,
 };
 
-
-
-// function googleFontsUi() {
-//     return rowUi(`<input type="checkbox" id="googleFonts" name="googleFonts">Google Fonts`);
-// }
-
-// function simpleCodeUi() {
-//     return rowUi(`<input type="checkbox" id="simpleCode" name="simpleCode" >SimpleCode`);
-// }
-
 function prototypeInteractionsUi() {
     return rowUi(`<input type="checkbox" id="prototypeInteractions" name="prototypeInteractions" checked>Prototype Interactions`);
 }
-
-
-function simpleTypeUi() {
-    return rowUi(`<input type="checkbox" id="simpleType" name="simpleType">Simple Type (Alpha)`);
-    // return rowUi(`<input type="checkbox" id="simpleType" name="simpleType" >Simple Type (Beta)`);
-}

src/ui/components/output_ui.js

@@ -7,7 +7,7 @@ function outputUi(two) {
     return title + outputText;
 }
 
-function changeOutputUiText(newText, color) {
+function changeOutputUiText(newText, color, stop = false) {
     const redColor = 'LightCoral';
     const greenColor = 'MediumSeaGreen';
     const element = document.getElementById('outputText');
@@ -24,6 +24,7 @@ function changeOutputUiText(newText, color) {
         element.style.color = color;
         element2.style.color = color;
     }
+    if (stop) alert('error to stop the app');
 }
 
 function getOutputUiText() {

src/widgets/children.js

@@ -85,7 +85,7 @@ class Children {
             const spacer = this.childrenSpaces[index];
             if (spacer > 0) {
                 if (withStyledWidget) {
-                    widgets.push(`s(${spacer})`);
+                    widgets.push(`${spacer}.spacer`);
                 } else {
                     widgets.push(`Spacer(flex: ${spacer})`);
                 }
@@ -98,27 +98,27 @@ class Children {
         let set = new Set(dist);
         if (set.size == 1) {
             if (set.getByIdx(0) == 0) return;
-            this.columnOrRowMainAlignment = withSw ? '.mainSpaceEvenly' : 'mainAxisAlignment: MainAxisAlignment.spaceEvenly,';
+            this.columnOrRowMainAlignment = withSw ? '.mSpaceEvenly' : 'mainAxisAlignment: MainAxisAlignment.spaceEvenly,';
             return;
         }
         set = new Set(dist.slice(1, dist.length - 1)); // remove first and last item of Set
         if (dist[0] == 0 && dist[dist.length - 1] == 0 && set.size == 1) {
-            this.columnOrRowMainAlignment = withSw ? '.mainSpaceBetween' : 'mainAxisAlignment: MainAxisAlignment.spaceBetween,';
+            this.columnOrRowMainAlignment = withSw ? '.mSpaceBetween' : 'mainAxisAlignment: MainAxisAlignment.spaceBetween,';
             return;
         }
         let first = dist[0];
         if (first != 0 && dist[dist.length - 1] == first && set.size == 1 && set.getByIdx(0) == first * 2) {
-            this.columnOrRowMainAlignment = withSw ? '.mainSpaceAround' : 'mainAxisAlignment: MainAxisAlignment.spaceAround,';
+            this.columnOrRowMainAlignment = withSw ? '.mSpaceAround' : 'mainAxisAlignment: MainAxisAlignment.spaceAround,';
             return;
         }
         let last = dist[dist.length - 1];
         if (first != 0 && last != 0 && first == last && set.size == 1 && set.getByIdx(0) == 0) {
-            this.columnOrRowMainAlignment = withSw ? '.mainCenter' : 'mainAxisAlignment: MainAxisAlignment.center,';
+            this.columnOrRowMainAlignment = withSw ? '.mCenter' : 'mainAxisAlignment: MainAxisAlignment.center,';
             return;
         }
         set = new Set(dist.slice(1, dist.length)); // remove first and last item of Set
         if (first != 0 && set.size == 1 && set.getByIdx(0) == 0) {
-            this.columnOrRowMainAlignment = withSw ? '.mainEnd' : 'mainAxisAlignment: MainAxisAlignment.end,';
+            this.columnOrRowMainAlignment = withSw ? '.mEnd' : 'mainAxisAlignment: MainAxisAlignment.end,';
             return;
         }
     }
@@ -166,11 +166,11 @@ class Children {
         if (center >= end && center >= start) return;
         if (end >= center && end >= start) {
             this.isEnd = true;
-            this.columnOrRowCrossAlignment = withSw ? '.crossEnd' : 'crossAxisAlignment: CrossAxisAlignment.end,';
+            this.columnOrRowCrossAlignment = withSw ? '.cEnd' : 'crossAxisAlignment: CrossAxisAlignment.end,';
         }
         if (start >= center && start >= end) {
             this.isStart = true;
-            this.columnOrRowCrossAlignment = withSw ? '.crossStart' : 'crossAxisAlignment: CrossAxisAlignment.start,';
+            this.columnOrRowCrossAlignment = withSw ? '.cStart' : 'crossAxisAlignment: CrossAxisAlignment.start,';
         }
     }
 

src/widgets/group.js

@@ -11,7 +11,8 @@ class GroupWidget {
         const { removeItemsFromGroup } = require("../util");
         const ungroupedItems = removeItemsFromGroup(this.xdNode.children);
         const itemsDart = itemsToDart(ungroupedItems);
-        return `\n// Group: ${this.xdNode.name}\n${itemsDart}`;
+        return itemsDart;
+        // return `\n// Group: ${this.xdNode.name}\n${itemsDart}`;
         /*
         return `
         Container(