Skip to content

Commit 8344c5e

Browse files
hansolnoh95hansolnoh95
authored
Merge branch 'main' into feature/#1 
2 parents c0bcf9f + 2077af7 commit 8344c5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1113
-13
lines changed

‎Coinone-iOS/Coinone-iOS.xcodeproj/project.pbxproj

Lines changed: 95 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88

99
/* Begin PBXBuildFile section */
1010
06A1A45591145692DA4F18C7 /* Pods_Coinone_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0AB500236EDF60103A408AE /* Pods_Coinone_iOS.framework */; };
11+
922E2322264FB40300F8ADA7 /* GeoraesoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 922E2321264FB40300F8ADA7 /* GeoraesoVC.swift */; };
12+
92C9EE8F2650314C00E73641 /* StockTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92C9EE8E2650314C00E73641 /* StockTVC.swift */; };
13+
92C9EE962650609300E73641 /* StockModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92C9EE952650609300E73641 /* StockModel.swift */; };
14+
CC272E5B26517E6000637BCE /* TabbarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC272E5A26517E6000637BCE /* TabbarViewController.swift */; };
15+
CC272E6226517F0500637BCE /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC272E6126517F0500637BCE /* HomeViewController.swift */; };
16+
CC272E6526517F1000637BCE /* TransactionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC272E6426517F1000637BCE /* TransactionViewController.swift */; };
17+
CC272E6E2651872400637BCE /* NotoSansKR-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E682651872300637BCE /* NotoSansKR-Regular.otf */; };
18+
CC272E6F2651872400637BCE /* NotoSansKR-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E692651872300637BCE /* NotoSansKR-Thin.otf */; };
19+
CC272E702651872400637BCE /* NotoSansKR-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E6A2651872300637BCE /* NotoSansKR-Medium.otf */; };
20+
CC272E712651872400637BCE /* NotoSansKR-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E6B2651872400637BCE /* NotoSansKR-Light.otf */; };
21+
CC272E722651872400637BCE /* NotoSansKR-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E6C2651872400637BCE /* NotoSansKR-Black.otf */; };
22+
CC272E732651872400637BCE /* NotoSansKR-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC272E6D2651872400637BCE /* NotoSansKR-Bold.otf */; };
1123
CCA0ECC6264FA7A4001CC563 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCA0ECC5264FA7A4001CC563 /* AppDelegate.swift */; };
1224
CCA0ECC8264FA7A4001CC563 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCA0ECC7264FA7A4001CC563 /* SceneDelegate.swift */; };
1325
CCA0ECCD264FA7A4001CC563 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CCA0ECCB264FA7A4001CC563 /* Main.storyboard */; };
@@ -27,11 +39,23 @@
2739
/* Begin PBXFileReference section */
2840
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>"; };
2941
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>"; };
42+
922E2321264FB40300F8ADA7 /* GeoraesoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeoraesoVC.swift; sourceTree = "<group>"; };
43+
92C9EE8E2650314C00E73641 /* StockTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = StockTVC.swift; path = "Coinone-iOS/Source/Cells/StockTVC.swift"; sourceTree = SOURCE_ROOT; };
44+
92C9EE952650609300E73641 /* StockModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StockModel.swift; sourceTree = "<group>"; };
45+
CC272E5A26517E6000637BCE /* TabbarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarViewController.swift; sourceTree = "<group>"; };
46+
CC272E6126517F0500637BCE /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
47+
CC272E6426517F1000637BCE /* TransactionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionViewController.swift; sourceTree = "<group>"; };
48+
CC272E682651872300637BCE /* NotoSansKR-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Regular.otf"; sourceTree = "<group>"; };
49+
CC272E692651872300637BCE /* NotoSansKR-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Thin.otf"; sourceTree = "<group>"; };
50+
CC272E6A2651872300637BCE /* NotoSansKR-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Medium.otf"; sourceTree = "<group>"; };
51+
CC272E6B2651872400637BCE /* NotoSansKR-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Light.otf"; sourceTree = "<group>"; };
52+
CC272E6C2651872400637BCE /* NotoSansKR-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Black.otf"; sourceTree = "<group>"; };
53+
CC272E6D2651872400637BCE /* NotoSansKR-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansKR-Bold.otf"; sourceTree = "<group>"; };
3054
CCA0ECC2264FA7A4001CC563 /* Coinone-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Coinone-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3155
CCA0ECC5264FA7A4001CC563 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3256
CCA0ECC7264FA7A4001CC563 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
3357
CCA0ECCC264FA7A4001CC563 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
34-
CCA0ECCE264FA7A6001CC563 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
58+
CCA0ECCE264FA7A6001CC563 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = "Coinone-iOS/Resource/Assets.xcassets"; sourceTree = SOURCE_ROOT; };
3559
CCA0ECD1264FA7A6001CC563 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
3660
CCA0ECD3264FA7A6001CC563 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3761
CCAA9A20264FAB8A008E50BF /* Georaeso.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Georaeso.storyboard; sourceTree = "<group>"; };
@@ -58,6 +82,51 @@
5882
/* End PBXFrameworksBuildPhase section */
5983

6084
/* Begin PBXGroup section */
85+
922E231F264FB3D600F8ADA7 /* Source */ = {
86+
isa = PBXGroup;
87+
children = (
88+
92C9EE942650607500E73641 /* Models */,
89+
92C9EE8D2650313500E73641 /* Cells */,
90+
922E2320264FB3E600F8ADA7 /* ViewControllers */,
91+
);
92+
path = Source;
93+
sourceTree = "<group>";
94+
};
95+
922E2320264FB3E600F8ADA7 /* ViewControllers */ = {
96+
isa = PBXGroup;
97+
children = (
98+
922E2321264FB40300F8ADA7 /* GeoraesoVC.swift */,
99+
);
100+
path = ViewControllers;
101+
sourceTree = "<group>";
102+
};
103+
92C9EE8D2650313500E73641 /* Cells */ = {
104+
isa = PBXGroup;
105+
children = (
106+
92C9EE8E2650314C00E73641 /* StockTVC.swift */,
107+
);
108+
path = Cells;
109+
sourceTree = "<group>";
110+
};
111+
92C9EE942650607500E73641 /* Models */ = {
112+
isa = PBXGroup;
113+
children = (
114+
92C9EE952650609300E73641 /* StockModel.swift */,
115+
);
116+
path = Models;
117+
CC272E672651871300637BCE /* Font */ = {
118+
isa = PBXGroup;
119+
children = (
120+
CC272E6C2651872400637BCE /* NotoSansKR-Black.otf */,
121+
CC272E6D2651872400637BCE /* NotoSansKR-Bold.otf */,
122+
CC272E6B2651872400637BCE /* NotoSansKR-Light.otf */,
123+
CC272E6A2651872300637BCE /* NotoSansKR-Medium.otf */,
124+
CC272E682651872300637BCE /* NotoSansKR-Regular.otf */,
125+
CC272E692651872300637BCE /* NotoSansKR-Thin.otf */,
126+
);
127+
path = Font;
128+
sourceTree = "<group>";
129+
};
61130
CCA0ECB9264FA7A4001CC563 = {
62131
isa = PBXGroup;
63132
children = (
@@ -79,7 +148,7 @@
79148
CCA0ECC4264FA7A4001CC563 /* Coinone-iOS */ = {
80149
isa = PBXGroup;
81150
children = (
82-
E8F7A8DA264FB4090032A8BC /* Source */,
151+
922E231F264FB3D600F8ADA7 /* Source */,
83152
CCAA9A1D264FAA2A008E50BF /* Resource */,
84153
CCA0ECD0264FA7A6001CC563 /* LaunchScreen.storyboard */,
85154
);
@@ -89,6 +158,7 @@
89158
CCAA9A1D264FAA2A008E50BF /* Resource */ = {
90159
isa = PBXGroup;
91160
children = (
161+
CC272E672651871300637BCE /* Font */,
92162
CCA0ECC5264FA7A4001CC563 /* AppDelegate.swift */,
93163
CCA0ECC7264FA7A4001CC563 /* SceneDelegate.swift */,
94164
CCAA9A29264FACC9008E50BF /* Extensions */,
@@ -99,6 +169,17 @@
99169
path = Resource;
100170
sourceTree = "<group>";
101171
};
172+
173+
CCAA9A1E264FAA6C008E50BF /* ViewControllers */ = {
174+
isa = PBXGroup;
175+
children = (
176+
CC272E5A26517E6000637BCE /* TabbarViewController.swift */,
177+
CC272E6126517F0500637BCE /* HomeViewController.swift */,
178+
CC272E6426517F1000637BCE /* TransactionViewController.swift */,
179+
);
180+
path = ViewControllers;
181+
sourceTree = "<group>";
182+
};
102183
CCAA9A1F264FAA7B008E50BF /* Storyboards */ = {
103184
isa = PBXGroup;
104185
children = (
@@ -221,11 +302,17 @@
221302
buildActionMask = 2147483647;
222303
files = (
223304
CCAA9A27264FABB0008E50BF /* My.storyboard in Resources */,
305+
CC272E722651872400637BCE /* NotoSansKR-Black.otf in Resources */,
224306
CCA0ECD2264FA7A6001CC563 /* LaunchScreen.storyboard in Resources */,
225307
CCA0ECCF264FA7A6001CC563 /* Assets.xcassets in Resources */,
308+
CC272E702651872400637BCE /* NotoSansKR-Medium.otf in Resources */,
226309
CCA0ECCD264FA7A4001CC563 /* Main.storyboard in Resources */,
310+
CC272E6F2651872400637BCE /* NotoSansKR-Thin.otf in Resources */,
311+
CC272E712651872400637BCE /* NotoSansKR-Light.otf in Resources */,
227312
CCAA9A21264FAB8A008E50BF /* Georaeso.storyboard in Resources */,
228313
CCAA9A24264FAB95008E50BF /* Popup.storyboard in Resources */,
314+
CC272E732651872400637BCE /* NotoSansKR-Bold.otf in Resources */,
315+
CC272E6E2651872400637BCE /* NotoSansKR-Regular.otf in Resources */,
229316
);
230317
runOnlyForDeploymentPostprocessing = 0;
231318
};
@@ -280,10 +367,16 @@
280367
files = (
281368
CCAA9A34264FAF68008E50BF /* UIView+.swift in Sources */,
282369
CCAA9A2B264FACDD008E50BF /* UIColor+.swift in Sources */,
370+
92C9EE962650609300E73641 /* StockModel.swift in Sources */,
371+
922E2322264FB40300F8ADA7 /* GeoraesoVC.swift in Sources */,
372+
CC272E5B26517E6000637BCE /* TabbarViewController.swift in Sources */,
283373
CCA0ECC6264FA7A4001CC563 /* AppDelegate.swift in Sources */,
284374
E8F7A8DD264FB4260032A8BC /* MyViewController.swift in Sources */,
375+
92C9EE8F2650314C00E73641 /* StockTVC.swift in Sources */,
285376
CCAA9A2E264FAEB9008E50BF /* CALayer+.swift in Sources */,
377+
CC272E6226517F0500637BCE /* HomeViewController.swift in Sources */,
286378
CCA0ECC8264FA7A4001CC563 /* SceneDelegate.swift in Sources */,
379+
CC272E6526517F1000637BCE /* TransactionViewController.swift in Sources */,
287380
);
288381
runOnlyForDeploymentPostprocessing = 0;
289382
};

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinIcon.imageset/Contents.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x",
6+
"filename" : "coinIcon.png"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x",
11+
"filename" : "[email protected]"
12+
},
13+
{
14+
"scale" : "3x",
15+
"filename" : "[email protected]",
16+
"idiom" : "universal"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinIcon.imageset/coinIcon.png

291 Bytes
Loading

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinIcon.imageset/[email protected]

417 Bytes
Loading

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinIcon.imageset/[email protected]

609 Bytes
Loading

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/Contents.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "coinoneGuide41.png",
5+
"scale" : "1x",
6+
"idiom" : "universal"
7+
},
8+
{
9+
"scale" : "2x",
10+
"idiom" : "universal",
11+
"filename" : "[email protected]"
12+
},
13+
{
14+
"scale" : "3x",
15+
"idiom" : "universal",
16+
"filename" : "[email protected]"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/coinoneGuide41.png

2.22 KB
Loading

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/[email protected]

4.88 KB
Loading

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/coinoneGuide41.imageset/[email protected]

7.94 KB
Loading

‎Coinone-iOS/Coinone-iOS/Resource/Assets.xcassets/graph.imageset/Contents.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"scale" : "1x",
5+
"idiom" : "universal",
6+
"filename" : "graph.png"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x",
11+
"filename" : "[email protected]"
12+
},
13+
{
14+
"filename" : "[email protected]",
15+
"scale" : "3x",
16+
"idiom" : "universal"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

0 commit comments

Comments
 (0)