USW-Random-Chat · RnaYuta · Oct 4, 2023 · Oct 4, 2023 · Oct 4, 2023 · Oct 4, 2023
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,25 @@
+{
+    // 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"
+        }
+    ]
+}
diff --git a/android/.gitignore b/android/.gitignore
diff --git a/android/app/build.gradle b/android/app/build.gradle
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/kotlin/com/example/suwon/MainActivity.kt b/android/app/src/main/kotlin/com/example/suwon/MainActivity.kt
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
diff --git a/android/build.gradle b/android/build.gradle
diff --git a/android/gradle.properties b/android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/settings.gradle b/android/settings.gradle
diff --git a/assets/Exit.svg b/assets/Exit.svg
diff --git a/asstes/Group.png → assets/Group.png b/asstes/Group.png → assets/Group.png
diff --git a/asstes/Icon_menu.svg → assets/Icon_menu.svg b/asstes/Icon_menu.svg → assets/Icon_menu.svg
diff --git a/assets/Report button.svg b/assets/Report button.svg
diff --git a/asstes/SUCHAT.png → assets/SUCHAT.png b/asstes/SUCHAT.png → assets/SUCHAT.png
diff --git a/assets/User.svg b/assets/User.svg
diff --git a/asstes/Vector6.png → assets/Vector6.png b/asstes/Vector6.png → assets/Vector6.png
diff --git a/asstes/bubble.png → assets/bubble.png b/asstes/bubble.png → assets/bubble.png
diff --git a/asstes/bubble_main.PNG → assets/bubble_main.PNG b/asstes/bubble_main.PNG → assets/bubble_main.PNG
diff --git a/asstes/close.png → assets/close.png b/asstes/close.png → assets/close.png
diff --git a/asstes/feedback.svg → assets/feedback.svg b/asstes/feedback.svg → assets/feedback.svg
diff --git a/asstes/font/KCC-Chassam.otf → assets/font/KCC-Chassam.otf b/asstes/font/KCC-Chassam.otf → assets/font/KCC-Chassam.otf
diff --git a/asstes/font/KCC-Chassam.ttf → assets/font/KCC-Chassam.ttf b/asstes/font/KCC-Chassam.ttf → assets/font/KCC-Chassam.ttf
diff --git a/asstes/font/Pretendard-Light.ttf → assets/font/Pretendard-Light.ttf b/asstes/font/Pretendard-Light.ttf → assets/font/Pretendard-Light.ttf
diff --git a/asstes/font/Pretendard-Regular.ttf → assets/font/Pretendard-Regular.ttf b/asstes/font/Pretendard-Regular.ttf → assets/font/Pretendard-Regular.ttf
diff --git a/asstes/font/Pretendard-SemiBold.ttf → assets/font/Pretendard-SemiBold.ttf b/asstes/font/Pretendard-SemiBold.ttf → assets/font/Pretendard-SemiBold.ttf
diff --git a/asstes/logout.svg → assets/logout.svg b/asstes/logout.svg → assets/logout.svg
diff --git a/assets/offchatbt.svg b/assets/offchatbt.svg
diff --git a/assets/onchatbt.svg b/assets/onchatbt.svg
diff --git a/asstes/onclikmenu.svg → assets/onclikmenu.svg b/asstes/onclikmenu.svg → assets/onclikmenu.svg
diff --git a/asstes/policy.svg → assets/policy.svg b/asstes/policy.svg → assets/policy.svg
diff --git a/asstes/profile.svg → assets/profile.svg b/asstes/profile.svg → assets/profile.svg
diff --git a/asstes/vector.svg → assets/vector.svg b/asstes/vector.svg → assets/vector.svg
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -168,7 +168,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C8080294A63A400263BE5 = {

diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:suwon/viewmodels/AccountRecovery_viewmodel.dart';
-import 'package:suwon/viewmodels/login_viewmodel.dart';
-import 'package:suwon/viewmodels/signup_viewmodel.dart'; // 추가: SignupViewModel 임포트
-import 'package:suwon/views/login_screen.dart';
-import 'package:suwon/views/signup_creen.dart';
+import 'package:suwon/viewmodels/AccountRecoveryVM.dart';
+import 'package:suwon/viewmodels/ChattingVM.dart';
+import 'package:suwon/viewmodels/LoginVM.dart';
+import 'package:suwon/viewmodels/SignupVM.dart'; // 추가: SignupViewModel 임포트
+import 'package:suwon/views/LoginScreen.dart';
+import 'package:suwon/views/SignUpScreen.dart';
 
 void main() {
   runApp(const MyApp());
@@ -17,15 +18,15 @@ class MyApp extends StatelessWidget {
     return MultiProvider(
       // ChangeNotifierProvider 대신 MultiProvider로 변경
       providers: [
-        ChangeNotifierProvider(create: (context) => LoginViewModel()),
+        ChangeNotifierProvider(create: (context) => LoginVM()),
         ChangeNotifierProvider(
-            create: (context) => SignupViewModel()), // 추가: SignupViewModel 제공
-        ChangeNotifierProvider(
-            create: (context) => AccountRecoveryViewModel()),
+            create: (context) => SignupVM()), // 추가: SignupViewModel 제공
+        ChangeNotifierProvider(create: (context) => AccountRecoveryVM()),
+        ChangeNotifierProvider(create: (context) => ChatViewModel()),
       ],
       child: MaterialApp(
         debugShowCheckedModeBanner: false,
-        home: NewLoignMain(),
+        home: LoginScreen(),
       ),
     );
   }