Skip to content

Commit

Permalink
Merge branch 'main' into feature/#2
Browse files Browse the repository at this point in the history
  • Loading branch information
hansolnoh95 authored May 17, 2021
2 parents 69aac77 + 03c4c05 commit dec4100
Show file tree
Hide file tree
Showing 29 changed files with 281 additions and 4 deletions.
50 changes: 50 additions & 0 deletions Coinone-iOS/Coinone-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@
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 @@ -32,6 +41,15 @@
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>"; };
Expand Down Expand Up @@ -94,6 +112,17 @@
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 = {
Expand Down Expand Up @@ -127,6 +156,7 @@
CCAA9A1D264FAA2A008E50BF /* Resource */ = {
isa = PBXGroup;
children = (
CC272E672651871300637BCE /* Font */,
CCA0ECC5264FA7A4001CC563 /* AppDelegate.swift */,
CCA0ECC7264FA7A4001CC563 /* SceneDelegate.swift */,
CCAA9A29264FACC9008E50BF /* Extensions */,
Expand All @@ -137,6 +167,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 @@ -243,11 +284,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 @@ -304,10 +351,13 @@
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 */,
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" : [
{
"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" : [
{
"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
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 9 additions & 0 deletions Coinone-iOS/Coinone-iOS/Resource/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIAppFonts</key>
<array>
<string>NotoSansKR-Black.otf</string>
<string>NotoSansKR-Bold.otf</string>
<string>NotoSansKR-Light.otf</string>
<string>NotoSansKR-Medium.otf</string>
<string>NotoSansKR-Regular.otf</string>
<string>NotoSansKR-Thin.otf</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="NotoSansKR-Regular.otf">
<string>NotoSansKR-Regular</string>
</array>
</customFonts>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
Expand All @@ -15,13 +20,22 @@
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="23r-Qz-ra7">
<rect key="frame" x="186" y="276" width="44" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="NotoSansKR-Regular" family="Noto Sans KR" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="35" y="94"/>
<point key="canvasLocation" x="34.782608695652179" y="93.75"/>
</scene>
</scenes>
<resources>
Expand Down
7 changes: 4 additions & 3 deletions Coinone-iOS/Coinone-iOS/Resource/Storyboards/Popup.storyboard
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?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">
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
</dependencies>
<scenes/>
</document>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//
// HomeViewController.swift
// Coinone-iOS
//
// Created by ๋…ธํ•œ์†” on 2021/05/17.
//

import UIKit

class HomeViewController: UIViewController {

override func viewDidLoad() {
super.viewDidLoad()

// Do any additional setup after loading the view.
}


/*
// MARK: - Navigation

// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
//
// TabbarViewController.swift
// Coinone-iOS
//
// Created by ๋…ธํ•œ์†” on 2021/05/17.
//

import Foundation
import UIKit

class TabbarViewContorller: UITabBarController {
var defaultIndex = 0 {
didSet {
self.selectedIndex = defaultIndex
}
}
override func viewDidLoad() {
super.viewDidLoad()
self.view.backgroundColor = .clear
self.selectedIndex = defaultIndex
self.tabBar.layer.borderWidth = 0.6
// self.tabBar.layer.borderColor = lineColor.cgColor
}

}

extension TabbarViewContorller {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
let firstTabController = HomeViewController()
let secondTabController = TransactionViewController()
let viewControllers = [firstTabController, secondTabController]
self.setViewControllers(viewControllers, animated: true)

let tabBar: UITabBar = self.tabBar
tabBar.backgroundColor = UIColor.clear
tabBar.barStyle = UIBarStyle.default
tabBar.barTintColor = UIColor.white

let imageNames = ["tabHomeInact", "tabSearchInact", "tabCommunityInact", "tabMyInact"]
let imageSelectedNames = ["tabHomeAct", "tabSearchAct", "tabCommunityAct", "tabMyAct"]

for (ind, value) in (tabBar.items?.enumerated())! {
let tabBarItem: UITabBarItem = value as UITabBarItem
tabBarItem.title = nil
tabBarItem.image = UIImage(named: imageNames[ind])?.withRenderingMode(.alwaysOriginal)
tabBarItem.selectedImage = UIImage(named: imageSelectedNames[ind])?.withRenderingMode(.alwaysOriginal)
tabBarItem.accessibilityIdentifier = imageNames[ind]
tabBarItem.imageInsets.top = 15
tabBarItem.imageInsets.bottom = -15
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//
// TransactionViewController.swift
// Coinone-iOS
//
// Created by ๋…ธํ•œ์†” on 2021/05/17.
//

import UIKit

class TransactionViewController: UIViewController {

override func viewDidLoad() {
super.viewDidLoad()

// Do any additional setup after loading the view.
}


/*
// MARK: - Navigation

// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/

}

0 comments on commit dec4100

Please sign in to comment.