add typeface support

Author: CamronG

configurator/bin/configurator.dart

@@ -149,6 +149,7 @@ Future<void> generateConfigurations({
     FileUtils.writeFile(
       path: outputFilePath,
       content: DartFormatter().format( await result.write() ),
+      // content: await result.write(),
     );
 
     print( outputFilePath );

configurator/lib/configurator.dart

@@ -1,6 +1,6 @@
 library configurator;
 
-export 'src/models/typeface.dart';
+export 'src/models/yaml_text_style.dart';
 export 'src/scopes/scope.dart';
 export 'src/scopes/proxy.dart';
 export 'src/configuration.dart';

configurator/lib/src/configuration.dart

@@ -107,10 +107,10 @@ class Configuration  {
     })?.misc[ id ];
   }
 
-  dynamic typefaces( String id ) {
+  Map<String, dynamic>  textStyle( String id ) {
     return _scopesSorted.reversed.firstWhereOrNull( ( s ) {
-      return s.typefaces.containsKey( id );
-    })?.misc[ id ];
+      return s.textStyles.containsKey( id );
+    })?.textStyles[ id ];
   }
 
   double size( String id ) {

configurator/lib/src/models/processed_config.dart

@@ -17,7 +17,7 @@ import 'package:configurator/src/writers/slang_writer.dart';
 import 'package:configurator/src/writers/theme_writer.dart';
 import 'package:configurator/src/writers/weight_writer.dart';
 
-import '../writers/typeface_writer.dart';
+import '../writers/text_style_writer.dart';
 
 class ProcessedConfig {
 
@@ -37,7 +37,7 @@ class ProcessedConfig {
       Directive.import( 'package:slang/builder/model/node.dart' ),
       Directive.export( 'package:slang_flutter/slang_flutter.dart' ),
     ]);
-
+    
     builder.body.addAll([
 
       TitleWriter( 'Color Util' ).write(),
@@ -76,8 +76,8 @@ class ProcessedConfig {
       TitleWriter( 'Misc' ).write(),
       MiscWriter( frameworkName, yamlConfiguration.misc ).write(),
 
-      TitleWriter( 'Typefaces' ).write(),
-      TypefaceWriter( frameworkName, yamlConfiguration.typefaces ).write(),
+      TitleWriter( 'TextStyles' ).write(),
+      TextStyleWriter( frameworkName, yamlConfiguration.textStyles ).write(),
 
       TitleWriter( 'Slang (i18n)' ).write(),
       SlangWriter( yamlConfiguration.strings ).write(),

configurator/lib/src/models/typeface.dart

@@ -11,10 +11,10 @@ class YamlConfiguration {
   final List<YamlSetting> colors;
   final List<YamlSetting> images;
   final List<YamlSetting> misc;
-  final List<YamlSetting> typefaces;
   final List<YamlSetting> sizes;
   final List<YamlSetting> padding;
   final List<YamlSetting> margins;
+  final List<YamlTextStyle> textStyles;
   final List<YamlRoute> routes;
   final List<YamlI18n> strings;
 
@@ -26,7 +26,7 @@ class YamlConfiguration {
     this.colors = const [],
     this.images = const [],
     this.misc = const [],
-    this.typefaces = const [],
+    this.textStyles = const [],
     this.sizes = const [],
     this.routes = const [],
     this.strings = const [],
@@ -41,7 +41,7 @@ class YamlConfiguration {
       'flags': { for (var e in flags) e.name: e.value},
       'images': { for (var e in images) e.name: e.value},
       'misc': { for (var e in misc) e.name: e.value},
-      'typefaces': { for (var e in typefaces) e.name: e.value},
+      'textStyles': { for (var e in textStyles) e.key: e.toJson()},
       'sizes': { for (var e in sizes) e.name: e.value},
       'colors': { for (var e in colors) e.name: e.value},
       'routes': { for (var e in routes) e.id : e.path },
@@ -55,8 +55,8 @@ class YamlConfiguration {
     misc.removeWhere(( e ) => t.misc.contains( e ));
     misc.addAll( t.misc );
 
-    typefaces.removeWhere(( e ) => t.typefaces.contains( e ));
-    typefaces.addAll( t.typefaces );
+    textStyles.removeWhere(( e ) => t.textStyles.contains( e ));
+    textStyles.addAll( t.textStyles );
 
     padding.removeWhere(( e ) => t.padding.contains( e ));
     padding.addAll( t.padding );

configurator/lib/src/models/yaml_configuration.dart

@@ -0,0 +1,33 @@
+class YamlTextStyle {
+  final String key;
+  final String color;
+  final int size;
+  final int weight;
+
+  final Map<String, String> typeface;
+
+  /// Model containing TextStyle information
+  YamlTextStyle({
+    required this.key,
+    required this.color,
+    required this.size,
+    required this.weight,
+    required this.typeface,
+  });
+
+  factory YamlTextStyle.fromJson(Map json) => YamlTextStyle(
+    key: json['key'] as String,
+    color: json['color'] as String,
+    size: json['size'] as int,
+    weight: json['weight'] as int,
+    typeface: json['typeface'] as Map<String, String>,
+  );
+
+  Map<String, dynamic> toJson() => <String, dynamic>{
+    'key': key,
+    'color': color,
+    'size': size,
+    'weight': weight,
+    'typeface': typeface,
+  };
+}

configurator/lib/src/models/yaml_text_style.dart

@@ -35,7 +35,7 @@ class ProxyScope extends ConfigScope {
   Map<String, dynamic> misc;
 
   @override
-  Map<String, dynamic> typefaces;
+  Map<String, dynamic> textStyles;
 
   ProxyScope({
     required this.name,
@@ -49,6 +49,6 @@ class ProxyScope extends ConfigScope {
     this.padding = const {},
     this.margins = const {},
     this.misc = const {},
-    this.typefaces = const {},
+    this.textStyles = const {},
   });
 }

configurator/lib/src/scopes/proxy.dart

@@ -15,7 +15,7 @@ abstract class ConfigScope {
   Map<String, double> get padding;
   Map<String, double> get margins;
   Map<String, double> get radius => {};
-  Map<String, dynamic> get typefaces => {};
+  Map<String, dynamic> get textStyles => {};
   Map<int, String?> get routes;
 
 
@@ -33,7 +33,7 @@ abstract class ConfigScope {
       flags: { for (var e in config.flags) e.name : e.value },
       images: { for (var e in config.images) e.name : e.value },
       misc: { for (var e in config.misc) e.name : e.value },
-      typefaces: { for (var e in config.typefaces) e.name : e.value },
+      textStyles: { for (var e in config.textStyles) e.key : e },
       routes: { for (var e in config.routes) e.id : e.path },
       sizes: { for (var e in config.sizes) e.name : e.value },
       padding: { for (var e in config.padding) e.name : e.value },
@@ -48,7 +48,7 @@ abstract class ConfigScope {
       'flags': { for (var e in flags.entries) e.key: e.value},
       'images': { for (var e in images.entries) e.key: e.value},
       'misc': { for (var e in misc.entries) e.key: e.value},
-      'typefaces': { for (var e in typefaces.entries) e.key: e.value},
+      'textStyles': { for (var e in textStyles.entries) e.key: e.value},
       'sizes': { for (var e in sizes.entries) e.key: e.value},
       'padding': { for (var e in padding.entries) e.key: e.value},
       'margins': { for (var e in margins.entries) e.key: e.value},
@@ -66,7 +66,7 @@ abstract class ConfigScope {
           const ListEquality().equals( partFiles, other.partFiles ) &&
           const MapEquality().equals( images, other.images ) &&
           const MapEquality().equals( misc, other.misc ) &&
-          const MapEquality().equals( typefaces, other.typefaces ) &&
+          const MapEquality().equals( textStyles, other.textStyles ) &&
           const MapEquality().equals( routes, other.routes ) &&
           const MapEquality().equals( colors, other.colors ) &&
           const MapEquality().equals( padding, other.padding ) &&
@@ -80,7 +80,7 @@ abstract class ConfigScope {
       ^ partFiles.hashCode
       ^ images.hashCode
       ^ misc.hashCode
-      ^ typefaces.hashCode
+      ^ textStyles.hashCode
       ^ padding.hashCode
       ^ margins.hashCode
       ^ routes.hashCode