Merge branch 'main' into feature/#31

BE-SOPT-Collaboration-Seminar-Coinone · Jun 10, 2021 · 8aff7d8 · 8aff7d8
2 parents 1df4384 + fcb9443
commit 8aff7d8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/Coinone-iOS/Coinone-iOS/Source/Cells/StockTVC.swift b/Coinone-iOS/Coinone-iOS/Source/Cells/StockTVC.swift
@@ -148,7 +148,7 @@ extension StockTVC {
 }
 
 extension StockTVC {
-    func setData(coinLogoImageName: String, coinEnglishTitle: String, coinKoreanTitle: String, coinCurrentPrice: Float, riseOrDescent: String, percentage: Float, coinTotalPrice: Float) {
+    func setData(coinLogoImageName: String, coinEnglishTitle: String, coinKoreanTitle: String, coinCurrentPrice: Float, riseOrDescent: String, percentage: Double, coinTotalPrice: Float) {
         let formatter = NumberFormatter().then {
           $0.numberStyle = .decimal
         }

diff --git a/Coinone-iOS/Coinone-iOS/Source/Models/StockModel.swift b/Coinone-iOS/Coinone-iOS/Source/Models/StockModel.swift
@@ -10,7 +10,8 @@ struct StockModel {
     var logoImage: String!
     var title: String!
     var subTitle: String!
-    var curValue: String!
-    var rate: String!
-    var transPrice: Int!
+    var curValue: Float!
+    var riseOrDescent: String
+    var rate: Double!
+    var transPrice: Float!
 }
diff --git a/Coinone-iOS/Coinone-iOS/Source/ViewControllers/GeoraesoVC.swift b/Coinone-iOS/Coinone-iOS/Source/ViewControllers/GeoraesoVC.swift
@@ -238,6 +238,7 @@ class GeoraesoVC: UIViewController {
 
     tableView.backgroundColor = .tableViewGray
     tableView.tableFooterView = UIView(frame: .zero)
+    tableView.separatorStyle = .none
 
     tableView.register(StockTVC.self, forCellReuseIdentifier: StockTVC.identifier)
 
@@ -306,23 +307,26 @@ class GeoraesoVC: UIViewController {
   // MARK: - DummyData
   func setDummyData() {
     stockList.append(contentsOf: [
-                      StockModel(logoImage: "",
+                      StockModel(logoImage: "coinLogo",
                                  title: "XRP",
                                  subTitle: "리플",
-                                 curValue: "1,625",
-                                 rate: "-0.37%",
+                                 curValue: 1625,
+                                 riseOrDescent: "-",
+                                 rate: 0.37,
                                  transPrice: 2059),
-                      StockModel(logoImage: "",
+                      StockModel(logoImage: "coinLogo",
                                  title: "XRP",
                                  subTitle: "리플",
-                                 curValue: "1,500",
-                                 rate: "-0.37%",
+                                 curValue: 1625,
+                                 riseOrDescent: "-",
+                                 rate: 0.37,
                                  transPrice: 2489),
-                      StockModel(logoImage: "",
+                      StockModel(logoImage: "coinLogo",
                                  title: "XRP",
                                  subTitle: "리플",
-                                 curValue: "1,000",
-                                 rate: "-0.37%",
+                                 curValue: 1625,
+                                 riseOrDescent: "-",
+                                 rate: 0.37,
                                  transPrice: 1280)])
   }
 }