Merge pull request #47 from Team-Shaka/temp-Develop

2.0.1 Release
Team-Shaka · Jan 4, 2024 · 1473bba · 1473bba
2 parents 99190c8 + 2ced724
commit 1473bba
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 28 deletions.
diff --git 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 = "";

diff --git 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,

diff --git 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)
         }
     }

diff --git 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()