diff --git a/Coinone-iOS/Coinone-iOS.xcodeproj/project.pbxproj b/Coinone-iOS/Coinone-iOS.xcodeproj/project.pbxproj index 9181bd5..64a61ae 100644 --- a/Coinone-iOS/Coinone-iOS.xcodeproj/project.pbxproj +++ b/Coinone-iOS/Coinone-iOS.xcodeproj/project.pbxproj @@ -8,9 +8,6 @@ /* Begin PBXBuildFile section */ 06A1A45591145692DA4F18C7 /* Pods_Coinone_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0AB500236EDF60103A408AE /* Pods_Coinone_iOS.framework */; }; - 922E2322264FB40300F8ADA7 /* GeoraesoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 922E2321264FB40300F8ADA7 /* GeoraesoVC.swift */; }; - 92C9EE8F2650314C00E73641 /* StockTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92C9EE8E2650314C00E73641 /* StockTVC.swift */; }; - 92C9EE962650609300E73641 /* StockModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92C9EE952650609300E73641 /* StockModel.swift */; }; CC272E5B26517E6000637BCE /* TabbarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC272E5A26517E6000637BCE /* TabbarViewController.swift */; }; CC272E6226517F0500637BCE /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC272E6126517F0500637BCE /* HomeViewController.swift */; }; CC272E6526517F1000637BCE /* TransactionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC272E6426517F1000637BCE /* TransactionViewController.swift */; }; @@ -38,9 +35,6 @@ /* Begin PBXFileReference section */ 3E2F6097EABAAACC664AB52A /* Pods-Coinone-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Coinone-iOS.debug.xcconfig"; path = "Target Support Files/Pods-Coinone-iOS/Pods-Coinone-iOS.debug.xcconfig"; sourceTree = ""; }; 4BA5E0330054E48E147B52CA /* Pods-Coinone-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Coinone-iOS.release.xcconfig"; path = "Target Support Files/Pods-Coinone-iOS/Pods-Coinone-iOS.release.xcconfig"; sourceTree = ""; }; - 922E2321264FB40300F8ADA7 /* GeoraesoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeoraesoVC.swift; sourceTree = ""; }; - 92C9EE8E2650314C00E73641 /* StockTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = StockTVC.swift; path = "Coinone-iOS/Source/Cells/StockTVC.swift"; sourceTree = SOURCE_ROOT; }; - 92C9EE952650609300E73641 /* StockModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StockModel.swift; sourceTree = ""; }; CC272E5A26517E6000637BCE /* TabbarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarViewController.swift; sourceTree = ""; }; CC272E6126517F0500637BCE /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = ""; }; CC272E6426517F1000637BCE /* TransactionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionViewController.swift; sourceTree = ""; }; @@ -54,7 +48,7 @@ CCA0ECC5264FA7A4001CC563 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; CCA0ECC7264FA7A4001CC563 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; CCA0ECCC264FA7A4001CC563 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - CCA0ECCE264FA7A6001CC563 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = "Coinone-iOS/Resource/Assets.xcassets"; sourceTree = SOURCE_ROOT; }; + CCA0ECCE264FA7A6001CC563 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; CCA0ECD1264FA7A6001CC563 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; CCA0ECD3264FA7A6001CC563 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CCAA9A20264FAB8A008E50BF /* Georaeso.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Georaeso.storyboard; sourceTree = ""; }; @@ -80,38 +74,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 922E231F264FB3D600F8ADA7 /* Source */ = { - isa = PBXGroup; - children = ( - 92C9EE942650607500E73641 /* Models */, - 92C9EE8D2650313500E73641 /* Cells */, - 922E2320264FB3E600F8ADA7 /* ViewControllers */, - ); - path = Source; - sourceTree = ""; - }; - 922E2320264FB3E600F8ADA7 /* ViewControllers */ = { - isa = PBXGroup; - children = ( - 922E2321264FB40300F8ADA7 /* GeoraesoVC.swift */, - ); - path = ViewControllers; - sourceTree = ""; - }; - 92C9EE8D2650313500E73641 /* Cells */ = { - isa = PBXGroup; - children = ( - 92C9EE8E2650314C00E73641 /* StockTVC.swift */, - ); - path = Cells; - sourceTree = ""; - }; - 92C9EE942650607500E73641 /* Models */ = { - isa = PBXGroup; - children = ( - 92C9EE952650609300E73641 /* StockModel.swift */, - ); - path = Models; CC272E672651871300637BCE /* Font */ = { isa = PBXGroup; children = ( @@ -146,13 +108,21 @@ CCA0ECC4264FA7A4001CC563 /* Coinone-iOS */ = { isa = PBXGroup; children = ( - 922E231F264FB3D600F8ADA7 /* Source */, CCAA9A1D264FAA2A008E50BF /* Resource */, + CCAA9A1A264FAA0C008E50BF /* Source */, CCA0ECD0264FA7A6001CC563 /* LaunchScreen.storyboard */, ); path = "Coinone-iOS"; sourceTree = ""; }; + CCAA9A1A264FAA0C008E50BF /* Source */ = { + isa = PBXGroup; + children = ( + CCAA9A1E264FAA6C008E50BF /* ViewControllers */, + ); + path = Source; + sourceTree = ""; + }; CCAA9A1D264FAA2A008E50BF /* Resource */ = { isa = PBXGroup; children = ( @@ -167,7 +137,6 @@ path = Resource; sourceTree = ""; }; - CCAA9A1E264FAA6C008E50BF /* ViewControllers */ = { isa = PBXGroup; children = ( @@ -349,11 +318,8 @@ files = ( CCAA9A34264FAF68008E50BF /* UIView+.swift in Sources */, CCAA9A2B264FACDD008E50BF /* UIColor+.swift in Sources */, - 92C9EE962650609300E73641 /* StockModel.swift in Sources */, - 922E2322264FB40300F8ADA7 /* GeoraesoVC.swift in Sources */, CC272E5B26517E6000637BCE /* TabbarViewController.swift in Sources */, CCA0ECC6264FA7A4001CC563 /* AppDelegate.swift in Sources */, - 92C9EE8F2650314C00E73641 /* StockTVC.swift in Sources */, CCAA9A2E264FAEB9008E50BF /* CALayer+.swift in Sources */, CC272E6226517F0500637BCE /* HomeViewController.swift in Sources */, CCA0ECC8264FA7A4001CC563 /* SceneDelegate.swift in Sources */, diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/Contents.json b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/Contents.json deleted file mode 100644 index 6001ea1..0000000 --- a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "coinoneGuide41.png", - "scale" : "1x", - "idiom" : "universal" - }, - { - "scale" : "2x", - "idiom" : "universal", - "filename" : "coinoneGuide41@2x.png" - }, - { - "scale" : "3x", - "idiom" : "universal", - "filename" : "coinoneGuide41@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41.png deleted file mode 100644 index 07f5d48..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41@2x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41@2x.png deleted file mode 100644 index 71e4966..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41@2x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41@3x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41@3x.png deleted file mode 100644 index 2cd4ae5..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41@3x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/Contents.json b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/Contents.json deleted file mode 100644 index da0efbc..0000000 --- a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "group411.png", - "scale" : "1x", - "idiom" : "universal" - }, - { - "filename" : "group411@2x.png", - "scale" : "2x", - "idiom" : "universal" - }, - { - "filename" : "group411@3x.png", - "scale" : "3x", - "idiom" : "universal" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411.png deleted file mode 100644 index 37f2275..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411@2x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411@2x.png deleted file mode 100644 index c2ef871..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411@2x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411@3x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411@3x.png deleted file mode 100644 index 4b7d011..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group411.imageset/group411@3x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/Contents.json b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/Contents.json deleted file mode 100644 index 57e44ee..0000000 --- a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "group423.png", - "scale" : "1x", - "idiom" : "universal" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "group423@2x.png" - }, - { - "scale" : "3x", - "idiom" : "universal", - "filename" : "group423@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423.png deleted file mode 100644 index e81a2d3..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423@2x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423@2x.png deleted file mode 100644 index b9db844..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423@2x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423@3x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423@3x.png deleted file mode 100644 index 23b112d..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/group423.imageset/group423@3x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/Contents.json b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/Contents.json deleted file mode 100644 index cd264df..0000000 --- a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "modeLight.png", - "scale" : "1x", - "idiom" : "universal" - }, - { - "idiom" : "universal", - "filename" : "modeLight@2x.png", - "scale" : "2x" - }, - { - "filename" : "modeLight@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight.png deleted file mode 100644 index d0f9f30..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight@2x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight@2x.png deleted file mode 100644 index 281a3e6..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight@2x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight@3x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight@3x.png deleted file mode 100644 index 6ebe9aa..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLight.imageset/modeLight@3x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/Contents.json b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/Contents.json deleted file mode 100644 index 91c1e99..0000000 --- a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "modeLightDirectionPrevious.png" - }, - { - "scale" : "2x", - "idiom" : "universal", - "filename" : "modeLightDirectionPrevious@2x.png" - }, - { - "scale" : "3x", - "idiom" : "universal", - "filename" : "modeLightDirectionPrevious@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious.png deleted file mode 100644 index 64f15f5..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious@2x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious@2x.png deleted file mode 100644 index a58a525..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious@2x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious@3x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious@3x.png deleted file mode 100644 index 4f2a52c..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/modeLightDirectionPrevious.imageset/modeLightDirectionPrevious@3x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/Contents.json b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/Contents.json deleted file mode 100644 index 49f5530..0000000 --- a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "xrp1.png", - "scale" : "1x", - "idiom" : "universal" - }, - { - "scale" : "2x", - "filename" : "xrp1@2x.png", - "idiom" : "universal" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "xrp1@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1.png deleted file mode 100644 index a46fafc..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1@2x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1@2x.png deleted file mode 100644 index 3f43bfd..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1@2x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1@3x.png b/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1@3x.png deleted file mode 100644 index 8131bc1..0000000 Binary files a/Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/xrp1.imageset/xrp1@3x.png and /dev/null differ diff --git a/Coinone-iOS/Coinone-iOS/Resource/Extensions/UIColor+.swift b/Coinone-iOS/Coinone-iOS/Resource/Extensions/UIColor+.swift index 7bd32fc..6d4ecc4 100644 --- a/Coinone-iOS/Coinone-iOS/Resource/Extensions/UIColor+.swift +++ b/Coinone-iOS/Coinone-iOS/Resource/Extensions/UIColor+.swift @@ -8,11 +8,7 @@ import UIKit extension UIColor { - @nonobjc class var textGray: UIColor { - return UIColor(red: 173.0 / 255.0, green: 179.0 / 255.0, blue: 186.0 / 255.0, alpha: 1.0) - } - - @nonobjc class var tableViewGray: UIColor { - return UIColor(red: 249.0 / 255.0, green: 249.0 / 255.0, blue: 249.0 / 255.0, alpha: 1.0) + @nonobjc class var textGray: UIColor { + return UIColor(red: 173.0 / 255.0, green: 179.0 / 255.0, blue: 186.0 / 255.0, alpha: 1.0) } } diff --git a/Coinone-iOS/Coinone-iOS/Resource/Info.plist b/Coinone-iOS/Coinone-iOS/Resource/Info.plist index 41b75c1..4c6a667 100644 --- a/Coinone-iOS/Coinone-iOS/Resource/Info.plist +++ b/Coinone-iOS/Coinone-iOS/Resource/Info.plist @@ -43,7 +43,7 @@ UISceneDelegateClassName $(PRODUCT_MODULE_NAME).SceneDelegate UISceneStoryboardFile - Georaeso + Main diff --git a/Coinone-iOS/Coinone-iOS/Resource/Storyboards/Georaeso.storyboard b/Coinone-iOS/Coinone-iOS/Resource/Storyboards/Georaeso.storyboard index 9f9d1f3..f9a048e 100644 --- a/Coinone-iOS/Coinone-iOS/Resource/Storyboards/Georaeso.storyboard +++ b/Coinone-iOS/Coinone-iOS/Resource/Storyboards/Georaeso.storyboard @@ -1,33 +1,7 @@ - - - + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Coinone-iOS/Coinone-iOS/Source/Cells/StockTVC.swift b/Coinone-iOS/Coinone-iOS/Source/Cells/StockTVC.swift deleted file mode 100644 index 16669a1..0000000 --- a/Coinone-iOS/Coinone-iOS/Source/Cells/StockTVC.swift +++ /dev/null @@ -1,143 +0,0 @@ -// -// StockTVC.swift -// Coinone-iOS -// -// Created by soyeon on 2021/05/16. -// - -import UIKit -import SnapKit - -class StockTVC: UITableViewCell { - static let identifier = "StockTVC" - - private lazy var logoImage: UIImageView = { - let imageView = UIImageView() - let image = UIImage() - imageView.image = UIImage(named: "xrp1") - - return imageView - }() - - private let titleLabel: UILabel = { - let label = UILabel() - label.font = .boldSystemFont(ofSize: 14) - label.textColor = .black - - return label - }() - - private let subTitleLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 10) - label.textColor = UIColor(red: 173.0 / 255.0, green: 179.0 / 255.0, blue: 186.0 / 255.0, alpha: 1.0) - - return label - }() - - private let curValueLabel: UILabel = { - let label = UILabel() - label.font = .boldSystemFont(ofSize: 14) - label.textColor = UIColor(red: 23.0 / 255.0, green: 97.0 / 255.0, blue: 181.0 / 255.0, alpha: 1.0) - - return label - }() - - private let rateLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 14) - label.textColor = UIColor(red: 23.0 / 255.0, green: 97.0 / 255.0, blue: 181.0 / 255.0, alpha: 1.0) - - return label - }() - - private let transPriceLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 14) - label.textColor = UIColor(red: 173.0 / 255.0, green: 179.0 / 255.0, blue: 186.0 / 255.0, alpha: 1.0) - - return label - }() - - // MARK: - Initializer - override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { - super.init(style: style, reuseIdentifier: reuseIdentifier) - setConfigure() - } - - @available(*, unavailable) - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - - // MARK: - LifeCycle - override func awakeFromNib() { - super.awakeFromNib() - } - - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - } -} - -extension StockTVC { - func setConfigure() { - contentView.addSubview(logoImage) - contentView.addSubview(titleLabel) - contentView.addSubview(subTitleLabel) - contentView.addSubview(curValueLabel) - contentView.addSubview(rateLabel) - contentView.addSubview(transPriceLabel) - - setConstraints() - } - - func setConstraints() { - - logoImage.snp.makeConstraints { make in - make.width.equalTo(12) - make.height.equalTo(12) - make.top.equalTo(contentView.snp.top).inset(19) - make.leading.equalTo(contentView.snp.leading).inset(30) - } - - titleLabel.snp.makeConstraints { make in - make.top.equalTo(contentView.snp.top).inset(14) - make.leading.equalTo(contentView.snp.leading).inset(51) - } - - subTitleLabel.snp.makeConstraints { make in - make.top.equalTo(contentView.snp.top).inset(34) - make.leading.equalTo(contentView.snp.leading).inset(51) - } - - curValueLabel.snp.makeConstraints { make in - make.top.equalTo(contentView.snp.top).inset(22) - make.leading.equalTo(contentView.snp.leading).inset(170) - make.bottom.equalTo(contentView.snp.bottom).inset(21) - } - - rateLabel.snp.makeConstraints { make in - make.top.equalTo(contentView.snp.top).inset(22) - make.leading.equalTo(contentView.snp.leading).inset(231) - make.bottom.equalTo(contentView.snp.bottom).inset(21) - } - - transPriceLabel.snp.makeConstraints { make in - make.top.equalTo(contentView.snp.top).inset(22) - make.leading.equalTo(contentView.snp.leading).inset(299) - make.bottom.equalTo(contentView.snp.bottom).inset(21) - } - } -} - -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)억" - } -} diff --git a/Coinone-iOS/Coinone-iOS/Source/Models/StockModel.swift b/Coinone-iOS/Coinone-iOS/Source/Models/StockModel.swift deleted file mode 100644 index a4cadac..0000000 --- a/Coinone-iOS/Coinone-iOS/Source/Models/StockModel.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// Stock.swift -// Coinone-iOS -// -// Created by soyeon on 2021/05/16. -// - -import Foundation - -struct StockModel { - var logoImage: String! - var title: String! - var subTitle: String! - var curValue: String! - var rate: String! - var transPrice: Int! -} diff --git a/Coinone-iOS/Coinone-iOS/Source/ViewControllers/GeoraesoVC.swift b/Coinone-iOS/Coinone-iOS/Source/ViewControllers/GeoraesoVC.swift deleted file mode 100644 index 19b2fa6..0000000 --- a/Coinone-iOS/Coinone-iOS/Source/ViewControllers/GeoraesoVC.swift +++ /dev/null @@ -1,452 +0,0 @@ -// -// GeoraesoVC.swift -// Coinone-iOS -// -// Created by soyeon on 2021/05/15. -// - -import UIKit -import SnapKit - -class GeoraesoVC: UIViewController { - private var stockList: [StockModel] = [] - - // MARK: - Header UI - private lazy var headerView: UIView = { - let view = UIView() - view.backgroundColor = .white - return view - }() - - private lazy var logoImage: UIImageView = { - let imageView = UIImageView() - imageView.image = UIImage(named: "coinoneGuide41") - return imageView - }() - - private lazy var searchButton: UIButton = { - let button = UIButton() - button.setImage(UIImage(named: "modeLight"), for: .normal) - button.setPreferredSymbolConfiguration(.init(pointSize: 20, - weight: .light, - scale: .large), - forImageIn: .normal) - return button - }() - - private lazy var myLabel: UILabel = { - let label = UILabel() - label.font = .boldSystemFont(ofSize: 16) - label.text = "마이" - label.textColor = UIColor.textGray - return label - }() - private lazy var marketLabel: UILabel = { - let label = UILabel() - label.font = .boldSystemFont(ofSize: 16) - label.text = "거래소" - label.textColor = UIColor.black - return label - }() - private lazy var easyTransLabel: UILabel = { - let label = UILabel() - label.font = .boldSystemFont(ofSize: 16) - label.text = "간편 구매" - label.textColor = UIColor.textGray - return label - }() - private lazy var infoLabel: UILabel = { - let label = UILabel() - label.font = .boldSystemFont(ofSize: 16) - label.text = "정보" - label.textColor = UIColor.textGray - return label - }() - private lazy var lineView: UIView = { - let view = UIView() - view.backgroundColor = .black - return view - }() - - // MARK: - Filter UI - // coin filter button - private lazy var coinView: UIView = { - let view = UIView() - view.backgroundColor = .white - view.setBorder(borderColor: nil, borderWidth: nil) - - view.addSubview(coinLabel) - view.addSubview(cFilterButton) - - coinLabel.snp.makeConstraints { make in - make.top.equalTo(view.snp.top).inset(6) - make.leading.equalTo(view.snp.leading).inset(8) - } - cFilterButton.snp.makeConstraints { make in - make.centerY.equalTo(coinLabel) - make.leading.equalTo(coinLabel.snp.trailing).inset(-38) - } - return view - }() - private lazy var coinLabel: UILabel = { - let label = UILabel() - label.font = UIFont.systemFont(ofSize: 12) - label.text = "코인명" - label.textColor = UIColor.textGray - return label - }() - private lazy var cFilterButton: UIButton = { - let button = UIButton() - button.setImage(UIImage(named: "group423"), for: .normal) - button.setPreferredSymbolConfiguration(.init(pointSize: 20, - weight: .light, - scale: .large), - forImageIn: .normal) - return button - }() - - // curvalue filter button - private lazy var curValueView: UIView = { - let view = UIView() - view.backgroundColor = .white - view.setBorder(borderColor: nil, borderWidth: nil) - - view.addSubview(curValueLabel) - view.addSubview(vFilterButton) - - curValueLabel.snp.makeConstraints { make in - make.top.equalTo(view.snp.top).inset(6) - make.leading.equalTo(view.snp.leading).inset(8) - } - vFilterButton.snp.makeConstraints { make in - make.centerY.equalTo(curValueLabel) - make.leading.equalTo(curValueLabel.snp.trailing).inset(-38) - } - - return view - }() - private lazy var curValueLabel: UILabel = { - let label = UILabel() - label.font = UIFont.systemFont(ofSize: 12) - label.text = "현재가" - label.textColor = UIColor.textGray - return label - }() - private lazy var vFilterButton: UIButton = { - let button = UIButton() - button.setImage(UIImage(named: "group423"), for: .normal) - button.setPreferredSymbolConfiguration(.init(pointSize: 20, - weight: .light, - scale: .large), - forImageIn: .normal) - return button - }() - - // rate filter button - private lazy var rateView: UIView = { - let view = UIView() - view.backgroundColor = .white - view.setBorder(borderColor: nil, borderWidth: nil) - - view.addSubview(rateLabel) - view.addSubview(rFilterButton) - - rateLabel.snp.makeConstraints { make in - make.top.equalTo(view.snp.top).inset(6) - make.leading.equalTo(view.snp.leading).inset(8) - } - rFilterButton.snp.makeConstraints { make in - make.centerY.equalTo(rateLabel) - make.leading.equalTo(rateLabel.snp.trailing).inset(-10) - } - - return view - }() - private lazy var rateLabel: UILabel = { - let label = UILabel() - label.font = UIFont.systemFont(ofSize: 12) - label.text = "등락률" - label.textColor = UIColor.textGray - return label - }() - private lazy var rFilterButton: UIButton = { - let button = UIButton() - button.setImage(UIImage(named: "group423"), for: .normal) - button.setPreferredSymbolConfiguration(.init(pointSize: 20, - weight: .light, - scale: .large), - forImageIn: .normal) - return button - }() - - // trans price filter button - private lazy var transPriceView: UIView = { - let view = UIView() - view.backgroundColor = .white - view.setBorder(borderColor: nil, borderWidth: nil) - - view.addSubview(transPriceLabel) - view.addSubview(pFilterButton) - - transPriceLabel.snp.makeConstraints { make in - make.top.equalTo(view.snp.top).inset(6) - make.leading.equalTo(view.snp.leading).inset(8) - } - pFilterButton.snp.makeConstraints { make in - make.centerY.equalTo(transPriceLabel) - make.leading.equalTo(transPriceLabel.snp.trailing).inset(-3) - } - - return view - }() - private lazy var transPriceLabel: UILabel = { - let label = UILabel() - label.font = UIFont.systemFont(ofSize: 12) - label.text = "거래대금" - label.textColor = UIColor.black - return label - }() - private lazy var pFilterButton: UIButton = { - let button = UIButton() - button.setImage(UIImage(named: "group411"), for: .normal) - button.setPreferredSymbolConfiguration(.init(pointSize: 20, - weight: .light, - scale: .large), - forImageIn: .normal) - return button - }() - - - // MARK: - Table View - private lazy var tableView: UITableView = { - let tableView = UITableView(frame: .zero, style: .plain) - tableView.delegate = self - tableView.dataSource = self - - tableView.backgroundColor = .tableViewGray - tableView.tableFooterView = UIView(frame: .zero) - - tableView.register(StockTVC.self, forCellReuseIdentifier: StockTVC.identifier) - - return tableView - }() - - // MARK: - Table Header View - private lazy var tableHeaderView: UIView = { - let view = UIView() - - view.backgroundColor = .tableViewGray - - view.addSubview(tableHeaderLabel) - view.addSubview(foldListButton) - - tableHeaderLabel.snp.makeConstraints { make in - make.leading.equalTo(view.snp.leading).inset(20) - make.centerY.equalTo(view.snp.centerY) - } - foldListButton.snp.makeConstraints { make in - make.trailing.equalTo(view.snp.trailing).inset(20) - make.centerY.equalTo(view.snp.centerY) - make.width.equalTo(10) - make.height.equalTo(6) - } - - return view - }() - - private var tableHeaderLabel: UILabel = { - let label = UILabel() - label.text = "Main Market" - label.font = .boldSystemFont(ofSize: 12) - label.textColor = UIColor(red: 101.0 / 255.0, green: 101.0 / 255.0, blue: 101.0 / 255.0, alpha: 1.0) - - - return label - }() - private let foldListButton: UIButton = { - let button = UIButton() - button.setImage(UIImage(named: "modeLightDirectionPrevious"), for: .normal) - button.setPreferredSymbolConfiguration(.init(pointSize: 20, - weight: .light, - scale: .large), - forImageIn: .normal) - button.addTarget(self, action: #selector(foldList(_:)), for: .touchUpInside) - - return button - }() - - - override func viewDidLoad() { - super.viewDidLoad() - - setConfigure() - setDummyData() - } - - // MARK: - DummyData - func setDummyData() { - stockList.append(contentsOf: [ - StockModel(logoImage: "", - title: "XRP", - subTitle: "리플", - curValue: "1,625", - rate: "-0.37%", - transPrice: 2059), - StockModel(logoImage: "", - title: "XRP", - subTitle: "리플", - curValue: "1,500", - rate: "-0.37%", - transPrice: 2489), - StockModel(logoImage: "", - title: "XRP", - subTitle: "리플", - curValue: "1,000", - rate: "-0.37%", - transPrice: 1280)]) - } -} - -// MARK: - UI -extension GeoraesoVC { - private func setConfigure() { - setHeaderView() - setTableView() - } - - private func setHeaderView() { - view.addSubview(headerView) - - view.addSubview(logoImage) - view.addSubview(searchButton) - - view.addSubview(myLabel) - view.addSubview(marketLabel) - view.addSubview(lineView) - view.addSubview(easyTransLabel) - view.addSubview(infoLabel) - - view.addSubview(coinView) - view.addSubview(curValueView) - view.addSubview(rateView) - view.addSubview(transPriceView) - - headerView.snp.makeConstraints { make in - make.top.leading.trailing.equalTo(view.safeAreaLayoutGuide) - make.height.equalTo(140) - } - - logoImage.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(20) - make.leading.equalTo(headerView.snp.leading).inset(20) - } - searchButton.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(20) - make.leading.equalTo(headerView.snp.leading).inset(339) - } - - // MARK: - Header Tab Constraints - myLabel.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(51) - make.leading.equalTo(headerView.snp.leading).inset(20) - } - marketLabel.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(51) - make.leading.equalTo(headerView.snp.leading).inset(70) - } - lineView.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(78) - make.centerX.equalTo(marketLabel) - make.width.equalTo(48) - make.height.equalTo(2) - } - easyTransLabel.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(51) - make.leading.equalTo(headerView.snp.leading).inset(135) - } - infoLabel.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(51) - make.leading.equalTo(headerView.snp.leading).inset(214) - } - - // MARK: - Filter Button Constraints - coinView.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(96) - make.leading.equalTo(headerView.snp.leading).inset(20) - make.width.equalTo(94) - make.height.equalTo(30) - } - curValueView.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(96) - make.leading.equalTo(headerView.snp.leading).inset(118) - make.width.equalTo(94) - make.height.equalTo(30) - } - rateView.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(96) - make.leading.equalTo(headerView.snp.leading).inset(216) - make.width.equalTo(66) - make.height.equalTo(30) - } - transPriceView.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.top).inset(96) - make.leading.equalTo(headerView.snp.leading).inset(286) - make.width.equalTo(70) - make.height.equalTo(30) - } - } - - private func setTableView() { - view.addSubview(tableView) - - tableView.snp.makeConstraints { make in - make.top.equalTo(headerView.snp.bottom) - make.leading.trailing.equalTo(view.safeAreaLayoutGuide) - make.bottom.equalToSuperview() - } - } - -} - -// MARK: - TableViewDelegate -extension GeoraesoVC: UITableViewDelegate { - func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { - tableHeaderView - } - - func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { - 30 - } - - func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { - return 60 - } - - @objc func foldList(_ sender: UIButton) { - print("fold button touched") - - // TODO: - fold list action - } - -} - -// MARK: - TableViewDataSource -extension GeoraesoVC: UITableViewDataSource { - func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return stockList.count - } - - func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - guard let cell = tableView.dequeueReusableCell(withIdentifier: StockTVC.identifier) as? StockTVC else { - return UITableViewCell() - } - cell.contentView.backgroundColor = .white - - let data = stockList[indexPath.row] - cell.setData(logoPath: data.title, title: data.title, subTitle: data.subTitle, curValue: data.curValue, rate: data.rate, transPrice: data.transPrice) - cell.layer.applyShadow() - return cell - } - -} -