Some changes

Author: apiep

analysis_options.yml

@@ -1,3 +1,4 @@
 analyzer:
   enable-experiment:
     - control-flow-collections
+  exclude: ['**/*.g.dart', '**/*.freezed.dart']

lib/main.dart

@@ -21,7 +21,7 @@ extension on Router {
     String path, {
     Widget Function(BuildContext, Map<String, List<String>>) handler,
   }) {
-    this.define(
+    define(
       path,
       handler: Handler(handlerFunc: (ctx, args) => handler(ctx, args)),
     );
@@ -33,19 +33,18 @@ class _MyAppState extends State<MyApp> {
 
   _MyAppState() {
     router
-      ..handle('/login', handler: (_, __) => LoginPage())
-      ..handle(
-        '/room/:roomId',
-        handler: (_, args) => ChatPage(roomId: int.parse(args['roomId'][0])),
-      )
-      ..handle('/room/:roomId/detail',
-          handler: (_, args) => RoomDetailPage(
-                roomId: int.parse(args['roomId'][0]),
-              ))
-      ..handle(
-        '/room',
-        handler: (_, __) => RoomListPage(),
-      );
+          ..handle('/login', handler: (_, __) => LoginPage())
+          ..handle('/room/:roomId',
+              handler: (_, args) => ChatPage(
+                    roomId: int.parse(args['roomId'][0]),
+                  ))
+          ..handle('/room/:roomId/detail',
+              handler: (_, args) => RoomDetailPage(
+                    roomId: int.parse(args['roomId'][0]),
+                  ))
+          ..handle('/room', handler: (_, __) => RoomListPage())
+        //
+        ;
   }
 
   static final appState = AppState();

lib/src/page/chat_page.dart

@@ -21,7 +21,8 @@ class ChatPage extends StatefulWidget {
 class _ChatState extends State<ChatPage> {
   final scrollController = ScrollController();
   final scaffoldKey = GlobalKey<ScaffoldState>();
-  final _debounceTimer = TimerStream(true, const Duration(milliseconds: 500));
+  final _debounceTimer = TimerStream(true, const Duration(milliseconds: 500)) //
+      .asBroadcastStream();
   final scroll$ = StreamController<ScrollNotification>();
   final typing$ = StreamController();
 
@@ -168,7 +169,7 @@ class _ChatState extends State<ChatPage> {
     var messageState = Provider.of<MessageState>(context, listen: false);
 
     controller.addListener(() {
-      print('controller listener');
+      typing$.sink.add(null);
     });
 
     final submit = (String message) {
@@ -250,7 +251,7 @@ class _ChatState extends State<ChatPage> {
     return Expanded(
       child: NotificationListener<ScrollNotification>(
         onNotification: (notification) {
-          scroll$.add(notification);
+          scroll$.sink.add(notification);
           return true;
         },
         child: Consumer<MessageState>(builder: (_, state, __) {

lib/src/page/login_page.dart

@@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:qiscus_chat_sample/src/state/app_state.dart';
-import 'package:qiscus_chat_sample/src/state/room_state.dart';
 
 class LoginPage extends StatefulWidget {
   @override
@@ -14,7 +13,6 @@ class _LoginState extends State<LoginPage> {
   var _appIdController = TextEditingController(text: 'sdksample');
   var _userIdController = TextEditingController(text: 'guest-1002');
   var _userKeyController = TextEditingController(text: 'passkey');
-  var _targetController = TextEditingController(text: 'guest-1001');
 
   var isLoggingIn = false;
 
@@ -26,16 +24,18 @@ class _LoginState extends State<LoginPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: DecoratedBox(
-        decoration: BoxDecoration(
-          image: DecorationImage(
-            image: Image.asset('assets/login-background.png').image,
-            fit: BoxFit.cover,
+      body: SafeArea(
+        child: DecoratedBox(
+          decoration: BoxDecoration(
+            image: DecorationImage(
+              image: Image.asset('assets/login-background.png').image,
+              fit: BoxFit.cover,
+            ),
+          ),
+          child: Form(
+            key: _loginFormKey,
+            child: buildContainer(),
           ),
-        ),
-        child: Form(
-          key: _loginFormKey,
-          child: buildContainer(),
         ),
       ),
     );
@@ -67,21 +67,6 @@ class _LoginState extends State<LoginPage> {
             controller: _userKeyController,
             decoration: InputDecoration(labelText: 'User Key'),
           ),
-          TextFormField(
-            autovalidate: true,
-            validator: (text) {
-              var noWhitespace = _noWhitespaceValidator(text);
-              if (noWhitespace != null) {
-                return noWhitespace;
-              }
-              if (text == _userIdController.text) {
-                return 'One doesn\'t simply, text to yourself';
-              }
-              return null;
-            },
-            controller: _targetController,
-            decoration: InputDecoration(labelText: 'Chat Target'),
-          ),
           Padding(
             padding: const EdgeInsets.only(top: 40.0),
             child: RaisedButton(
@@ -104,12 +89,10 @@ class _LoginState extends State<LoginPage> {
 
   _doLogin() async {
     var appState = Provider.of<AppState>(context, listen: false);
-    var roomState = Provider.of<RoomState>(context, listen: false);
     if (_loginFormKey.currentState.validate()) {
       var appId = _appIdController.text;
       var userId = _userIdController.text;
       var userKey = _userKeyController.text;
-      var target = _targetController.text;
 
       setState(() {
         isLoggingIn = true;

lib/src/state/room_state.dart

@@ -99,9 +99,12 @@ class RoomState extends ChangeNotifier {
     Timer _timer;
     var unsubscribe = qiscus.onUserTyping((userId, roomId, isTyping) {
       if (_timer != null) _timer.cancel();
-      _typing$.add(Typing(userId, roomId, isTyping));
+      if (userId != appState.userId) {
+        _typing$.add(Typing(userId, roomId, isTyping));
+      }
       _timer = Timer(const Duration(seconds: 2), () {
         _typing$.add(Typing(userId, roomId, false));
+        qiscus.publishTyping(roomId: roomId, isTyping: false);
       });
     });
     _typing$.onCancel = () => unsubscribe();
@@ -117,7 +120,6 @@ class RoomState extends ChangeNotifier {
   Stream<Online> get onPresence {
     var unsubscribe = qiscus.onUserOnlinePresence(
       (userId, isOnline, lastOnline) {
-        print('on presence: $userId $isOnline $lastOnline');
         _online$.add(Online(userId, isOnline, lastOnline));
       },
     );

lib/src/widget/chat_bubble.dart

@@ -66,7 +66,4 @@ class ChatBubble extends StatelessWidget {
       ),
     );
   }
-
-  String _getThumbnailUrl(String url) =>
-      url.replaceAll(r'/upload/', '/upload/w_30,c_scale/');
 }

pubspec.lock

@@ -36,13 +36,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.0"
-  bloc:
-    dependency: "direct main"
-    description:
-      name: bloc
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -155,6 +148,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.16.1"
+  cuid:
+    dependency: "direct main"
+    description:
+      name: cuid
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -230,34 +230,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_bloc:
-    dependency: "direct main"
-    description:
-      name: flutter_bloc
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.2.0"
-  flutter_mobx:
-    dependency: "direct main"
-    description:
-      name: flutter_mobx
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.6"
-  flutter_redux:
-    dependency: "direct main"
-    description:
-      name: flutter_redux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -389,20 +368,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.9.6+3"
-  mobx:
-    dependency: "direct main"
-    description:
-      name: mobx
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.2+1"
-  mobx_codegen:
-    dependency: "direct dev"
-    description:
-      name: mobx_codegen
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.2"
   mqtt_client:
     dependency: transitive
     description:
@@ -504,11 +469,9 @@ packages:
   qiscus_chat_sdk:
     dependency: "direct main"
     description:
-      path: "."
-      ref: master
-      resolved-ref: "4cdb999f1b701ad03e43941b18c67d687a957c5e"
-      url: "git://github.com/qiscus/qiscus-chat-sdk-flutter.git"
-    source: git
+      path: "..\\qiscus-chat-sdk-flutter"
+      relative: true
+    source: path
     version: "0.1.0"
   quiver:
     dependency: transitive
@@ -517,20 +480,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
-  redux:
-    dependency: "direct main"
-    description:
-      name: redux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.0.0"
-  redux_thunk:
-    dependency: "direct main"
-    description:
-      name: redux_thunk
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.0"
   retrofit:
     dependency: transitive
     description:

pubspec.yaml

@@ -7,25 +7,19 @@ environment:
 
 dependencies:
   timeago: ^2.0.26
-  bloc: ^3.0.0
-  flutter_bloc: ^3.2.0
   provider: ^4.0.4
   async:
-  mobx: ^1.0.2+1
-  flutter_mobx: ^1.0.1
   fluttertoast: ^3.1.3
-  flutter_redux: ^0.6.0
   file_picker: ^1.5.1
-  redux: ^4.0.0
-  redux_thunk: ^0.3.0
   freezed_annotation:
   fluro: ^1.6.1
   date_format: ^1.0.8
+  cuid: ^0.1.2
   qiscus_chat_sdk:
-    #    path: ../qiscus-chat-sdk-flutter
-    git:
-      url: git://github.com/qiscus/qiscus-chat-sdk-flutter.git
-      ref: master
+    path: ../qiscus-chat-sdk-flutter
+    # git:
+    #   url: git://github.com/qiscus/qiscus-chat-sdk-flutter.git
+    #   ref: master
   flutter:
     sdk: flutter
 
@@ -34,7 +28,6 @@ dependencies:
   cupertino_icons: ^0.1.2
 
 dev_dependencies:
-  mobx_codegen: ^1.0.2
   build_runner:
   freezed:
   flutter_test: