Fix/#148 fix

assets/translations/en-US.json

@@ -245,7 +245,7 @@
   "chatting-report5": "Scam",
   "chatting-report6": "Etc",
   "chatting-report7": "Please write down the reason for reporting.",
-  "chatting-report8": "A report is received",
+  "chatting-report8": "A report is received. \nOnce you submit your app for reviews, it takes about 24-48 hrs",
   "chatting-block1": "Block",
   "chatting-block2": "Do you want to block this user?",
   "chatting-block3": "You can't receive or send messages, and can't rematch with blocked users.",

assets/translations/ko-KR.json

@@ -247,7 +247,7 @@
   "chatting-report5": "사기",
   "chatting-report6": "기타",
   "chatting-report7": "신고 사유를 적어주세요.",
-  "chatting-report8": "신고가 접수되었습니다.",
+  "chatting-report8": "신고가 접수되었습니다. \n검토까지는 최대 24시간 소요됩니다.",
   "chatting-block1": "차단하기",
   "chatting-block2": "사용자를 차단하시겠습니까?",
   "chatting-block3": "메세지 수신 및 발신이 모두 차단되며, 차단된 상대방과는 재매칭이 불가합니다.",
@@ -270,7 +270,6 @@
   "market-posting-title-error": "최대 30자까지 입력가능합니다.",
   "market_noti": "장터게시판 이용 시 주의사항",
   "market-productStatus" : "상품 상태",
-  "modify": "수정하기",
 
 
   "board": "게시판",

ios/Runner.xcodeproj/project.pbxproj

@@ -369,15 +369,22 @@
 				DEVELOPMENT_TEAM = 7CMQ9ZRHWF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Friendship;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aliens.friendship;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -502,16 +509,23 @@
 				DEVELOPMENT_TEAM = 7CMQ9ZRHWF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Friendship;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aliens.friendship;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -529,15 +543,22 @@
 				DEVELOPMENT_TEAM = 7CMQ9ZRHWF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Friendship;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aliens.friendship;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

lib/views/components/board_dialog_widget.dart

@@ -1,3 +1,4 @@
+import 'package:aliens/mockdatas/board_mockdata.dart';
 import 'package:aliens/models/memberDetails_model.dart';
 import 'package:aliens/models/partner_model.dart';
 import 'package:aliens/models/screenArgument.dart';
@@ -58,7 +59,7 @@ class BoardDialog extends StatelessWidget{
                 Navigator.pop(context);
                 showDialog(
                     context: context,
-                    builder: (builder) => ReportDialog(partner: Partner(), context: context));
+                    builder: (builder) => ReportDialog(memberId: board.member!.memberId!, context: context));
               },
               child: Container(
                 padding: EdgeInsets.all(13).r,

lib/views/components/chat_dialog_widget.dart

@@ -61,7 +61,7 @@ class ChatDialog extends StatelessWidget{
               onTap: (){
                 Navigator.pop(context);
                 showDialog(context: context, builder: (context){
-                  return ReportDialog(partner: partner, context: context);
+                  return ReportDialog(memberId: partner.memberId!, context: context);
                 });
               },
               child: Container(

lib/views/components/comment_dialog_widget.dart

@@ -132,7 +132,7 @@ class CommentDialog extends StatelessWidget{
                 Navigator.pop(context);
                 showDialog(
                     context: context,
-                    builder: (builder) => ReportDialog(partner: Partner(), context: context));
+                    builder: (builder) => ReportDialog(memberId: comment.member!.memberId!, context: context));
 
               },
               child: Container(

lib/views/components/home_widget.dart

@@ -47,7 +47,7 @@ class HomeWidget extends StatelessWidget{
                                   fontSize: 24.spMin,
                                   fontWeight: FontWeight.bold,
                                   color: Colors.black,
-                                  height: 1.5)),
+                                  height: 1.5.h)),
                           TextSpan(
                               text: '${'homepage-welcome1.2'.tr()}\n',
                               style: TextStyle(
@@ -64,20 +64,20 @@ class HomeWidget extends StatelessWidget{
                                   fontSize: 24.spMin,
                                   fontWeight: FontWeight.bold,
                                   color: Colors.black,
-                                  height: 1.5)),
+                                  height: 1.5.h)),
                         ]),
                         TextSpan(
                             text: '${'homepage-happy'.tr()}\n',
                             style: TextStyle(
                                 fontSize: 12.spMin,
                                 color: Color(0xff888888),
-                                height: 2)),
+                                height: 2.h)),
                         TextSpan(
                             text: '${'homepage-positive1'.tr()} ',
                             style: TextStyle(
                                 fontSize: 12.spMin,
                                 color: Color(0xff888888),
-                                height: 1.5)),
+                                height: 1.5.h)),
                         TextSpan(
                             text: '${'homepage-positive2'.tr()}'
                             /*'${args.memberDetails?.mbti}'*/,

lib/views/components/liked_post_widget.dart

@@ -4,6 +4,7 @@ import 'package:aliens/apis/apis.dart';
 import 'package:aliens/apis/apis.dart';
 import 'package:aliens/models/memberDetails_model.dart';
 import 'package:aliens/models/message_model.dart';
+import 'package:aliens/models/screenArgument.dart';
 import 'package:aliens/views/pages/board/article_writing_page.dart';
 import 'package:aliens/views/pages/board/info_article_page.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -14,17 +15,19 @@ import 'package:flutter_svg/svg.dart';
 import 'package:provider/provider.dart';
 import 'dart:convert';
 import '../../models/board_model.dart';
+import '../../models/market_articles.dart';
 import '../../repository/board_provider.dart';
 import '../pages/board/article_page.dart';
+import '../pages/board/market_detail_page.dart';
 import 'board_dialog_widget.dart';
 
 class LikedArticleWidget extends StatefulWidget {
 
-  LikedArticleWidget({super.key, required this.board, required this.nationCode, required this.memberDetails, required this.index});
+  LikedArticleWidget({super.key, required this.board, required this.nationCode, required this.screenArguments, required this.index});
 
   final Board board;
   final String nationCode;
-  final MemberDetails memberDetails;
+  final ScreenArguments screenArguments;
   final int index;
   @override
   State<StatefulWidget> createState() => _LikedArticleWidgetWidgetState();
@@ -138,7 +141,7 @@ class _LikedArticleWidgetWidgetState extends State<LikedArticleWidget>{
                         context: context,
                         builder: (builder) {
                           return BoardDialog(
-                            context: context, board: widget.board, memberDetails: widget.memberDetails, boardCategory: "좋아하는 게시글",
+                            context: context, board: widget.board, memberDetails: widget.screenArguments.memberDetails!, boardCategory: "좋아하는 게시글",
                           );
                         });
                   },
@@ -189,18 +192,54 @@ class _LikedArticleWidgetWidgetState extends State<LikedArticleWidget>{
           ),
         ),
         onTap: () {
+          print(widget.board.category);
           if (widget.board.category == "정보게시판") {
             Navigator.push(
               context,
               MaterialPageRoute(
                   builder: (context) =>
                       InfoArticlePage(board: widget.board)),
             );
-          } else {
+          }
+          else if(widget.board.category == "장터게시판"){
+            showDialog(
+                context: context,
+                builder: (_) => FutureBuilder(
+                    future: APIs.getMarketArticle(widget.board.articleId!),
+                    builder: (BuildContext context,
+                        AsyncSnapshot snapshot) {
+                      if (snapshot.connectionState == ConnectionState.waiting) {
+                        //받아오는 동안
+                        return Container(
+                            child: Image(
+                                image: AssetImage(
+                                    "assets/illustration/loading_01.gif")));
+                      } else{
+                        MarketBoard data = snapshot.data;
+                        //받아온 후
+                        WidgetsBinding.instance!.addPostFrameCallback((_) {
+                          Navigator.pop(context);
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(builder: (context) => MarketDetailPage(screenArguments: widget.screenArguments, marketBoard: data,
+                              productStatus: getProductStatusText(data.productStatus),
+                              StatusText: getStatusText(data.marketArticleStatus),
+                              index: -1,)),
+                          );
+                        });
+                        return Container(
+                            child: Image(
+                                image: AssetImage(
+                                    "assets/illustration/loading_01.gif")));
+                      }
+
+                    }));
+          }
+          else {
             Navigator.push(
               context,
               MaterialPageRoute(
-                  builder: (context) => ArticlePage(board: widget.board, memberDetails: widget.memberDetails, index: widget.index )),
+                  builder: (context) => ArticlePage(board: widget.board, memberDetails: widget.screenArguments.memberDetails!, index: widget.index,)),
             );
           }
         },

lib/views/components/market_dialog_widget.dart

@@ -64,7 +64,7 @@ class MarketBoardDialog extends StatelessWidget{
                 Navigator.pop(context);
                 showDialog(
                     context: context,
-                    builder: (builder) => ReportDialog(partner: Partner(), context: context));
+                    builder: (builder) => ReportDialog(memberId: marketBoard.member!.memberId!, context: context));
               },
               child: Container(
                 padding: EdgeInsets.all(13).r,

lib/views/components/marketcomment_dialog.dart

@@ -102,7 +102,7 @@ class MarketCommentDialog extends StatelessWidget{
                 Navigator.pop(context);
                 showDialog(
                     context: context,
-                    builder: (builder) => ReportDialog(partner: Partner(), context: context));
+                    builder: (builder) => ReportDialog(memberId: marketcomment.member!.memberId!, context: context));
 
               },
               child: Container(

lib/views/components/report_dialog_widget.dart

@@ -12,12 +12,12 @@ import '../../apis/apis.dart';
 
 
 class ReportDialog extends StatefulWidget {
-  final Partner partner;
+  final int memberId;
   final BuildContext context;
 
   const ReportDialog({
     Key? key,
-    required this.partner,
+    required this.memberId,
     required this.context
   }) : super(key: key);
   @override
@@ -41,7 +41,7 @@ class _ReportDialogState extends State<ReportDialog>{
   ["SCAM", 'chatting-report5'.tr()],
   ["ETC", 'chatting-report6'.tr()]
   ];
-  final TextEditingController _textEditingController = TextEditingController(text: ' ');
+  final TextEditingController _textEditingController = TextEditingController();
 
   String? _reportReason = 'chatting-report2'.tr();
   Widget androidReport(){
@@ -142,7 +142,7 @@ class _ReportDialogState extends State<ReportDialog>{
               break;
             }
           }
-          if(await APIs.reportPartner(reportCategory, _textEditingController.text, widget.partner.memberId!)){
+          if(await APIs.reportPartner(reportCategory, _textEditingController.text, widget.memberId)){
             Navigator.pop(context);
             showDialog(context: context, builder: (context){
               return AlertDialog(

lib/views/components/total_article_widget.dart

@@ -302,7 +302,8 @@ class _TotalArticleWidgetState extends State<TotalArticleWidget>{
                             productStatus: getProductStatusText(data.productStatus),
                             StatusText: getStatusText(data.marketArticleStatus),
                             index: -1,)),
-                        );
+                        ).then((value) =>
+                              boardProvider.getAllArticles());
                         });
                         return Container(
                             child: Image(

lib/views/pages/board/article_page.dart

@@ -312,7 +312,8 @@ class _ArticlePageState extends State<ArticlePage> {
                         Container(
                           child: Column(
                             children: [
-                              Padding(
+
+                              Container(
                                 padding: EdgeInsets.symmetric(vertical: 15, horizontal: 30).r,
                                 child: Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,
@@ -400,6 +401,7 @@ class _ArticlePageState extends State<ArticlePage> {
                                     ),
                                   ],
                                 ),
+                                color: parentsCommentId == commentProvider.commentListData![index].articleCommentId ? Color(0xffF5F7FF) : Colors.white,
                               ),
 
                               //대댓글

lib/views/pages/board/market_detail_page.dart

@@ -417,7 +417,7 @@ class _MarketDetailPageState extends State<MarketDetailPage> {
                               Container(
                                 child: Column(
                                   children: [
-                                    Padding(
+                                    Container(
                                       padding: EdgeInsets.symmetric(vertical: 15, horizontal: 30).r,
                                       child: Column(
                                         crossAxisAlignment: CrossAxisAlignment.start,
@@ -503,6 +503,7 @@ class _MarketDetailPageState extends State<MarketDetailPage> {
                                           ),
                                         ],
                                       ),
+                                      color: parentsCommentId == marketcommentProvider.commentListData![index].articleCommentId ? Color(0xffF5F7FF) : Colors.white,
                                     ),
 
                                     //대댓글

lib/views/pages/board/my_article_page.dart

@@ -197,7 +197,7 @@ class _MyArticlePageState extends State<MyArticlePage> {
                               children: [
                                 LikedArticleWidget(
                                     board: boardProvider.articleList![index],
-                                    nationCode: nationCode, memberDetails: widget.screenArguments.memberDetails!,
+                                    nationCode: nationCode, screenArguments: widget.screenArguments!,
                                   index: index
                                 ),
                                 Divider(

lib/views/pages/matching/matching_choose_page.dart

@@ -433,8 +433,8 @@ class LanguageButton extends StatelessWidget {
                   children: [
                     Container(
                         child : SvgPicture.asset(puzzle,
-                          width: 45.r,
-                          height: 45.r,
+                          width: 40.r,
+                          height: 40.r,
                         )
                     ),
                     Container(
@@ -479,7 +479,7 @@ class LanguageButton extends StatelessWidget {
                       language,
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
-                        fontSize:20.spMin,
+                        fontSize:18.spMin,
                         color: selectedFirst || selectedSecond
                             ? Colors.white
                             : Colors.black,