Merge pull request #34 from geeker-ai/wrong-style

Wrong style
geeker-ai · Oct 27, 2023 · 78f6699 · 78f6699
2 parents d4e64d5 + 0909a9e
commit 78f6699
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/lib/components/desktop_main_right_component.dart b/lib/components/desktop_main_right_component.dart
@@ -72,8 +72,8 @@ class DeskTopMainRightComponent extends StatelessWidget {
             20);
   }
 
-  void scrollToBottom() {
-    scrollController.animateTo(
+  Future<void> scrollToBottom() {
+    return scrollController.animateTo(
       scrollController.position.minScrollExtent,
       duration: const Duration(milliseconds: 500),
       curve: Curves.linear,
@@ -294,7 +294,8 @@ class QuestionInputComponent extends StatelessWidget {
               focusedBorder: InputBorder.none,
               filled: false,
               suffixIcon: IconButton(
-                  onPressed: () {
+                  onPressed: () async {
+                    await scrollToBottom();
                     controller.submit(sid, onDone: () {
                       chatListController.updateSessionLastEdit(
                           chatListController.currentSession);
@@ -304,7 +305,6 @@ class QuestionInputComponent extends StatelessWidget {
                           chatListController.currentSession);
                       chatListController.update();
                     });
-                    scrollToBottom();
                   },
                   icon: const Icon(Icons.send)),
             ),
@@ -316,7 +316,8 @@ class QuestionInputComponent extends StatelessWidget {
               controller.inputQuestion = value;
               // controller.update(['inputQuestion']);
             },
-            onSubmitted: (String value) {
+            onSubmitted: (String value) async {
+              await scrollToBottom();
               controller.submit(sid, onDone: () {
                 chatListController
                     .updateSessionLastEdit(chatListController.currentSession);
@@ -326,7 +327,6 @@ class QuestionInputComponent extends StatelessWidget {
                     .updateSessionLastEdit(chatListController.currentSession);
                 chatListController.update();
               });
-              scrollToBottom();
             },
             onTap: () {
               //

diff --git a/lib/pages/chat_message_page.dart b/lib/pages/chat_message_page.dart
@@ -30,8 +30,8 @@ class ChatMessagePage extends StatelessWidget {
   ChatListController chatListController = Get.find<ChatListController>();
   TextEditingController textEditingController = TextEditingController();
 
-  void scrollToBottom() {
-    scrollController.animateTo(scrollController.position.maxScrollExtent,
+  scrollToBottom() {
+    return scrollController.animateTo(scrollController.position.minScrollExtent,
         duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
   }
 
@@ -104,12 +104,33 @@ class ChatMessagePage extends StatelessWidget {
                               minLines: 1,
                               maxLines: 3,
                               textInputAction: TextInputAction.go,
-                              decoration: const InputDecoration(filled: false),
+                              decoration: InputDecoration(
+                                  filled: false,
+                                  suffixIcon: IconButton(
+                                      onPressed: () async {
+                                        await scrollToBottom();
+                                        controller.submit(sid ?? '',
+                                            onDone: () {
+                                          chatListController
+                                              .updateSessionLastEdit(
+                                                  chatListController
+                                                      .currentSession);
+                                          chatListController.update();
+                                        }, onError: () {
+                                          chatListController
+                                              .updateSessionLastEdit(
+                                                  chatListController
+                                                      .currentSession);
+                                          chatListController.update();
+                                        });
+                                      },
+                                      icon: const Icon(Icons.send))),
                               onChanged: (value) {
                                 controller.inputQuestion = value;
                               },
-                              onSubmitted: (String value) {
+                              onSubmitted: (String value) async {
                                 // onSubmit();
+                                await scrollToBottom();
                                 controller.submit(sid ?? '', onDone: () {
                                   chatListController.updateSessionLastEdit(
                                       chatListController.currentSession);

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -50,4 +50,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.14.1