done

Dat-TG · Dec 29, 2023 · 877aa9e · 877aa9e
1 parent e25c940
commit 877aa9e
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 5 deletions.
diff --git a/lib/core/widgets/main_drawer.dart b/lib/core/widgets/main_drawer.dart
@@ -36,6 +36,9 @@ class _MainDrawerState extends State<MainDrawer> {
  Navigator.pop(context);
  },
  ),
+ Divider(
+ height: 1,
+ ),
  Expanded(
  child: Observer(builder: (context) {
  if (_chatStore.isLoadingChatThreads) {
@@ -44,6 +47,7 @@ class _MainDrawerState extends State<MainDrawer> {
  );
  }
  return ListView(
+ clipBehavior: Clip.antiAlias,
  padding: EdgeInsets.zero,
  children: _chatStore.chatThreads
  .map(
@@ -60,6 +64,17 @@ class _MainDrawerState extends State<MainDrawer> {
  );
  }),
  ),
+ Divider(
+ height: 1,
+ ),
+ ListTile(
+ leading: FaIcon(
+ FontAwesomeIcons.solidStar,
+ size: 20,
+ ),
+ title: Text('Lê Công Đắt'),
+ minLeadingWidth: 10,
+ ),
  ],
  ),
  );

diff --git a/lib/data/local/datasources/message/message_datasource.dart b/lib/data/local/datasources/message/message_datasource.dart
@@ -1,7 +1,6 @@
 import 'package:boilerplate/core/data/local/sembast/sembast_client.dart';
 import 'package:boilerplate/data/local/constants/db_constants.dart';
 import 'package:boilerplate/domain/entity/message/chat_thread.dart';
-import 'package:boilerplate/domain/entity/post/post.dart';
 import 'package:sembast/sembast.dart';
 
 class MessageDataSource {

diff --git a/lib/data/network/apis/message/message_api.dart b/lib/data/network/apis/message/message_api.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: unused_field
+
 import 'dart:async';
 
 import 'package:boilerplate/core/data/network/dio/dio_client.dart';

diff --git a/lib/data/network/apis/posts/post_api.dart b/lib/data/network/apis/posts/post_api.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: unused_field
+
 import 'dart:async';
 
 import 'package:boilerplate/core/data/network/dio/dio_client.dart';
@@ -26,13 +28,12 @@ class PostApi {
  }
  }
 
-/// sample api call with default rest client
+ /// sample api call with default rest client
 // Future<PostsList> getPosts() {
 //
 // return _restClient
 // .get(Endpoints.getPosts)
 // .then((dynamic res) => PostsList.fromJson(res))
 // .catchError((error) => throw NetworkException(message: error));
 // }
-
 }
diff --git a/lib/presentation/chat_screen/chat_screen.dart b/lib/presentation/chat_screen/chat_screen.dart
@@ -21,8 +21,10 @@ class _ChatScreenState extends State<ChatScreen> {
 
  void scrollToBottom() {
  if (_controller.hasClients) {
- _controller.jumpTo(
+ _controller.animateTo(
  _controller.position.maxScrollExtent,
+ duration: Duration(seconds: 1),
+ curve: Curves.fastOutSlowIn,
  );
  }
  }
@@ -37,6 +39,11 @@ class _ChatScreenState extends State<ChatScreen> {
 
  ChatStore _chatStore = getIt<ChatStore>();
 
+ @override
+ void initState() {
+ super.initState();
+ }
+
  @override
  void dispose() {
  _controller.dispose();
@@ -62,13 +69,18 @@ class _ChatScreenState extends State<ChatScreen> {
  print('new chat thread index: ${chatThreadIndex}');
  print(_chatStore
  .chatThreads[chatThreadIndex].messages[1].message.content);
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ scrollToBottom();
+ });
+
  if (_chatStore.chatThreads[chatThreadIndex].messages.isEmpty) {
  return const Center(
  child: Text('No messages yet'),
  );
  }
  return ListView.builder(
  controller: _controller,
+ physics: AlwaysScrollableScrollPhysics(),
  itemCount:
  _chatStore.chatThreads[chatThreadIndex].messages.length +
  (_chatStore.isLoading ? 1 : 0),
@@ -143,7 +155,14 @@ class _ChatScreenState extends State<ChatScreen> {
  : Theme.of(context).colorScheme.primary),
  padding: const EdgeInsets.only(
  left: 16, right: 16, top: 16, bottom: 16),
- child: ((index ==
+ child: ((DateTime.now()
+ .difference(_chatStore
+ .chatThreads[chatThreadIndex]
+ .messages[index]
+ .time)
+ .inSeconds <
+ 30) &&
+ (index ==
  _chatStore.chatThreads[chatThreadIndex]
  .messages.length -
  1) &&
@@ -205,6 +224,7 @@ class _ChatScreenState extends State<ChatScreen> {
  ),
  ChatInput(onSend: (String content) {
  _chatStore.sendMessage(content);
+ scrollToBottom();
  }),
  ],
  );

diff --git a/lib/presentation/home_demo/store/language/language_store.dart b/lib/presentation/home_demo/store/language/language_store.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: unused_field, override_on_non_overriding_member
+
 import 'package:boilerplate/core/stores/error/error_store.dart';
 import 'package:boilerplate/domain/entity/language/Language.dart';
 import 'package:boilerplate/domain/repository/setting/setting_repository.dart';

diff --git a/lib/presentation/home_demo/store/theme/theme_store.dart b/lib/presentation/home_demo/store/theme/theme_store.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: override_on_non_overriding_member
+
 import 'package:boilerplate/core/stores/error/error_store.dart';
 import 'package:boilerplate/domain/repository/setting/setting_repository.dart';
 import 'package:flutter/material.dart';