Skip to content

Commit c44a576

Browse files
authored
Merge pull request #367 from Team-Capple/fix/#366-answer-list-of-question-dto
2.1.2 배포 - AnswerListQuestion DTO 핫픽스
2 parents b82d7ba + 8367be5 commit c44a576

File tree

6 files changed

+25
-22
lines changed

6 files changed

+25
-22
lines changed

Qapple/Qapple.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@
402402
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
403403
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
404404
CODE_SIGN_ENTITLEMENTS = Qapple/QappleBox/Qapple.entitlements;
405-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
405+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
406406
CODE_SIGN_STYLE = Manual;
407-
CURRENT_PROJECT_VERSION = 2503091219;
407+
CURRENT_PROJECT_VERSION = 2505142036;
408408
DEVELOPMENT_ASSET_PATHS = "\"Qapple/Resource/Preview Content\"";
409409
DEVELOPMENT_TEAM = "";
410410
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G9WTRLK7PY;
@@ -425,11 +425,11 @@
425425
"$(inherited)",
426426
"@executable_path/Frameworks",
427427
);
428-
MARKETING_VERSION = 2.1.0;
428+
MARKETING_VERSION = 2.1.3;
429429
PRODUCT_BUNDLE_IDENTIFIER = "com.qapple.Apple-Developer-Academy-POSTECH";
430430
PRODUCT_NAME = "$(TARGET_NAME)";
431431
PROVISIONING_PROFILE_SPECIFIER = "";
432-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Qapple+Development";
432+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Qapple+Distribution";
433433
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
434434
SUPPORTS_MACCATALYST = NO;
435435
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
@@ -449,9 +449,9 @@
449449
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
450450
CODE_SIGN_ENTITLEMENTS = Qapple/QappleBox/Qapple.entitlements;
451451
CODE_SIGN_IDENTITY = "Apple Development";
452-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
452+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
453453
CODE_SIGN_STYLE = Manual;
454-
CURRENT_PROJECT_VERSION = 2503091219;
454+
CURRENT_PROJECT_VERSION = 2505142036;
455455
DEVELOPMENT_ASSET_PATHS = "\"Qapple/Resource/Preview Content\"";
456456
DEVELOPMENT_TEAM = "";
457457
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G9WTRLK7PY;
@@ -472,11 +472,11 @@
472472
"$(inherited)",
473473
"@executable_path/Frameworks",
474474
);
475-
MARKETING_VERSION = 2.1.0;
475+
MARKETING_VERSION = 2.1.3;
476476
PRODUCT_BUNDLE_IDENTIFIER = "com.qapple.Apple-Developer-Academy-POSTECH";
477477
PRODUCT_NAME = "$(TARGET_NAME)";
478478
PROVISIONING_PROFILE_SPECIFIER = "";
479-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Qapple+Development";
479+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Qapple+Distribution";
480480
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
481481
SUPPORTS_MACCATALYST = NO;
482482
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;

Qapple/Qapple/SourceCode/App/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extension AppDelegate {
2929
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil
3030
) -> Bool {
3131
#if DEBUG
32-
RepositoryService.shared.configureServer(to: .test)
32+
RepositoryService.shared.configureServer(to: .production)
3333
#else
3434
RepositoryService.shared.configureServer(to: .production)
3535
#endif

Qapple/Qapple/SourceCode/Data/Repository/AnswerRepository.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Foundation
1212
struct AnswerRepository {
1313
var fetchAnswerListOfProfile: (_ threshold: Int?) async throws -> ([Answer], QappleAPI.PaginationInfo)
1414
var fetchAnswerPreviewList: (_ questionId: Int) async throws -> [Answer]
15-
var fetchAnswerListOfQuestion: (_ questionId: Int, _ threshold: String?) async throws -> (
15+
var fetchAnswerListOfQuestion: (_ questionId: Int, _ threshold: Int?) async throws -> (
1616
[Answer],
1717
QappleAPI.TotalCount,
1818
QappleAPI.PaginationInfo

Qapple/Qapple/SourceCode/Feature/2.QuestionTab/2-6.AnswerList/AnswerListFeature.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ struct AnswerListFeature {
7979
do {
8080
let response = try await answerRepository.fetchAnswerListOfQuestion(
8181
state.question.id,
82-
state.paginationInfo.threshold
82+
Int(state.paginationInfo.threshold)
8383
)
8484
await send(.paginagionResponse(response.0, response.2))
8585
} catch {

Qapple/Qapple/SourceCode/Feature/3.BulletinBoard/3-1.BulletinBoard/BulletinBoardView.swift

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private struct QuestionNotificationView: View {
120120
}
121121
} else {
122122
Button {
123-
store.send(.popularAnswerTapped(store.todayQuestion))
123+
// store.send(.popularAnswerTapped(store.todayQuestion))
124124
} label: {
125125
HStack(spacing: 0) {
126126
VStack(spacing: 0) {
@@ -136,13 +136,15 @@ private struct QuestionNotificationView: View {
136136

137137

138138
VStack(alignment: .leading, spacing: 0) {
139-
Text("오늘의 인기 답변")
140-
.font(.pretendard(.regular, size: 12))
141-
.foregroundStyle(TextLabel.sub4)
139+
// Text("오늘의 인기 답변")
140+
// .font(.pretendard(.regular, size: 12))
141+
// .foregroundStyle(TextLabel.sub4)
142+
//
143+
// Spacer()
142144

143-
Spacer()
144-
145-
Text("프라이데이는 여자친구가 가지고 싶어요") // TODO: 인기 답변으로
145+
Text("이전에 개발자의 실수로 이상한(?) 정보가 표시됐었답니다.") // TODO: 인기 답변으로
146+
.lineLimit(2)
147+
.multilineTextAlignment(.leading)
146148
.font(.pretendard(.regular, size: 15))
147149
.foregroundStyle(.white)
148150
}

Qapple/Qapple/SourceCode/UIComponent/QPAnswerCell.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,12 @@ private struct NormalCell: View {
8484
Content()
8585
.padding(.top, 8)
8686
.padding(.horizontal, 16)
87-
88-
Footer()
89-
.padding(.top, 6)
9087
.padding(.bottom, 20)
91-
.padding(.horizontal, 16)
88+
89+
// Footer()
90+
// .padding(.top, 6)
91+
// .padding(.bottom, 20)
92+
// .padding(.horizontal, 16)
9293
}
9394
.background(.first)
9495
}

0 commit comments

Comments
 (0)