Merge branch 'main' into featuer/#27

BE-SOPT-Collaboration-Seminar-Coinone · Jun 2, 2021 · 7bd7994 · 7bd7994
2 parents 7113433 + 1967a3a
commit 7bd7994
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/Coinone-iOS/Coinone-iOS/Resource/Info.plist b/Coinone-iOS/Coinone-iOS/Resource/Info.plist
@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -25,6 +20,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIAppFonts</key>
 	<array>
 		<string>NotoSansKR-Black.otf</string>
@@ -48,7 +48,7 @@
 					<key>UISceneDelegateClassName</key>
 					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
 					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
+					<string>Georaeso</string>
 				</dict>
 			</array>
 		</dict>
@@ -58,7 +58,7 @@
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
+	<string>Georaeso</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/Coinone-iOS/Coinone-iOS/Resource/Storyboards/Base.lproj/Main.storyboard b/Coinone-iOS/Coinone-iOS/Resource/Storyboards/Base.lproj/Main.storyboard
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="VGR-Yk-zJZ">
-
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>

diff --git a/Coinone-iOS/Coinone-iOS/Source/Cells/StockTVC.swift b/Coinone-iOS/Coinone-iOS/Source/Cells/StockTVC.swift
@@ -106,7 +106,7 @@ extension StockTVC {
         backView.snp.makeConstraints { make in
             make.width.equalTo(335)
             make.height.equalTo(60)
-            make.top.equalTo(contentView).inset(12)
+            make.top.equalTo(contentView).inset(6)
             make.leading.trailing.equalTo(contentView).inset(20)
         }
 
@@ -148,11 +148,26 @@ extension StockTVC {
 }
 
 extension StockTVC {
-    func setData(logoPath: String, title: String, subTitle: String, curValue: String, rate: String, transPrice: Int) {
-        titleLabel.text = title
-        subTitleLabel.text = subTitle
-        curValueLabel.text = curValue
-        rateLabel.text = rate
-        transPriceLabel.text = "\(transPrice)억"
+    func setData(coinLogoImageName: String, coinEnglishTitle: String, coinKoreanTitle: String, coinCurrentPrice: Float, riseOrDescent: String, percentage: Float, coinTotalPrice: Float) {
+        let formatter = NumberFormatter().then {
+          $0.numberStyle = .decimal
+        }
+
+        self.logoImage.image = UIImage(named: coinLogoImageName)
+        self.titleLabel.text = coinEnglishTitle
+        self.subTitleLabel.text = coinKoreanTitle
+
+
+        if riseOrDescent == "+" {
+            self.curValueLabel.setLabel(text: "\(formatter.string(from: NSNumber(value: coinCurrentPrice))!)", textColor: .textRed, font: .boldSystemFont(ofSize: 14))
+            self.rateLabel.setLabel(text: "\(riseOrDescent)\(percentage)%", textColor: .textRed, font: .systemFont(ofSize: 14, weight: .regular))
+        } else {
+            self.curValueLabel.setLabel(text: "\(formatter.string(from: NSNumber(value: coinCurrentPrice))!)", textColor: .mainBlue, font: .boldSystemFont(ofSize: 14))
+            self.rateLabel.setLabel(text: "\(riseOrDescent)\(percentage)%", textColor: .mainBlue, font: .systemFont(ofSize: 14, weight: .regular))
+        }
+
+        self.transPriceLabel.setLabel(text: "\(formatter.string(from: NSNumber(value:coinTotalPrice))!)억", textColor: .coinGray, font: .systemFont(ofSize: 14, weight: .regular))
+
     }
 }
+