Skip to content

Commit

Permalink
Merge pull request #10 from BE-SOPT-Collaboration-Seminar-Coinone/rev…
Browse files Browse the repository at this point in the history
…ert-6-feature/#2

Revert "Market View UI Update"
  • Loading branch information
hansolnoh95 authored May 17, 2021
2 parents 4e53a6c + 07e4f8f commit 3190a3f
Show file tree
Hide file tree
Showing 31 changed files with 17 additions and 831 deletions.
54 changes: 10 additions & 44 deletions Coinone-iOS/Coinone-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 = "<group>"; };
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 = "<group>"; };
922E2321264FB40300F8ADA7 /* GeoraesoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeoraesoVC.swift; sourceTree = "<group>"; };
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 = "<group>"; };
CC272E5A26517E6000637BCE /* TabbarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarViewController.swift; sourceTree = "<group>"; };
CC272E6126517F0500637BCE /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
CC272E6426517F1000637BCE /* TransactionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionViewController.swift; sourceTree = "<group>"; };
Expand All @@ -54,7 +48,7 @@
CCA0ECC5264FA7A4001CC563 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
CCA0ECC7264FA7A4001CC563 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
CCA0ECCC264FA7A4001CC563 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
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 = "<group>"; };
CCA0ECD1264FA7A6001CC563 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
CCA0ECD3264FA7A6001CC563 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
CCAA9A20264FAB8A008E50BF /* Georaeso.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Georaeso.storyboard; sourceTree = "<group>"; };
Expand All @@ -80,38 +74,6 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
922E231F264FB3D600F8ADA7 /* Source */ = {
isa = PBXGroup;
children = (
92C9EE942650607500E73641 /* Models */,
92C9EE8D2650313500E73641 /* Cells */,
922E2320264FB3E600F8ADA7 /* ViewControllers */,
);
path = Source;
sourceTree = "<group>";
};
922E2320264FB3E600F8ADA7 /* ViewControllers */ = {
isa = PBXGroup;
children = (
922E2321264FB40300F8ADA7 /* GeoraesoVC.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
};
92C9EE8D2650313500E73641 /* Cells */ = {
isa = PBXGroup;
children = (
92C9EE8E2650314C00E73641 /* StockTVC.swift */,
);
path = Cells;
sourceTree = "<group>";
};
92C9EE942650607500E73641 /* Models */ = {
isa = PBXGroup;
children = (
92C9EE952650609300E73641 /* StockModel.swift */,
);
path = Models;
CC272E672651871300637BCE /* Font */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -146,13 +108,21 @@
CCA0ECC4264FA7A4001CC563 /* Coinone-iOS */ = {
isa = PBXGroup;
children = (
922E231F264FB3D600F8ADA7 /* Source */,
CCAA9A1D264FAA2A008E50BF /* Resource */,
CCAA9A1A264FAA0C008E50BF /* Source */,
CCA0ECD0264FA7A6001CC563 /* LaunchScreen.storyboard */,
);
path = "Coinone-iOS";
sourceTree = "<group>";
};
CCAA9A1A264FAA0C008E50BF /* Source */ = {
isa = PBXGroup;
children = (
CCAA9A1E264FAA6C008E50BF /* ViewControllers */,
);
path = Source;
sourceTree = "<group>";
};
CCAA9A1D264FAA2A008E50BF /* Resource */ = {
isa = PBXGroup;
children = (
Expand All @@ -167,7 +137,6 @@
path = Resource;
sourceTree = "<group>";
};

CCAA9A1E264FAA6C008E50BF /* ViewControllers */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -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 */,
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 2 additions & 6 deletions Coinone-iOS/Coinone-iOS/Resource/Extensions/UIColor+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
2 changes: 1 addition & 1 deletion Coinone-iOS/Coinone-iOS/Resource/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Georaeso</string>
<string>Main</string>
</dict>
</array>
</dict>
Expand Down
34 changes: 4 additions & 30 deletions Coinone-iOS/Coinone-iOS/Resource/Storyboards/Georaeso.storyboard
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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="S4T-Ah-wTy">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<dependencies>
<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"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
</dependencies>
<scenes>
<!--GeoraesoVC-->
<scene sceneID="NUk-me-qjZ">
<objects>
<viewController storyboardIdentifier="GeoraesoVC" id="S4T-Ah-wTy" customClass="GeoraesoVC" customModule="Coinone_iOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="90q-DT-WdP">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<viewLayoutGuide key="safeArea" id="Zbo-fa-HFo"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Nef-hI-6cW" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1550.7246376811595" y="-17.410714285714285"/>
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
<scenes/>
</document>
Loading

0 comments on commit 3190a3f

Please sign in to comment.