Merge branch 'fix/message' into dev

FiveNemos · Jul 29, 2022 · 8f42391 · 8f42391
2 parents b21aa40 + f6525d3
commit 8f42391
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/screens/message/chat_detail_page.dart b/lib/screens/message/chat_detail_page.dart
@@ -8,7 +8,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:intl/intl.dart';
 
 class ChatScreen extends StatefulWidget {
-  var chatroomID;
+  int chatroomID;
   int loginID;
   int friendID;
   String friendName;
@@ -33,7 +33,7 @@ class _ChatScreenState extends State<ChatScreen> {
   final TextEditingController _messageController = TextEditingController();
   final ScrollController _scrollController = ScrollController();
 
-  getChatMessages(chatroomid) async {
+  getChatMessages(int chatroomid) async {
     try {
       var dio = Dio();
       Response response = await dio.get(

diff --git a/lib/screens/mypage/profile_page.dart b/lib/screens/mypage/profile_page.dart
@@ -300,11 +300,12 @@ class _ProfilePageState extends State<ProfilePage> {
                             var roomID =
                                 await getChatRoom(loginID, widget.friendId);
                             if (!mounted) return;
-                            if (int.parse(roomID) > 0) {
+                            int chatroomID = int.parse(roomID);
+                            if (chatroomID > 0) {
                               Navigator.push(context,
                                   MaterialPageRoute(builder: (context) {
                                 return ChatScreen(
-                                  chatroomID: roomID, // chatroomID // 수정필요
+                                  chatroomID: chatroomID, // chatroomID // 수정필요
                                   loginID: loginID,
                                   friendID: widget.friendId!, // not isMe
                                   friendName: user.nickname,