Skip to content

Commit

Permalink
Merge pull request #19 from hyun99999/feature/#17
Browse files Browse the repository at this point in the history
[Feat] #17 - 피드, 홈, 보관함 탭바 구현
  • Loading branch information
hyun99999 authored Jan 10, 2022
2 parents 0bd8db6 + 07ef67f commit bf699ae
Show file tree
Hide file tree
Showing 12 changed files with 234 additions and 16 deletions.
60 changes: 50 additions & 10 deletions Spark-iOS/Spark-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
EBA77239278A2E14002958A5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EBA77238278A2E14002958A5 /* Colors.xcassets */; };
F8096F042784107D00B71D38 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F032784107D00B71D38 /* AppDelegate.swift */; };
F8096F062784107D00B71D38 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F052784107D00B71D38 /* SceneDelegate.swift */; };
F8096F0B2784107D00B71D38 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8096F092784107D00B71D38 /* Main.storyboard */; };
F8096F0B2784107D00B71D38 /* Home.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8096F092784107D00B71D38 /* Home.storyboard */; };
F8096F0D2784107E00B71D38 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F8096F0C2784107E00B71D38 /* Assets.xcassets */; };
F8096F102784107E00B71D38 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8096F0E2784107E00B71D38 /* LaunchScreen.storyboard */; };
F8096F2927841F1E00B71D38 /* Const.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F2827841F1E00B71D38 /* Const.swift */; };
F8096F2B27841F4100B71D38 /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F2A27841F4100B71D38 /* Storyboard.swift */; };
F8096F3027841F9200B71D38 /* MainVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F2F27841F9200B71D38 /* MainVC.swift */; };
F8096F3027841F9200B71D38 /* HomeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F2F27841F9200B71D38 /* HomeVC.swift */; };
F8096F3227841FE100B71D38 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F3127841FE100B71D38 /* ViewController.swift */; };
F8096F34278420F100B71D38 /* TempView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F33278420F100B71D38 /* TempView.swift */; };
F8096F36278420FA00B71D38 /* TempProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F35278420FA00B71D38 /* TempProtocol.swift */; };
Expand All @@ -34,6 +34,12 @@
F8096F422784214900B71D38 /* TempAppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F412784214900B71D38 /* TempAppModel.swift */; };
F8096F442784221900B71D38 /* Xib.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F432784221900B71D38 /* Xib.swift */; };
F8096F462784247100B71D38 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8096F452784247100B71D38 /* Notification.swift */; };
F80A3E4D278C182100728E07 /* MainTabBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F80A3E4C278C182100728E07 /* MainTabBar.storyboard */; };
F80A3E4F278C18BA00728E07 /* MainTBC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80A3E4E278C18BA00728E07 /* MainTBC.swift */; };
F80A3E51278C1BCE00728E07 /* Feed.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F80A3E50278C1BCE00728E07 /* Feed.storyboard */; };
F80A3E53278C1C0C00728E07 /* Storage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F80A3E52278C1C0C00728E07 /* Storage.storyboard */; };
F80A3E55278C1C1F00728E07 /* StorageVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80A3E54278C1C1F00728E07 /* StorageVC.swift */; };
F80A3E57278C1C2700728E07 /* FeedVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80A3E56278C1C2700728E07 /* FeedVC.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -50,13 +56,13 @@
F8096F002784107D00B71D38 /* Spark-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Spark-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
F8096F032784107D00B71D38 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
F8096F052784107D00B71D38 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
F8096F0A2784107D00B71D38 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
F8096F0A2784107D00B71D38 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Home.storyboard; sourceTree = "<group>"; };
F8096F0C2784107E00B71D38 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F8096F0F2784107E00B71D38 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
F8096F112784107E00B71D38 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F8096F2827841F1E00B71D38 /* Const.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Const.swift; sourceTree = "<group>"; };
F8096F2A27841F4100B71D38 /* Storyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Storyboard.swift; sourceTree = "<group>"; };
F8096F2F27841F9200B71D38 /* MainVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainVC.swift; sourceTree = "<group>"; };
F8096F2F27841F9200B71D38 /* HomeVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeVC.swift; sourceTree = "<group>"; };
F8096F3127841FE100B71D38 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
F8096F33278420F100B71D38 /* TempView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempView.swift; sourceTree = "<group>"; };
F8096F35278420FA00B71D38 /* TempProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempProtocol.swift; sourceTree = "<group>"; };
Expand All @@ -68,6 +74,12 @@
F8096F412784214900B71D38 /* TempAppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempAppModel.swift; sourceTree = "<group>"; };
F8096F432784221900B71D38 /* Xib.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Xib.swift; sourceTree = "<group>"; };
F8096F452784247100B71D38 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
F80A3E4C278C182100728E07 /* MainTabBar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainTabBar.storyboard; sourceTree = "<group>"; };
F80A3E4E278C18BA00728E07 /* MainTBC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTBC.swift; sourceTree = "<group>"; };
F80A3E50278C1BCE00728E07 /* Feed.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Feed.storyboard; sourceTree = "<group>"; };
F80A3E52278C1C0C00728E07 /* Storage.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Storage.storyboard; sourceTree = "<group>"; };
F80A3E54278C1C1F00728E07 /* StorageVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageVC.swift; sourceTree = "<group>"; };
F80A3E56278C1C2700728E07 /* FeedVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedVC.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -184,8 +196,8 @@
F8096F1B27841A3D00B71D38 /* Storyboards */ = {
isa = PBXGroup;
children = (
F8096F092784107D00B71D38 /* Main.storyboard */,
F8096F0E2784107E00B71D38 /* LaunchScreen.storyboard */,
F80A3E59278C239F00728E07 /* TabBar */,
);
path = Storyboards;
sourceTree = "<group>";
Expand All @@ -209,7 +221,7 @@
F8096F1E27841DC100B71D38 /* ViewControllers */ = {
isa = PBXGroup;
children = (
F8096F2F27841F9200B71D38 /* MainVC.swift */,
F80A3E58278C22BA00728E07 /* TabBar */,
);
path = ViewControllers;
sourceTree = "<group>";
Expand Down Expand Up @@ -255,6 +267,28 @@
path = Cells;
sourceTree = "<group>";
};
F80A3E58278C22BA00728E07 /* TabBar */ = {
isa = PBXGroup;
children = (
F80A3E4E278C18BA00728E07 /* MainTBC.swift */,
F8096F2F27841F9200B71D38 /* HomeVC.swift */,
F80A3E54278C1C1F00728E07 /* StorageVC.swift */,
F80A3E56278C1C2700728E07 /* FeedVC.swift */,
);
path = TabBar;
sourceTree = "<group>";
};
F80A3E59278C239F00728E07 /* TabBar */ = {
isa = PBXGroup;
children = (
F80A3E4C278C182100728E07 /* MainTabBar.storyboard */,
F80A3E50278C1BCE00728E07 /* Feed.storyboard */,
F8096F092784107D00B71D38 /* Home.storyboard */,
F80A3E52278C1C0C00728E07 /* Storage.storyboard */,
);
path = TabBar;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -316,15 +350,18 @@
buildActionMask = 2147483647;
files = (
2B9471F4278BE8B3005484C5 /* futura medium bt.ttf in Resources */,
F80A3E4D278C182100728E07 /* MainTabBar.storyboard in Resources */,
F8096F102784107E00B71D38 /* LaunchScreen.storyboard in Resources */,
2B9471F9278BE922005484C5 /* NotoSansKR-Bold.otf in Resources */,
2B9471FA278BE922005484C5 /* NotoSansKR-Medium.otf in Resources */,
2B9471FB278BE922005484C5 /* NotoSansKR-Regular.otf in Resources */,
EBA77239278A2E14002958A5 /* Colors.xcassets in Resources */,
F80A3E51278C1BCE00728E07 /* Feed.storyboard in Resources */,
F80A3E53278C1C0C00728E07 /* Storage.storyboard in Resources */,
F8096F0D2784107E00B71D38 /* Assets.xcassets in Resources */,
F8096F0B2784107D00B71D38 /* Main.storyboard in Resources */,
2B9471F5278BE8B3005484C5 /* Futura Medium Italic font.ttf in Resources */,
2B9471F3278BE8B3005484C5 /* Futura Bold font.ttf in Resources */,
F8096F0B2784107D00B71D38 /* Home.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -380,31 +417,34 @@
F8096F422784214900B71D38 /* TempAppModel.swift in Sources */,
F8096F3227841FE100B71D38 /* ViewController.swift in Sources */,
F8096F042784107D00B71D38 /* AppDelegate.swift in Sources */,
F80A3E55278C1C1F00728E07 /* StorageVC.swift in Sources */,
F8096F3A2784210A00B71D38 /* TempModel.swift in Sources */,
F8096F3C2784211D00B71D38 /* UIColor+Extension.swift in Sources */,
F8096F34278420F100B71D38 /* TempView.swift in Sources */,
F8096F2B27841F4100B71D38 /* Storyboard.swift in Sources */,
F8096F442784221900B71D38 /* Xib.swift in Sources */,
F80A3E4F278C18BA00728E07 /* MainTBC.swift in Sources */,
F8096F402784214000B71D38 /* TempCell.swift in Sources */,
F80A3E57278C1C2700728E07 /* FeedVC.swift in Sources */,
F8096F36278420FA00B71D38 /* TempProtocol.swift in Sources */,
F8096F062784107D00B71D38 /* SceneDelegate.swift in Sources */,
F8096F382784210000B71D38 /* TempService.swift in Sources */,
F8096F3E2784213700B71D38 /* UIFont+Extension.swift in Sources */,
F8096F2927841F1E00B71D38 /* Const.swift in Sources */,
F8096F3027841F9200B71D38 /* MainVC.swift in Sources */,
F8096F3027841F9200B71D38 /* HomeVC.swift in Sources */,
F8096F462784247100B71D38 /* Notification.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
F8096F092784107D00B71D38 /* Main.storyboard */ = {
F8096F092784107D00B71D38 /* Home.storyboard */ = {
isa = PBXVariantGroup;
children = (
F8096F0A2784107D00B71D38 /* Base */,
);
name = Main.storyboard;
name = Home.storyboard;
sourceTree = "<group>";
};
F8096F0E2784107E00B71D38 /* LaunchScreen.storyboard */ = {
Expand Down
5 changes: 4 additions & 1 deletion Spark-iOS/Spark-iOS/Resource/Constants/Storyboard.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ extension Const {
/// Storyboard 의 name 을 상수로 관리합니다.
struct Storyboard {
struct Name {
static let main = "Main"
static let mainTabBar = "MainTabBar"
static let home = "Home"
static let feed = "Feed"
static let storage = "Storage"
}
}
}
5 changes: 4 additions & 1 deletion Spark-iOS/Spark-iOS/Resource/Constants/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ extension Const {
/// ViewController 의 identifier 을 상수로 관리합니다.
struct ViewController {
struct Identifier {
static let main = "MainVC"
static let mainTabBar = "MainTBC"
static let home = "HomeVC"
static let feed = "FeedVC"
static let storage = "StorageVC"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--MainVC-->
<!--HomeVC-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController storyboardIdentifier="MainVC" id="BYZ-38-t0r" customClass="MainVC" customModule="Spark_iOS" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="HomeVC" id="BYZ-38-t0r" customClass="HomeVC" customModule="Spark_iOS" customModuleProvider="target" sceneMemberID="viewController">
<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"/>
Expand Down
32 changes: 32 additions & 0 deletions Spark-iOS/Spark-iOS/Resource/Storyboards/TabBar/Feed.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" 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="19519"/>
<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"/>
</dependencies>
<scenes>
<!--FeedVC-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController storyboardIdentifier="FeedVC" id="Y6W-OH-hqX" customClass="FeedVC" customModule="Spark_iOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="20" y="66"/>
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" 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="19519"/>
<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"/>
</dependencies>
<scenes>
<!--MainTBC-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController storyboardIdentifier="MainTBC" id="Y6W-OH-hqX" customClass="MainTBC" customModule="Spark_iOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="20" y="85"/>
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
32 changes: 32 additions & 0 deletions Spark-iOS/Spark-iOS/Resource/Storyboards/TabBar/Storage.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" 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="19519"/>
<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"/>
</dependencies>
<scenes>
<!--StorageVC-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController storyboardIdentifier="StorageVC" id="Y6W-OH-hqX" customClass="StorageVC" customModule="Spark_iOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="20" y="66"/>
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
Loading

0 comments on commit bf699ae

Please sign in to comment.