From 75012d49b46a30ebde32264cec1159437c788911 Mon Sep 17 00:00:00 2001 From: BoMin Date: Tue, 26 Dec 2023 20:34:41 +0900 Subject: [PATCH 1/4] FIX: Url query without date and time --- Briefing/Models/Network/Briefing/BriefingNetworkManager.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Briefing/Models/Network/Briefing/BriefingNetworkManager.swift b/Briefing/Models/Network/Briefing/BriefingNetworkManager.swift index aaa3037..36407b4 100644 --- a/Briefing/Models/Network/Briefing/BriefingNetworkManager.swift +++ b/Briefing/Models/Network/Briefing/BriefingNetworkManager.swift @@ -30,9 +30,7 @@ extension BriefingNetworkManager { url: url, method: .get, path: .keywords, - query: [.date: date.dateToString(), - .type: type.rawValue, - .timeOfDay: morning.rawValue]) else { + query: [.type: type.rawValue]) else { return Single.error(BFNetworkError.wrongURLRequestError) } return response(urlRequest, From 8d2a07160b94f5df53b15759d84cb04f3de9454c Mon Sep 17 00:00:00 2001 From: BoMin Date: Tue, 26 Dec 2023 20:34:55 +0900 Subject: [PATCH 2/4] FIX: Edit category order --- Briefing/Scenes/HomeScenes/HomeViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Briefing/Scenes/HomeScenes/HomeViewController.swift b/Briefing/Scenes/HomeScenes/HomeViewController.swift index 0925186..5b731a5 100644 --- a/Briefing/Scenes/HomeScenes/HomeViewController.swift +++ b/Briefing/Scenes/HomeScenes/HomeViewController.swift @@ -15,9 +15,9 @@ final class HomeViewController: UIViewController { let categories: [BriefingCategory] = [ .social, - .science, .global, - .economy + .economy, + .science ] let disposeBag: DisposeBag = DisposeBag() From b4fb6ddcb5b4456bdae6e0c5c9df804536f8b1bd Mon Sep 17 00:00:00 2001 From: BoMin Date: Tue, 26 Dec 2023 21:43:14 +0900 Subject: [PATCH 3/4] FIX: Article URL --- .../BriefingCardViewController.swift | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/Briefing/Scenes/BriefingCardScenes/BriefingCardViewController.swift b/Briefing/Scenes/BriefingCardScenes/BriefingCardViewController.swift index ffea908..1a1cdda 100644 --- a/Briefing/Scenes/BriefingCardScenes/BriefingCardViewController.swift +++ b/Briefing/Scenes/BriefingCardScenes/BriefingCardViewController.swift @@ -376,23 +376,6 @@ class BriefingCardViewController: UIViewController { make.top.equalTo(topicLabel.snp.bottom).offset(8) } -// dateInformationLabel.snp.makeConstraints{ make in -// -// } -// -// categoryInformationLabel.snp.makeConstraints{ make in -// -// } -// -// generateInformationLabel.snp.makeConstraints{ make in -// -// } -// -// informationStackView.snp.makeConstraints{ make in -// make.leading.equalTo(topicLabel) -// make.top.equalTo(topicLabel.snp.bottom).offset(8) -// } - lineSeparatorView1.snp.makeConstraints{ make in make.top.equalTo(informationLabel.snp.bottom).offset(20) make.leading.equalToSuperview().offset(-10) @@ -448,13 +431,13 @@ class BriefingCardViewController: UIViewController { } @objc func openSecondArticleURL() { - if let secondArticleURL = self.briefingData?.articles[0].url { + if let secondArticleURL = self.briefingData?.articles[1].url { openURLInSafari(secondArticleURL) } } @objc func openThirdArticleURL() { - if let thirdArticleURL = self.briefingData?.articles[0].url { + if let thirdArticleURL = self.briefingData?.articles[2].url { openURLInSafari(thirdArticleURL) } } From 2ced72430c67854a4ee4c7af2e7aeeefa9c7b73a Mon Sep 17 00:00:00 2001 From: BoMin Date: Tue, 26 Dec 2023 21:43:28 +0900 Subject: [PATCH 4/4] FIX: App Version and Build number --- Briefing.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Briefing.xcodeproj/project.pbxproj b/Briefing.xcodeproj/project.pbxproj index 085fd98..f42431b 100644 --- a/Briefing.xcodeproj/project.pbxproj +++ b/Briefing.xcodeproj/project.pbxproj @@ -1086,7 +1086,7 @@ CODE_SIGN_ENTITLEMENTS = Briefing/Briefing.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = XB6KV776A2; GENERATE_INFOPLIST_FILE = YES; @@ -1103,7 +1103,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 2.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.bmlee.briefing; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1123,7 +1123,7 @@ CODE_SIGN_ENTITLEMENTS = Briefing/Briefing.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = XB6KV776A2; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = Briefing/Resources/Info.plist; @@ -1139,7 +1139,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 2.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.bmlee.briefing; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "";