From 6a4b298dfd2cb0e1c9ed143c34f23af59cc576ef Mon Sep 17 00:00:00 2001 From: shin seung jae Date: Wed, 4 Oct 2023 12:24:34 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=9D=B4=EC=9A=A9=EC=95=BD=EA=B4=80=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/views/TermsConditionsDrawerScreen.dart | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 lib/views/TermsConditionsDrawerScreen.dart diff --git a/lib/views/TermsConditionsDrawerScreen.dart b/lib/views/TermsConditionsDrawerScreen.dart new file mode 100644 index 0000000..614aada --- /dev/null +++ b/lib/views/TermsConditionsDrawerScreen.dart @@ -0,0 +1,36 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:suwon/views/widgets/DrawerAppBarWidget.dart'; + +class TermsConditionsDrawerScreen extends StatelessWidget { + final GlobalKey _formKey = GlobalKey(); + + @override + Widget build(BuildContext context) { + return ScreenUtilInit( + designSize: Size(390, 844), + builder: (context, child) => Scaffold( + resizeToAvoidBottomInset: false, + body: Container( + margin: EdgeInsets.only(top: 88.h), + child: Form( + key: _formKey, + child: Column( + children: [ + Container( + //상단바 + margin: EdgeInsets.symmetric(horizontal: 20.w), + child: DrawerAppBarWidget( + text: '이용약관', + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ), + ], + ), + ), + )), + ); + } +} From 33c803fd5b7e965fe637eb7e91e860e3676afefb Mon Sep 17 00:00:00 2001 From: shin seung jae Date: Wed, 4 Oct 2023 12:26:09 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EB=93=9C=EB=A1=9C=EC=96=B4=20=EC=95=88?= =?UTF-8?q?=EC=97=90=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=93=A4=EC=9D=84=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20=EA=B0=9C=EB=B3=84=20=EC=95=B1=EB=B0=94?= =?UTF-8?q?=EC=9C=84=EC=A0=AF=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/views/widgets/DrawerAppBarWidget.dart | 51 +++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 lib/views/widgets/DrawerAppBarWidget.dart diff --git a/lib/views/widgets/DrawerAppBarWidget.dart b/lib/views/widgets/DrawerAppBarWidget.dart new file mode 100644 index 0000000..15ad629 --- /dev/null +++ b/lib/views/widgets/DrawerAppBarWidget.dart @@ -0,0 +1,51 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class DrawerAppBarWidget extends StatelessWidget { + final String text; + final VoidCallback onPressed; + + const DrawerAppBarWidget({ + required this.text, + required this.onPressed, + }); + + @override + Widget build(BuildContext context) { + double iconScale = 4.sp; + double iconButtonPadding = 40.sp; + + return Container( + width: double.maxFinite, + height: 40.h, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + // 아이콘 맨 오른쪽 정렬 위해서 왼쪽에 더미공간 추가 + SizedBox( + width: iconScale + iconButtonPadding, + height: iconScale + iconButtonPadding, + ), + Container( + alignment: Alignment.center, + child: Text( + text, + style: TextStyle( + fontFamily: 'Pretendard-Regular', + fontSize: 18.sp, + fontWeight: FontWeight.w600, + ), + ), + ), + IconButton( + onPressed: onPressed, + icon: Image.asset( + 'asstes/close.png', + scale: iconScale, + ), + ), + ], + ), + ); + } +} From 2489144e971ec186da1762f1c1c965d61938e49f Mon Sep 17 00:00:00 2001 From: shin seung jae Date: Wed, 4 Oct 2023 14:14:46 +0900 Subject: [PATCH 3/5] =?UTF-8?q?edit=5Fprofile=20->=20EditProfileDrawerScre?= =?UTF-8?q?en=EC=9C=BC=EB=A1=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/views/{edit_profie.dart => EditProfileDrawerScreen.dart} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename lib/views/{edit_profie.dart => EditProfileDrawerScreen.dart} (99%) diff --git a/lib/views/edit_profie.dart b/lib/views/EditProfileDrawerScreen.dart similarity index 99% rename from lib/views/edit_profie.dart rename to lib/views/EditProfileDrawerScreen.dart index 8a4b64a..10c7f2a 100644 --- a/lib/views/edit_profie.dart +++ b/lib/views/EditProfileDrawerScreen.dart @@ -8,7 +8,7 @@ import 'package:provider/provider.dart'; import 'package:suwon/views/widgets/csbutton.dart'; import 'package:suwon/views/widgets/font.dart'; -class EditProfile extends StatelessWidget { +class EditProfileDrawerScreen extends StatelessWidget { final GlobalKey _formKey = GlobalKey(); @override From 60d8d019f34bac07d1f1320a551c7fc8653ddbc0 Mon Sep 17 00:00:00 2001 From: shin seung jae Date: Wed, 4 Oct 2023 17:13:05 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=ED=94=BC=EB=93=9C=EB=B0=B1=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/views/FeedbackDrawerScreen.dart | 69 +++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 lib/views/FeedbackDrawerScreen.dart diff --git a/lib/views/FeedbackDrawerScreen.dart b/lib/views/FeedbackDrawerScreen.dart new file mode 100644 index 0000000..00a9551 --- /dev/null +++ b/lib/views/FeedbackDrawerScreen.dart @@ -0,0 +1,69 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:suwon/views/widgets/DrawerAppBarWidget.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; + +class FeedbackDrawerScreen extends StatelessWidget { + final GlobalKey _formKey = GlobalKey(); + + @override + Widget build(BuildContext context) { + return ScreenUtilInit( + designSize: Size(390, 844), + builder: (context, child) => Scaffold( + resizeToAvoidBottomInset: false, + body: Container( + margin: EdgeInsets.only(top: 88.h), + child: Form( + key: _formKey, + child: Column( + children: [ + Container( + //상단바 + margin: EdgeInsets.symmetric(horizontal: 20.w), + child: DrawerAppBarWidget( + text: '피드백', + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 32.w), + child: Column( + children: [ + SizedBox(height: 20.h), + TextField( + maxLength: 40, + maxLines: 9, // 여기에서 줄넘김 기능을 추가합니다. + decoration: InputDecoration( + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(10), + ), + hintText: '앱 사용 시 불편한 점 또는 건의 사항이 있다면 자유롭게 작성해 주세요', + hintStyle: TextStyle( + fontFamily: 'Pretendard-Regular', + fontSize: 14.sp, + fontWeight: FontWeight.w400, + ), + counterText: '', + contentPadding: EdgeInsets.symmetric( + vertical: 20, horizontal: 12), + ), + ), + SizedBox(height: 24.h), + CustomButton( + text: "제출하기", + backgroundColor: Color(0xFF2D64D8), + onPressed: () {}, + color: Color(0xFFFFFFFF)) + ], + ), + ), + ], + ), + ), + )), + ); + } +} From 890932419d21c07002fdb7b84ad331ab076334ed Mon Sep 17 00:00:00 2001 From: shin seung jae Date: Wed, 4 Oct 2023 17:13:30 +0900 Subject: [PATCH 5/5] =?UTF-8?q?Main=5Fpage=EC=97=90=EC=84=9C=20=EA=B0=81?= =?UTF-8?q?=20drawer=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/views/Main_page.dart | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/lib/views/Main_page.dart b/lib/views/Main_page.dart index a420f17..59c3ea5 100644 --- a/lib/views/Main_page.dart +++ b/lib/views/Main_page.dart @@ -2,7 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:suwon/views/widgets/cancel_and_action_alert_dialog.dart'; -import 'package:suwon/views/edit_profie.dart'; +import 'package:suwon/views/EditProfileDrawerScreen.dart'; +import 'package:suwon/views/TermsConditionsDrawerScreen.dart'; +import 'package:suwon/views/FeedbackDrawerScreen.dart'; import 'package:suwon/views/login_screen.dart'; import 'package:suwon/views/matching_loding.dart'; @@ -167,7 +169,8 @@ class MainPage extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => EditProfile(), + builder: (context) => + EditProfileDrawerScreen(), ), ); }, @@ -189,7 +192,15 @@ class MainPage extends StatelessWidget { letterSpacing: -0.4.sp, ), ), - onTap: () {}, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => + TermsConditionsDrawerScreen(), + ), + ); + }, trailing: Image.asset( 'asstes/Vector6.png', scale: 4.sp, @@ -208,7 +219,15 @@ class MainPage extends StatelessWidget { letterSpacing: -0.4.sp, ), ), - onTap: () {}, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => + FeedbackDrawerScreen(), + ), + ); + }, trailing: Image.asset( 'asstes/Vector6.png', scale: 4.sp,