From 530a494e9e03ed60657e4a8e2e1e4463e57ccfce Mon Sep 17 00:00:00 2001 From: singerdmx Date: Tue, 22 Dec 2020 01:53:08 -0800 Subject: [PATCH] Make attribute value final --- lib/models/documents/attribute.dart | 24 +++++++++--------------- lib/models/documents/nodes/line.dart | 4 ++-- lib/models/documents/style.dart | 6 +++--- lib/models/rules/insert.dart | 2 +- lib/widgets/editor.dart | 2 +- lib/widgets/raw_editor.dart | 2 +- lib/widgets/text_block.dart | 2 +- 7 files changed, 18 insertions(+), 24 deletions(-) diff --git a/lib/models/documents/attribute.dart b/lib/models/documents/attribute.dart index 140ae433..453a9236 100644 --- a/lib/models/documents/attribute.dart +++ b/lib/models/documents/attribute.dart @@ -9,12 +9,9 @@ enum AttributeScope { class Attribute { final String key; final AttributeScope scope; - T _value; + final T value; - Attribute(this.key, this.scope, this._value); - - T getValue() => _value; - setValue(T val) => _value = val; + Attribute(this.key, this.scope, this.value); static final Map _registry = { Attribute.bold.key: Attribute.bold, @@ -63,22 +60,19 @@ class Attribute { bool get isBlockExceptHeader => scope == AttributeScope.BLOCK && key != Attribute.header.key; - Map toJson() => {key: _value}; + Map toJson() => {key: value}; static Attribute fromKeyValue(String key, dynamic value) { if (!_registry.containsKey(key)) { throw ArgumentError.value(key, 'key "$key" not found.'); } Attribute origin = _registry[key]; - Attribute attribute = clone(origin); - if (value != null) { - attribute.setValue(value); - } + Attribute attribute = clone(origin, value); return attribute; } - static Attribute clone(Attribute origin) { - return Attribute(origin.key, origin.scope, origin.getValue()); + static Attribute clone(Attribute origin, dynamic value) { + return Attribute(origin.key, origin.scope, value); } @override @@ -88,15 +82,15 @@ class Attribute { Attribute typedOther = other; return key == typedOther.key && scope == typedOther.scope && - _value == typedOther._value; + value == typedOther.value; } @override - int get hashCode => hash3(key, scope, _value); + int get hashCode => hash3(key, scope, value); @override String toString() { - return 'Attribute{key: $key, scope: $scope, value: $_value}'; + return 'Attribute{key: $key, scope: $scope, value: $value}'; } } diff --git a/lib/models/documents/nodes/line.dart b/lib/models/documents/nodes/line.dart index c3edfe20..2727e101 100644 --- a/lib/models/documents/nodes/line.dart +++ b/lib/models/documents/nodes/line.dart @@ -168,7 +168,7 @@ class Line extends Container { if (parent is Block) { Attribute parentStyle = (parent as Block).style.getBlockExceptHeader(); - if (blockStyle.getValue() == null) { + if (blockStyle.value == null) { _unwrap(); } else if (blockStyle != parentStyle) { _unwrap(); @@ -177,7 +177,7 @@ class Line extends Container { _wrap(block); block.adjust(); } - } else if (blockStyle.getValue() != null) { + } else if (blockStyle.value != null) { Block block = Block(); block.applyAttribute(blockStyle); _wrap(block); diff --git a/lib/models/documents/style.dart b/lib/models/documents/style.dart index 8d63fdfb..4637e50d 100644 --- a/lib/models/documents/style.dart +++ b/lib/models/documents/style.dart @@ -24,8 +24,8 @@ class Style { Map toJson() => _attributes.isEmpty ? null - : _attributes.map((String _, Attribute value) => - MapEntry(value.key, value.getValue())); + : _attributes.map((String _, Attribute attribute) => + MapEntry(attribute.key, attribute.value)); Iterable get keys => _attributes.keys; @@ -54,7 +54,7 @@ class Style { Style merge(Attribute attribute) { Map merged = Map.from(_attributes); - if (attribute.getValue() == null) { + if (attribute.value == null) { merged.remove(attribute.key); } else { merged[attribute.key] = attribute; diff --git a/lib/models/rules/insert.dart b/lib/models/rules/insert.dart index de5e5abe..529dd8da 100644 --- a/lib/models/rules/insert.dart +++ b/lib/models/rules/insert.dart @@ -79,7 +79,7 @@ class PreserveBlockStyleOnInsertRule extends InsertRule { return null; } - var blockStyle = {attribute.key: attribute.getValue()}; + var blockStyle = {attribute.key: attribute.value}; Map resetStyle; diff --git a/lib/widgets/editor.dart b/lib/widgets/editor.dart index 9a092089..48449d36 100644 --- a/lib/widgets/editor.dart +++ b/lib/widgets/editor.dart @@ -298,7 +298,7 @@ class _QuillEditorSelectionGestureDetectorBuilder if (getEditor().widget.readOnly) { getEditor() .widget - .onLaunchUrl(segment.style.attributes[Attribute.link.key].getValue()); + .onLaunchUrl(segment.style.attributes[Attribute.link.key].value); } } } diff --git a/lib/widgets/raw_editor.dart b/lib/widgets/raw_editor.dart index 78488813..c3f47320 100644 --- a/lib/widgets/raw_editor.dart +++ b/lib/widgets/raw_editor.dart @@ -609,7 +609,7 @@ class RawEditorState extends EditorState Line line, DefaultStyles defaultStyles) { Map attrs = line.style.attributes; if (attrs.containsKey(Attribute.header.key)) { - int level = attrs[Attribute.header.key].getValue(); + int level = attrs[Attribute.header.key].value; switch (level) { case 1: return defaultStyles.h1.verticalSpacing; diff --git a/lib/widgets/text_block.dart b/lib/widgets/text_block.dart index 06695e26..d9cf20b0 100644 --- a/lib/widgets/text_block.dart +++ b/lib/widgets/text_block.dart @@ -145,7 +145,7 @@ class EditableTextBlock extends StatelessWidget { Map attrs = block.style.attributes; if (attrs.containsKey(Attribute.header.key)) { - int level = attrs[Attribute.header.key].getValue(); + int level = attrs[Attribute.header.key].value; switch (level) { case 1: top = defaultStyles.h1.verticalSpacing.item1;