Skip to content

DrawerAppBar, 이용약관, 피드백 페이지 추가 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Monfi98 merged 5 commits into from
Oct 4, 2023
Merged

DrawerAppBar, 이용약관, 피드백 페이지 추가 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a4b298
이용약관 페이지 추가
Monfi98 Oct 4, 2023
33c803f
드로어 안에 페이지들을 위한 개별 앱바위젯 추가
Monfi98 Oct 4, 2023
2489144
edit_profile -> EditProfileDrawerScreen으로 네이밍 수정
Monfi98 Oct 4, 2023
60d8d01
피드백 페이지 추가
Monfi98 Oct 4, 2023
8909324
Main_page에서 각 drawer페이지 연결
Monfi98 Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/views/edit_profie.dart → lib/views/EditProfileDrawerScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<FormState> _formKey = GlobalKey<FormState>();

@override
Expand Down
69 changes: 69 additions & 0 deletions lib/views/FeedbackDrawerScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<FormState> _formKey = GlobalKey<FormState>();

@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))
],
),
),
],
),
),
)),
);
}
}
27 changes: 23 additions & 4 deletions lib/views/Main_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -167,7 +169,8 @@ class MainPage extends StatelessWidget {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => EditProfile(),
builder: (context) =>
EditProfileDrawerScreen(),
),
);
},
Expand All @@ -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,
Expand All @@ -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,
Expand Down
36 changes: 36 additions & 0 deletions lib/views/TermsConditionsDrawerScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<FormState> _formKey = GlobalKey<FormState>();

@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();
},
),
),
],
),
),
)),
);
}
}
51 changes: 51 additions & 0 deletions lib/views/widgets/DrawerAppBarWidget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
),
),
],
),
);
}
}