Skip to content

Commit 436168e

Browse files
committed
Layout Groups #8
- Remove remaining backwards compatibility.
1 parent 5996702 commit 436168e

File tree

4 files changed

+2
-23
lines changed

4 files changed

+2
-23
lines changed

lib/src/data/data_manager.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,9 +1099,6 @@ class DataManager {
10991099
// Process Variables
11001100
if (model.updates.variables.containsKey(layoutID)) {
11011101
log('\tLayout [$layoutID] has variables.');
1102-
// backward compatibility. Old layout structure. Layout contains only
1103-
// one canvas. So we need to fetch variables using layoutID.
1104-
// TODO: remove after migration
11051102
try {
11061103
final SDKLayoutVariables? variables =
11071104
await getOrFetchVariables(layoutID);
@@ -1122,9 +1119,6 @@ class DataManager {
11221119
// Process Conditions
11231120
if (model.updates.conditions.containsKey(layoutID)) {
11241121
log('\tLayout [$layoutID] has conditions.');
1125-
// backward compatibility. Old layout structure. Layout contains only
1126-
// one canvas. So we need to fetch conditions using layoutID.
1127-
// TODO: remove after migration
11281122
try {
11291123
final SDKLayoutConditions? conditions =
11301124
await getOrFetchConditions(layoutID);

lib/src/model/sdk_publish_model.dart

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ class SDKPublishLayout extends PrivacyBase {
184184
/// A list of the nodes that makes up this layout.
185185
/// CanvasID -> <NodeID -> Node>
186186
@CanvasesMapConverter()
187-
@JsonKey(readValue: nodesOrCanvasesReader)
188187
final Map<String, Map<String, BaseNode>> canvases;
189188

190189
final List<Breakpoint> breakpoints;
@@ -266,17 +265,6 @@ class SDKPublishLayout extends PrivacyBase {
266265
lastUpdated,
267266
breakpoints,
268267
];
269-
270-
// For backwards compatibility
271-
static Map<String, dynamic> nodesOrCanvasesReader(
272-
Map<dynamic, dynamic> json, String key) {
273-
if (json.containsKey('nodes') && json.containsKey('canvasId')) {
274-
// backwards compatibility
275-
return {json['canvasId']: json['nodes']};
276-
}
277-
assert(json.containsKey('canvases'));
278-
return json[key];
279-
}
280268
}
281269

282270
/// Represents a single variation of a common font.

lib/src/model/sdk_publish_model.g.dart

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/src/ui/layout_builder.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ class _CodelesslyLayoutBuilderState extends State<CodelesslyLayoutBuilder> {
203203
}
204204
final publishModel = context.read<Codelessly>().dataManager.publishModel!;
205205

206-
// Uses layout id for backwards compatibility.
207206
final Map<String, VariableData> variablesMap =
208207
publishModel.variables[widget.layout.id]?.variables[widget.canvasId] ??
209208
{};
@@ -221,7 +220,6 @@ class _CodelesslyLayoutBuilderState extends State<CodelesslyLayoutBuilder> {
221220
codelesslyContext.variables[variable.id] = notifier;
222221
}
223222

224-
// Uses layout id for backwards compatibility.
225223
final conditions = publishModel
226224
.conditions[widget.layout.id]?.conditions[widget.canvasId] ??
227225
{};

0 commit comments

Comments
 (0)