Merge pull request #109 from APP-iOS3rd/feature/ChatView

fix: 채팅관련 로딩 오류 수정, 앱 아이콘 변경
APP-iOS3rd · Feb 27, 2024 · c5b1ddc · c5b1ddc
2 parents 656fbfd + 8984fe9
commit c5b1ddc
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 7 deletions.
diff --git a/TrackUs/TrackUs.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TrackUs/TrackUs.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -138,7 +138,7 @@
     {
       "identity" : "mapbox-maps-ios",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/mapbox/mapbox-maps-ios",
+      "location" : "https://github.com/mapbox/mapbox-maps-ios/",
       "state" : {
         "branch" : "main",
         "revision" : "d83e2e3603c69b2a933899b29b6b93779514d68d"

diff --git a/TrackUs/TrackUs/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/TrackUs/TrackUs/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png
diff --git a/TrackUs/TrackUs/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/TrackUs/TrackUs/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "appicon.png",
+      "filename" : "appIcon.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

diff --git a/TrackUs/TrackUs/Resources/Assets.xcassets/AppIcon.appiconset/appIcon.png b/TrackUs/TrackUs/Resources/Assets.xcassets/AppIcon.appiconset/appIcon.png
diff --git a/TrackUs/TrackUs/Sources/Authentication/View/DailyGoalView.swift b/TrackUs/TrackUs/Sources/Authentication/View/DailyGoalView.swift
@@ -48,7 +48,9 @@ struct DailyGoalView: View {
                 MainButton(active: goal != nil, buttonText: "다음으로") {
                     authViewModel.userInfo.setDailyGoal = goal
                     authViewModel.userInfo.isProfilePublic = isProfilePublic
-                    authViewModel.storeUserInfoInFirebase()
+                    Task{
+                        authViewModel.storeUserInfoInFirebase()
+                    }
                     authViewModel.authenticationState = .authenticated
                     router.popToRoot()
                 }

diff --git a/TrackUs/TrackUs/Sources/Authentication/View/SignUpView.swift b/TrackUs/TrackUs/Sources/Authentication/View/SignUpView.swift
@@ -96,8 +96,10 @@ struct SignUpView: View {
         case .daily:
             // 테스트용
             router.popToRoot()
+            Task{
+                authViewModel.storeUserInfoInFirebase()
+            }
             authViewModel.authenticationState = .authenticated
-            authViewModel.storeUserInfoInFirebase()
         }
     }
 

diff --git a/TrackUs/TrackUs/Sources/Authentication/ViewModel/AuthenticationViewModel.swift b/TrackUs/TrackUs/Sources/Authentication/ViewModel/AuthenticationViewModel.swift
@@ -48,6 +48,7 @@ class FirebaseManger: NSObject {
 @MainActor
 class AuthenticationViewModel: NSObject, ObservableObject {
     static let shared = AuthenticationViewModel()
+    var chatListViewModel = ChatListViewModel.shared
 
     @Published var authenticationState: AuthenticationState = .startapp
     @Published var errorMessage: String = ""
@@ -86,6 +87,7 @@ class AuthenticationViewModel: NSObject, ObservableObject {
                             self.authenticationState = .signUpcating
                         }else {
                             self.getMyInformation()
+                            self.chatListViewModel.subscribeToUpdates()
                             self.authenticationState = .authenticated
                         }
                     }

diff --git a/TrackUs/TrackUs/Sources/Chatting/View/ChattingView.swift b/TrackUs/TrackUs/Sources/Chatting/View/ChattingView.swift
@@ -198,7 +198,7 @@ struct ChattingView: View {
                 .frame(maxWidth: .infinity, maxHeight: 1)
                 .foregroundStyle(.gray3)
             VStack(alignment: .leading, spacing: 6){
-                Text("채팅밤 맴버")
+                Text("채팅방 맴버")
                     .customFontStyle(.gray1_R12)
                 // 참여 중인 사용자 프로필 정보
                 ForEach(chatViewModel.chatRoom.members, id: \.self) { uid in

diff --git a/TrackUs/TrackUs/Sources/Chatting/ViewModel/ChatListViewModel.swift b/TrackUs/TrackUs/Sources/Chatting/ViewModel/ChatListViewModel.swift
@@ -23,10 +23,10 @@ class ChatListViewModel: ObservableObject {
         self.newMessage = false
         if let currentUId = FirebaseManger().auth.currentUser?.uid {
             self.currentUId = currentUId
+            //subscribeToUpdates()
         }else{
             self.currentUId = ""
         }
-        subscribeToUpdates()
     }
 
     // 탭바 신규 메세지 확인

diff --git a/TrackUs/TrackUs/Sources/Running/View/CourseDetailView.swift b/TrackUs/TrackUs/Sources/Running/View/CourseDetailView.swift
@@ -71,7 +71,7 @@ struct CourseDetailView: View {
         .alert(isPresented: $showingAlert) {
             Alert(
                 title: Text("알림"),
-                message: Text("방장이 참가를 취소하는 경우 모집글이 삭제됩니다 계속 참가를 취소 하시겠습니까?"),
+                message: Text("방장이 참가를 취소하는 경우 모집글이 삭제됩니다.\n계속 참가를 취소 하시겠습니까?"),
                 primaryButton: .default (
                     Text("취소"),
                     action: { }