Skip to content

Commit 068156f

Browse files
Roy-wonjiRoy-wonji
committed
🪛[chore]: 라이브러리 cocoapod에서 spm으로 변경
1 parent 9de76f7 commit 068156f

File tree

155 files changed

+1047
-89886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1047
-89886
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ MarketApp/build/
3333
*.cer
3434
*.swp
3535
*.json
36+
*.p12
37+
*.certSigningRequest
38+
*.DS_Store
39+
*.pbxproj
40+
*.resolved
3641

3742
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
3843
*.xcscmblueprint

‎MarketApp/.DS_Store‎

0 Bytes
Binary file not shown.

‎MarketApp/MarketApp.xcodeproj/project.pbxproj‎

Lines changed: 216 additions & 49 deletions
Large diffs are not rendered by default.

‎MarketApp/MarketApp/View/Authorization/Login/LoginView.swift‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import SwiftUI
99
import AuthenticationServices
1010
import Firebase
11-
import ExytePopupView
11+
import PopupView
1212

1313
struct LoginView: View {
1414

@@ -77,12 +77,30 @@ struct LoginView: View {
7777
}
7878
}
7979

80-
.popup(isPresented: $loginErrorPopUp, type: .default, position: .bottom, animation: .spring(), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
80+
.popup(isPresented: $loginErrorPopUp, view: {
8181
POPUPViews(title: "로그인 에러", message: "아이디와 비밀 번호를 한번 확인 해주세요", cancelTitle: "취소", confiremTitle: "확인", color: Color.colorAsset.mainColor)
82-
}
83-
.popup(isPresented: $loginPopUP, type: .default, position: .bottom, animation: .spring(), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
82+
}, customize: { popup in
83+
popup
84+
.type(.default)
85+
.position(.bottom)
86+
.animation(.spring())
87+
.autohideIn(2)
88+
.closeOnTap(true)
89+
.closeOnTapOutside(true)
90+
})
91+
92+
.popup(isPresented: $loginPopUP, view: {
8493
POPUPViews(title: "로그인 하기", message: "로그인을 해주세요", cancelTitle: "취소", confiremTitle: "확인", color: Color.colorAsset.mainColor)
85-
}
94+
}, customize: { popup in
95+
popup
96+
.type(.default)
97+
.position(.bottom)
98+
.animation(.spring())
99+
.autohideIn(2)
100+
.closeOnTap(true)
101+
.closeOnTapOutside(true)
102+
})
103+
86104
.fullScreenCover(isPresented: $showMainView) {
87105
NavigationStack {
88106
MainTabView()

‎MarketApp/MarketApp/View/Authorization/SignUP/SignUPNickNameView.swift‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import SwiftUI
9-
import ExytePopupView
9+
import PopupView
1010

1111
struct SignUPNickNameView: View {
1212

@@ -58,9 +58,15 @@ struct SignUPNickNameView: View {
5858
}
5959
}
6060

61-
.popup(isPresented: $checkNickName, type: .floater(verticalPadding: 20), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
62-
SignupPOPUPVIew(image: "person", title: "회원가입 양식을 확인 해주세요", alertMessage: "닉네임을 한번 더 확인해주세요")
63-
}
61+
.popup(isPresented: $checkNickName, view: {
62+
SignupPOPUPVIew(image: "person", title: "회원가입 양식을 확인 해주세요", alertMessage: "닉네임을 한번 더 확인해주세요")
63+
}, customize: { popup in
64+
popup
65+
.type(.floater(verticalPadding: 20))
66+
.autohideIn(2)
67+
.closeOnTap(true)
68+
.closeOnTapOutside(true)
69+
})
6470
}
6571
//MARK: - 타이틀 헤더
6672
@ViewBuilder

‎MarketApp/MarketApp/View/Authorization/SignUP/SignUPView.swift‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import SwiftUI
9-
import ExytePopupView
9+
import PopupView
1010
import FirebaseAuth
1111

1212
struct SignUPView: View {
@@ -22,7 +22,7 @@ struct SignUPView: View {
2222
@State private var recheckPassword: Bool = false
2323
@State private var showNickNameView: Bool = false
2424
@State private var checkOnePassword: Bool = false
25-
25+
2626

2727
@StateObject var viewModel: SignUPViewModel = SignUPViewModel()
2828

@@ -55,27 +55,52 @@ struct SignUPView: View {
5555
.frame(width: 30, height: 30)
5656
.foregroundColor(.black)
5757
}
58-
58+
5959
}
6060
}
6161
.navigationDestination(isPresented: $showNickNameView) {
6262
SignUPNickNameView()
6363
}
6464

65-
.popup(isPresented: $checkEmail, type: .floater(verticalPadding: 20), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
65+
.popup(isPresented: $checkEmail, view: {
6666
SignupPOPUPVIew(image: "envelope", title: "회원가입 양식을 확인 해주세요", alertMessage: "이메일을 확인 해주세요")
67-
}
68-
.popup(isPresented: $checkPassword, type: .floater(verticalPadding: 20), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
67+
}, customize: { popup in
68+
popup
69+
.type(.floater(verticalPadding: 20))
70+
.autohideIn(2)
71+
.closeOnTap(true)
72+
.closeOnTapOutside(true)
73+
})
74+
75+
.popup(isPresented: $checkPassword, view: {
6976
SignupPOPUPVIew(image: "lock", title: "회원가입 양식을 확인 해주세요", alertMessage: "비밀번호를 입력해주세요")
70-
}
71-
.popup(isPresented: $recheckPassword, type: .floater(verticalPadding: 20), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
77+
}, customize: { popup in
78+
popup
79+
.type(.floater(verticalPadding: 20))
80+
.autohideIn(2)
81+
.closeOnTap(true)
82+
.closeOnTapOutside(true)
83+
})
84+
85+
.popup(isPresented: $recheckPassword, view: {
7286
SignupPOPUPVIew(image: "lock", title: "회원가입 양식을 확인 해주세요", alertMessage: "비밀번호를 입력해주세요")
73-
}
87+
}, customize: { popup in
88+
popup
89+
.type(.floater(verticalPadding: 20))
90+
.autohideIn(2)
91+
.closeOnTap(true)
92+
.closeOnTapOutside(true)
93+
})
7494

75-
.popup(isPresented: $checkOnePassword, type: .floater(verticalPadding: 20), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
95+
.popup(isPresented: $checkOnePassword, view: {
7696
SignupPOPUPVIew(image: "lock", title: "회원가입 양식을 확인 해주세요", alertMessage: "비밀번호를 한번더 확인해주세요")
77-
}
78-
97+
}, customize: { popup in
98+
popup
99+
.type(.floater(verticalPadding: 20))
100+
.autohideIn(2)
101+
.closeOnTap(true)
102+
.closeOnTapOutside(true)
103+
})
79104
}
80105

81106
@ViewBuilder
@@ -113,10 +138,10 @@ struct SignUPView: View {
113138
RoundedRectangle(cornerRadius: 10)
114139
.fill(Color.colorAsset.blueGray)
115140
.frame(width: UIScreen.screenWidth - 60, height: 44)
116-
)
141+
)
117142
}
118143
.disabled(emailTextField.isEmpty || passwordTextField.isEmpty || recheckPsswordTextField.isEmpty)
119-
144+
120145
}
121146

122147
}

‎MarketApp/MarketApp/View/Home/HomeView.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,7 @@ struct HomeView: View {
186186
@ViewBuilder
187187
private func SelectBrandProductView() -> some View {
188188
LazyVStack {
189-
if let shoesData = filterBrand {
190-
ProdductListView(shoesData: shoesData)
191-
}
189+
ProdductListView(shoesData: filterBrand)
192190
}
193191
}
194192

‎MarketApp/MarketApp/View/ProductDetail/DetailImageView.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ struct DetailImageView: View {
3030
productImageInfo(transName: transName)
3131

3232
} else if selectedPicker == .community {
33-
// ScrollView(showsIndicators: false) {
34-
// ForEach(0..<7) { _ in
35-
// CommunityView(nickName: "Zero",
36-
// comment: "요즘 매종 키츠네 신발 유행인가요? 알려주세요 :)")
37-
// }
38-
// }
33+
ScrollView(showsIndicators: false) {
34+
ForEach(0..<7) { _ in
35+
CommunityView(nickName: "Zero",
36+
comment: "요즘 매종 키츠네 신발 유행인가요? 알려주세요 :)")
37+
}
38+
}
3939
}
4040
}
4141
.animation(nil)

‎MarketApp/MarketApp/View/Profile/ProfileNickNameView.swift‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import SwiftUI
9-
import ExytePopupView
9+
import PopupView
1010

1111
struct ProfileNickNameView: View {
1212
@StateObject var viewModel: SignUPViewModel = SignUPViewModel()
@@ -57,9 +57,16 @@ struct ProfileNickNameView: View {
5757
// }
5858
// }
5959

60-
.popup(isPresented: $checkNickName, type: .floater(verticalPadding: 20), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
61-
SignupPOPUPVIew(image: "person", title: "회원가입 양식을 확인 해주세요", alertMessage: "닉네임을 한번 더 확인해주세요")
62-
}
60+
.popup(isPresented: $checkNickName, view: {
61+
SignupPOPUPVIew(image: "person", title: "회원가입 양식을 확인 해주세요", alertMessage: "닉네임을 한번 더 확인해주세요")
62+
}, customize: { popup in
63+
popup
64+
.type(.floater(verticalPadding: 20))
65+
.autohideIn(2)
66+
.closeOnTap(true)
67+
.closeOnTapOutside(true)
68+
})
69+
6370
}
6471
//MARK: - 타이틀 헤더
6572
@ViewBuilder

‎MarketApp/MarketApp/View/Profile/ProfileView.swift‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import SwiftUI
9-
import ExytePopupView
9+
import PopupView
1010
import Kingfisher
1111
import Photos
1212

@@ -54,24 +54,50 @@ struct ProfileView: View {
5454
.navigationDestination(isPresented: $editProfileName) {
5555
ProfileNickNameView()
5656
}
57+
5758
.navigationDestination(isPresented: $showTermsPolicesView, destination: {
5859
WebViews(url: "https://velog.io/@suhwj/%EA%B0%9C%EC%9D%B8%EC%A0%95%EB%B3%B4-%EC%B2%98%EB%A6%AC-%EB%B0%A9%EC%B9%A8")
5960
})
6061
//MARK: - 팝업 관련
61-
.popup(isPresented: $showLogoutPOPUPView, type: .default, position: .bottom, animation: .spring(), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
62+
.popup(isPresented: $showLogoutPOPUPView, view: {
6263
SignOutPOPUPView()
63-
}
64+
}, customize: { popup in
65+
popup
66+
.type(.default)
67+
.position(.bottom)
68+
.animation(.spring())
69+
.autohideIn(2)
70+
.closeOnTap(true)
71+
.closeOnTapOutside(true)
72+
})
6473

65-
.popup(isPresented: $showWithDrawPOPUPView, type: .default, position: .bottom, animation: .spring(), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
74+
.popup(isPresented: $showWithDrawPOPUPView, view: {
6675
withDrawPOPUPView(title: "회원탈퇴", message: "진짜 회원 탈퇴를 하시겠어요 ??") {
6776
viewModel.withdrawUser()
6877
viewModel.loginStatus = true
6978
}
70-
71-
.popup(isPresented: $deniedAlbum, type: .default, position: .bottom, animation: .spring(), autohideIn: 2, closeOnTap: true, closeOnTapOutside: true) {
72-
POPUPViews(title: "사진 접근 허용 불가", message: "사진 접근 허용 불가", cancelTitle: "취소", confiremTitle: "확인", color: Color.colorAsset.blueGray)
73-
}
74-
}
79+
}, customize: { popup in
80+
popup
81+
.type(.default)
82+
.position(.bottom)
83+
.animation(.spring())
84+
.autohideIn(2)
85+
.closeOnTap(true)
86+
.closeOnTapOutside(true)
87+
})
88+
89+
.popup(isPresented: $deniedAlbum, view: {
90+
POPUPViews(title: "사진 접근 허용 불가", message: "사진 접근 허용 불가", cancelTitle: "취소", confiremTitle: "확인", color: Color.colorAsset.blueGray)
91+
}, customize: { popup in
92+
popup
93+
.type(.default)
94+
.position(.bottom)
95+
.animation(.spring())
96+
.autohideIn(2)
97+
.closeOnTap(true)
98+
.closeOnTapOutside(true)
99+
})
100+
75101
}
76102

77103
@ViewBuilder

0 commit comments

Comments
 (0)