UserStatusDetailViewが遷移時がたつく現象を改善

boardguy1024 · Oct 20, 2023 · 6036e93 · 6036e93
1 parent 7502fd3
commit 6036e93
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 239 deletions.
diff --git a/TwitterSwiftUI.xcodeproj/project.pbxproj b/TwitterSwiftUI.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2D0C6CC12AE2C31F00D8F733 /* ProfileEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D0C6CC02AE2C31F00D8F733 /* ProfileEditView.swift */; };
+		2D0C6CC32AE2C32E00D8F733 /* ProfileEditViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D0C6CC22AE2C32E00D8F733 /* ProfileEditViewModel.swift */; };
 		2D58392B2AE006A700EC2C67 /* ChatBubbleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D58392A2AE006A700EC2C67 /* ChatBubbleView.swift */; };
 		2D6173EA2AE011260089F1E7 /* Timestamp+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D6173E92AE011250089F1E7 /* Timestamp+Extensions.swift */; };
 		2D7CD6522ADEC894006DECA4 /* UserStatusDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D7CD6512ADEC894006DECA4 /* UserStatusDetailView.swift */; };
@@ -109,6 +111,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		2D0C6CC02AE2C31F00D8F733 /* ProfileEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileEditView.swift; sourceTree = "<group>"; };
+		2D0C6CC22AE2C32E00D8F733 /* ProfileEditViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileEditViewModel.swift; sourceTree = "<group>"; };
 		2D58392A2AE006A700EC2C67 /* ChatBubbleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatBubbleView.swift; sourceTree = "<group>"; };
 		2D6173E92AE011250089F1E7 /* Timestamp+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Timestamp+Extensions.swift"; sourceTree = "<group>"; };
 		2D7CD6512ADEC894006DECA4 /* UserStatusDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserStatusDetailView.swift; sourceTree = "<group>"; };
@@ -546,29 +550,31 @@
 		FF44B9412ABC8BB9005B87F4 /* Profile */ = {
 			isa = PBXGroup;
 			children = (
-				FF44B9492ABC8D59005B87F4 /* Views */,
-				FF44B9482ABC8D54005B87F4 /* ViewModels */,
+				FF44B9492ABC8D59005B87F4 /* View */,
+				FF44B9482ABC8D54005B87F4 /* ViewModel */,
 			);
 			path = Profile;
 			sourceTree = "<group>";
 		};
-		FF44B9482ABC8D54005B87F4 /* ViewModels */ = {
+		FF44B9482ABC8D54005B87F4 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
 				FF5F92732ABEC64E00A33B9C /* ProfileTweetsTabType.swift */,
 				FFACF2BD2AC1BD2A00A2C911 /* ProfileViewModel.swift */,
 				FF63590D2AD7EA6700A7B114 /* TweetListViewModel.swift */,
+				2D0C6CC22AE2C32E00D8F733 /* ProfileEditViewModel.swift */,
 			);
-			path = ViewModels;
+			path = ViewModel;
 			sourceTree = "<group>";
 		};
-		FF44B9492ABC8D59005B87F4 /* Views */ = {
+		FF44B9492ABC8D59005B87F4 /* View */ = {
 			isa = PBXGroup;
 			children = (
 				FF44B94A2ABC8D6A005B87F4 /* ProfileView.swift */,
+				2D0C6CC02AE2C31F00D8F733 /* ProfileEditView.swift */,
 				FF63590B2AD7E84800A7B114 /* TweetListView.swift */,
 			);
-			path = Views;
+			path = View;
 			sourceTree = "<group>";
 		};
 		FF4C5D742AD27A3C003F3E90 /* TabBar */ = {
@@ -706,6 +712,7 @@
 				FFACF2BC2AC1A82C00A2C911 /* Tweet.swift in Sources */,
 				FF63590E2AD7EA6700A7B114 /* TweetListViewModel.swift in Sources */,
 				2D58392B2AE006A700EC2C67 /* ChatBubbleView.swift in Sources */,
+				2D0C6CC32AE2C32E00D8F733 /* ProfileEditViewModel.swift in Sources */,
 				2DE08BE72ADAEBF900DAA3C4 /* NewTweetButton.swift in Sources */,
 				2D89D9DC2AD9844200F20E91 /* FeedTabListView.swift in Sources */,
 				FF2EE4FB2ABF1C2F000522CF /* TextAreaView.swift in Sources */,
@@ -751,6 +758,7 @@
 				FF2EE4F42ABF0D5F000522CF /* SideMenuOptionRowView.swift in Sources */,
 				FF170EF42AD2F2DB00B90E2D /* AuthHeaderView.swift in Sources */,
 				FFFB5D5A2AC045D600817497 /* ImageUploader.swift in Sources */,
+				2D0C6CC12AE2C31F00D8F733 /* ProfileEditView.swift in Sources */,
 				FFACF2B82AC1A53600A2C911 /* NewTweetViewModel.swift in Sources */,
 				FF170EF02AD2DAB900B90E2D /* UIImage+Extensions.swift in Sources */,
 				FF63590A2AD7E2E500A7B114 /* PagerTabView.swift in Sources */,

diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/paku.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/paku.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/TwitterSwiftUI/Core/Components/Users/UserStatusDetailView.swift b/TwitterSwiftUI/Core/Components/Users/UserStatusDetailView.swift
@@ -10,7 +10,6 @@ import SwiftUI
 struct UserStatusDetailView: View {
 
     @Environment(\.dismiss) var dismiss
-
     @EnvironmentObject var tabBarViewModel: MainTabBarViewModel
     @StateObject var viewModel: UserStatusDetailViewModel
 
@@ -33,9 +32,6 @@ struct UserStatusDetailView: View {
         }
         .padding(.top, 30)
         .overlay(navigationHeader.edgesIgnoringSafeArea(.top), alignment: .top)
-        .onAppear {
-            tabBarViewModel.showUserStatusDetail = false
-        }
     }
 
     @ViewBuilder
@@ -74,5 +70,9 @@ extension UserStatusDetailView {
 }
 
 #Preview {
-    UserStatusDetailView(initialTab: .followers, user: PreviewProvider.shared.user)
+    UserStatusDetailView(initialTab: .followers,
+                         user: .init(username: "username",
+                                     fullname: "fullname",
+                                     profileImageUrl: "profileImageUrl",
+                                     email: "email"))
 }
diff --git a/TwitterSwiftUI/Core/FeedView.swift b/TwitterSwiftUI/Core/FeedView.swift
@@ -53,7 +53,7 @@ struct FeedView: View {
             }
             .onChange(of: tabBarViewModel.showUserStatusDetail) { _ in
                 if tabBarViewModel.selectedTab == .home {
-                    viewModel.showUserStatusDetail = true
+                    viewModel.showUserStatusDetail.toggle()
                 }
             }
             .navigationDestination(isPresented: $viewModel.showUserStatusDetail, destination: {

diff --git a/...UI/Core/Profile/Views/TweetListView.swift → ...tUI/Core/Profile/View/TweetListView.swift b/...UI/Core/Profile/Views/TweetListView.swift → ...tUI/Core/Profile/View/TweetListView.swift
diff --git a/TwitterSwiftUI/Core/Profile/ViewModel/ProfileEditViewModel.swift b/TwitterSwiftUI/Core/Profile/ViewModel/ProfileEditViewModel.swift
@@ -0,0 +1,17 @@
+//
+//  ProfileEditViewModel.swift
+//  TwitterSwiftUI
+//
+//  Created by paku on 2023/10/20.
+//
+
+import Foundation
+
+class ProfileEditViewModel: ObservableObject {
+
+    let user: User
+
+    init(user: User) {
+        self.user = user
+    }
+}
diff --git a/...ile/ViewModels/ProfileTweetsTabType.swift → ...file/ViewModel/ProfileTweetsTabType.swift b/...ile/ViewModels/ProfileTweetsTabType.swift → ...file/ViewModel/ProfileTweetsTabType.swift
diff --git a/...Profile/ViewModels/ProfileViewModel.swift → .../Profile/ViewModel/ProfileViewModel.swift b/...Profile/ViewModels/ProfileViewModel.swift → .../Profile/ViewModel/ProfileViewModel.swift
@@ -12,6 +12,7 @@ class ProfileViewModel: ObservableObject {
     @Published var isFollowed = false
     @Published var followersCount: Int = 0
     @Published var follwoingCount: Int = 0
+    @Published var showProfileEdit: Bool = false
 
     let user: User
 
@@ -33,7 +34,7 @@ class ProfileViewModel: ObservableObject {
     func actionButtonTapped() {
 
         if user.isCurrentUser {
-            // Edit Profile
+            showProfileEdit.toggle()
 
         } else {
             // Follow or Following

diff --git a/...ofile/ViewModels/TweetListViewModel.swift → ...rofile/ViewModel/TweetListViewModel.swift b/...ofile/ViewModels/TweetListViewModel.swift → ...rofile/ViewModel/TweetListViewModel.swift
diff --git a/TwitterSwiftUI/Core/Profile/Views/ProfileView.swift b/TwitterSwiftUI/Core/Profile/Views/ProfileView.swift
diff --git a/TwitterSwiftUI/Core/SideMenu/View/SideMenuView.swift b/TwitterSwiftUI/Core/SideMenu/View/SideMenuView.swift
@@ -58,7 +58,7 @@ struct SideMenuView: View {
                     buttonTapped: { status in
                         showSideMenu = false
                         tabBarViewModel.userStatueInitialTap = status
-                        tabBarViewModel.showUserStatusDetail = true
+                        tabBarViewModel.showUserStatusDetail.toggle()
                     })
                 .padding(.vertical)
             }

diff --git a/TwitterSwiftUI/Core/TabBar/Explore/View/ExploreView.swift b/TwitterSwiftUI/Core/TabBar/Explore/View/ExploreView.swift
@@ -33,7 +33,7 @@ struct ExploreView: View {
             }
             .onChange(of: tabBarViewModel.showUserStatusDetail) { _ in
                 if tabBarViewModel.selectedTab == .explore {
-                    viewModel.showUserStatusDetail = true
+                    viewModel.showUserStatusDetail.toggle()
                 }
             }
             .navigationDestination(isPresented: $viewModel.showUserStatusDetail, destination: {