Skip to content

네이밍 변경 #19

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 3 commits into from
Nov 11, 2023
Merged

네이밍 변경 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e997e6
Widget 네이밍 변경
Monfi98 Nov 11, 2023
79dc575
ViewModel, Screen 네이밍 변경 / asstes -> assets 디렉터리명 변경
Monfi98 Nov 11, 2023
2212b20
오류 수정
Monfi98 Nov 11, 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
0 asstes/Group.png → assets/Group.png
View file
Open in desktop
File renamed without changes
0 asstes/Icon_menu.svg → assets/Icon_menu.svg
View file
Open in desktop
File renamed without changes
0 asstes/SUCHAT.png → assets/SUCHAT.png
View file
Open in desktop
File renamed without changes
0 asstes/Vector6.png → assets/Vector6.png
View file
Open in desktop
File renamed without changes
0 asstes/bubble.png → assets/bubble.png
View file
Open in desktop
File renamed without changes
0 asstes/bubble_main.PNG → assets/bubble_main.PNG
View file
Open in desktop
File renamed without changes
0 asstes/close.png → assets/close.png
View file
Open in desktop
File renamed without changes
0 asstes/feedback.svg → assets/feedback.svg
View file
Open in desktop
File renamed without changes
0 asstes/font/KCC-Chassam.otf → assets/font/KCC-Chassam.otf
View file
Open in desktop
File renamed without changes.
0 asstes/font/KCC-Chassam.ttf → assets/font/KCC-Chassam.ttf
View file
Open in desktop
File renamed without changes.
0 asstes/font/Pretendard-Light.ttf → assets/font/Pretendard-Light.ttf
View file
Open in desktop
File renamed without changes.
0 asstes/font/Pretendard-Regular.ttf → assets/font/Pretendard-Regular.ttf
View file
Open in desktop
File renamed without changes.
0 asstes/font/Pretendard-SemiBold.ttf → assets/font/Pretendard-SemiBold.ttf
View file
Open in desktop
File renamed without changes.
0 asstes/logout.svg → assets/logout.svg
View file
Open in desktop
File renamed without changes
0 asstes/onclikmenu.svg → assets/onclikmenu.svg
View file
Open in desktop
File renamed without changes
0 asstes/policy.svg → assets/policy.svg
View file
Open in desktop
File renamed without changes
0 asstes/profile.svg → assets/profile.svg
View file
Open in desktop
File renamed without changes
0 asstes/vector.svg → assets/vector.svg
View file
Open in desktop
File renamed without changes
19 changes: 9 additions & 10 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:suwon/viewmodels/AccountRecovery_viewmodel.dart';
import 'package:suwon/viewmodels/login_viewmodel.dart';
import 'package:suwon/viewmodels/signup_viewmodel.dart'; // 추가: SignupViewModel 임포트
import 'package:suwon/views/login_screen.dart';
import 'package:suwon/views/signup_creen.dart';
import 'package:suwon/viewmodels/AccountRecoveryVM.dart';
import 'package:suwon/viewmodels/LoginVM.dart';
import 'package:suwon/viewmodels/SignupVM.dart'; // 추가: SignupViewModel 임포트
import 'package:suwon/views/LoginScreen.dart';
import 'package:suwon/views/SignUpScreen.dart';

void main() {
runApp(const MyApp());
Expand All @@ -17,15 +17,14 @@ class MyApp extends StatelessWidget {
return MultiProvider(
// ChangeNotifierProvider 대신 MultiProvider로 변경
providers: [
ChangeNotifierProvider(create: (context) => LoginViewModel()),
ChangeNotifierProvider(create: (context) => LoginVM()),
ChangeNotifierProvider(
create: (context) => SignupViewModel()), // 추가: SignupViewModel 제공
ChangeNotifierProvider(
create: (context) => AccountRecoveryViewModel()),
create: (context) => SignupVM()), // 추가: SignupViewModel 제공
ChangeNotifierProvider(create: (context) => AccountRecoveryVM()),
],
child: MaterialApp(
debugShowCheckedModeBanner: false,
home: NewLoignMain(),
home: LoginScreen(),
),
);
}
Expand Down
12 changes: 5 additions & 7 deletions ...viewmodels/AccountRecovery_viewmodel.dart → lib/viewmodels/AccountRecoveryVM.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import 'package:flutter/material.dart';

class AccountRecoveryViewModel extends ChangeNotifier {
class AccountRecoveryVM extends ChangeNotifier {
String _id = '';
String _password = '';
String _email = '';
String _validationCode = '';


bool _idError = false;
bool _pwError = false;
bool _emailError = false;
Expand All @@ -20,7 +19,6 @@ class AccountRecoveryViewModel extends ChangeNotifier {
TextEditingController pwMatchController = TextEditingController();
TextEditingController ValidationCodeController = TextEditingController();


bool get idError => _idError;
bool get pwError => _pwError;
bool get emailError => _emailError;
Expand Down Expand Up @@ -78,7 +76,7 @@ class AccountRecoveryViewModel extends ChangeNotifier {

bool validateEmail(String value) {
final RegExp emailRegExp =
RegExp(r'^[\w-]+(\.[\w-]+)*@([\w-]+\.)+[a-zA-Z]{2,7}$');
RegExp(r'^[\w-]+(\.[\w-]+)*@([\w-]+\.)+[a-zA-Z]{2,7}$');
_isEmailValid = emailRegExp.hasMatch(value);
notifyListeners();
return _isEmailValid;
Expand All @@ -90,11 +88,11 @@ class AccountRecoveryViewModel extends ChangeNotifier {
//
String email = _email;
print('eamil: $email');

}
}

Future<void> Search_PW() async {
if(validateEmail(_email)&& !_idError) {
if (validateEmail(_email) && !_idError) {
// 이메일 및 ID 검증
// 인증코드 전송 및 검증
String id = _id;
Expand All @@ -106,4 +104,4 @@ class AccountRecoveryViewModel extends ChangeNotifier {
print('validationCode = $validationCode');
}
}
}
}
2 changes: 1 addition & 1 deletion lib/viewmodels/login_viewmodel.dart → lib/viewmodels/LoginVM.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

class LoginViewModel extends ChangeNotifier {
class LoginVM extends ChangeNotifier {
String _userid = '';
String _userpw = '';

Expand Down
2 changes: 1 addition & 1 deletion lib/viewmodels/signup_viewmodel.dart → lib/viewmodels/SignupVM.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

class SignupViewModel extends ChangeNotifier {
class SignupVM extends ChangeNotifier {
String _id = '';
String _password = '';
String _email = '';
Expand Down
20 changes: 9 additions & 11 deletions lib/views/Login_page_changePW.dart → lib/views/ChangePasswordScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:provider/provider.dart';
import 'package:suwon/viewmodels/AccountRecovery_viewmodel.dart';
import 'package:suwon/viewmodels/AccountRecoveryVM.dart';

import 'package:suwon/views/login_screen.dart';
import 'package:suwon/views/LoginScreen.dart';

import 'package:suwon/views/widgets/appbar.dart';
import 'package:suwon/views/widgets/csbutton.dart';
import 'package:suwon/views/widgets/SuchatAppBarWidget.dart';
import 'package:suwon/views/widgets/CustomButtonWidget.dart';

class ChangePW extends StatelessWidget {
class ChangePasswordScreen extends StatelessWidget {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();

@override
Widget build(BuildContext context) {
final accountRecoveryViewModel =
Provider.of<AccountRecoveryViewModel>(context);
final accountRecoveryViewModel = Provider.of<AccountRecoveryVM>(context);

return ScreenUtilInit(
designSize: Size(390, 844),
Expand All @@ -29,15 +27,15 @@ class ChangePW extends StatelessWidget {
children: [
Container(
margin: EdgeInsets.symmetric(horizontal: 20.w),
child: SuchatAppBar(
child: SuchatAppBarWidget(
text: '비밀번호 변경',
onPressed: () {
accountRecoveryViewModel.pwController.clear();
accountRecoveryViewModel.pwMatchController.clear();
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const NewLoignMain()),
builder: (context) => const LoginScreen()),
);
},
),
Expand Down Expand Up @@ -93,7 +91,7 @@ class ChangePW extends StatelessWidget {
: Icons.visibility,
),
SizedBox(height: 48.h),
CustomButton(
CustomButtonWidget(
text: '변경 완료',
color: Colors.white,
backgroundColor: Color(0xff2D64D8),
Expand Down
18 changes: 9 additions & 9 deletions lib/views/CustomDrawerScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:flutter_svg/flutter_svg.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/LoginScreen.dart';
import 'package:suwon/views/widgets/CancelAndActionAlertDialogWidget.dart';

class CustomDrawerScreen extends StatelessWidget {
Expand All @@ -31,7 +31,7 @@ class CustomDrawerScreen extends StatelessWidget {
Navigator.of(context).pop();
},
icon: Image.asset(
'asstes/close.png',
'assets/close.png',
scale: 4.sp,
),
)
Expand All @@ -52,7 +52,7 @@ class CustomDrawerScreen extends StatelessWidget {
children: <Widget>[
CircleAvatar(
backgroundColor: Colors.white,
backgroundImage: AssetImage('asstes/Group.png'),
backgroundImage: AssetImage('assets/Group.png'),
),
SizedBox(height: 8),
Text(
Expand Down Expand Up @@ -88,7 +88,7 @@ class CustomDrawerScreen extends StatelessWidget {
SizedBox(height: 20),
ListTile_main(
text: '프로필 수정',
Menu_Icon: 'asstes/profile.svg',
Menu_Icon: 'assets/profile.svg',
onTap: () {
Navigator.push(
context,
Expand All @@ -101,7 +101,7 @@ class CustomDrawerScreen extends StatelessWidget {
SizedBox(height: 20),
ListTile_main(
text: '이용약관',
Menu_Icon: 'asstes/policy.svg',
Menu_Icon: 'assets/policy.svg',
onTap: () {
Navigator.push(
context,
Expand All @@ -114,7 +114,7 @@ class CustomDrawerScreen extends StatelessWidget {
SizedBox(height: 20),
ListTile_main(
text: ' 피드백',
Menu_Icon: 'asstes/feedback.svg',
Menu_Icon: 'assets/feedback.svg',
onTap: () {
Navigator.push(
context,
Expand All @@ -127,7 +127,7 @@ class CustomDrawerScreen extends StatelessWidget {
SizedBox(height: 20),
ListTile_main(
text: '로그아웃',
Menu_Icon: 'asstes/logout.svg',
Menu_Icon: 'assets/logout.svg',
onTap: () {
CancelAndActionAlertDialogWidget(
title: "로그아웃 하시겠습니까?",
Expand All @@ -136,7 +136,7 @@ class CustomDrawerScreen extends StatelessWidget {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => NewLoignMain()),
builder: (context) => LoginScreen()),
);
},
onCancel: () {})
Expand Down Expand Up @@ -179,7 +179,7 @@ class ListTile_main extends StatelessWidget {
), // 제목
SizedBox(width: 20.sp),
Image.asset(
'asstes/Vector6.png',
'assets/Vector6.png',
scale: 4.sp,
)
],
Expand Down
20 changes: 10 additions & 10 deletions lib/views/EditProfileDrawerScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:suwon/views/Main_page.dart';
import 'package:suwon/views/signup_creen.dart';
import 'package:suwon/views/widgets/appbar.dart';
import 'package:suwon/viewmodels/signup_viewmodel.dart';
import 'package:suwon/views/HomeScreen.dart';
import 'package:suwon/views/SignUpScreen.dart';
import 'package:suwon/views/widgets/SuchatAppBarWidget.dart';
import 'package:suwon/viewmodels/SignupVM.dart';
import 'package:provider/provider.dart';
import 'package:suwon/views/widgets/csbutton.dart';
import 'package:suwon/views/widgets/font.dart';
import 'package:suwon/views/widgets/CustomButtonWidget.dart';
import 'package:suwon/views/widgets/TextFontWidget.dart';

class EditProfileDrawerScreen extends StatelessWidget {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();

@override
Widget build(BuildContext context) {
final signupViewModel = Provider.of<SignupViewModel>(context);
final signupViewModel = Provider.of<SignupVM>(context);
return ScreenUtilInit(
designSize: Size(390, 844),
builder: (context, child) => Scaffold(
Expand All @@ -27,15 +27,15 @@ class EditProfileDrawerScreen extends StatelessWidget {
Container(
//상단바
margin: EdgeInsets.symmetric(horizontal: 20.w),
child: SuchatAppBar(
child: SuchatAppBarWidget(
text: ' 프로필 설정',
onPressed: () {
signupViewModel.idController.clear();
signupViewModel.pwController.clear();
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MainPage(),
builder: (context) => HomeScreen(),
),
);
},
Expand Down Expand Up @@ -70,7 +70,7 @@ class EditProfileDrawerScreen extends StatelessWidget {
),
child: TextButton(
onPressed: () {},
child: TextFont.fontRegular(
child: TextFontWidget.fontRegular(
color: Color(0xFFFFFFFF),
fontSize: 14,
text: '중복 확인')),
Expand Down
4 changes: 2 additions & 2 deletions lib/views/FeedbackDrawerScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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';
import 'package:suwon/views/widgets/CustomButtonWidget.dart';

class FeedbackDrawerScreen extends StatelessWidget {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
Expand Down Expand Up @@ -52,7 +52,7 @@ class FeedbackDrawerScreen extends StatelessWidget {
),
),
SizedBox(height: 24.h),
CustomButton(
CustomButtonWidget(
text: "제출하기",
backgroundColor: Color(0xFF2D64D8),
onPressed: () {},
Expand Down
14 changes: 7 additions & 7 deletions lib/views/Main_page.dart → lib/views/HomeScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:suwon/views/CustomDrawerScreen.dart';
import 'package:suwon/views/matching_loding.dart';
import 'package:suwon/views/MatchingLoadingScreen.dart';

class MainPage extends StatelessWidget {
const MainPage({super.key});
class HomeScreen extends StatelessWidget {
const HomeScreen({super.key});

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -34,7 +34,7 @@ class MainPage extends StatelessWidget {
width: 15.w,
),
Image.asset(
'asstes/SUCHAT.png',
'assets/SUCHAT.png',
width: 76.w,
height: 20.h,
)
Expand All @@ -51,7 +51,7 @@ class MainPage extends StatelessWidget {
onPressed: () {
_scaffoldKey.currentState?.openEndDrawer();
},
icon: SvgPicture.asset('asstes/onclikmenu.svg',
icon: SvgPicture.asset('assets/onclikmenu.svg',
width: 28.w, height: 20.h),
)),
SizedBox(
Expand Down Expand Up @@ -93,7 +93,7 @@ class MainPage extends StatelessWidget {
offset: const Offset(0, -60),
child: ClipRect(
child: Image.asset(
'asstes/bubble_main.PNG',
'assets/bubble_main.PNG',
fit: BoxFit.fill,
),
),
Expand All @@ -109,7 +109,7 @@ class MainPage extends StatelessWidget {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MatchingLoading()),
builder: (context) => MatchingLoadingScreen()),
);
},
),
Expand Down
Loading