Fix reported screen

Team-Mingle · Apr 11, 2024 · 040062c · 040062c
1 parent 1c2cac7
commit 040062c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 28 deletions.
diff --git a/mingle/lib/common/component/general_post_preview_card.dart b/mingle/lib/common/component/general_post_preview_card.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:mingle/common/component/reported_component.dart';
 import 'package:mingle/common/const/colors.dart';
 import 'package:mingle/common/model/cursor_pagination_model.dart';
 import 'package:mingle/post/components/indicator_widget.dart';
@@ -244,7 +245,8 @@ class _GeneralPostPreviewCardState extends ConsumerState<GeneralPostPreviewCard>
                                   );
                             }
                             final post = postList.data[index];
-                            final reported = post.status == "REPORTED";
+                            final reported = post.status == "REPORTED" ||
+                                post.status == "DELETED";
                             return Column(
                               children: [
                                 // 첫번째 줄에만 padding

diff --git a/mingle/lib/common/component/reported_component.dart b/mingle/lib/common/component/reported_component.dart
@@ -9,20 +9,14 @@ class ReportedComponent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return SingleChildScrollView(
+    return Center(
       child: Column(
         children: [
-          Center(
-            child: Column(
-              children: [
-                Text(reportedTitle),
-                Text(
-                  reportedReason,
-                  style: const TextStyle(color: PRIMARY_COLOR_ORANGE_01),
-                )
-              ],
-            ),
-          ),
+          Text(reportedTitle),
+          Text(
+            reportedReason,
+            style: const TextStyle(color: PRIMARY_COLOR_ORANGE_01),
+          )
         ],
       ),
     );

diff --git a/mingle/lib/main.dart b/mingle/lib/main.dart
@@ -17,6 +17,7 @@ import 'package:mingle/timetable/view/timetable_tab_screen.dart';
 import 'package:mingle/user/view/signup_screen/enter_free_domain_email_screen.dart';
 import 'package:mingle/user/view/signup_screen/enter_offer_id_screen.dart';
 import 'package:mingle/user/view/signup_screen/finish_temp_signup_screen.dart';
+import 'package:mingle/user/view/signup_screen/service_agreement_screen.dart';
 import 'package:mingle/user/view/signup_screen/upload_identification_screen.dart';
 
 final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
@@ -260,12 +261,12 @@ class _AppState extends ConsumerState<_App> {
           FirebaseAnalyticsObserver(analytics: analytics),
         ],
         debugShowCheckedModeBanner: false,
-        home:
-            //  const EnterOfferIdScreen()
-            // const FinishTempSinupScreen(),
-            // const TimeTableHomeScreen()
+        home: const SplashScreen(),
+        //  const EnterOfferIdScreen()
+        // const FinishTempSinupScreen(),
+        // const TimeTableHomeScreen()
 
-            const SplashScreen(),
+        // const ServiceAgreementScreen(),
       ),
     );
   }

diff --git a/mingle/lib/post/view/post_detail_screen.dart b/mingle/lib/post/view/post_detail_screen.dart
@@ -379,7 +379,7 @@ class _PostDetailScreenState extends ConsumerState<PostDetailScreen> {
 
   Widget renderContent(PostModel post) {
     print(post.status);
-    bool reported = post.status == "REPORTED";
+    bool reported = post.status == "REPORTED" || post.status == "DELETED";
     print(PostModel.convertUTCtoLocalPreview(post.createdAt));
     print("post is detail model? ${post is PostDetailModel}");
     String createdAtLocal = PostModel.convertUTCtoLocal(post.createdAt);
@@ -500,11 +500,9 @@ class _PostDetailScreenState extends ConsumerState<PostDetailScreen> {
                     ],
             ),
             body: reported
-                ? Align(
-                    alignment: Alignment.center,
-                    child: ReportedComponent(
-                        reportedTitle: post.title,
-                        reportedReason: post.content),
+                ? ReportedComponent(
+                    reportedTitle: post.title,
+                    reportedReason: post.content,
                   )
                 : CustomScrollView(
                     physics: const AlwaysScrollableScrollPhysics(),
@@ -808,7 +806,7 @@ class _PostDetailScreenState extends ConsumerState<PostDetailScreen> {
             bottomNavigationBar:
                 // Container(height: parentCommentId != null ? 56.0 + 32.0 : 56.0),
                 reported
-                    ? Container()
+                    ? null
                     : Column(
                         mainAxisSize: MainAxisSize.min,
                         children: [

diff --git a/mingle/lib/user/view/signup_screen/select_nickname_screen.dart b/mingle/lib/user/view/signup_screen/select_nickname_screen.dart
@@ -73,8 +73,8 @@ class _SelectNicknameScreenState extends ConsumerState<SelectNicknameScreen> {
       setState(() {
         isLoading = false;
       });
-      Navigator.of(context)
-          .push(MaterialPageRoute(builder: (_) => const LoginScreen()));
+      Navigator.of(context).pushReplacement(
+          MaterialPageRoute(builder: (_) => const LoginScreen()));
     } on DioException catch (e) {
       setState(() {
         isLoading = false;
@@ -121,7 +121,7 @@ class _SelectNicknameScreenState extends ConsumerState<SelectNicknameScreen> {
       setState(() {
         isLoading = false;
       });
-      Navigator.of(context).push(
+      Navigator.of(context).pushReplacement(
           MaterialPageRoute(builder: (_) => const FinishTempSinupScreen()));
     } on DioException catch (e) {
       print(e.response?.data);