Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring/post search #177

Merged
merged 22 commits into from
Apr 23, 2024
Merged

Refactoring/post search #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f9a5147
[Modify] MyPageView 네비게이션 바 타이틀 디플레이모드 .inline으로 변경
bdrsky2010 Apr 12, 2024
8e33a6d
[Modify] PostSearch 에러 첫번째 문제 해결 #173
bdrsky2010 Apr 12, 2024
256a8ac
[Modify] PostViewModel 실시간 데이터 처리 수정중 173
bdrsky2010 Apr 14, 2024
7956306
[Modify] 리스너 구독취소 함수 작성 및 리스너 데이터 수정 시 다음 작동 코드 일단 주석처리 #173
bdrsky2010 Apr 18, 2024
07d44e6
[Modify] 실시간 파베 처리 위해서 포스트 삭제 후 재패치 코드 주석처리 #173
bdrsky2010 Apr 19, 2024
05606f8
[Modify] 실시간 데이터베이스 코드 수정 #173
bdrsky2010 Apr 19, 2024
efb175c
[Modify] 검색해서 전달받은 Post 배열 변수 선언
bdrsky2010 Apr 19, 2024
70224a8
[Modify] Navigation에 전달하는 enum 연관값에 뷰에 전달해줄 검색 결과 배열 추가
bdrsky2010 Apr 19, 2024
8f4fe9d
[Modify] 추가된 enum 연관값에 해당하는 데이터 전달
bdrsky2010 Apr 19, 2024
840c19e
[Modify] enum에 연관값 추가
bdrsky2010 Apr 19, 2024
ffce3fc
[Modify] 검색 로직 수정중
bdrsky2010 Apr 19, 2024
a4c48d6
[Modify] PostGridContent 속성 추가로 인한 수정 #173
bdrsky2010 Apr 20, 2024
0f81200
[Modify] PostGridContent 속성 추가로 인한 수정 #173
bdrsky2010 Apr 20, 2024
ee0a182
[Modify] 검색결과로 받은 Post 배열 State 속성 추가 #173
bdrsky2010 Apr 20, 2024
df1edc3
[Modify] 검색결과인 Post 배열 전달받을 속성 추가
bdrsky2010 Apr 20, 2024
383450d
[Modify] 뷰모델 프로퍼티 수정에 따른 코드 수정
bdrsky2010 Apr 20, 2024
037a7d9
[Modify] 뷰모델 프로퍼티 및 PostGrid 속성 변경에 따른 코드 수정 #173
bdrsky2010 Apr 20, 2024
e8c07f3
[Modify] 전에 수정한 코드 롤백 #173
bdrsky2010 Apr 20, 2024
8652120
[Modify] 검색 로직 변경에 따른 메서드 추가 및 수정 #173
bdrsky2010 Apr 20, 2024
8de4ddd
[Modify] 불필요한 코드 삭제 및 주석 추가
bdrsky2010 Apr 21, 2024
44b0090
[Modify] 패치중일 때 Shimmer View 추가
bdrsky2010 Apr 23, 2024
66280db
Merge branch 'develop' into refactoring/PostSearch
bdrsky2010 Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions JUDA_iOS/JUDA.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@
7B0A8BCF2B8CA8C300740E61 /* PostSearchListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0A8BCE2B8CA8C300740E61 /* PostSearchListCell.swift */; };
7B5174922B69EAB300915793 /* NavigationPostsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B5174912B69EAB300915793 /* NavigationPostsView.swift */; };
7B56AE172BA66C8200C47F3C /* FirebaseFunctions in Frameworks */ = {isa = PBXBuildFile; productRef = 7B56AE162BA66C8200C47F3C /* FirebaseFunctions */; };
7B648FC52BC52969009010DC /* APIKEYS.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7B648FC32BC52969009010DC /* APIKEYS.plist */; };
7B648FC62BC52969009010DC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7B648FC42BC52969009010DC /* GoogleService-Info.plist */; };
7B6D76A72B677A8F00601B55 /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6D76A62B677A8F00601B55 /* Button.swift */; };
7B6D76AB2B67CE3D00601B55 /* PostDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6D76AA2B67CE3D00601B55 /* PostDetailView.swift */; };
7B6D76AF2B67CFC900601B55 /* PostInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6D76AE2B67CFC900601B55 /* PostInfo.swift */; };
Expand All @@ -117,6 +119,7 @@
7BBDFF702B6B90EB0036FB8B /* PostGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6D76B62B68972000601B55 /* PostGrid.swift */; };
7BBDFF722B6B912C0036FB8B /* TabItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C63DD512B676E1000770E3A /* TabItem.swift */; };
7BBDFF732B6B912C0036FB8B /* DrinkInfoSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = B16EB85B2B63859800E920A3 /* DrinkInfoSegment.swift */; };
7BD26B482BADC00F0036EB91 /* DrinkLoading.json in Resources */ = {isa = PBXBuildFile; fileRef = 7BD26B472BADC00F0036EB91 /* DrinkLoading.json */; };
7BE14B952B84733900C1F6C3 /* Drink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BE14B942B84733900C1F6C3 /* Drink.swift */; };
7BE14B972B84767000C1F6C3 /* DrinkUploadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BE14B962B84767000C1F6C3 /* DrinkUploadViewModel.swift */; };
AC110B572B69658C005390BB /* ChangeUserNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC110B562B69658C005390BB /* ChangeUserNameView.swift */; };
Expand Down Expand Up @@ -222,7 +225,6 @@
09BCC1592B7C8CD300FF4D1B /* IdentityVerificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityVerificationView.swift; sourceTree = "<group>"; };
09BCC15E2B7CFC7E00FF4D1B /* TermsAndVerificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TermsAndVerificationView.swift; sourceTree = "<group>"; };
09C7C9AE2B8DB57E00F62617 /* NavigationRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationRouter.swift; sourceTree = "<group>"; };
09E3B6E72BC51396001BC529 /* DrinkLoading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = DrinkLoading.json; path = "../../../../../흐르미/Lottie/DrinkLoading.json"; sourceTree = "<group>"; };
09E3B6E92BC5139F001BC529 /* APIKEYS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = APIKEYS.plist; path = "../../../흐르미/APIKEYS.plist"; sourceTree = "<group>"; };
09E3B6EA2BC5139F001BC529 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../흐르미/GoogleService-Info.plist"; sourceTree = "<group>"; };
09F869922B68E36800A56A4C /* Formatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Formatter.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -256,6 +258,8 @@
7B0A8BCC2B8CA7E900740E61 /* PostSearchList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostSearchList.swift; sourceTree = "<group>"; };
7B0A8BCE2B8CA8C300740E61 /* PostSearchListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostSearchListCell.swift; sourceTree = "<group>"; };
7B5174912B69EAB300915793 /* NavigationPostsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationPostsView.swift; sourceTree = "<group>"; };
7B648FC32BC52969009010DC /* APIKEYS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = APIKEYS.plist; path = ../../../../../../JUDA_file/APIKEYS.plist; sourceTree = "<group>"; };
7B648FC42BC52969009010DC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../../JUDA_file/GoogleService-Info.plist"; sourceTree = "<group>"; };
7B6D76A62B677A8F00601B55 /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
7B6D76AA2B67CE3D00601B55 /* PostDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostDetailView.swift; sourceTree = "<group>"; };
7B6D76AE2B67CFC900601B55 /* PostInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostInfo.swift; sourceTree = "<group>"; };
Expand All @@ -273,6 +277,7 @@
7B92656C2B692F0700840095 /* PostReportContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostReportContent.swift; sourceTree = "<group>"; };
7B92656E2B69303F00840095 /* PostReportButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostReportButton.swift; sourceTree = "<group>"; };
7B9265702B6941D000840095 /* PostReportToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostReportToolbar.swift; sourceTree = "<group>"; };
7BD26B472BADC00F0036EB91 /* DrinkLoading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = DrinkLoading.json; path = ../../../../../../../../JUDA_file/Lottie/DrinkLoading.json; sourceTree = "<group>"; };
7BE14B942B84733900C1F6C3 /* Drink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Drink.swift; sourceTree = "<group>"; };
7BE14B962B84767000C1F6C3 /* DrinkUploadViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrinkUploadViewModel.swift; sourceTree = "<group>"; };
AC110B562B69658C005390BB /* ChangeUserNameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeUserNameView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -495,6 +500,13 @@
name = Frameworks;
sourceTree = "<group>";
};
7B648FC22BC528F7009010DC /* Recovered References */ = {
isa = PBXGroup;
children = (
);
name = "Recovered References";
sourceTree = "<group>";
};
B121A5652B5F8D2000667D42 /* Resource */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -556,7 +568,6 @@
children = (
B1B8FE7B2B5EA9D900921BBE /* JUDA */,
7B56AE152BA66C8200C47F3C /* Frameworks */,
09E3B6E62BC51344001BC529 /* Recovered References */,
);
sourceTree = "<group>";
};
Expand Down
2 changes: 1 addition & 1 deletion JUDA_iOS/JUDA.xcodeproj/xcshareddata/xcschemes/JUDA.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
allowLocationSimulation = "YES">
<PathRunnable
runnableDebuggingMode = "0"
FilePath = "/Users/minjaekim/Library/Developer/Xcode/DerivedData/JUDA-gzjyaxsluhlruncajghxttycvogn/Build/Products/Debug-iphoneos/JUDA.app">
BundleIdentifier = "com.hrmi.juda"
FilePath = "/Users/phang/Library/Developer/Xcode/DerivedData/JUDA-cosstivdqydphqdalurmudoqzqie/Build/Products/Debug-iphonesimulator/JUDA.app">
</PathRunnable>
<MacroExpansion>
<BuildableReference
Expand Down
1 change: 0 additions & 1 deletion JUDA_iOS/JUDA/Resource/Constants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ enum WhereUsedDrinkListCell {
enum WhereUsedPostGridContent {
case post
case postSearch
case postFoodTag
case drinkDetail
case liked
case myPage
Expand Down
3 changes: 1 addition & 2 deletions JUDA_iOS/JUDA/View/DrinkInfo/DrinkDetail/DrinkDetails.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ struct DrinkDetails: View {
.NavigationPosts(usedTo: .drinkDetail,
searchTagType: nil,
taggedPosts: drink.taggedPosts,
selectedDrinkName: drink.drinkField.name,
selectedFoodTag: nil)) {
selectedDrinkName: drink.drinkField.name)) {
Text("\(drink.taggedPosts.count)개의 태그된 게시물")
.font(.regular16)
.foregroundStyle(.gray01)
Expand Down
6 changes: 2 additions & 4 deletions JUDA_iOS/JUDA/View/DrinkInfo/DrinkInfoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,11 @@ struct DrinkInfoView: View {
case .NavigationPosts(let usedTo,
let searchTagType,
let taggedPosts,
let selectedDrinkName,
let selectedFoodTag):
let selectedDrinkName):
NavigationPostsView(usedTo: usedTo,
searchTagType: searchTagType,
taggedPosts: taggedPosts,
selectedDrinkName: selectedDrinkName,
selectedFoodTag: selectedFoodTag)
selectedDrinkName: selectedDrinkName)
case .NavigationPostsTo(let usedTo,
let searchTagType,
let postSearchText):
Expand Down
6 changes: 2 additions & 4 deletions JUDA_iOS/JUDA/View/Main/MainView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,11 @@ struct MainView: View {
case .NavigationPosts(let usedTo,
let searchTagType,
let taggedPosts,
let selectedDrinkName,
let selectedFoodTag):
let selectedDrinkName):
NavigationPostsView(usedTo: usedTo,
searchTagType: searchTagType,
taggedPosts: taggedPosts,
selectedDrinkName: selectedDrinkName,
selectedFoodTag: selectedFoodTag)
selectedDrinkName: selectedDrinkName)
case .NavigationPostsTo(let usedTo,
let searchTagType,
let postSearchText):
Expand Down
6 changes: 3 additions & 3 deletions JUDA_iOS/JUDA/View/Mypage/AuthenticatedMypageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ struct AuthenticatedMypageView: View {
// MARK: iOS 16.4 이상
if #available(iOS 16.4, *) {
ScrollView() {
PostGridContent(usedTo: .myPage, searchTagType: nil)
PostGridContent(usedTo: .myPage, searchTagType: nil, searchPosts: .constant([]))
}
.scrollBounceBehavior(.basedOnSize, axes: .vertical)
// MARK: iOS 16.4 미만
} else {
ViewThatFits(in: .vertical) {
PostGridContent(usedTo: .myPage, searchTagType: nil)
PostGridContent(usedTo: .myPage, searchTagType: nil, searchPosts: .constant([]))
.frame(maxHeight: .infinity, alignment: .top)
ScrollView {
PostGridContent(usedTo: .myPage, searchTagType: nil)
PostGridContent(usedTo: .myPage, searchTagType: nil, searchPosts: .constant([]))
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions JUDA_iOS/JUDA/View/Mypage/NavigationProfileView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,23 @@ struct NavigationProfileView: View {
ScrollView() {
PostGridContent(usedTo: .myPage,
searchTagType: nil,
userType: userType)
userType: userType,
searchPosts: .constant([]))
}
.scrollBounceBehavior(.basedOnSize, axes: .vertical)
// MARK: iOS 16.4 미만
} else {
ViewThatFits(in: .vertical) {
PostGridContent(usedTo: .myPage,
searchTagType: nil,
userType: userType)
userType: userType,
searchPosts: .constant([]))
.frame(maxHeight: .infinity, alignment: .top)
ScrollView {
PostGridContent(usedTo: .myPage,
searchTagType: nil,
userType: userType)
userType: userType,
searchPosts: .constant([]))
}
}
}
Expand Down
Loading