Zefyr video

packages/notus/lib/notus.dart

@@ -15,3 +15,4 @@ export 'src/heuristics.dart';
 export 'src/heuristics/delete_rules.dart';
 export 'src/heuristics/format_rules.dart';
 export 'src/heuristics/insert_rules.dart';
+export 'src/history.dart';

packages/notus/lib/src/document.dart

@@ -4,6 +4,7 @@
 import 'dart:async';
 
 import 'package:quill_delta/quill_delta.dart';
+import 'package:notus/notus.dart';
 
 import 'document/attributes.dart';
 import 'document/block.dart';
@@ -40,25 +41,37 @@ class NotusDocument {
   /// Creates new empty Notus document.
   NotusDocument()
       : _heuristics = NotusHeuristics.fallback,
+        _history = NotusHistory(),
         _delta = Delta()..insert('\n') {
     _loadDocument(_delta);
   }
 
   NotusDocument.fromJson(List data)
       : _heuristics = NotusHeuristics.fallback,
+        _history = NotusHistory(),
         _delta = Delta.fromJson(data) {
     _loadDocument(_delta);
   }
 
   NotusDocument.fromDelta(Delta delta)
       : assert(delta != null),
         _heuristics = NotusHeuristics.fallback,
+        _history = NotusHistory(),
         _delta = delta {
     _loadDocument(_delta);
   }
 
   final NotusHeuristics _heuristics;
 
+  NotusHistory _history;
+
+  set history(NotusHistory value) {
+    _history?.clear();
+    _history = value;
+  }
+
+  NotusHistory get history => _history;
+
   /// The root node of this document tree.
   RootNode get root => _root;
   final RootNode _root = RootNode();
@@ -92,6 +105,7 @@ class NotusDocument {
   /// Closes [changes] stream.
   void close() {
     _controller.close();
+    _history.clear();
   }
 
   /// Inserts [text] in this document at specified [index].
@@ -216,7 +230,7 @@ class NotusDocument {
   /// of this document.
   ///
   /// In case the [change] is invalid, behavior of this method is unspecified.
-  void compose(Delta change, ChangeSource source) {
+  void compose(Delta change, ChangeSource source, {bool history}) {
     _checkMutable();
     change.trim();
     assert(change.isNotEmpty);
@@ -241,7 +255,9 @@ class NotusDocument {
       throw StateError('Compose produced inconsistent results. '
           'This is likely due to a bug in the library. Tried to compose change $change from $source.');
     }
-    _controller.add(NotusChange(before, change, source));
+    final notusChange = NotusChange(before, change, source);
+    _controller.add(notusChange);
+    if (history != true) _history?.handleDocChange(notusChange);
   }
 
   //
@@ -293,4 +309,12 @@ class NotusDocument {
       _root.remove(node);
     }
   }
+
+  void undo() {
+    _history?.undo(this);
+  }
+
+  void redo() {
+    _history?.redo(this);
+  }
 }

packages/notus/lib/src/document/attributes.dart

@@ -56,24 +56,32 @@ abstract class NotusAttributeBuilder<T> implements NotusAttributeKey<T> {
 ///       document.format(0, 5, NotusAttribute.bold);
 ///       // Similarly for italic
 ///       document.format(0, 5, NotusAttribute.italic);
+///       // Similarly for underline
+///       document.format(0, 5, NotusAttribute.underline)
 ///       // Format first line as a heading (h1)
 ///       // Note that there is no need to specify character range of the whole
 ///       // line. Simply set index position to anywhere within the line and
 ///       // length to 0.
 ///       document.format(0, 0, NotusAttribute.h1);
+///       // Note that there is no need to specify character range of the whole
+///       // line. Simply set index position to anywhere within the line and
+///       // length to 0.
+///       document.format(0, 0, NotusAttribute.left);
 ///     }
 ///
 /// List of supported attributes:
 ///
 ///   * [NotusAttribute.bold]
 ///   * [NotusAttribute.italic]
+///   * [NotusAttribute.underline]
 ///   * [NotusAttribute.link]
 ///   * [NotusAttribute.heading]
 ///   * [NotusAttribute.block]
 class NotusAttribute<T> implements NotusAttributeBuilder<T> {
   static final Map<String, NotusAttributeBuilder> _registry = {
     NotusAttribute.bold.key: NotusAttribute.bold,
     NotusAttribute.italic.key: NotusAttribute.italic,
+    NotusAttribute.underline.key: NotusAttribute.underline,
     NotusAttribute.link.key: NotusAttribute.link,
     NotusAttribute.heading.key: NotusAttribute.heading,
     NotusAttribute.block.key: NotusAttribute.block,
@@ -88,6 +96,9 @@ class NotusAttribute<T> implements NotusAttributeBuilder<T> {
   /// Italic style attribute.
   static const italic = _ItalicAttribute();
 
+  /// Underline style attribure.
+  static const underline = _UnderlineAttribute();
+
   /// Link style attribute.
   // ignore: const_eval_throws_exception
   static const link = LinkAttributeBuilder._();
@@ -120,6 +131,18 @@ class NotusAttribute<T> implements NotusAttributeBuilder<T> {
   /// Alias for [NotusAttribute.block.quote].
   static NotusAttribute<String> get bq => block.quote;
 
+  /// Alias for [NotusAttribute.block.alignLeft].
+  static NotusAttribute<String> get alignLeft => block.alignLeft;
+
+  /// Alias for [NotusAttribute.block.alignRight].
+  static NotusAttribute<String> get alignRight => block.alignRight;
+
+  /// Alias for [NotusAttribute.block.alignCenter].
+  static NotusAttribute<String> get alignCenter => block.alignCenter;
+
+  /// Alias for [NotusAttribute.block.alignJustify].
+  static NotusAttribute<String> get alignJustify => block.alignJustify;
+
   /// Alias for [NotusAttribute.block.code].
   static NotusAttribute<String> get code => block.code;
 
@@ -332,6 +355,11 @@ class _ItalicAttribute extends NotusAttribute<bool> {
   const _ItalicAttribute() : super._('i', NotusAttributeScope.inline, true);
 }
 
+/// Applies underline style to a text segment.
+class _UnderlineAttribute extends NotusAttribute<bool> {
+  const _UnderlineAttribute() : super._('u', NotusAttributeScope.inline, true);
+}
+
 /// Builder for link attribute values.
 ///
 /// There is no need to use this class directly, consider using
@@ -387,6 +415,22 @@ class BlockAttributeBuilder extends NotusAttributeBuilder<String> {
   /// Formats a block of lines as a quote.
   NotusAttribute<String> get quote =>
       NotusAttribute<String>._(key, scope, 'quote');
+
+  /// Formats a block of lines into align left.
+  NotusAttribute<String> get alignLeft =>
+      NotusAttribute<String>._(key, scope, 'alignLeft');
+
+  /// Formats a block of lines into align right.
+  NotusAttribute<String> get alignRight =>
+      NotusAttribute<String>._(key, scope, 'alignRight');
+
+  /// Formats a block of lines into align center.
+  NotusAttribute<String> get alignCenter =>
+      NotusAttribute<String>._(key, scope, 'alignCenter');
+
+  /// Formats a block of lines into align justify.
+  NotusAttribute<String> get alignJustify =>
+      NotusAttribute<String>._(key, scope, 'alignJustify');
 }
 
 class EmbedAttributeBuilder
@@ -399,6 +443,9 @@ class EmbedAttributeBuilder
 
   NotusAttribute<Map<String, dynamic>> image(String source) =>
       EmbedAttribute.image(source);
+
+  NotusAttribute<Map<String, dynamic>> video(String source) =>
+      EmbedAttribute.video(source);
 
   @override
   NotusAttribute<Map<String, dynamic>> get unset => EmbedAttribute._(null);
@@ -409,13 +456,14 @@ class EmbedAttributeBuilder
 }
 
 /// Type of embedded content.
-enum EmbedType { horizontalRule, image }
+enum EmbedType { horizontalRule, image, video }
 
 class EmbedAttribute extends NotusAttribute<Map<String, dynamic>> {
   static const _kValueEquality = MapEquality<String, dynamic>();
   static const _kEmbed = 'embed';
   static const _kHorizontalRuleEmbed = 'hr';
   static const _kImageEmbed = 'image';
+  static const _KVideoEmbed = 'video';
 
   EmbedAttribute._(Map<String, dynamic> value)
       : super._(_kEmbed, NotusAttributeScope.inline, value);
@@ -426,10 +474,14 @@ class EmbedAttribute extends NotusAttribute<Map<String, dynamic>> {
   EmbedAttribute.image(String source)
       : this._(<String, dynamic>{'type': _kImageEmbed, 'source': source});
 
+  EmbedAttribute.video(String source)
+      : this._(<String, dynamic>{'type': _KVideoEmbed, 'source': source});
+
   /// Type of this embed.
   EmbedType get type {
     if (value['type'] == _kHorizontalRuleEmbed) return EmbedType.horizontalRule;
     if (value['type'] == _kImageEmbed) return EmbedType.image;
+    if (value['type'] == _KVideoEmbed) return EmbedType.video;
     assert(false, 'Unknown embed attribute value $value.');
     return null;
   }

packages/notus/lib/src/document/block.dart

@@ -10,7 +10,7 @@ import 'node.dart';
 /// A block represents a group of adjacent [LineNode]s with the same block
 /// style.
 ///
-/// Block examples: lists, quotes, code snippets.
+/// Block examples: lists, quotes, code snippets, alignment.
 class BlockNode extends ContainerNode<LineNode>
     with StyledNodeMixin
     implements StyledNode {

packages/notus/lib/src/history.dart

@@ -0,0 +1,119 @@
+import 'package:notus/notus.dart';
+import 'package:notus/src/document.dart';
+import 'package:quill_delta/quill_delta.dart';
+
+///
+/// record users operation or api change(Collaborative editing)
+/// used for redo or undo function
+///
+class NotusHistory {
+  final NotusHistoryStack stack = NotusHistoryStack.empty();
+
+  /// used for disable redo or undo function
+  bool ignoreChange;
+
+  int lastRecorded;
+
+  ///Collaborative editing's conditions should be true
+  final bool userOnly;
+
+  ///max operation count for undo
+  final int maxStack;
+
+  ///record delay
+  final int interval;
+
+  NotusHistory(
+      {this.ignoreChange = false,
+      this.interval = 400,
+      this.maxStack = 100,
+      this.userOnly = false,
+      this.lastRecorded = 0});
+
+  void handleDocChange(NotusChange event) {
+    if (ignoreChange) return;
+    if (!userOnly || event.source == ChangeSource.local) {
+      record(event.change, event.before);
+    } else {
+      transform(event.change);
+    }
+  }
+
+  void clear() {
+    stack.clear();
+  }
+
+  void record(Delta change, Delta before) {
+    if (change.isEmpty) return;
+    stack.redo.clear();
+    Delta undoDelta = change.invert(before);
+    final timeStamp = DateTime.now().millisecondsSinceEpoch;
+
+    if (lastRecorded + interval > timeStamp && stack.undo.isNotEmpty) {
+      final lastDelta = stack.undo.removeLast();
+      undoDelta = undoDelta.compose(lastDelta);
+    } else {
+      lastRecorded = timeStamp;
+    }
+
+    if (undoDelta.isEmpty) return;
+    stack.undo.add(undoDelta);
+
+    if (stack.undo.length > maxStack) {
+      stack.undo.removeAt(0);
+    }
+  }
+
+  ///
+  ///It will override pre local undo delta,replaced by remote change
+  ///
+  void transform(Delta delta) {
+    transformStack(this.stack.undo, delta);
+    transformStack(this.stack.redo, delta);
+  }
+
+  void transformStack(List<Delta> stack, Delta delta) {
+    for (int i = stack.length - 1; i >= 0; i -= 1) {
+      final oldDelta = stack[i];
+      stack[i] = delta.transform(oldDelta, true);
+      delta = oldDelta.transform(delta, false);
+      if (stack[i].length == 0) {
+        stack.removeAt(i);
+      }
+    }
+  }
+
+  void _change(NotusDocument doc, List<Delta> source, List<Delta> dest) {
+    if (source.length == 0) return;
+    Delta delta = source.removeLast();
+    Delta base = doc.toDelta();
+    Delta inverseDelta = delta.invert(base);
+    dest.add(inverseDelta);
+    this.lastRecorded = 0;
+    this.ignoreChange = true;
+    doc.compose(delta, ChangeSource.local, history: true);
+    this.ignoreChange = false;
+  }
+
+  void undo(NotusDocument doc) {
+    _change(doc, stack.undo, stack.redo);
+  }
+
+  void redo(NotusDocument doc) {
+    _change(doc, stack.redo, stack.undo);
+  }
+}
+
+class NotusHistoryStack {
+  final List<Delta> undo;
+  final List<Delta> redo;
+
+  NotusHistoryStack.empty()
+      : undo = [],
+        redo = [];
+
+  void clear() {
+    undo.clear();
+    redo.clear();
+  }
+}

packages/notus/pubspec.yaml

@@ -5,7 +5,7 @@ author: Anatoly Pulyaevskiy <anatoly.pulyaevskiy@gmail.com>
 homepage: https://github.com/memspace/zefyr
 
 environment:
-  sdk: '>=2.2.0 <3.0.0'
+  sdk: ">=2.2.0 <3.0.0"
 
 dependencies:
   collection: ^1.14.6

packages/zefyr/example/android/gradle.properties

@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true

packages/zefyr/example/lib/generated_plugin_registrant.dart

@@ -0,0 +1,14 @@
+//
+// Generated file. Do not edit.
+//
+
+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+// ignore_for_file: lines_longer_than_80_chars
+
+import 'package:url_launcher_web/url_launcher_web.dart';
+
+// ignore: public_member_api_docs
+void registerPlugins(Registrar registrar) {
+  UrlLauncherPlugin.registerWith(registrar);
+  registrar.messenger; //registerMessageHandler();
+}

packages/zefyr/example/lib/src/form.dart

@@ -32,7 +32,7 @@ class _FormEmbeddedScreenState extends State<FormEmbeddedScreen> {
     );
 
     final result = Scaffold(
-      resizeToAvoidBottomPadding: true,
+      resizeToAvoidBottomInset: true,
       appBar: AppBar(
         title: ZefyrLogo(),
         actions: [