Skip to content

Commit 8161a68

Browse files
Onix-IvanOnix-Ivan
committed
feat(Figma): Added comments, updated mapper. Removed unused data models
1 parent 3745996 commit 8161a68

File tree

56 files changed

+113
-535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+113
-535
lines changed

lib/data/mapper/converter/figma/figma_node_type_converter.dart renamed to lib/data/converter/figma/figma_node_type_converter.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class FigmaNodeTypeConverter
5555

5656
@override
5757
Map<String, dynamic> toJson(NodeDataModel object) {
58-
return {};
58+
// TODO(Ivan Modlo): Implement it if necessary
59+
throw UnimplementedError();
5960
}
6061
}

lib/data/mapper/converter/figma/figma_nodes_converter.dart renamed to lib/data/converter/figma/figma_nodes_converter.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:json_annotation/json_annotation.dart';
2-
import 'package:onix_flutter_bricks/data/mapper/converter/figma/figma_node_type_converter.dart';
2+
import 'package:onix_flutter_bricks/data/converter/figma/figma_node_type_converter.dart';
33
import 'package:onix_flutter_bricks/data/model/figma/nodes/node/node_data_model.dart';
44

55
class FigmaNodesConverter
@@ -21,6 +21,7 @@ class FigmaNodesConverter
2121

2222
@override
2323
Map<String, dynamic> toJson(List<NodeDataModel> object) {
24+
// TODO(Ivan Modlo): Implement it if necessary
2425
throw UnimplementedError();
2526
}
2627
}

‎lib/data/mapper/figma/figma_file_mapper.dart‎

Whitespace-only changes.

‎lib/data/mapper/figma/figma_nodes_mapper.dart‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:onix_flutter_bricks/core/arch/domain/common/converter/mapper.dart';
2-
import 'package:onix_flutter_bricks/data/mapper/figma/paint_property_mapper.dart';
2+
import 'package:onix_flutter_bricks/data/mapper/figma/properties_mapper.dart';
33
import 'package:onix_flutter_bricks/data/model/figma/nodes/connector/connector_node_data_model.dart';
44
import 'package:onix_flutter_bricks/data/model/figma/nodes/document/document_node_data_model.dart';
55
import 'package:onix_flutter_bricks/data/model/figma/nodes/frame/frame_node_data_model.dart';
@@ -11,6 +11,7 @@ import 'package:onix_flutter_bricks/data/model/figma/nodes/table_cell/table_cell
1111
import 'package:onix_flutter_bricks/data/model/figma/nodes/text/text_node_data_model.dart';
1212
import 'package:onix_flutter_bricks/data/model/figma/nodes/vector/vector_node_data_model.dart';
1313
import 'package:onix_flutter_bricks/data/model/figma/properties/paint/paint_property_data_model.dart';
14+
import 'package:onix_flutter_bricks/data/model/figma/properties/type_style/figma_type_style.dart';
1415
import 'package:onix_flutter_bricks/domain/entity/figma/nodes/connector_node/connector_node_entity.dart';
1516
import 'package:onix_flutter_bricks/domain/entity/figma/nodes/document_node/document_node_entity.dart';
1617
import 'package:onix_flutter_bricks/domain/entity/figma/nodes/frame_node/frame_node_entity.dart';
@@ -23,9 +24,6 @@ import 'package:onix_flutter_bricks/domain/entity/figma/nodes/table_cell_node/ta
2324
import 'package:onix_flutter_bricks/domain/entity/figma/nodes/text_node/text_node_entity.dart';
2425
import 'package:onix_flutter_bricks/domain/entity/figma/nodes/vector_node/vector_node_entity.dart';
2526
import 'package:onix_flutter_bricks/domain/entity/figma/properties/paint_property/paint_property.dart';
26-
import 'package:onix_flutter_bricks/domain/entity/figma/properties/type_style/type_style_metadata.dart';
27-
28-
typedef A = ({int a, int b});
2927

3028
class FigmaNodesMapper {
3129
List<BaseNode> mapNodesDataModelToEntity(List<NodeDataModel> from) =>
@@ -43,6 +41,7 @@ class _MapNodeDataModelToEntity
4341
key: from.key ?? '',
4442
name: from.name ?? '',
4543
type: from.type ?? '',
44+
// (Ivan Modlo): Maybe we should call the map method recursively
4645
children: from.children
4746
?.map(
4847
(e) => BaseNodeEntity(
@@ -62,11 +61,14 @@ class _MapNodeDataModelToEntity
6261
name: from.name ?? '',
6362
type: from.type ?? '',
6463
fills: _mapPaintProperty(from.fills),
65-
style: TypeStyleMetadata(
66-
fontFamily: from.style?.fontFamily ?? '',
67-
fontWeight: from.style?.fontWeight ?? 0,
68-
fontSize: from.style?.fontSize ?? 0,
69-
letterSpacing: from.style?.letterSpacing ?? 0,
64+
style: PropertyMapper().mapFigmaTypeStyleDataModelToEntity(
65+
from.style ??
66+
const FigmaTypeStyle(
67+
fontFamily: '',
68+
fontWeight: 0,
69+
fontSize: 0,
70+
letterSpacing: 0,
71+
),
7072
),
7173
);
7274
case FrameNodeDataModel _:
@@ -138,7 +140,5 @@ class _MapNodeDataModelToEntity
138140
}
139141

140142
List<PaintProperty> _mapPaintProperty(List<PaintPropertyDataModel>? from) =>
141-
PaintPropertyMapper()
142-
.mapPaintPropertyDataModelToEntity(from ?? [])
143-
.toList();
143+
PropertyMapper().mapPaintPropertyDataModelToEntity(from ?? []).toList();
144144
}

‎lib/data/mapper/figma/node_style_mapper.dart‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎lib/data/mapper/figma/paint_property_mapper.dart‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎lib/data/mapper/figma/properties_mapper.dart‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
import 'package:onix_flutter_bricks/core/arch/domain/common/converter/mapper.dart';
2+
import 'package:onix_flutter_bricks/data/model/figma/properties/node_style/figma_node_style.dart';
3+
import 'package:onix_flutter_bricks/data/model/figma/properties/paint/paint_property_data_model.dart';
4+
import 'package:onix_flutter_bricks/data/model/figma/properties/type_style/figma_type_style.dart';
5+
import 'package:onix_flutter_bricks/domain/entity/figma/properties/color_property/color_property.dart';
6+
import 'package:onix_flutter_bricks/domain/entity/figma/properties/node_style_property/node_style_property.dart';
7+
import 'package:onix_flutter_bricks/domain/entity/figma/properties/paint_property/paint_property.dart';
8+
import 'package:onix_flutter_bricks/domain/entity/figma/properties/type_style/type_style_metadata.dart';
9+
10+
class PropertyMapper {
11+
Iterable<PaintProperty> mapPaintPropertyDataModelToEntity(
12+
Iterable<PaintPropertyDataModel> from,
13+
) =>
14+
_MapPaintsPropertyDataModelToEntity().mapIterable(from);
15+
16+
NodeStyleProperty mapNodeStyleDataModelToEntity(FigmaNodeStyle from) =>
17+
_MapNodeStyleDataModelToEntity().map(from);
18+
19+
TypeStyleMetadata mapFigmaTypeStyleDataModelToEntity(FigmaTypeStyle from) =>
20+
_MapFigmaTypeStyleDataModelToEntity().map(from);
21+
}
22+
23+
class _MapPaintsPropertyDataModelToEntity
24+
extends MapperIterable<PaintPropertyDataModel, PaintProperty> {
25+
@override
26+
PaintProperty map(PaintPropertyDataModel from) {
27+
return PaintProperty(
28+
color: ColorProperty(
29+
r: from.color?.r ?? 0,
30+
g: from.color?.g ?? 0,
31+
b: from.color?.b ?? 0,
32+
a: from.color?.a ?? 255,
33+
),
34+
type: PaintPropertyType.fromRawString(from.type ?? ''),
35+
);
36+
}
37+
}
38+
39+
class _MapNodeStyleDataModelToEntity
40+
extends Mapper<FigmaNodeStyle, NodeStyleProperty> {
41+
@override
42+
NodeStyleProperty map(FigmaNodeStyle from) {
43+
return NodeStyleProperty(
44+
key: from.nodeId ?? '',
45+
name: from.name ?? '',
46+
description: '',
47+
style: NodeStyleType.fromRawString(
48+
from.styleType ?? '',
49+
),
50+
);
51+
}
52+
}
53+
54+
class _MapFigmaTypeStyleDataModelToEntity
55+
extends Mapper<FigmaTypeStyle, TypeStyleMetadata> {
56+
@override
57+
TypeStyleMetadata map(FigmaTypeStyle from) {
58+
return TypeStyleMetadata(
59+
fontFamily: from.fontFamily ?? '',
60+
fontWeight: from.fontWeight ?? 0,
61+
fontSize: from.fontSize ?? 0,
62+
letterSpacing: from.letterSpacing ?? 0,
63+
);
64+
}
65+
}

‎lib/data/model/config/config_data_model.dart‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎lib/data/model/config/config_data_model.g.dart‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎lib/data/model/data_component/data_component_model.dart‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)