From aa60238bb6b2dd0429889fcbe74e75019c153937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=88=98=EB=B9=88?= <97301965+LeeSubin3020@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:57:26 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"=EC=9E=84=EC=8B=9C=20=EC=B1=84?= =?UTF-8?q?=ED=8C=85=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20=EC=88=98=EC=A0=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 25 - android/.gitignore | 13 + android/app/build.gradle | 72 +++ android/app/src/debug/AndroidManifest.xml | 7 + android/app/src/main/AndroidManifest.xml | 33 ++ .../kotlin/com/example/suwon/MainActivity.kt | 6 + .../res/drawable-v21/launch_background.xml | 12 + .../main/res/drawable/launch_background.xml | 12 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 + android/app/src/main/res/values/styles.xml | 18 + android/app/src/profile/AndroidManifest.xml | 7 + android/build.gradle | 31 ++ android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 5 + android/settings.gradle | 11 + assets/Exit.svg | 5 - assets/Report button.svg | 8 - assets/User.svg | 6 - assets/offchatbt.svg | 6 - assets/onchatbt.svg | 6 - {assets => asstes}/Group.png | Bin {assets => asstes}/Icon_menu.svg | 0 {assets => asstes}/SUCHAT.png | Bin {assets => asstes}/Vector6.png | Bin {assets => asstes}/bubble.png | Bin {assets => asstes}/bubble_main.PNG | Bin {assets => asstes}/close.png | Bin {assets => asstes}/feedback.svg | 0 {assets => asstes}/font/KCC-Chassam.otf | Bin {assets => asstes}/font/KCC-Chassam.ttf | Bin {assets => asstes}/font/Pretendard-Light.ttf | Bin .../font/Pretendard-Regular.ttf | Bin .../font/Pretendard-SemiBold.ttf | Bin {assets => asstes}/logout.svg | 0 {assets => asstes}/onclikmenu.svg | 0 {assets => asstes}/policy.svg | 0 {assets => asstes}/profile.svg | 0 {assets => asstes}/vector.svg | 0 ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- lib/main.dart | 21 +- lib/models/chat_model.dart | 23 - lib/models/user_model.dart | 14 +- ...VM.dart => AccountRecovery_viewmodel.dart} | 12 +- lib/viewmodels/ChattingVM.dart | 50 -- lib/viewmodels/LoginVM.dart | 59 --- lib/viewmodels/login_viewmodel.dart | 28 ++ .../{SignupVM.dart => signup_viewmodel.dart} | 82 +--- lib/views/ChattingScreen.dart | 187 -------- lib/views/CustomDrawerScreen.dart | 189 -------- lib/views/EmailAuthentication.dart | 132 ------ lib/views/FeedbackDrawerScreen.dart | 69 --- lib/views/HomeScreen.dart | 214 --------- ...rdScreen.dart => Login_page_changePW.dart} | 20 +- ...IdScreen.dart => Login_page_searchID.dart} | 31 +- ...rdScreen.dart => Login_page_searchPW.dart} | 30 +- lib/views/Main_page.dart | 440 ++++++++++++++++++ lib/views/RandomChatScreen.dart | 164 ------- lib/views/TermsConditionsDrawerScreen.dart | 36 -- ...fileDrawerScreen.dart => edit_profie.dart} | 24 +- .../{LoginScreen.dart => login_screen.dart} | 83 ++-- ...oadingScreen.dart => matching_loding.dart} | 15 +- ...{SetProfileScreen.dart => setprofile.dart} | 24 +- .../{SignUpScreen.dart => signup_creen.dart} | 147 ++---- ...SignUpDoneScreen.dart => signup_done.dart} | 28 +- .../CancelAndActionAlertDialogWidget.dart | 41 -- lib/views/widgets/DrawerAppBarWidget.dart | 51 -- .../widgets/NormalAlertDialogWidget.dart | 34 -- .../{SuchatAppBarWidget.dart => appbar.dart} | 4 +- ...{CustomButtonWidget.dart => csbutton.dart} | 6 +- ...ilTextFieldWidget.dart => emailfield.dart} | 8 +- .../{TextFontWidget.dart => font.dart} | 2 +- .../{IdTextFieldWidget.dart => idfield.dart} | 8 +- pubspec.lock | 98 +--- pubspec.yaml | 28 +- web/favicon.png | Bin 917 -> 0 bytes web/icons/Icon-192.png | Bin 5292 -> 0 bytes web/icons/Icon-512.png | Bin 8252 -> 0 bytes web/icons/Icon-maskable-192.png | Bin 5594 -> 0 bytes web/icons/Icon-maskable-512.png | Bin 20998 -> 0 bytes web/index.html | 59 --- web/manifest.json | 35 -- 87 files changed, 978 insertions(+), 1826 deletions(-) delete mode 100644 .vscode/launch.json create mode 100644 android/.gitignore create mode 100644 android/app/build.gradle create mode 100644 android/app/src/debug/AndroidManifest.xml create mode 100644 android/app/src/main/AndroidManifest.xml create mode 100644 android/app/src/main/kotlin/com/example/suwon/MainActivity.kt create mode 100644 android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 android/app/src/main/res/drawable/launch_background.xml create mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/values-night/styles.xml create mode 100644 android/app/src/main/res/values/styles.xml create mode 100644 android/app/src/profile/AndroidManifest.xml create mode 100644 android/build.gradle create mode 100644 android/gradle.properties create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100644 android/settings.gradle delete mode 100644 assets/Exit.svg delete mode 100644 assets/Report button.svg delete mode 100644 assets/User.svg delete mode 100644 assets/offchatbt.svg delete mode 100644 assets/onchatbt.svg rename {assets => asstes}/Group.png (100%) rename {assets => asstes}/Icon_menu.svg (100%) rename {assets => asstes}/SUCHAT.png (100%) rename {assets => asstes}/Vector6.png (100%) rename {assets => asstes}/bubble.png (100%) rename {assets => asstes}/bubble_main.PNG (100%) rename {assets => asstes}/close.png (100%) rename {assets => asstes}/feedback.svg (100%) rename {assets => asstes}/font/KCC-Chassam.otf (100%) rename {assets => asstes}/font/KCC-Chassam.ttf (100%) rename {assets => asstes}/font/Pretendard-Light.ttf (100%) rename {assets => asstes}/font/Pretendard-Regular.ttf (100%) rename {assets => asstes}/font/Pretendard-SemiBold.ttf (100%) rename {assets => asstes}/logout.svg (100%) rename {assets => asstes}/onclikmenu.svg (100%) rename {assets => asstes}/policy.svg (100%) rename {assets => asstes}/profile.svg (100%) rename {assets => asstes}/vector.svg (100%) delete mode 100644 lib/models/chat_model.dart rename lib/viewmodels/{AccountRecoveryVM.dart => AccountRecovery_viewmodel.dart} (94%) delete mode 100644 lib/viewmodels/ChattingVM.dart delete mode 100644 lib/viewmodels/LoginVM.dart create mode 100644 lib/viewmodels/login_viewmodel.dart rename lib/viewmodels/{SignupVM.dart => signup_viewmodel.dart} (55%) delete mode 100644 lib/views/ChattingScreen.dart delete mode 100644 lib/views/CustomDrawerScreen.dart delete mode 100644 lib/views/EmailAuthentication.dart delete mode 100644 lib/views/FeedbackDrawerScreen.dart delete mode 100644 lib/views/HomeScreen.dart rename lib/views/{ChangePasswordScreen.dart => Login_page_changePW.dart} (92%) rename lib/views/{SearchIdScreen.dart => Login_page_searchID.dart} (85%) rename lib/views/{SearchPasswordScreen.dart => Login_page_searchPW.dart} (89%) create mode 100644 lib/views/Main_page.dart delete mode 100644 lib/views/RandomChatScreen.dart delete mode 100644 lib/views/TermsConditionsDrawerScreen.dart rename lib/views/{EditProfileDrawerScreen.dart => edit_profie.dart} (92%) rename lib/views/{LoginScreen.dart => login_screen.dart} (67%) rename lib/views/{MatchingLoadingScreen.dart => matching_loding.dart} (87%) rename lib/views/{SetProfileScreen.dart => setprofile.dart} (93%) rename lib/views/{SignUpScreen.dart => signup_creen.dart} (68%) rename lib/views/{SignUpDoneScreen.dart => signup_done.dart} (87%) delete mode 100644 lib/views/widgets/CancelAndActionAlertDialogWidget.dart delete mode 100644 lib/views/widgets/DrawerAppBarWidget.dart delete mode 100644 lib/views/widgets/NormalAlertDialogWidget.dart rename lib/views/widgets/{SuchatAppBarWidget.dart => appbar.dart} (95%) rename lib/views/widgets/{CustomButtonWidget.dart => csbutton.dart} (88%) rename lib/views/widgets/{EmailTextFieldWidget.dart => emailfield.dart} (87%) rename lib/views/widgets/{TextFontWidget.dart => font.dart} (97%) rename lib/views/widgets/{IdTextFieldWidget.dart => idfield.dart} (89%) delete mode 100644 web/favicon.png delete mode 100644 web/icons/Icon-192.png delete mode 100644 web/icons/Icon-512.png delete mode 100644 web/icons/Icon-maskable-192.png delete mode 100644 web/icons/Icon-maskable-512.png delete mode 100644 web/index.html delete mode 100644 web/manifest.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 2071b9e..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - // IntelliSense를 사용하여 가능한 특성에 대해 알아보세요. - // 기존 특성에 대한 설명을 보려면 가리킵니다. - // 자세한 내용을 보려면 https://go.microsoft.com/fwlink/?linkid=830387을(를) 방문하세요. - "version": "0.2.0", - "configurations": [ - { - "name": "Flutter", - "request": "launch", - "type": "dart" - }, - { - "name": "Flutter (profile mode)", - "request": "launch", - "type": "dart", - "flutterMode": "profile" - }, - { - "name": "Flutter (release mode)", - "request": "launch", - "type": "dart", - "flutterMode": "release" - } - ] -} \ No newline at end of file diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..6f56801 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 0000000..f56b525 --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,72 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + namespace "com.example.suwon" + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.suwon" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..d1d507c --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/android/app/src/main/kotlin/com/example/suwon/MainActivity.kt b/android/app/src/main/kotlin/com/example/suwon/MainActivity.kt new file mode 100644 index 0000000..3cd393e --- /dev/null +++ b/android/app/src/main/kotlin/com/example/suwon/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.suwon + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 0000000..f7eb7f6 --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.7.10' + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.3.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +tasks.register("clean", Delete) { + delete rootProject.buildDir +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..94adc3a --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3c472b9 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 0000000..44e62bc --- /dev/null +++ b/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/assets/Exit.svg b/assets/Exit.svg deleted file mode 100644 index 1d96145..0000000 --- a/assets/Exit.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/assets/Report button.svg b/assets/Report button.svg deleted file mode 100644 index 8fd0751..0000000 --- a/assets/Report button.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/assets/User.svg b/assets/User.svg deleted file mode 100644 index 212264e..0000000 --- a/assets/User.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/offchatbt.svg b/assets/offchatbt.svg deleted file mode 100644 index 43a66b8..0000000 --- a/assets/offchatbt.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/onchatbt.svg b/assets/onchatbt.svg deleted file mode 100644 index 27b8150..0000000 --- a/assets/onchatbt.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/Group.png b/asstes/Group.png similarity index 100% rename from assets/Group.png rename to asstes/Group.png diff --git a/assets/Icon_menu.svg b/asstes/Icon_menu.svg similarity index 100% rename from assets/Icon_menu.svg rename to asstes/Icon_menu.svg diff --git a/assets/SUCHAT.png b/asstes/SUCHAT.png similarity index 100% rename from assets/SUCHAT.png rename to asstes/SUCHAT.png diff --git a/assets/Vector6.png b/asstes/Vector6.png similarity index 100% rename from assets/Vector6.png rename to asstes/Vector6.png diff --git a/assets/bubble.png b/asstes/bubble.png similarity index 100% rename from assets/bubble.png rename to asstes/bubble.png diff --git a/assets/bubble_main.PNG b/asstes/bubble_main.PNG similarity index 100% rename from assets/bubble_main.PNG rename to asstes/bubble_main.PNG diff --git a/assets/close.png b/asstes/close.png similarity index 100% rename from assets/close.png rename to asstes/close.png diff --git a/assets/feedback.svg b/asstes/feedback.svg similarity index 100% rename from assets/feedback.svg rename to asstes/feedback.svg diff --git a/assets/font/KCC-Chassam.otf b/asstes/font/KCC-Chassam.otf similarity index 100% rename from assets/font/KCC-Chassam.otf rename to asstes/font/KCC-Chassam.otf diff --git a/assets/font/KCC-Chassam.ttf b/asstes/font/KCC-Chassam.ttf similarity index 100% rename from assets/font/KCC-Chassam.ttf rename to asstes/font/KCC-Chassam.ttf diff --git a/assets/font/Pretendard-Light.ttf b/asstes/font/Pretendard-Light.ttf similarity index 100% rename from assets/font/Pretendard-Light.ttf rename to asstes/font/Pretendard-Light.ttf diff --git a/assets/font/Pretendard-Regular.ttf b/asstes/font/Pretendard-Regular.ttf similarity index 100% rename from assets/font/Pretendard-Regular.ttf rename to asstes/font/Pretendard-Regular.ttf diff --git a/assets/font/Pretendard-SemiBold.ttf b/asstes/font/Pretendard-SemiBold.ttf similarity index 100% rename from assets/font/Pretendard-SemiBold.ttf rename to asstes/font/Pretendard-SemiBold.ttf diff --git a/assets/logout.svg b/asstes/logout.svg similarity index 100% rename from assets/logout.svg rename to asstes/logout.svg diff --git a/assets/onclikmenu.svg b/asstes/onclikmenu.svg similarity index 100% rename from assets/onclikmenu.svg rename to asstes/onclikmenu.svg diff --git a/assets/policy.svg b/asstes/policy.svg similarity index 100% rename from assets/policy.svg rename to asstes/policy.svg diff --git a/assets/profile.svg b/asstes/profile.svg similarity index 100% rename from assets/profile.svg rename to asstes/profile.svg diff --git a/assets/vector.svg b/asstes/vector.svg similarity index 100% rename from assets/vector.svg rename to asstes/vector.svg diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 960c3b7..5ff8545 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -168,7 +168,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 87131a0..e42adcb 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ LoginVM()), + ChangeNotifierProvider(create: (context) => LoginViewModel()), ChangeNotifierProvider( - create: (context) => SignupVM()), // 추가: SignupViewModel 제공 - ChangeNotifierProvider(create: (context) => AccountRecoveryVM()), - ChangeNotifierProvider(create: (context) => ChatViewModel()), + create: (context) => SignupViewModel()), // 추가: SignupViewModel 제공 + ChangeNotifierProvider( + create: (context) => AccountRecoveryViewModel()), ], child: MaterialApp( debugShowCheckedModeBanner: false, - home: LoginScreen(), + home: NewLoignMain(), ), ); } diff --git a/lib/models/chat_model.dart b/lib/models/chat_model.dart deleted file mode 100644 index 52c6db1..0000000 --- a/lib/models/chat_model.dart +++ /dev/null @@ -1,23 +0,0 @@ -class Message { - final String roomId; - final String sender; - final String contents; - - Message({required this.roomId, required this.sender, required this.contents}); - - factory Message.fromJson(Map json) { - return Message( - roomId: json['roomId'], - sender: json['sender'], - contents: json['contents'], - ); - } - - Map toJson() { - return { - 'roomId': roomId, - 'sender': sender, - 'contents': contents, - }; - } -} diff --git a/lib/models/user_model.dart b/lib/models/user_model.dart index 5376f71..a395fed 100644 --- a/lib/models/user_model.dart +++ b/lib/models/user_model.dart @@ -1,9 +1,11 @@ class UserModel { - final String account, password, email, nickname; + final String id; + final String password; + final String email; - UserModel.fromJson(Map json) - : account = json["account"], - password = json["password"], - email = json["email"], - nickname = json["nickname"]; + UserModel({ + required this.id, + required this.password, + required this.email, + }); } diff --git a/lib/viewmodels/AccountRecoveryVM.dart b/lib/viewmodels/AccountRecovery_viewmodel.dart similarity index 94% rename from lib/viewmodels/AccountRecoveryVM.dart rename to lib/viewmodels/AccountRecovery_viewmodel.dart index 1b12018..0b92b54 100644 --- a/lib/viewmodels/AccountRecoveryVM.dart +++ b/lib/viewmodels/AccountRecovery_viewmodel.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; -class AccountRecoveryVM extends ChangeNotifier { +class AccountRecoveryViewModel extends ChangeNotifier { String _id = ''; String _password = ''; String _email = ''; String _validationCode = ''; + bool _idError = false; bool _pwError = false; bool _emailError = false; @@ -19,6 +20,7 @@ class AccountRecoveryVM extends ChangeNotifier { TextEditingController pwMatchController = TextEditingController(); TextEditingController ValidationCodeController = TextEditingController(); + bool get idError => _idError; bool get pwError => _pwError; bool get emailError => _emailError; @@ -76,7 +78,7 @@ class AccountRecoveryVM 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; @@ -88,11 +90,11 @@ class AccountRecoveryVM extends ChangeNotifier { // String email = _email; print('eamil: $email'); + } } - Future Search_PW() async { - if (validateEmail(_email) && !_idError) { + if(validateEmail(_email)&& !_idError) { // 이메일 및 ID 검증 // 인증코드 전송 및 검증 String id = _id; @@ -104,4 +106,4 @@ class AccountRecoveryVM extends ChangeNotifier { print('validationCode = $validationCode'); } } -} +} \ No newline at end of file diff --git a/lib/viewmodels/ChattingVM.dart b/lib/viewmodels/ChattingVM.dart deleted file mode 100644 index 8803107..0000000 --- a/lib/viewmodels/ChattingVM.dart +++ /dev/null @@ -1,50 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:stomp_dart_client/stomp.dart'; -import 'package:stomp_dart_client/stomp_config.dart'; -import 'package:stomp_dart_client/stomp_frame.dart'; -import 'dart:convert'; -import 'package:suwon/models/chat_model.dart'; - -class ChatViewModel extends ChangeNotifier { - StompClient? client; - String serverUrl = 'ws://3.35.83.91:8080/stomp'; - String sendEndpoint = '/pub/chat/message/1234'; - List chatMessages = []; - - ChatViewModel() { - client = StompClient( - config: StompConfig( - url: serverUrl, - onConnect: onConnect, - onWebSocketError: (dynamic error) => print(error.toString()), - ), - ); - } - - void initialize() { - client!.activate(); - } - - void onConnect(StompFrame frame) { - client!.subscribe( - destination: '/sub/chat/room/1234', - callback: (StompFrame frame) { - if (frame.body != null) { - Map jsonData = json.decode(frame.body!); - Message message = Message.fromJson(jsonData); - chatMessages.add(message); - notifyListeners(); // 새로운 메시지가 추가될 때마다 호출 - } - }, - ); - } - - void sendMessage(String message) { - client!.send( - destination: sendEndpoint, - body: json.encode( - Message(roomId: '1234', sender: 'your_name', contents: message) - .toJson()), - ); - } -} diff --git a/lib/viewmodels/LoginVM.dart b/lib/viewmodels/LoginVM.dart deleted file mode 100644 index 0dbae9a..0000000 --- a/lib/viewmodels/LoginVM.dart +++ /dev/null @@ -1,59 +0,0 @@ -import 'package:flutter/material.dart'; -import 'dart:convert'; -import 'package:http/http.dart' as http; -import 'package:suwon/models/user_model.dart'; - -class LoginVM extends ChangeNotifier { - String _loginResult = ''; - String get loginResult => _loginResult; - - // 사용자 ID 및 비밀번호를 저장하는 변수들 - String _userid = ''; - String _userpw = ''; - - // 사용자 ID를 업데이트하는 메서드 - void setUserid(String value) { - _userid = value; - } - - // 사용자 비밀번호를 업데이트하는 메서드 - void setUserpw(String value) { - _userpw = value; - } - - Future login() async { - try { - final apiUrl = Uri.parse('http://3.35.83.91:8080/member/sign-in'); - final requestBody = { - "account": _userid, - "password": _userpw, - }; - - final response = await http.post( - apiUrl, - headers: { - 'Content-Type': 'application/json', - }, - body: json.encode(requestBody), - ); - - if (response.statusCode == 200) { - final Map data = json.decode(response.body); - if (data['success'] != null && data['success']) { - _loginResult = '아이디 또는 비밀번호가 다릅니다'; - print('서버 응답 바디: ${response.body}'); - } else { - _loginResult = '로그인 성공'; - print('서버 응답 바디: ${response.body}'); - } - } else { - _loginResult = '서버 오류: ${response.statusCode}'; - } - } catch (error) { - _loginResult = '오류: $error'; - } - - // 상태가 변경되었음을 알림 - notifyListeners(); - } -} diff --git a/lib/viewmodels/login_viewmodel.dart b/lib/viewmodels/login_viewmodel.dart new file mode 100644 index 0000000..42b2fba --- /dev/null +++ b/lib/viewmodels/login_viewmodel.dart @@ -0,0 +1,28 @@ +import 'package:flutter/material.dart'; + +class LoginViewModel extends ChangeNotifier { + String _userid = ''; + String _userpw = ''; + + String get userid => _userid; + String get userpw => _userpw; + + void setUserid(String value) { + _userid = value; + notifyListeners(); + } + + void setUserpw(String value) { + _userpw = value; + notifyListeners(); + } + + Future login() async { + // 여기에서 실제 로그인 로직을 수행하고 결과를 반환합니다. + // 예를 들어, 서버와 통신하여 사용자 인증을 검증할 수 있습니다. + await Future.delayed(Duration(seconds: 2)); // 가상의 지연 시간 추가 + + // 가상의 로그인 결과 반환 + return _userid == 'userid' && _userpw == 'userpw'; + } +} diff --git a/lib/viewmodels/SignupVM.dart b/lib/viewmodels/signup_viewmodel.dart similarity index 55% rename from lib/viewmodels/SignupVM.dart rename to lib/viewmodels/signup_viewmodel.dart index 708764e..2ad25bc 100644 --- a/lib/viewmodels/SignupVM.dart +++ b/lib/viewmodels/signup_viewmodel.dart @@ -1,15 +1,13 @@ import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; -import 'package:suwon/models/user_model.dart'; -import 'dart:convert'; -class SignupVM extends ChangeNotifier { - String id = ''; - String password = ''; - String email = ''; - String nickname = ''; +class SignupViewModel extends ChangeNotifier { + String _id = ''; + String _password = ''; + String _email = ''; + String _nickname = ''; + String _mbti = ''; + String _self = ''; //자기소개 - bool btActivation = true; bool _idError = false; bool _pwError = false; bool _emailError = false; @@ -39,7 +37,6 @@ class SignupVM extends ChangeNotifier { void validateIdInput(String value) { if (value.length >= 4 && value.length <= 16) { _idError = false; - btActivation = false; } else { _idError = true; } @@ -49,7 +46,6 @@ class SignupVM extends ChangeNotifier { void validatePwInput(String value) { if (value.length >= 6 && value.length <= 20) { _pwError = false; - btActivation = false; } else { _pwError = true; } @@ -57,19 +53,17 @@ class SignupVM extends ChangeNotifier { } void validatePwMatch(String value) { - if (pwController.text == value) { - _pwMatch = false; - btActivation = false; - } else { + if (pwController.text != value) { _pwMatch = true; + } else { + _pwMatch = false; } notifyListeners(); } - void validateNickNameInput(String value) { + void validateNickName(String value) { if (value.length < 9) { _nicknameError = false; - btActivation = false; } else { _nicknameError = true; } @@ -86,14 +80,6 @@ class SignupVM extends ChangeNotifier { notifyListeners(); } - void truebt(btActivation) { - if (_idError && _pwError && _pwMatch && _nicknameError == false) { - btActivation = false; - } else { - btActivation = true; - } - } - bool validateEmail(String value) { final RegExp emailRegExp = RegExp(r'^[\w-]+(\.[\w-]+)*@([\w-]+\.)+[a-zA-Z]{2,7}$'); @@ -102,41 +88,17 @@ class SignupVM extends ChangeNotifier { return _isEmailValid; } - Future signup(UserModel userModel) async { - try { - // Convert UserModel to Map - Map userMap = { - "account": userModel.account, - "password": userModel.password, - "email": userModel.email, - "nickname": userModel.nickname, - }; - - // Encode Map to JSON String - String signupData = json.encode(userMap); - - // Make a POST request to your backend API - final response = await http.post( - Uri.parse("http://3.35.83.91:8080/member/sign-up"), - headers: { - 'Content-Type': 'application/json', - }, - body: signupData, - ); - - print(userMap); - - // 응답 상태 확인 - if (response.statusCode == 200) { - // 회원가입 성공 시, 필요한 경우 응답을 처리 - print('Signup successful'); - } else { - // 회원가입 실패 시, 에러 처리 - print('Signup failed - ${response.statusCode}: ${response.body}'); - } - } catch (error) { - // 회원가입 과정에서 발생하는 에러 처리 - print('Signup failed: $error'); + Future signup() async { + if (validateEmail(_email) && !_idError && !_pwError && _pwMatch) { + // 회원가입 로직을 여기에 구현하면 됩니다. + // 예: API 호출, 데이터 저장 등 + String id = _id; + String password = _password; + String email = _email; + + print('id: $id'); + print('Password: $password'); + print('email: $email'); } } } diff --git a/lib/views/ChattingScreen.dart b/lib/views/ChattingScreen.dart deleted file mode 100644 index c6bf8a9..0000000 --- a/lib/views/ChattingScreen.dart +++ /dev/null @@ -1,187 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:provider/provider.dart'; -import 'package:suwon/views/HomeScreen.dart'; -import 'package:suwon/viewmodels/ChattingVM.dart'; - -class RandomChat extends StatefulWidget { - const RandomChat({Key? key}); - - @override - State createState() => _RandomChatState(); -} - -class _RandomChatState extends State { - late ChatViewModel viewModel; - - @override - void initState() { - super.initState(); - viewModel = Provider.of(context, listen: false); - viewModel.initialize(); - } - - @override - Widget build(BuildContext context) { - return ScreenUtilInit( - designSize: Size(390, 844), - builder: (context, child) => Scaffold( - resizeToAvoidBottomInset: true, - body: SizedBox( - height: 812.h, - child: Column( - children: [ - _Header(), - Expanded( - child: SingleChildScrollView( - child: Column( - children: viewModel.chatMessages - .map( - (message) => _ChatBubble(message: message.contents)) - .toList(), - ), - ), - ), - Container( - padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 24.w), - height: 58.h, - child: _CustomTextField(viewModel: viewModel), - ), - ], - ), - ), - ), - ); - } -} - -class _CustomTextField extends StatefulWidget { - final ChatViewModel viewModel; - - _CustomTextField({Key? key, required this.viewModel}) : super(key: key); - - @override - _CustomTextFieldState createState() => _CustomTextFieldState(); -} - -class _CustomTextFieldState extends State<_CustomTextField> { - final TextEditingController _textController = TextEditingController(); - - @override - Widget build(BuildContext context) { - return TextField( - controller: _textController, - decoration: InputDecoration( - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(20), - ), - hintText: '채팅을 시작하세요...', - hintStyle: TextStyle( - color: Color(0xff737373), - fontFamily: 'Pretendard-Regular', - fontSize: 16.sp, - fontWeight: FontWeight.w400, - ), - contentPadding: EdgeInsets.only(left: 17.w, top: 12, bottom: 12), - suffixIcon: GestureDetector( - onTap: () { - String message = _textController.text; - if (message.isNotEmpty) { - widget.viewModel.sendMessage(message); - _textController.clear(); - } - }, - child: SvgPicture.asset( - 'assets/onchatbt.svg', - width: 40.w, - height: 40.h, - ), - ), - ), - ); - } -} - -class _Header extends StatelessWidget { - @override - Widget build(BuildContext context) { - final chattingViewModel = Provider.of(context); - return Container( - height: 128.h, - alignment: Alignment.bottomCenter, - padding: EdgeInsets.only(right: 32.w, left: 32.w, bottom: 14.h), - color: Color(0xff4D76C8), - width: double.maxFinite, - child: Row( - children: [ - Container( - child: Row( - children: [ - SvgPicture.asset( - 'assets/User.svg', - width: 32.w, - height: 32.h, - ), - SizedBox(width: 12.w), - Text( - '닉네임', - style: TextStyle( - fontFamily: 'KCCChassam', - fontSize: 22.sp, - fontWeight: FontWeight.w400, - color: Colors.white, - ), - ), - ], - ), - ), - SizedBox(width: 95.w), - GestureDetector( - child: SvgPicture.asset( - 'assets/Report button.svg', - width: 40.w, - height: 40.h, - ), - ), - SizedBox(width: 12.w), - GestureDetector( - onTap: () { - Navigator.push( - context, - MaterialPageRoute(builder: (context) => HomeScreen()), - ); - }, - child: SvgPicture.asset( - 'assets/Exit.svg', - width: 38.w, - height: 38.h, - ), - ), - ], - ), - ); - } -} - -class _ChatBubble extends StatelessWidget { - final String message; - - const _ChatBubble({Key? key, required this.message}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.all(8), - margin: EdgeInsets.symmetric(vertical: 4), - decoration: BoxDecoration( - color: Colors.lightBlueAccent, - borderRadius: BorderRadius.circular(10), - ), - child: Text( - message, - style: TextStyle(color: Colors.white), - ), - ); - } -} diff --git a/lib/views/CustomDrawerScreen.dart b/lib/views/CustomDrawerScreen.dart deleted file mode 100644 index 05aac55..0000000 --- a/lib/views/CustomDrawerScreen.dart +++ /dev/null @@ -1,189 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -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/LoginScreen.dart'; -import 'package:suwon/views/widgets/CancelAndActionAlertDialogWidget.dart'; - -class CustomDrawerScreen extends StatelessWidget { - @override - Widget build(BuildContext context) { - return Drawer( - child: Container( - color: Colors.white, - child: ListView( - physics: const NeverScrollableScrollPhysics(), - padding: EdgeInsets.zero, - children: [ - Container( - height: 100.sp, - padding: EdgeInsets.only(right: 20.sp), - child: Row( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, // 가로 방향에서 맨 오른쪽 정렬 - children: [ - SizedBox(), - IconButton( - onPressed: () { - Navigator.of(context).pop(); - }, - icon: Image.asset( - 'assets/close.png', - scale: 4.sp, - ), - ) - ], - ), - ), - Container( - padding: EdgeInsets.all(0), - child: Column( - children: [ - Container( - alignment: Alignment.topLeft, - margin: EdgeInsets.zero, // 상단 여백 제거 - padding: EdgeInsets.only(left: 40.sp), - height: 120, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CircleAvatar( - backgroundColor: Colors.white, - backgroundImage: AssetImage('assets/Group.png'), - ), - SizedBox(height: 8), - Text( - 'AnSungMin', - style: TextStyle( - color: Colors.black, - fontFamily: 'KCCChassam', - fontSize: 22, - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w400, - ), - ), - Text( - '# ISTP', - style: TextStyle( - color: Color(0xff767676), - fontFamily: 'KCCChassam', - fontSize: 14, - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w400, - ), - ), - ], - ), - ), - ], - ), - ), - Divider( - color: Color(0xFFEDEDED), - thickness: 1.0, - ), - SizedBox(height: 20), - ListTile_main( - text: '프로필 수정', - Menu_Icon: 'assets/profile.svg', - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => EditProfileDrawerScreen(), - ), - ); - }, - ), - SizedBox(height: 20), - ListTile_main( - text: '이용약관', - Menu_Icon: 'assets/policy.svg', - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => TermsConditionsDrawerScreen(), - ), - ); - }, - ), - SizedBox(height: 20), - ListTile_main( - text: ' 피드백', - Menu_Icon: 'assets/feedback.svg', - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => FeedbackDrawerScreen(), - ), - ); - }, - ), - SizedBox(height: 20), - ListTile_main( - text: '로그아웃', - Menu_Icon: 'assets/logout.svg', - onTap: () { - CancelAndActionAlertDialogWidget( - title: "로그아웃 하시겠습니까?", - action: "로그아웃", - onAction: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => LoginScreen()), - ); - }, - onCancel: () {}) - .show(context); - }), - ], - ), - ), - ); - } -} - -class ListTile_main extends StatelessWidget { - final String text; - final String Menu_Icon; - final VoidCallback onTap; - - const ListTile_main( - {required this.text, required this.Menu_Icon, required this.onTap}); - @override - Widget build(BuildContext context) { - return ListTile( - title: Row( - children: [ - SizedBox( - width: 20.sp, - ), - SvgPicture.asset(Menu_Icon), - SizedBox(width: 10.sp), - Text( - text, - style: TextStyle( - color: Colors.black, - fontFamily: 'Pretendard', - fontSize: 16.sp, - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w400, - letterSpacing: -0.4.sp, - ), - ), // 제목 - SizedBox(width: 20.sp), - Image.asset( - 'assets/Vector6.png', - scale: 4.sp, - ) - ], - ), - onTap: onTap); - } -} diff --git a/lib/views/EmailAuthentication.dart b/lib/views/EmailAuthentication.dart deleted file mode 100644 index 32f8691..0000000 --- a/lib/views/EmailAuthentication.dart +++ /dev/null @@ -1,132 +0,0 @@ -import 'dart:convert'; - -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:suwon/models/user_model.dart'; -import 'package:suwon/viewmodels/SignupVM.dart'; -import 'package:provider/provider.dart'; -import 'package:suwon/views/LoginScreen.dart'; -import 'package:suwon/views/SignUpScreen.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; -import 'package:suwon/views/widgets/EmailTextFieldWidget.dart'; -import 'package:suwon/views/widgets/SuchatAppBarWidget.dart'; -import 'package:suwon/views/widgets/TextFontWidget.dart'; - -class EmailAuth extends StatelessWidget { - const EmailAuth({super.key}); - - @override - Widget build(BuildContext context) { - final signupViewModel = Provider.of(context); - return ScreenUtilInit( - designSize: Size(390, 844), - builder: (context, child) => Scaffold( - resizeToAvoidBottomInset: false, - body: Container( - margin: EdgeInsets.only(top: 88.h), - child: Form( - child: Column( - children: [ - Container( - //상단바 - margin: EdgeInsets.symmetric(horizontal: 20.w), - child: SuchatAppBarWidget( - text: ' 회원가입', - onPressed: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => SignUpScreen(), - ), - ); - }, - ), - ), - Container( - margin: EdgeInsets.symmetric(horizontal: 32.w), - child: Column(children: [ - SizedBox( - width: double.maxFinite, - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - SizedBox(height: 35.h), - EmailTextFieldWidget( - controller: signupViewModel.emailController, - onChanged: (value) => - signupViewModel.isEmailValid), - SizedBox(height: 57.h), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - TextFontWidget.fontSemiBold( - text: '* 입력하신 메일로 ', - fontSize: 12.sp, - color: Color(0xFF989898), - ), - TextFontWidget.fontSemiBold( - text: '이메일 인증 URL ', - fontSize: 12.sp, - color: Color(0xff2d63d8), - ), - TextFontWidget.fontSemiBold( - text: '을 전송합니다', - fontSize: 12.sp, - color: Color(0xFF989898), - ), - ], - ), - SizedBox(height: 10.h), - CustomButtonWidget( - text: '인증메일 전송', - color: Colors.white, - backgroundColor: Color(0xff2d63d8), - onPressed: () async { - // 사용자 입력을 JSON 형식으로 변환합니다 - String jsonData = json.encode({ - "memberId": signupViewModel.idController.text, - "password": signupViewModel.pwController.text, - "email": signupViewModel.emailController.text, - "nickname": - signupViewModel.nicknameController.text, - }); - - // UserModel.fromJson 생성자를 사용하여 UserModel 객체를 만듭니다 - UserModel userModel = - UserModel.fromJson(json.decode(jsonData)); - - // UserModel 객체와 함께 signup 메서드를 호출합니다 - await signupViewModel.signup(userModel); - }, - ), - SizedBox( - height: 15.h, - ), - CustomButtonWidget( - text: '회원가입 완료', - color: Colors.white, - backgroundColor: Color(0xFF111111), - onPressed: () { - signupViewModel.idController.clear(); - signupViewModel.pwController.clear(); - signupViewModel.pwMatchController.clear(); - signupViewModel.emailController.clear(); - signupViewModel.nicknameController.clear(); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => LoginScreen()), - ); - }), - ], - ), - ), - ]), - ), - ], - ), - ), - )), - ); - } -} diff --git a/lib/views/FeedbackDrawerScreen.dart b/lib/views/FeedbackDrawerScreen.dart deleted file mode 100644 index 18a5eb4..0000000 --- a/lib/views/FeedbackDrawerScreen.dart +++ /dev/null @@ -1,69 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:suwon/views/widgets/DrawerAppBarWidget.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.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), - CustomButtonWidget( - text: "제출하기", - backgroundColor: Color(0xFF2D64D8), - onPressed: () {}, - color: Color(0xFFFFFFFF)) - ], - ), - ), - ], - ), - ), - )), - ); - } -} diff --git a/lib/views/HomeScreen.dart b/lib/views/HomeScreen.dart deleted file mode 100644 index c2e22fd..0000000 --- a/lib/views/HomeScreen.dart +++ /dev/null @@ -1,214 +0,0 @@ -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/MatchingLoadingScreen.dart'; - -class HomeScreen extends StatelessWidget { - const HomeScreen({super.key}); - - @override - Widget build(BuildContext context) { - final _scaffoldKey = GlobalKey(); - - return ScreenUtilInit( - designSize: Size(390, 844), - builder: (context, child) => Scaffold( - backgroundColor: Colors.white, - key: _scaffoldKey, - resizeToAvoidBottomInset: false, - appBar: AppBar( - toolbarHeight: 80.h, - centerTitle: false, - automaticallyImplyLeading: false, - elevation: 0.0, - backgroundColor: Colors.white, - title: Container( - width: 96.w, - height: 80.h, - padding: EdgeInsets.zero, - margin: EdgeInsets.zero, - child: Row( - children: [ - SizedBox( - width: 15.w, - ), - Image.asset( - 'assets/SUCHAT.png', - width: 76.w, - height: 20.h, - ) - ], - ), - ), - actions: [ - Container( - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Container( - child: IconButton( - onPressed: () { - _scaffoldKey.currentState?.openEndDrawer(); - }, - icon: SvgPicture.asset('assets/onclikmenu.svg', - width: 28.w, height: 20.h), - )), - SizedBox( - width: 25.w, - ), - ], - ), - ), - ], - ), - body: Column( - children: [ - Container( - child: Text( - '_배너', - style: TextStyle( - fontSize: 18.sp, - fontWeight: FontWeight.w400, - ), - ), - alignment: Alignment.center, - height: 55.h, - width: 390.w, - color: Color(0xffDBDBDB), - ), - Row( - children: [ - SizedBox( - width: 32.w, - ), - Container( - height: 335.h, - width: 358.w, - clipBehavior: Clip.hardEdge, - decoration: BoxDecoration(color: Colors.white), - child: Transform.scale( - scale: 1, - child: Transform.translate( - offset: const Offset(0, -60), - child: ClipRect( - child: Image.asset( - 'assets/bubble_main.PNG', - fit: BoxFit.fill, - ), - ), - ), - ), - ), - ], - ), - Container( - child: CustomButton_main( - text: '매칭 시작하기', - onPressed: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => MatchingLoadingScreen()), - ); - }, - ), - ), - SizedBox( - height: 24.h, - width: 360.w, - ), - Container( - child: Text( - '주의!! 욕설 및 상대방에게 불쾌함을 주는 채팅\n 적발 시 계정 이용이 제한됩니다 ', - style: TextStyle( - color: Color(0xff767676), - fontFamily: 'KCCChassam', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w400, - fontSize: 14.sp, - letterSpacing: -0.4, - ), - ), - ), - SizedBox( - height: 120.h, - width: 390.w, - ), - Container( - height: 20.h, - width: 390.w, - child: Text( - '@copyright by Flag', - textAlign: TextAlign.center, - style: TextStyle( - color: Color(0xff767676), - fontFamily: 'Pretendard', - fontSize: 12.sp, - fontWeight: FontWeight.w400, - letterSpacing: 0.3, - ), - ), - ) - ], - ), - endDrawer: CustomDrawerScreen(), - )); - } -} - -class CustomButton_main extends StatelessWidget { - final String text; - final VoidCallback onPressed; - - const CustomButton_main({ - required this.text, - required this.onPressed, - }); - - @override - Widget build(BuildContext context) { - return Container( - height: 64.h, - width: 334.w, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(25.r), - color: Color(0xff2D64D8), - ), - child: TextButton( - onPressed: onPressed, - child: Text( - text, - style: TextStyle( - color: Color(0xffffffff), - fontSize: 24.sp, - fontWeight: FontWeight.w400, - fontFamily: 'KCCChassam', - fontStyle: FontStyle.normal, - ), - ), - ), - ); - } -} - -class resign_Button extends StatelessWidget { - @override - Widget build(BuildContext context) { - return TextButton( - onPressed: () {}, - child: Text( - '회원 탈퇴하기 >', - style: TextStyle( - color: Color(0xff767676), - fontFamily: 'Pretendard', - fontSize: 12.sp, - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w400, - letterSpacing: 0.3.sp, - ), - ), - style: TextButton.styleFrom(padding: EdgeInsets.zero), - ); - } -} diff --git a/lib/views/ChangePasswordScreen.dart b/lib/views/Login_page_changePW.dart similarity index 92% rename from lib/views/ChangePasswordScreen.dart rename to lib/views/Login_page_changePW.dart index 3dc087b..37eba13 100644 --- a/lib/views/ChangePasswordScreen.dart +++ b/lib/views/Login_page_changePW.dart @@ -1,19 +1,21 @@ +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/AccountRecoveryVM.dart'; +import 'package:suwon/viewmodels/AccountRecovery_viewmodel.dart'; -import 'package:suwon/views/LoginScreen.dart'; +import 'package:suwon/views/login_screen.dart'; -import 'package:suwon/views/widgets/SuchatAppBarWidget.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; +import 'package:suwon/views/widgets/appbar.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; -class ChangePasswordScreen extends StatelessWidget { +class ChangePW extends StatelessWidget { final GlobalKey _formKey = GlobalKey(); @override Widget build(BuildContext context) { - final accountRecoveryViewModel = Provider.of(context); + final accountRecoveryViewModel = + Provider.of(context); return ScreenUtilInit( designSize: Size(390, 844), @@ -27,7 +29,7 @@ class ChangePasswordScreen extends StatelessWidget { children: [ Container( margin: EdgeInsets.symmetric(horizontal: 20.w), - child: SuchatAppBarWidget( + child: SuchatAppBar( text: '비밀번호 변경', onPressed: () { accountRecoveryViewModel.pwController.clear(); @@ -35,7 +37,7 @@ class ChangePasswordScreen extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => const LoginScreen()), + builder: (context) => const NewLoignMain()), ); }, ), @@ -91,7 +93,7 @@ class ChangePasswordScreen extends StatelessWidget { : Icons.visibility, ), SizedBox(height: 48.h), - CustomButtonWidget( + CustomButton( text: '변경 완료', color: Colors.white, backgroundColor: Color(0xff2D64D8), diff --git a/lib/views/SearchIdScreen.dart b/lib/views/Login_page_searchID.dart similarity index 85% rename from lib/views/SearchIdScreen.dart rename to lib/views/Login_page_searchID.dart index e1ab2f2..2504818 100644 --- a/lib/views/SearchIdScreen.dart +++ b/lib/views/Login_page_searchID.dart @@ -1,21 +1,22 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:suwon/viewmodels/AccountRecoveryVM.dart'; -import 'package:suwon/viewmodels/SignupVM.dart'; -import 'package:suwon/views/LoginScreen.dart'; -import 'package:suwon/views/widgets/SuchatAppBarWidget.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; -import 'package:suwon/views/widgets/EmailTextFieldWidget.dart'; +import 'package:suwon/viewmodels/AccountRecovery_viewmodel.dart'; +import 'package:suwon/viewmodels/signup_viewmodel.dart'; +import 'package:suwon/views/login_screen.dart'; +import 'package:suwon/views/widgets/appbar.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; +import 'package:suwon/views/widgets/emailfield.dart'; import 'package:provider/provider.dart'; -class SearchIdScreen extends StatelessWidget { - const SearchIdScreen({super.key}); +class SearchID extends StatelessWidget { + const SearchID({super.key}); @override Widget build(BuildContext context) { final GlobalKey _formKey = GlobalKey(); - final accountRecoveryViewModel = Provider.of(context); + final accountRecoveryViewModel = + Provider.of(context); return ScreenUtilInit( designSize: Size(390, 844), @@ -30,14 +31,14 @@ class SearchIdScreen extends StatelessWidget { Container( //상단바 margin: EdgeInsets.symmetric(horizontal: 20.w), - child: SuchatAppBarWidget( + child: SuchatAppBar( text: '아이디 찾기', onPressed: () { accountRecoveryViewModel.emailController.clear(); Navigator.push( context, MaterialPageRoute( - builder: (context) => const LoginScreen()), + builder: (context) => const NewLoignMain()), ); }, ), @@ -54,7 +55,7 @@ class SearchIdScreen extends StatelessWidget { SizedBox( height: 42.h, ), - EmailTextFieldWidget( + EmailFD( controller: accountRecoveryViewModel.emailController, onChanged: (value) => @@ -101,7 +102,7 @@ class SearchIdScreen extends StatelessWidget { SizedBox( height: 12.h, ), - CustomButtonWidget( + CustomButton( text: '확인메일 전송', color: Colors.white, backgroundColor: Color(0xff2D64D8), @@ -110,7 +111,7 @@ class SearchIdScreen extends StatelessWidget { SizedBox( height: 12.h, ), - CustomButtonWidget( + CustomButton( text: '로그인 하러가기', color: Colors.white, backgroundColor: Color(0xff111111), @@ -118,7 +119,7 @@ class SearchIdScreen extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => LoginScreen(), + builder: (context) => NewLoignMain(), ), ); }, diff --git a/lib/views/SearchPasswordScreen.dart b/lib/views/Login_page_searchPW.dart similarity index 89% rename from lib/views/SearchPasswordScreen.dart rename to lib/views/Login_page_searchPW.dart index 0968583..0eafa27 100644 --- a/lib/views/SearchPasswordScreen.dart +++ b/lib/views/Login_page_searchPW.dart @@ -1,20 +1,22 @@ +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/AccountRecoveryVM.dart'; -import 'package:suwon/views/LoginScreen.dart'; -import 'package:suwon/views/widgets/SuchatAppBarWidget.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; -import 'package:suwon/views/widgets/EmailTextFieldWidget.dart'; -import 'package:suwon/views/widgets/IdTextFieldWidget.dart'; +import 'package:suwon/viewmodels/AccountRecovery_viewmodel.dart'; +import 'package:suwon/views/login_screen.dart'; +import 'package:suwon/views/widgets/appbar.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; +import 'package:suwon/views/widgets/emailfield.dart'; +import 'package:suwon/views/widgets/idfield.dart'; -class SearchPasswordScreen extends StatelessWidget { +class SearchPW extends StatelessWidget { final GlobalKey _formKey = GlobalKey(); - SearchPasswordScreen({super.key}); + SearchPW({super.key}); @override Widget build(BuildContext context) { - final accountRecoveryViewModel = Provider.of(context); + final accountRecoveryViewModel = + Provider.of(context); return ScreenUtilInit( designSize: Size(390, 844), @@ -28,7 +30,7 @@ class SearchPasswordScreen extends StatelessWidget { children: [ Container( margin: EdgeInsets.symmetric(horizontal: 20.w), - child: SuchatAppBarWidget( + child: SuchatAppBar( text: '비밀번호 찾기', onPressed: () { accountRecoveryViewModel.idController.clear(); @@ -38,7 +40,7 @@ class SearchPasswordScreen extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => const LoginScreen()), + builder: (context) => const NewLoignMain()), ); }, ), @@ -51,7 +53,7 @@ class SearchPasswordScreen extends StatelessWidget { SizedBox( height: 42.h, ), - IdTextFieldWidget( + IdFD( controller: accountRecoveryViewModel.idController, onChanged: (value) => accountRecoveryViewModel @@ -59,7 +61,7 @@ class SearchPasswordScreen extends StatelessWidget { SizedBox( height: 21.h, ), - EmailTextFieldWidget( + EmailFD( controller: accountRecoveryViewModel.emailController, onChanged: (value) => @@ -108,7 +110,7 @@ class SearchPasswordScreen extends StatelessWidget { SizedBox( height: 12.h, ), - CustomButtonWidget( + CustomButton( text: '인증코드 전송', color: Colors.white, backgroundColor: Color(0xff2D64D8), diff --git a/lib/views/Main_page.dart b/lib/views/Main_page.dart new file mode 100644 index 0000000..bae9e3a --- /dev/null +++ b/lib/views/Main_page.dart @@ -0,0 +1,440 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:suwon/views/edit_profie.dart'; +import 'package:suwon/views/login_screen.dart'; +import 'package:suwon/views/matching_loding.dart'; + +class MainPage extends StatelessWidget { + const MainPage({super.key}); + + @override + Widget build(BuildContext context) { + final _scaffoldKey = GlobalKey(); + + return ScreenUtilInit( + designSize: Size(390, 844), + builder: (context, child) => Scaffold( + key: _scaffoldKey, + resizeToAvoidBottomInset: false, + appBar: AppBar( + elevation: 0.0, + backgroundColor: Colors.white, + title: Container( + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + SizedBox(width: 20.sp), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + 'asstes/SUCHAT.png', + width: 74.sp, + height: 20.sp, + fit: BoxFit.fill, + ) + ], + ) + ], + ), + ), + centerTitle: false, + automaticallyImplyLeading: false, + actions: [ + Container( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + child: IconButton( + onPressed: () { + _scaffoldKey.currentState?.openEndDrawer(); + }, + icon: SvgPicture.asset( + 'asstes/Icon_menu.svg', + ), + ), + ) + ], + ), + SizedBox( + width: 28.sp, + ) + ], + ), + ) + ], + ), + endDrawer: Drawer( + backgroundColor: Colors.white, + width: 250.sp, + child: Container( + height: 800.sp, + width: double.infinity, + child: + ListView( + physics: const NeverScrollableScrollPhysics(), + padding: EdgeInsets.only(top: 0), + children: [ + Column( + children: [ + Container( + height: 85.sp, + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + SizedBox( + width: 190.sp, + ), + IconButton( + onPressed: () {}, + icon: Image.asset( + 'asstes/close.png', + scale: 4.sp, + ), + ) + ], + ), + ), + UserAccountsDrawerHeader( + decoration: BoxDecoration(color: Colors.white), + margin: EdgeInsets.zero, + currentAccountPicture: CircleAvatar( + backgroundColor: Colors.white, + backgroundImage: AssetImage('asstes/Group.png'), + ), + currentAccountPictureSize: Size(49.sp, 49.sp), + accountName: Text( + 'AnSungMin', + style: TextStyle( + color: Colors.black, + fontFamily: 'KCCChassam', + fontSize: 22.sp, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + ), + ), + accountEmail: Text( + '# ISTP', + style: TextStyle( + color: Color(0xff767676), + fontFamily: 'KCCChassam', + fontSize: 14.sp, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + ), + ), + ), + Container( + height: 400.sp, + width: double.infinity, + decoration: BoxDecoration( + border: Border( + top: BorderSide( + color: Color(0xffEDEDED), + width: 1.sp, + ), + bottom: BorderSide( + color: Color(0xffEDEDED), + width: 1.sp, + ), + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + SizedBox( + height: 59.sp, + ), + ListTile( + leading: SvgPicture.asset('asstes/profile.svg'), + title: Text( + '프로필 수정', + style: TextStyle( + color: Colors.black, + fontFamily: 'Pretendard', + fontSize: 16.sp, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + letterSpacing: -0.4.sp, + ), + ), + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => EditProfile(), + ), + ); + }, + trailing: Image.asset( + 'asstes/Vector6.png', + scale: 4.sp, + ), + ), + ListTile( + leading: SvgPicture.asset('asstes/policy.svg'), + title: Text( + '이용약관', + style: TextStyle( + color: Colors.black, + fontFamily: 'Pretendard', + fontSize: 16.sp, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + letterSpacing: -0.4.sp, + ), + ), + onTap: () {}, + trailing: Image.asset( + 'asstes/Vector6.png', + scale: 4.sp, + ), + ), + ListTile( + leading: SvgPicture.asset('asstes/feedback.svg'), + title: Text( + '피드백', + style: TextStyle( + color: Colors.black, + fontFamily: 'Pretendard', + fontSize: 16.sp, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + letterSpacing: -0.4.sp, + ), + ), + onTap: () {}, + trailing: Image.asset( + 'asstes/Vector6.png', + scale: 4.sp, + ), + ), + ListTile( + leading: SvgPicture.asset('asstes/logout.svg'), + title: Padding( + padding: EdgeInsets.zero, + child: Text( + '로그아웃', + style: TextStyle( + color: Colors.black, + fontFamily: 'Pretendard', + fontSize: 16.sp, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + letterSpacing: -0.4.sp, + ), + ), + ), + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => NewLoignMain()), + ); + }, + trailing: Image.asset( + 'asstes/Vector6.png', + scale: 4.sp, + ), + ), + SizedBox( + height: 100.sp, + ) + ], + ), + ), + Container( + height: 150.sp, + width: double.infinity, + color: Color(0xffEDEDED), + child: Row( + children: [ + SizedBox( + width: 32.sp, + ), + Column( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 15.sp, + ), + Image.asset( + 'asstes/SUCHAT.png', + scale: 3.sp, + ), + SizedBox( + height: 12.sp, + ), + Text( + 'Copyright 2023.\nFlag inc. all rights reserved.', + style: TextStyle( + color: Color(0xff767676), + fontFamily: 'Pretendard', + fontSize: 10.sp, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + letterSpacing: 0.25.sp, + ), + ), + TextButton( + onPressed: () {}, + child: Text( + '회원 탈퇴하기 >', + style: TextStyle( + color: Color(0xff767676), + fontFamily: 'Pretendard', + fontSize: 12.sp, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + letterSpacing: 0.3.sp, + ), + ), + style: TextButton.styleFrom( + padding: EdgeInsets.zero), + ) + ], + ) + ], + ) + ], + ), + ) + ], + ) + ], + ), + ) + ), + body: Container( + color: Colors.white, + child: Column( + children: [ + SizedBox( + height: 18.sp, + ), + Container( + child: Container( + child: Text( + '_배너', + style: TextStyle( + fontSize: 18.sp, + fontWeight: FontWeight.w400, + ), + ), + alignment: Alignment.center, + height: 55.sp, + width: 390.sp, + color: Color(0xffDBDBDB), + ), + ), + Container( + height: 331.h, + width: double.infinity, + clipBehavior: Clip.hardEdge, + decoration: BoxDecoration(color: Colors.white), + child: Transform.scale( + scale: 1.sp, + child: Transform.translate( + offset: const Offset(25, -60), + child: Image.asset('asstes/bubble_main.PNG', scale: 1.sp,fit: BoxFit.fill,), + ), + ), + ), + Container( + child: CustomButton_main( + text: '매칭 시작하기', + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => MatchingLoading()), + ); + }, + ), + ), + SizedBox( + height: 24.sp, + width: double.infinity, + ), + Container( + + child: Text( + '주의!! 욕설 및 상대방에게 불쾌함을 주는 채팅\n 적발 시 계정 이용이 제한됩니다 ', + style: TextStyle( + color: Color(0xff767676), + fontFamily: 'KCCChassam', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + fontSize: 14.sp, + letterSpacing: -0.4.sp, + ), + ), + ), + SizedBox( + height: 120.sp, + width: double.infinity, + ), + Container( + height: 20.sp, + width: double.infinity, + child: Text( + '@copyright by Flag',textAlign: TextAlign.center, + style: TextStyle( + color: Color(0xff767676), + fontFamily: 'Pretendard', + fontSize: 12.sp, + fontWeight: FontWeight.w400, + letterSpacing: 0.3.sp, + + ), + ), + ) + ], + ), + ), + ), + ); + } +} + +class CustomButton_main extends StatelessWidget { + final String text; + final VoidCallback onPressed; + + const CustomButton_main({ + required this.text, + required this.onPressed, + }); + + @override + Widget build(BuildContext context) { + return Container( + height: 64.sp, + width: 334.sp, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(25.w), + color: Color(0xff2D64D8), + ), + child: TextButton( + onPressed: onPressed, + child: Text( + text, + style: TextStyle( + color: Color(0xffffffff), + fontSize: 24.sp, + fontWeight: FontWeight.w400, + fontFamily: 'KCCChassam', + fontStyle: FontStyle.normal, + ), + ), + ), + ); + } +} diff --git a/lib/views/RandomChatScreen.dart b/lib/views/RandomChatScreen.dart deleted file mode 100644 index 04e32c3..0000000 --- a/lib/views/RandomChatScreen.dart +++ /dev/null @@ -1,164 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:flutter_svg/flutter_svg.dart'; - -class RandomChat extends StatefulWidget { - const RandomChat({super.key}); - - @override - State createState() => _RandomChatState(); -} - -class _RandomChatState extends State { - bool isChatEnabled = false; - - @override - Widget build(BuildContext context) { - return ScreenUtilInit( - designSize: Size(390, 844), - builder: (context, child) => Scaffold( - resizeToAvoidBottomInset: true, - body: SizedBox( - height: 812.h, - child: Column( - children: [ - header(), - Expanded( - child: SingleChildScrollView( - child: Column( - children: [ - // Add your chat messages here - ], - ), - ), - ), - Container( - padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 24.w), - height: 58.h, - child: CustomTextField( - hintText: '채팅을 시작해 보세요...', - onIconTap: (isEnabled) { - setState(() { - isChatEnabled = isEnabled; - }); - }, - ), - ), - ], - ), - ), - ), - ); - } - - Widget header() { - return Container( - height: 128.h, - alignment: Alignment.bottomCenter, - padding: EdgeInsets.only(right: 32.w, left: 32.w, bottom: 14.h), - color: Color(0xff4D76C8), - width: double.maxFinite, - child: Row( - children: [ - Container( - child: Row( - children: [ - SvgPicture.asset( - 'assets/User.svg', - width: 32.w, - height: 32.h, - ), - SizedBox(width: 12.w), - Text( - 'nickname', - style: TextStyle( - fontFamily: 'KCCChassam', - fontSize: 22.sp, - fontWeight: FontWeight.w400, - color: Colors.white, - ), - ), - ], - ), - ), - SizedBox(width: 95.w), - InkWell( - onTap: () { - // 이미지 버튼이 탭되면 onPressed 함수를 호출합니다. - onPressed() {} - }, - child: SvgPicture.asset( - 'assets/Report button.svg', - width: 40.w, - height: 40.h, - ), - ), - SizedBox(width: 12.w), - InkWell( - onTap: () { - // 이미지 버튼이 탭되면 onPressed 함수를 호출합니다. - onPressed() {} - }, - child: SvgPicture.asset( - 'assets/Exit.svg', - width: 38.w, - height: 38.h, - ), - ), - ], - ), - ); - } -} - -class CustomTextField extends StatefulWidget { - final String hintText; - final Function(bool) onIconTap; - - CustomTextField({required this.hintText, required this.onIconTap}); - - @override - _CustomTextFieldState createState() => _CustomTextFieldState(); -} - -class _CustomTextFieldState extends State { - bool isInputEmpty = true; - - @override - Widget build(BuildContext context) { - return TextField( - decoration: InputDecoration( - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(20), - ), - hintText: widget.hintText, - hintStyle: TextStyle( - color: Color(0xff737373), - fontFamily: 'Pretendard-Regular', - fontSize: 16.sp, - fontWeight: FontWeight.w400, - ), - contentPadding: EdgeInsets.only(left: 17.w, top: 12, bottom: 12), - suffixIcon: InkWell( - onTap: () { - setState(() { - isInputEmpty = !isInputEmpty; - }); - widget.onIconTap(isInputEmpty); - }, - child: isInputEmpty - ? SvgPicture.asset( - 'asstes/onchatbt.svg', - width: 40.w, - height: 40.h, - ) - : SvgPicture.asset( - 'asstes/offchatbt.svg', - width: 40.w, - height: 40.h, - ), - ), - ), - ); - } -} diff --git a/lib/views/TermsConditionsDrawerScreen.dart b/lib/views/TermsConditionsDrawerScreen.dart deleted file mode 100644 index 614aada..0000000 --- a/lib/views/TermsConditionsDrawerScreen.dart +++ /dev/null @@ -1,36 +0,0 @@ -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(); - }, - ), - ), - ], - ), - ), - )), - ); - } -} diff --git a/lib/views/EditProfileDrawerScreen.dart b/lib/views/edit_profie.dart similarity index 92% rename from lib/views/EditProfileDrawerScreen.dart rename to lib/views/edit_profie.dart index b068bcf..8a4b64a 100644 --- a/lib/views/EditProfileDrawerScreen.dart +++ b/lib/views/edit_profie.dart @@ -1,19 +1,19 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.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: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:provider/provider.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; -import 'package:suwon/views/widgets/TextFontWidget.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; +import 'package:suwon/views/widgets/font.dart'; -class EditProfileDrawerScreen extends StatelessWidget { +class EditProfile extends StatelessWidget { final GlobalKey _formKey = GlobalKey(); @override Widget build(BuildContext context) { - final signupViewModel = Provider.of(context); + final signupViewModel = Provider.of(context); return ScreenUtilInit( designSize: Size(390, 844), builder: (context, child) => Scaffold( @@ -27,7 +27,7 @@ class EditProfileDrawerScreen extends StatelessWidget { Container( //상단바 margin: EdgeInsets.symmetric(horizontal: 20.w), - child: SuchatAppBarWidget( + child: SuchatAppBar( text: ' 프로필 설정', onPressed: () { signupViewModel.idController.clear(); @@ -35,7 +35,7 @@ class EditProfileDrawerScreen extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => HomeScreen(), + builder: (context) => MainPage(), ), ); }, @@ -56,7 +56,7 @@ class EditProfileDrawerScreen extends StatelessWidget { color: Color(0xFFFF0000), controller: signupViewModel.nicknameController, onChanged: (value) => - signupViewModel.validateNickNameInput(value), + signupViewModel.validateNickName(value), showErrorText: signupViewModel.nicknameError, errorText: '* 닉네임은 8자 이내로 작성 해주세요', hintText: '# NICKNAME', @@ -70,7 +70,7 @@ class EditProfileDrawerScreen extends StatelessWidget { ), child: TextButton( onPressed: () {}, - child: TextFontWidget.fontRegular( + child: TextFont.fontRegular( color: Color(0xFFFFFFFF), fontSize: 14, text: '중복 확인')), diff --git a/lib/views/LoginScreen.dart b/lib/views/login_screen.dart similarity index 67% rename from lib/views/LoginScreen.dart rename to lib/views/login_screen.dart index 91fae1b..d1c72c0 100644 --- a/lib/views/LoginScreen.dart +++ b/lib/views/login_screen.dart @@ -1,25 +1,22 @@ -// ignore_for_file: use_build_context_synchronously - import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:suwon/views/ChangePasswordScreen.dart'; -import 'package:suwon/views/SearchIdScreen.dart'; -import 'package:suwon/views/HomeScreen.dart'; -import 'package:suwon/views/SignUpScreen.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; +import 'package:suwon/views/Login_page_changePW.dart'; +import 'package:suwon/views/Login_page_searchID.dart'; +import 'package:suwon/views/Main_page.dart'; +import 'package:suwon/views/Signup_creen.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; import 'package:provider/provider.dart'; -import 'package:suwon/viewmodels/LoginVM.dart'; -import 'package:suwon/views/widgets/NormalAlertDialogWidget.dart'; -import 'package:suwon/views/widgets/TextFontWidget.dart'; +import 'package:suwon/viewmodels/login_viewmodel.dart'; +import 'package:suwon/views/widgets/font.dart'; -import 'SearchPasswordScreen.dart'; +import 'Login_page_searchPW.dart'; -class LoginScreen extends StatelessWidget { - const LoginScreen({super.key}); +class NewLoignMain extends StatelessWidget { + const NewLoignMain({super.key}); @override Widget build(BuildContext context) { - final loginViewModel = Provider.of(context); + final loginViewModel = Provider.of(context); return ScreenUtilInit( designSize: Size(390, 844), builder: (context, child) => Scaffold( @@ -33,7 +30,7 @@ class LoginScreen extends StatelessWidget { margin: EdgeInsets.only(left: 32.w), child: Image( fit: BoxFit.fill, - image: AssetImage('assets/bubble.PNG'), + image: AssetImage('asstes/bubble.PNG'), ), ), SizedBox(height: 32.h), @@ -43,44 +40,38 @@ class LoginScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ InputFD( - // ID 입력창 - onChanged: (value) => loginViewModel.setUserid(value), - hintText: 'ID', - ), + //ID 입력창 + onChanged: (value) => loginViewModel.setUserid(value), + hintText: 'ID'), SizedBox( height: 10.h, ), InputFD( - // PW 입력창 - onChanged: (value) => loginViewModel.setUserpw(value), - hintText: 'PW', - obscureText: true, - ), + // PW 입력창 + onChanged: (value) => loginViewModel.setUserpw(value), + hintText: 'PW', + obscureText: true), SizedBox(height: 24.h), - CustomButtonWidget( + CustomButton( // 로그인 버튼 text: '로그인', color: Colors.white, backgroundColor: Color(0xff2d63d8), onPressed: () async { - await loginViewModel.login(); - // 로그인 결과에 따른 처리를 추가할 수 있음 - print(loginViewModel.loginResult); - - // 예제로 홈 화면으로 이동하는 부분 추가 - if (loginViewModel.loginResult == '로그인 성공') { + /*bool success = await loginViewModel.login(); + if (success) { Navigator.push( context, - MaterialPageRoute( - builder: (context) => HomeScreen()), + MaterialPageRoute(builder: (context) => MainPage()), ); } else { - NormalAlertDialogWidget( - title: '알림', - message: 'ID 혹은 비밀번호가 올바르지 않습니다.', - onClose: () {}) - .show(context); + // 로그인 실패 처리 } + */ + Navigator.push( + context, + MaterialPageRoute(builder: (context) => MainPage()), + ); }), Row( mainAxisAlignment: MainAxisAlignment.center, @@ -90,24 +81,24 @@ class LoginScreen extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => const SearchIdScreen()), + builder: (context) => const SearchID()), ); }, - child: TextFontWidget.fontRegular( + child: TextFont.fontRegular( text: '아이디 찾기', fontSize: 14.sp, color: Color(0xFF232323))), - TextFontWidget.fontRegular( + TextFont.fontRegular( text: '/', fontSize: 16.sp, color: Color(0xFFBFBFBF)), TextButton( onPressed: () { Navigator.push( context, MaterialPageRoute( - builder: (context) => SearchPasswordScreen()), + builder: (context) => SearchPW()), ); }, - child: TextFontWidget.fontRegular( + child: TextFont.fontRegular( text: '비밀번호 찾기', fontSize: 14.sp, color: Color(0xFF232323))), @@ -125,7 +116,7 @@ class LoginScreen extends StatelessWidget { thickness: 1, color: Colors.grey, )), - TextFontWidget.fontRegular( + TextFont.fontRegular( text: '계정이 없으신가요?', fontSize: 14.sp, color: Color(0xFF767676)), @@ -140,7 +131,7 @@ class LoginScreen extends StatelessWidget { SizedBox( height: 18.h, ), - CustomButtonWidget( + CustomButton( text: '회원가입', color: Colors.white, backgroundColor: Color(0xFF111111), @@ -148,7 +139,7 @@ class LoginScreen extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => SignUpScreen()), + builder: (context) => SignupScreen()), ); }), ], diff --git a/lib/views/MatchingLoadingScreen.dart b/lib/views/matching_loding.dart similarity index 87% rename from lib/views/MatchingLoadingScreen.dart rename to lib/views/matching_loding.dart index e56150f..69ffd4e 100644 --- a/lib/views/MatchingLoadingScreen.dart +++ b/lib/views/matching_loding.dart @@ -2,18 +2,17 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:suwon/views/ChattingScreen.dart'; -import 'package:suwon/views/HomeScreen.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; +import 'package:suwon/views/Main_page.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; -class MatchingLoadingScreen extends StatefulWidget { - const MatchingLoadingScreen({Key? key}) : super(key: key); +class MatchingLoading extends StatefulWidget { + const MatchingLoading({Key? key}) : super(key: key); @override _MatchingLoadingState createState() => _MatchingLoadingState(); } -class _MatchingLoadingState extends State { +class _MatchingLoadingState extends State { StreamController dotStreamController = StreamController(); int numDots = 0; @@ -90,13 +89,13 @@ class _MatchingLoadingState extends State { fontsize: 16.sp, ), SizedBox(height: 60.h), - CustomButtonWidget( + CustomButton( text: '매칭 중단하기', backgroundColor: Color(0xff111111), onPressed: () { Navigator.push( context, - MaterialPageRoute(builder: (context) => RandomChat()), + MaterialPageRoute(builder: (context) => MainPage()), ); }, color: Color(0xffFFFFFF), diff --git a/lib/views/SetProfileScreen.dart b/lib/views/setprofile.dart similarity index 93% rename from lib/views/SetProfileScreen.dart rename to lib/views/setprofile.dart index f90a3be..a85c009 100644 --- a/lib/views/SetProfileScreen.dart +++ b/lib/views/setprofile.dart @@ -1,18 +1,18 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:suwon/views/SignUpScreen.dart'; -import 'package:suwon/views/widgets/SuchatAppBarWidget.dart'; -import 'package:suwon/viewmodels/SignupVM.dart'; +import 'package:suwon/views/signup_creen.dart'; +import 'package:suwon/views/widgets/appbar.dart'; +import 'package:suwon/viewmodels/signup_viewmodel.dart'; import 'package:provider/provider.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; -import 'package:suwon/views/widgets/TextFontWidget.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; +import 'package:suwon/views/widgets/font.dart'; -class SetProfileScreen extends StatelessWidget { +class SetProfile extends StatelessWidget { final GlobalKey _formKey = GlobalKey(); @override Widget build(BuildContext context) { - final signupViewModel = Provider.of(context); + final signupViewModel = Provider.of(context); return ScreenUtilInit( designSize: Size(390, 844), builder: (context, child) => Scaffold( @@ -26,7 +26,7 @@ class SetProfileScreen extends StatelessWidget { Container( //상단바 margin: EdgeInsets.symmetric(horizontal: 20.w), - child: SuchatAppBarWidget( + child: SuchatAppBar( text: ' 프로필 설정', onPressed: () { signupViewModel.idController.clear(); @@ -34,7 +34,7 @@ class SetProfileScreen extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => SignUpScreen(), + builder: (context) => SignupScreen(), ), ); }, @@ -54,7 +54,7 @@ class SetProfileScreen extends StatelessWidget { color: Color(0xFFFF0000), controller: signupViewModel.nicknameController, onChanged: (value) => - signupViewModel.validateNickNameInput(value), + signupViewModel.validateNickName(value), showErrorText: signupViewModel.nicknameError, errorText: '* 닉네임은 8자 이내로 작성 해주세요', hintText: '# NICKNAME', @@ -68,7 +68,7 @@ class SetProfileScreen extends StatelessWidget { ), child: TextButton( onPressed: () {}, - child: TextFontWidget.fontRegular( + child: TextFont.fontRegular( color: Color(0xFFFFFFFF), fontSize: 14, text: '중복 확인')), @@ -86,7 +86,7 @@ class SetProfileScreen extends StatelessWidget { SizedBox(height: 12.h), Self(controller: signupViewModel.selfController), SizedBox(height: 48.h), - CustomButtonWidget( + CustomButton( text: '시작하기', color: Colors.white, backgroundColor: Color(0xFF2D64D8), diff --git a/lib/views/SignUpScreen.dart b/lib/views/signup_creen.dart similarity index 68% rename from lib/views/SignUpScreen.dart rename to lib/views/signup_creen.dart index 97402c7..4d3283e 100644 --- a/lib/views/SignUpScreen.dart +++ b/lib/views/signup_creen.dart @@ -1,23 +1,20 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:suwon/views/EmailAuthentication.dart'; -import 'package:suwon/views/LoginScreen.dart'; -import 'package:suwon/views/SignUpDoneScreen.dart'; -import 'package:suwon/views/widgets/SuchatAppBarWidget.dart'; -import 'package:suwon/viewmodels/SignupVM.dart'; +import 'package:suwon/views/login_screen.dart'; +import 'package:suwon/views/signup_done.dart'; +import 'package:suwon/views/widgets/appbar.dart'; +import 'package:suwon/viewmodels/signup_viewmodel.dart'; import 'package:provider/provider.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; -import 'package:suwon/views/widgets/EmailTextFieldWidget.dart'; -import 'package:suwon/views/widgets/TextFontWidget.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; +import 'package:suwon/views/widgets/emailfield.dart'; +import 'package:suwon/views/widgets/font.dart'; -class SignUpScreen extends StatelessWidget { +class SignupScreen extends StatelessWidget { final GlobalKey _formKey = GlobalKey(); - SignUpScreen({super.key}); - @override Widget build(BuildContext context) { - final signupViewModel = Provider.of(context); + final signupViewModel = Provider.of(context); return ScreenUtilInit( designSize: Size(390, 844), builder: (context, child) => Scaffold( @@ -31,7 +28,7 @@ class SignUpScreen extends StatelessWidget { Container( //상단바 margin: EdgeInsets.symmetric(horizontal: 20.w), - child: SuchatAppBarWidget( + child: SuchatAppBar( text: ' 회원가입', onPressed: () { signupViewModel.idController.clear(); @@ -41,7 +38,7 @@ class SignUpScreen extends StatelessWidget { Navigator.push( context, MaterialPageRoute( - builder: (context) => LoginScreen(), + builder: (context) => NewLoignMain(), ), ); }, @@ -55,29 +52,8 @@ class SignUpScreen extends StatelessWidget { child: Column( mainAxisAlignment: MainAxisAlignment.start, children: [ - SizedBox(height: 40.h), - IdInputFD( - labelText: '아이디', - hintText: '아이디 입력 (4~16자)', - controller: signupViewModel.idController, - showErrorText: signupViewModel.idError, - errorText: '* 4자 이상 16자 이내로 작성해 주세요', - onChanged: (value) => - signupViewModel.validateIdInput(value), - onPressed: () {}, - ), - SizedBox(height: 40.h), - IdInputFD( - labelText: '닉네임', - hintText: '닉네임 입력', - controller: signupViewModel.nicknameController, - showErrorText: signupViewModel.nicknameError, - errorText: '8자 이내로 작성해 주세요', - onChanged: (value) => - signupViewModel.validateNickNameInput(value), - onPressed: () {}, - ), - SizedBox(height: 40.h), + IdInputFD(), + SizedBox(height: 44.h), PwInputFD( labelText: '비밀번호', showErrorText: signupViewModel.pwError, @@ -111,27 +87,30 @@ class SignUpScreen extends StatelessWidget { ? Icons.visibility_off : Icons.visibility, ), - SizedBox(height: 60.h), - CustomButtonWidget( - text: '다음', + SizedBox(height: 46.h), + EmailFD( + controller: signupViewModel.emailController, + onChanged: (value) => + signupViewModel.isEmailValid), + SizedBox(height: 57.h), + CustomButton( + text: '회원가입', color: Colors.white, - backgroundColor: signupViewModel.btActivation - ? Colors.grey - : Color(0xFF111111), - onPressed: () async {}), - - /* Navigator.push( + backgroundColor: Color(0xFF111111), + onPressed: () { + Navigator.push( context, MaterialPageRoute( - builder: (context) => EmailAuth()), - );*/ + builder: (context) => SignUpDone()), + ); + }), SizedBox( height: 14.h, ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - TextFontWidget.fontSemiBold( + TextFont.fontSemiBold( text: '회원가입 시 ', fontSize: 12.sp, color: Color(0xFF989898), @@ -140,13 +119,13 @@ class SignUpScreen extends StatelessWidget { onTap: () { // 버튼이 클릭되었을 때 실행될 코드 }, - child: TextFontWidget.fontSemiBold( + child: TextFont.fontSemiBold( text: '서비스 이용약관', fontSize: 12.sp, color: Color(0xFF2D64D8), ), ), - TextFontWidget.fontSemiBold( + TextFont.fontSemiBold( text: ' 및 ', fontSize: 12.sp, color: Color(0xFF989898), @@ -155,7 +134,7 @@ class SignUpScreen extends StatelessWidget { onTap: () { // 버튼이 클릭되었을 때 실행될 코드 }, - child: TextFontWidget.fontSemiBold( + child: TextFont.fontSemiBold( text: '개인정보 처리방침', fontSize: 12.sp, color: Color(0xFF2D64D8), @@ -163,7 +142,7 @@ class SignUpScreen extends StatelessWidget { ), ], ), - TextFontWidget.fontSemiBold( + TextFont.fontSemiBold( text: '하신 것으로 간주됩니다', fontSize: 12.sp, color: Color(0xFF989898), @@ -182,63 +161,37 @@ class SignUpScreen extends StatelessWidget { } class IdInputFD extends StatelessWidget { - final String labelText; - final String hintText; - final TextEditingController controller; - final Function(String) onChanged; - final bool showErrorText; - final String errorText; - final VoidCallback? onPressed; - - IdInputFD({ - required this.labelText, - required this.hintText, - required this.controller, - required this.onChanged, - required this.showErrorText, - required this.errorText, - this.onPressed, - }); - - // 에러 메시지 위젯 - Widget errorTextWidget() { - if (showErrorText) { - return Text( - errorText, - style: TextStyle(color: Colors.red), - ); - } else { - return Container(); // 에러가 없으면 빈 컨테이너 반환 - } - } - @override Widget build(BuildContext context) { + final signupViewModel = Provider.of(context); return Column( children: [ Row( children: [ SizedBox(width: 8.w), Text( - labelText, + '아이디', style: TextStyle( - fontFamily: 'Pretendard-Regular', - fontSize: 16.sp, - fontWeight: FontWeight.w400, - ), + fontFamily: 'Pretendard-Regular', + fontSize: 16.sp, + fontWeight: FontWeight.w400), ), SizedBox( width: 12.w, ), - errorTextWidget(), // 에러 메시지 위젯 추가 + if (signupViewModel.idError) + Text( + '* 4자 이상 16자 이내로 작성해 주세요', + style: TextStyle(color: Colors.red), + ), ], ), SizedBox(height: 8.h), SizedBox( height: 50.h, child: TextFormField( - controller: controller, - onChanged: onChanged, + controller: signupViewModel.idController, + onChanged: (value) => signupViewModel.validateIdInput(value), decoration: InputDecoration( border: OutlineInputBorder( borderRadius: BorderRadius.circular(10), @@ -247,7 +200,7 @@ class IdInputFD extends StatelessWidget { fontFamily: 'Pretendard-Light', fontSize: 14.sp, ), - hintText: hintText, + hintText: '아이디 입력 (4~16자)', contentPadding: EdgeInsets.only(top: 10, bottom: 17, left: 10, right: 10), suffix: Container( @@ -258,13 +211,9 @@ class IdInputFD extends StatelessWidget { color: Color(0xFF2D64D8), ), child: TextButton( - onPressed: onPressed ?? () {}, // onPressed가 null이 아닐 때만 사용 - child: TextFontWidget.fontRegular( - color: Color(0xFFFFFFFF), - fontSize: 14, - text: '중복 확인', - ), - ), + onPressed: () {}, + child: TextFont.fontRegular( + color: Color(0xFFFFFFFF), fontSize: 14, text: '중복 확인')), ), ), ), diff --git a/lib/views/SignUpDoneScreen.dart b/lib/views/signup_done.dart similarity index 87% rename from lib/views/SignUpDoneScreen.dart rename to lib/views/signup_done.dart index 392ee46..cbbe84f 100644 --- a/lib/views/SignUpDoneScreen.dart +++ b/lib/views/signup_done.dart @@ -1,17 +1,16 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:suwon/views/widgets/NormalAlertDialogWidget.dart'; -import 'package:suwon/views/widgets/CustomButtonWidget.dart'; -import 'package:suwon/views/LoginScreen.dart'; +import 'package:suwon/views/widgets/csbutton.dart'; +import 'package:suwon/views/login_screen.dart'; -class SignUpDoneScreen extends StatefulWidget { - const SignUpDoneScreen({super.key}); +class SignUpDone extends StatefulWidget { + const SignUpDone({super.key}); @override _SignUpDoneState createState() => _SignUpDoneState(); } -class _SignUpDoneState extends State { +class _SignUpDoneState extends State { bool showCheck = false; @override @@ -90,7 +89,7 @@ class _SignUpDoneState extends State { ), ], ), - CustomButtonWidget( + CustomButton( text: '로그인', color: Colors.black, border: Border.all(width: 1, color: Color(0xFF2D64D8)), @@ -99,7 +98,7 @@ class _SignUpDoneState extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => LoginScreen(), + builder: (context) => NewLoignMain(), ), ); }, @@ -107,19 +106,10 @@ class _SignUpDoneState extends State { SizedBox( height: 12.h, ), - CustomButtonWidget( + CustomButton( text: '메일 재발송', backgroundColor: Color(0xFF111111), - onPressed: () { - NormalAlertDialogWidget( - title: "알림", - message: "포털 메일이 재발송되었습니다.", - onClose: () { - // 다이얼로그 닫기 후 뒤로 화면이동 - //Navigator.of(context).pop(); - }, - ).show(context); - }, + onPressed: () {}, color: Colors.white, ), ], diff --git a/lib/views/widgets/CancelAndActionAlertDialogWidget.dart b/lib/views/widgets/CancelAndActionAlertDialogWidget.dart deleted file mode 100644 index 2c3642d..0000000 --- a/lib/views/widgets/CancelAndActionAlertDialogWidget.dart +++ /dev/null @@ -1,41 +0,0 @@ -import 'package:flutter/cupertino.dart'; - -class CancelAndActionAlertDialogWidget { - final String title; - final String action; - final VoidCallback onCancel; - final VoidCallback onAction; - - CancelAndActionAlertDialogWidget({ - required this.title, - required this.action, - required this.onCancel, - required this.onAction, - }); - - void show(BuildContext context) { - showCupertinoDialog( - context: context, - builder: (BuildContext context) { - return CupertinoAlertDialog( - title: Text(title), - actions: [ - CupertinoDialogAction( - child: Text('취소'), - onPressed: () { - onCancel(); - Navigator.of(context).pop(); - }, - ), - CupertinoDialogAction( - child: Text(action), - onPressed: () { - onAction(); - }, - ), - ], - ); - }, - ); - } -} diff --git a/lib/views/widgets/DrawerAppBarWidget.dart b/lib/views/widgets/DrawerAppBarWidget.dart deleted file mode 100644 index 0c1f8dc..0000000 --- a/lib/views/widgets/DrawerAppBarWidget.dart +++ /dev/null @@ -1,51 +0,0 @@ -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( - 'assets/close.png', - scale: iconScale, - ), - ), - ], - ), - ); - } -} diff --git a/lib/views/widgets/NormalAlertDialogWidget.dart b/lib/views/widgets/NormalAlertDialogWidget.dart deleted file mode 100644 index 209ad5c..0000000 --- a/lib/views/widgets/NormalAlertDialogWidget.dart +++ /dev/null @@ -1,34 +0,0 @@ -import 'package:flutter/cupertino.dart'; - -class NormalAlertDialogWidget { - final String title; - final String message; - final VoidCallback onClose; - - NormalAlertDialogWidget({ - required this.title, - required this.message, - required this.onClose, - }); - - void show(BuildContext context) { - showCupertinoDialog( - context: context, - builder: (BuildContext context) { - return CupertinoAlertDialog( - title: Text(title), - content: Text(message), - actions: [ - CupertinoDialogAction( - child: Text('확인'), - onPressed: () { - onClose(); - Navigator.of(context).pop(); - }, - ), - ], - ); - }, - ); - } -} diff --git a/lib/views/widgets/SuchatAppBarWidget.dart b/lib/views/widgets/appbar.dart similarity index 95% rename from lib/views/widgets/SuchatAppBarWidget.dart rename to lib/views/widgets/appbar.dart index e3ff747..6c50e1f 100644 --- a/lib/views/widgets/SuchatAppBarWidget.dart +++ b/lib/views/widgets/appbar.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -class SuchatAppBarWidget extends StatelessWidget { +class SuchatAppBar extends StatelessWidget { final String text; final VoidCallback onPressed; - const SuchatAppBarWidget({ + const SuchatAppBar({ required this.text, required this.onPressed, }); diff --git a/lib/views/widgets/CustomButtonWidget.dart b/lib/views/widgets/csbutton.dart similarity index 88% rename from lib/views/widgets/CustomButtonWidget.dart rename to lib/views/widgets/csbutton.dart index 6d61e9f..5b6b268 100644 --- a/lib/views/widgets/CustomButtonWidget.dart +++ b/lib/views/widgets/csbutton.dart @@ -1,21 +1,19 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -class CustomButtonWidget extends StatelessWidget { +class CustomButton extends StatelessWidget { final String text; final Color backgroundColor; final VoidCallback onPressed; final Border? border; final Color color; - final bool? isEnabled; - const CustomButtonWidget({ + const CustomButton({ required this.text, required this.backgroundColor, required this.onPressed, required this.color, this.border, - this.isEnabled, }); @override diff --git a/lib/views/widgets/EmailTextFieldWidget.dart b/lib/views/widgets/emailfield.dart similarity index 87% rename from lib/views/widgets/EmailTextFieldWidget.dart rename to lib/views/widgets/emailfield.dart index 0eeaaa5..6dc668c 100644 --- a/lib/views/widgets/EmailTextFieldWidget.dart +++ b/lib/views/widgets/emailfield.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:suwon/views/widgets/TextFontWidget.dart'; +import 'package:suwon/views/widgets/font.dart'; -class EmailTextFieldWidget extends StatelessWidget { +class EmailFD extends StatelessWidget { final TextEditingController? controller; final ValueChanged? onChanged; - const EmailTextFieldWidget({ + const EmailFD({ required this.controller, required this.onChanged, }); @@ -34,7 +34,7 @@ class EmailTextFieldWidget extends StatelessWidget { fontWeight: FontWeight.w400, color: Color(0xFF989898), ), - suffix: TextFontWidget.fontRegular( + suffix: TextFont.fontRegular( text: '@ suwon.ac.kr', fontSize: 16, color: Color(0xFF000000)), diff --git a/lib/views/widgets/TextFontWidget.dart b/lib/views/widgets/font.dart similarity index 97% rename from lib/views/widgets/TextFontWidget.dart rename to lib/views/widgets/font.dart index ae651a6..6c93f7e 100644 --- a/lib/views/widgets/TextFontWidget.dart +++ b/lib/views/widgets/font.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -class TextFontWidget { +class TextFont { static Widget fontRegular({ required String text, required double fontSize, diff --git a/lib/views/widgets/IdTextFieldWidget.dart b/lib/views/widgets/idfield.dart similarity index 89% rename from lib/views/widgets/IdTextFieldWidget.dart rename to lib/views/widgets/idfield.dart index cbb338e..f377490 100644 --- a/lib/views/widgets/IdTextFieldWidget.dart +++ b/lib/views/widgets/idfield.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:suwon/views/widgets/TextFontWidget.dart'; +import 'package:suwon/views/widgets/font.dart'; -class IdTextFieldWidget extends StatelessWidget { +class IdFD extends StatelessWidget { final TextEditingController? controller; final ValueChanged? onChanged; - const IdTextFieldWidget({ + const IdFD({ required this.controller, required this.onChanged, - }); +}); @override Widget build(BuildContext context) { diff --git a/pubspec.lock b/pubspec.lock index 73718ad..0b95113 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -45,18 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.18.0" - crypto: - dependency: transitive - description: - name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab - url: "https://pub.dev" - source: hosted - version: "3.0.3" + version: "1.17.1" cupertino_icons: dependency: "direct main" description: @@ -107,30 +99,14 @@ packages: description: flutter source: sdk version: "0.0.0" - http: - dependency: "direct main" - description: - name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba - url: "https://pub.dev" - source: hosted - version: "1.2.0" - http_parser: + js: dependency: transitive description: - name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "4.0.2" - json_annotation: - dependency: "direct main" - description: - name: json_annotation - sha256: "0aa7409f6c82acfab96853b8b0c7503de49918cbe705a57cfdeb477756b4521b" - url: "https://pub.dev" - source: hosted - version: "4.1.0" + version: "0.6.7" lints: dependency: transitive description: @@ -143,26 +119,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.15" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.2.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" nested: dependency: transitive description: @@ -212,34 +188,26 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" - url: "https://pub.dev" - source: hosted - version: "1.11.1" - stomp_dart_client: - dependency: "direct main" - description: - name: stomp_dart_client - sha256: "10ecb6255a95eec78c3b064512fc8700cd2af9506cedafe3694e9662773dd1d5" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -260,18 +228,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" - url: "https://pub.dev" - source: hosted - version: "0.6.1" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "0.5.1" vector_graphics: dependency: transitive description: @@ -304,22 +264,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b - url: "https://pub.dev" - source: hosted - version: "2.4.0" xml: dependency: transitive description: @@ -329,5 +273,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.2.0 <4.0.0" + dart: ">=3.0.3 <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index d3a5333..940e218 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: suwon description: flag project # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: "none" # Remove this line if you wish to publish to pub.dev +publish_to: 'none' # Remove this line if you wish to publish to pub.dev # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=3.0.3 <4.0.0" + sdk: '>=3.0.3 <4.0.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -30,18 +30,11 @@ environment: dependencies: flutter_svg: ^2.0.7 flutter_screenutil: ^5.8.4 - + flutter: sdk: flutter - provider: ^6.0.5 - - http: ^1.2.0 - - stomp_dart_client: ^1.0.3 - json_annotation: ^4.0.1 - # The following adds the Cupertino Icons font to your application. @@ -64,6 +57,7 @@ dev_dependencies: # The following section is specific to Flutter packages. flutter: + # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. @@ -71,9 +65,9 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - - assets/bubble.PNG - - assets/SUCHAT.png - - assets/ + - asstes/bubble.PNG + - asstes/SUCHAT.png + - asstes/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware @@ -89,19 +83,19 @@ flutter: fonts: - family: KCCChassam fonts: - - asset: assets/font/KCC-Chassam.ttf + - asset: asstes/font/KCC-Chassam.ttf style: normal - family: Pretendard-Light fonts: - - asset: assets/font/Pretendard-Light.ttf + - asset: asstes/font/Pretendard-Light.ttf style: normal - family: Pretendard-SemiBold fonts: - - asset: assets/font/Pretendard-SemiBold.ttf + - asset: asstes/font/Pretendard-SemiBold.ttf style: normal - family: Pretendard-Regular fonts: - - asset: assets/font/Pretendard-Regular.ttf + - asset: asstes/font/Pretendard-Regular.ttf style: normal # diff --git a/web/favicon.png b/web/favicon.png deleted file mode 100644 index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png deleted file mode 100644 index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 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 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8252 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 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d76e525556d5d89141648c724331630325d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c56691fbdb0b7efa65097c7cc1edac12a6d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20998 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 MPgg&ebxsLQ025IeI{*Lx diff --git a/web/index.html b/web/index.html deleted file mode 100644 index d92431e..0000000 --- a/web/index.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - toon_flix - - - - - - - - - - diff --git a/web/manifest.json b/web/manifest.json deleted file mode 100644 index a56629f..0000000 --- a/web/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "suwon", - "short_name": "suwon", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "A new Flutter project.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - }, - { - "src": "icons/Icon-maskable-192.png", - "sizes": "192x192", - "type": "image/png", - "purpose": "maskable" - }, - { - "src": "icons/Icon-maskable-512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" - } - ] -}