Skip to content

Commit

Permalink
Merge branch 'main' into feature/#1
Browse files Browse the repository at this point in the history
  • Loading branch information
hansolnoh95 authored May 17, 2021
2 parents c0bcf9f + 2077af7 commit 8344c5e
Show file tree
Hide file tree
Showing 58 changed files with 1,113 additions and 13 deletions.
97 changes: 95 additions & 2 deletions Coinone-iOS/Coinone-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@

/* 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 */; };
CC272E6E2651872400637BCE /* NotoSansKR-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E682651872300637BCE /* NotoSansKR-Regular.otf */; };
CC272E6F2651872400637BCE /* NotoSansKR-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E692651872300637BCE /* NotoSansKR-Thin.otf */; };
CC272E702651872400637BCE /* NotoSansKR-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E6A2651872300637BCE /* NotoSansKR-Medium.otf */; };
CC272E712651872400637BCE /* NotoSansKR-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E6B2651872400637BCE /* NotoSansKR-Light.otf */; };
CC272E722651872400637BCE /* NotoSansKR-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E6C2651872400637BCE /* NotoSansKR-Black.otf */; };
CC272E732651872400637BCE /* NotoSansKR-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E6D2651872400637BCE /* NotoSansKR-Bold.otf */; };
CCA0ECC6264FA7A4001CC563 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCA0ECC5264FA7A4001CC563 /* AppDelegate.swift */; };
CCA0ECC8264FA7A4001CC563 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCA0ECC7264FA7A4001CC563 /* SceneDelegate.swift */; };
CCA0ECCD264FA7A4001CC563 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CCA0ECCB264FA7A4001CC563 /* Main.storyboard */; };
Expand All @@ -27,11 +39,23 @@
/* 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>"; };
CC272E682651872300637BCE /* NotoSansKR-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Regular.otf"; sourceTree = "<group>"; };
CC272E692651872300637BCE /* NotoSansKR-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Thin.otf"; sourceTree = "<group>"; };
CC272E6A2651872300637BCE /* NotoSansKR-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Medium.otf"; sourceTree = "<group>"; };
CC272E6B2651872400637BCE /* NotoSansKR-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Light.otf"; sourceTree = "<group>"; };
CC272E6C2651872400637BCE /* NotoSansKR-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Black.otf"; sourceTree = "<group>"; };
CC272E6D2651872400637BCE /* NotoSansKR-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Bold.otf"; sourceTree = "<group>"; };
CCA0ECC2264FA7A4001CC563 /* Coinone-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Coinone-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
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; path = Assets.xcassets; sourceTree = "<group>"; };
CCA0ECCE264FA7A6001CC563 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = "Coinone-iOS/Resource/Assets.xcassets"; sourceTree = SOURCE_ROOT; };
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 @@ -58,6 +82,51 @@
/* 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 = (
CC272E6C2651872400637BCE /* NotoSansKR-Black.otf */,
CC272E6D2651872400637BCE /* NotoSansKR-Bold.otf */,
CC272E6B2651872400637BCE /* NotoSansKR-Light.otf */,
CC272E6A2651872300637BCE /* NotoSansKR-Medium.otf */,
CC272E682651872300637BCE /* NotoSansKR-Regular.otf */,
CC272E692651872300637BCE /* NotoSansKR-Thin.otf */,
);
path = Font;
sourceTree = "<group>";
};
CCA0ECB9264FA7A4001CC563 = {
isa = PBXGroup;
children = (
Expand All @@ -79,7 +148,7 @@
CCA0ECC4264FA7A4001CC563 /* Coinone-iOS */ = {
isa = PBXGroup;
children = (
E8F7A8DA264FB4090032A8BC /* Source */,
922E231F264FB3D600F8ADA7 /* Source */,
CCAA9A1D264FAA2A008E50BF /* Resource */,
CCA0ECD0264FA7A6001CC563 /* LaunchScreen.storyboard */,
);
Expand All @@ -89,6 +158,7 @@
CCAA9A1D264FAA2A008E50BF /* Resource */ = {
isa = PBXGroup;
children = (
CC272E672651871300637BCE /* Font */,
CCA0ECC5264FA7A4001CC563 /* AppDelegate.swift */,
CCA0ECC7264FA7A4001CC563 /* SceneDelegate.swift */,
CCAA9A29264FACC9008E50BF /* Extensions */,
Expand All @@ -99,6 +169,17 @@
path = Resource;
sourceTree = "<group>";
};

CCAA9A1E264FAA6C008E50BF /* ViewControllers */ = {
isa = PBXGroup;
children = (
CC272E5A26517E6000637BCE /* TabbarViewController.swift */,
CC272E6126517F0500637BCE /* HomeViewController.swift */,
CC272E6426517F1000637BCE /* TransactionViewController.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
};
CCAA9A1F264FAA7B008E50BF /* Storyboards */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -221,11 +302,17 @@
buildActionMask = 2147483647;
files = (
CCAA9A27264FABB0008E50BF /* My.storyboard in Resources */,
CC272E722651872400637BCE /* NotoSansKR-Black.otf in Resources */,
CCA0ECD2264FA7A6001CC563 /* LaunchScreen.storyboard in Resources */,
CCA0ECCF264FA7A6001CC563 /* Assets.xcassets in Resources */,
CC272E702651872400637BCE /* NotoSansKR-Medium.otf in Resources */,
CCA0ECCD264FA7A4001CC563 /* Main.storyboard in Resources */,
CC272E6F2651872400637BCE /* NotoSansKR-Thin.otf in Resources */,
CC272E712651872400637BCE /* NotoSansKR-Light.otf in Resources */,
CCAA9A21264FAB8A008E50BF /* Georaeso.storyboard in Resources */,
CCAA9A24264FAB95008E50BF /* Popup.storyboard in Resources */,
CC272E732651872400637BCE /* NotoSansKR-Bold.otf in Resources */,
CC272E6E2651872400637BCE /* NotoSansKR-Regular.otf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -280,10 +367,16 @@
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 */,
E8F7A8DD264FB4260032A8BC /* MyViewController.swift in Sources */,
92C9EE8F2650314C00E73641 /* StockTVC.swift in Sources */,
CCAA9A2E264FAEB9008E50BF /* CALayer+.swift in Sources */,
CC272E6226517F0500637BCE /* HomeViewController.swift in Sources */,
CCA0ECC8264FA7A4001CC563 /* SceneDelegate.swift in Sources */,
CC272E6526517F1000637BCE /* TransactionViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "coinIcon.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"scale" : "3x",
"filename" : "[email protected]",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "coinoneGuide41.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"scale" : "1x",
"idiom" : "universal",
"filename" : "graph.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "group411.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"scale" : "2x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "group423.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "modeLight.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "modeLightDirectionPrevious.png"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "searchIcon.png",
"scale" : "1x"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"scale" : "1x",
"idiom" : "universal",
"filename" : "titleImage.png"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8344c5e

Please sign in to comment.