Skip to content

Commit 19a6a12

Browse files
Roy-wonjiRoy-wonji
committed
✨[feat]: 리젝 사유 수정
* 프로필 뷰 수정
1 parent 3ad96da commit 19a6a12

File tree

5 files changed

+59
-34
lines changed

5 files changed

+59
-34
lines changed

‎MarketApp/MarketApp.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@
14741474
GENERATE_INFOPLIST_FILE = YES;
14751475
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
14761476
MARKETING_VERSION = 1.0;
1477-
PRODUCT_BUNDLE_IDENTIFIER = com.shoping.MarketApps;
1477+
PRODUCT_BUNDLE_IDENTIFIER = com.shoping.MarketAppsTests;
14781478
PRODUCT_NAME = "$(TARGET_NAME)";
14791479
PROVISIONING_PROFILE_SPECIFIER = "";
14801480
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1501,7 +1501,7 @@
15011501
GENERATE_INFOPLIST_FILE = YES;
15021502
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
15031503
MARKETING_VERSION = 1.0;
1504-
PRODUCT_BUNDLE_IDENTIFIER = com.shoping.MarketApps;
1504+
PRODUCT_BUNDLE_IDENTIFIER = com.shoping.MarketAppsTests;
15051505
PRODUCT_NAME = "$(TARGET_NAME)";
15061506
PROVISIONING_PROFILE_SPECIFIER = "";
15071507
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

‎MarketApp/MarketApp/Soreces/Network/MarketAPI/AffinityAPI-Main.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ enum AffinityAPI {
1212
static let MainShoes = String("/shoes/")
1313
static let MainDetailShoes = String("/shoes/")
1414
static let TermsPolicesUrl = String("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")
15+
static let ConnactASUrl = String("https://forms.gle/QpQHVg1PB7Tb2PYB8")
16+
static let makeAppDeveloperUrl = String("https://italsehf.notion.site/28e373fe45b843b4b6cb17f7e940eda0")
1517

1618
}
1719

‎MarketApp/MarketApp/Soreces/UI/View/Component/List/ListArrowView.swift‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,22 @@ struct ListArrowView: View {
1818

1919
Spacer()
2020

21-
22-
Button {
23-
showView.toggle()
24-
} label: {
25-
Image(systemName: "chevron.right")
26-
.resizable()
27-
.frame(width: 10, height: 20)
28-
.foregroundColor(Color.colorAsset.lightBlack)
29-
}
21+
Image(systemName: "chevron.right")
22+
.resizable()
23+
.frame(width: 10, height: 20)
24+
.foregroundColor(Color.colorAsset.lightBlack)
3025
}
3126
.padding(20)
3227
.overlay {
3328
RoundedRectangle(cornerRadius: 10)
3429
.fill(.clear)
3530
.frame(height: 50)
3631
.shadow(color: Color.colorAsset.lightBlack, radius: 10, x: 10, y: .zero)
32+
.onTapGesture {
33+
showView.toggle()
34+
}
3735
}
36+
3837
}
3938
}
4039

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

Lines changed: 46 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ struct ProfileView: View {
2525
@State private var notDeterminedAlbum = false
2626
@State private var editProfileName: Bool = false
2727
@State private var showTermsPolicesView: Bool = false
28+
@State private var showConnatASView: Bool = false
29+
@State private var showMakeAppDeveloperView: Bool = false
2830
@State private var selectedImage: UIImage?
2931
@State private var profileImage: Image?
3032

@@ -49,13 +51,26 @@ struct ProfileView: View {
4951
.fullScreenCover(isPresented: $viewModel.loginStatus) {
5052
LoginView()
5153
}
54+
//MARK: - 프로필 수정
5255
.navigationDestination(isPresented: $editProfileName) {
5356
ProfileNickNameView()
5457
}
5558

59+
//MARK: - 약관 정책 보여주는 화면
5660
.navigationDestination(isPresented: $showTermsPolicesView, destination: {
5761
WebViews(url: AffinityAPI.TermsPolicesUrl)
5862
})
63+
64+
//MARK: - 문의하기 화면
65+
.navigationDestination(isPresented: $showConnatASView, destination: {
66+
WebViews(url: AffinityAPI.ConnactASUrl)
67+
})
68+
69+
//MARK: - 만든 개발자 뷰
70+
.navigationDestination(isPresented: $showMakeAppDeveloperView, destination: {
71+
WebViews(url: AffinityAPI.makeAppDeveloperUrl)
72+
})
73+
5974
//MARK: - 팝업 관련
6075
.popup(isPresented: $showLogoutPOPUPView, view: {
6176
SignOutPOPUPView(title: "로그아웃 하시겠어요", message: "로그아웃 하셔도 Affinity는 유저님을 기다립니다") {
@@ -122,11 +137,11 @@ struct ProfileView: View {
122137

123138

124139
@ViewBuilder
125-
private func profileHeader() -> some View {
140+
private func profileHeader() -> some View {
126141
HStack{
127142
Rectangle()
128143
.frame(width: UIScreen.screenWidth, height: 200)
129-
// .edgesIgnoringSafeArea(.top)
144+
// .edgesIgnoringSafeArea(.top)
130145
.overlay {
131146
VStack(alignment: .leading, spacing: .zero){
132147
Spacer()
@@ -166,22 +181,22 @@ struct ProfileView: View {
166181
Spacer()
167182
.frame(height: 20)
168183

169-
HStack(alignment: .center){
170-
171-
Spacer()
172-
173-
Text("작성댓글")
174-
.nanumSquareNeo(family: .eHv, size: 24, color: Color.colorAsset.white)
175-
176-
Spacer()
177-
.frame(width: 120)
178-
179-
Text("좋아요")
180-
.nanumSquareNeo(family: .eHv, size: 24, color: Color.colorAsset.white)
181-
182-
Spacer()
183-
}
184-
184+
// HStack(alignment: .center){
185+
//
186+
// Spacer()
187+
//
188+
// Text("작성댓글")
189+
// .nanumSquareNeo(family: .eHv, size: 24, color: Color.colorAsset.white)
190+
//
191+
// Spacer()
192+
// .frame(width: 120)
193+
//
194+
// Text("좋아요")
195+
// .nanumSquareNeo(family: .eHv, size: 24, color: Color.colorAsset.white)
196+
//
197+
// Spacer()
198+
// }
199+
185200
Spacer()
186201

187202
}
@@ -192,7 +207,7 @@ struct ProfileView: View {
192207
}
193208

194209
@ViewBuilder
195-
private func imageEditView() -> some View {
210+
private func imageEditView() -> some View {
196211
VStack{
197212
ZStack {
198213
Button {
@@ -208,7 +223,7 @@ struct ProfileView: View {
208223
deniedAlbum.toggle()
209224

210225
case .restricted, .notDetermined:
211-
break
226+
break
212227

213228
default:
214229
break
@@ -224,7 +239,7 @@ struct ProfileView: View {
224239
.scaledToFill()
225240
.frame(width: 75, height: 75)
226241
.clipShape(Circle())
227-
242+
228243

229244
Image("camera")
230245
.resizable()
@@ -284,7 +299,7 @@ struct ProfileView: View {
284299

285300
}
286301
}
287-
302+
288303
func loadImage() {
289304
guard let selectedImage = selectedImage else { return }
290305
profileImage = Image(uiImage: selectedImage)
@@ -300,12 +315,21 @@ struct ProfileView: View {
300315
.onTapGesture {
301316
showTermsPolicesView.toggle()
302317
}
318+
303319
case .connatAS:
304320
ListArrowView(listTitle: item.description, showView: $showConnatView)
321+
.onTapGesture {
322+
showConnatASView.toggle()
323+
}
324+
305325
case .developer:
306326
ListArrowView(listTitle: item.description, showView: $showDeveloperView)
327+
.onTapGesture {
328+
showMakeAppDeveloperView.toggle()
329+
}
307330
}
308331
}
332+
309333
Spacer()
310334
.frame(height: 60)
311335
}

‎MarketApp/fastlane/metadata/ko/keywords.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
스니커즈, 신발 , 커뮤니티
1+
스니커즈, 신발 , 커뮤니티, Affinity, 어피니티

0 commit comments

Comments
 (0)