Merge branch 'feature/new-ui' into feature/mono-repo

packages/flutter_widgets/example/android/app/build.gradle

@@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.0.7026061'
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

packages/flutter_widgets/example/lib/main.dart

@@ -763,7 +763,7 @@ class _ChannelPageState extends State<ChannelPage> {
   }
 }
 
-class ThreadPage extends StatelessWidget {
+class ThreadPage extends StatefulWidget {
   final Message parent;
   final int initialScrollIndex;
   final double initialAlignment;
@@ -775,25 +775,54 @@ class ThreadPage extends StatelessWidget {
     this.initialAlignment,
   }) : super(key: key);
 
+  @override
+  _ThreadPageState createState() => _ThreadPageState();
+}
+
+class _ThreadPageState extends State<ThreadPage> {
+  Message _quotedMessage;
+  FocusNode _focusNode = FocusNode();
+
+  @override
+  void dispose() {
+    _focusNode.dispose();
+    super.dispose();
+  }
+
+  void _reply(Message message) {
+    setState(() => _quotedMessage = message);
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      _focusNode.requestFocus();
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
       appBar: ThreadHeader(
-        parent: parent,
+        parent: widget.parent,
       ),
       body: Column(
         children: <Widget>[
           Expanded(
             child: MessageListView(
-              parentMessage: parent,
-              initialScrollIndex: initialScrollIndex,
-              initialAlignment: initialAlignment,
+              parentMessage: widget.parent,
+              initialScrollIndex: widget.initialScrollIndex,
+              initialAlignment: widget.initialAlignment,
+              onMessageSwiped: _reply,
+              onReplyTap: _reply,
             ),
           ),
-          if (parent.type != 'deleted')
+          if (widget.parent.type != 'deleted')
             MessageInput(
-              parentMessage: parent,
+              parentMessage: widget.parent,
+              focusNode: _focusNode,
+              quotedMessage: _quotedMessage,
+              onQuotedMessageCleared: () {
+                setState(() => _quotedMessage = null);
+                _focusNode.unfocus();
+              },
             ),
         ],
       ),

packages/flutter_widgets/example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: example
 description: A new Flutter project.
-version: 1.1.1+2
+version: 1.1.1+3
 
 environment:
   sdk: ">=2.2.2 <3.0.0"