Merge pull request #16 from BE-SOPT-Collaboration-Seminar-Coinone/fea…

…ture/#1 메인과 거래소 연결 및 주석 작성
BE-SOPT-Collaboration-Seminar-Coinone · May 19, 2021 · 4722f81 · 4722f81
2 parents 19899cc + ea9d19b
commit 4722f81
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/Coinone-iOS/Coinone-iOS/Resource/Storyboards/My.storyboard b/Coinone-iOS/Coinone-iOS/Resource/Storyboards/My.storyboard
@@ -1,8 +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="ldg-o8-7ml">
+<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" initialViewController="ldg-o8-7ml">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -155,6 +155,9 @@
                                 <state key="normal" title="거래소">
                                     <color key="titleColor" red="0.96862745100000003" green="0.96862745100000003" blue="0.96862745100000003" alpha="1" colorSpace="calibratedRGB"/>
                                 </state>
+                                <connections>
+                                    <action selector="gaeraesobuttonclicked:" destination="ldg-o8-7ml" eventType="touchUpInside" id="n1V-G7-Pq9"/>
+                                </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SlR-xK-XYs">
                                 <rect key="frame" x="135" y="77.666666666666671" width="59" height="36"/>
@@ -193,7 +196,7 @@
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="MyTableViewCell" rowHeight="151" id="x9I-NT-7R2" customClass="MyTableViewCell" customModule="Coinone_iOS" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="24.333333969116211" width="375" height="151"/>
+                                        <rect key="frame" x="0.0" y="28" width="375" height="151"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="x9I-NT-7R2" id="a00-Nu-liJ">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="151"/>

diff --git a/Coinone-iOS/Coinone-iOS/Source/Cells/MyTableViewCell.swift b/Coinone-iOS/Coinone-iOS/Source/Cells/MyTableViewCell.swift
@@ -43,11 +43,11 @@ class MyTableViewCell: UITableViewCell {
                      GraphImage : String
                      )
         {
+
+//        불러오고 싶은 이미지가 여러개 인 경우 if let 구문을 여러번 사용해서 받아온다 //
             if let
                 image = UIImage(named: logoImage)
 
-
-
             {
                 LogoImage.image = image
 

diff --git a/Coinone-iOS/Coinone-iOS/Source/ViewControllers/MyViewController.swift b/Coinone-iOS/Coinone-iOS/Source/ViewControllers/MyViewController.swift
@@ -11,10 +11,22 @@ class MyViewController: UIViewController {
   @IBOutlet weak var underlineview: UIView!
   @IBOutlet weak var myTableView: UITableView!
   @IBOutlet weak var chartView: UIView!
-
+  @IBAction func gaeraesobuttonclicked(_ sender: Any) {
+
+//    거래소 버튼 누르면 거래소로 넘어가게 //
+
+        let storyboard = UIStoryboard(name:"Georaeso", bundle: nil)
+        guard let nextVC = storyboard.instantiateViewController(identifier: "GeoraesoVC") as? GeoraesoVC else {return}
+        nextVC.modalTransitionStyle = .crossDissolve
+        nextVC.modalPresentationStyle = .fullScreen
+
+        self.present(nextVC, animated: true, completion: nil)
+    }
+
   var myList : [MyListDataModel] = []
+
+//    Popup 창이 계속해서 반복해서 나오는 걸 탈출시키기 위해서 //
   var popupIsShown : Bool = false
-
   override func viewDidAppear(_ animated: Bool) {
 
 
@@ -45,7 +57,7 @@ class MyViewController: UIViewController {
     self.myTableView.dataSource = self
     self.myTableView.separatorStyle = .none
 
-
+//    chartView 뒤의 쉐도우 적용
     self.chartView.layer.applyShadow(color: .black, alpha: 0.12, x: 0, y: 0, blur: 8)
 
 
@@ -54,7 +66,7 @@ class MyViewController: UIViewController {
 
 
 
-  
+//  MyList 에 들어가는 Data //
   func setMyList()
   {
     myList.append(contentsOf: [