Skip to content

Commit

Permalink
准备尝试添加侧滑菜单
Browse files Browse the repository at this point in the history
  • Loading branch information
@zpz1237
zpz1237 committed Oct 12, 2015
1 parent 3555842 commit 907d013
Show file tree
Hide file tree
Showing 6 changed files with 2,512 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Bridging-Header.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@
#import "UINavigationBar+Awesome.h"
#import "SDCycleScrollView.h"
#import "ParallaxHeaderView.h"
#import "SWRevealViewController.h"


#endif /* Bridging_Header_h */
24 changes: 21 additions & 3 deletions zhihuDaily 2.0.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/* Begin PBXBuildFile section */
59A2C857D4471928CAC6EDAF /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68E146B6A006CAA43AC853C4 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
DB1438741BCB3E1300620843 /* SWRevealViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DB1438731BCB3E1300620843 /* SWRevealViewController.m */; settings = {ASSET_TAGS = (); }; };
DB1438761BCB45E100620843 /* SideMenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB1438751BCB45E100620843 /* SideMenuViewController.swift */; settings = {ASSET_TAGS = (); }; };
DB2DEAB91BBF8B1800713002 /* NSData+SDDataCache.m in Sources */ = {isa = PBXBuildFile; fileRef = DB2DEAA91BBF8B1800713002 /* NSData+SDDataCache.m */; settings = {ASSET_TAGS = (); }; };
DB2DEABA1BBF8B1800713002 /* TAAbstractDotView.m in Sources */ = {isa = PBXBuildFile; fileRef = DB2DEAAC1BBF8B1800713002 /* TAAbstractDotView.m */; settings = {ASSET_TAGS = (); }; };
DB2DEABB1BBF8B1800713002 /* TAAnimatedDotView.m in Sources */ = {isa = PBXBuildFile; fileRef = DB2DEAAE1BBF8B1800713002 /* TAAnimatedDotView.m */; settings = {ASSET_TAGS = (); }; };
Expand Down Expand Up @@ -39,6 +41,9 @@
/* Begin PBXFileReference section */
68E146B6A006CAA43AC853C4 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7153B3F99A238DC7B68AE0E4 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
DB1438721BCB3E1300620843 /* SWRevealViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWRevealViewController.h; sourceTree = "<group>"; };
DB1438731BCB3E1300620843 /* SWRevealViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWRevealViewController.m; sourceTree = "<group>"; };
DB1438751BCB45E100620843 /* SideMenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideMenuViewController.swift; sourceTree = "<group>"; };
DB2DEAA81BBF8B1800713002 /* NSData+SDDataCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+SDDataCache.h"; sourceTree = "<group>"; };
DB2DEAA91BBF8B1800713002 /* NSData+SDDataCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+SDDataCache.m"; sourceTree = "<group>"; };
DB2DEAAB1BBF8B1800713002 /* TAAbstractDotView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TAAbstractDotView.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -114,6 +119,15 @@
name = Pods;
sourceTree = "<group>";
};
DB1438711BCB3E1300620843 /* SWRevealViewController */ = {
isa = PBXGroup;
children = (
DB1438721BCB3E1300620843 /* SWRevealViewController.h */,
DB1438731BCB3E1300620843 /* SWRevealViewController.m */,
);
path = SWRevealViewController;
sourceTree = "<group>";
};
DB1728EE1BC125A300D28822 /* MainTableViewController */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -225,29 +239,31 @@
children = (
DBC515F61BBCCC9400EDFF48 /* AppDelegate.swift */,
DB803AA71BBE69C40081E032 /* StoryModel.swift */,
DBC516081BBCCDB300EDFF48 /* ThirdParty */,
DBC516081BBCCDB300EDFF48 /* FrameWork */,
DB803AA61BBE69260081E032 /* LaunchViewController */,
DB1728EE1BC125A300D28822 /* MainTableViewController */,
DBCFB2F41BBE17B600C352C5 /* Assets.xcassets */,
DBC515FA1BBCCC9400EDFF48 /* Main.storyboard */,
DBE96A5B1BC4CAA60004A591 /* Launch Screen.storyboard */,
DBC516021BBCCC9400EDFF48 /* Info.plist */,
DBC9BF101BC2268000B72D69 /* WebViewController.swift */,
DB1438751BCB45E100620843 /* SideMenuViewController.swift */,
);
path = "zhihuDaily 2.0";
sourceTree = "<group>";
};
DBC516081BBCCDB300EDFF48 /* ThirdParty */ = {
DBC516081BBCCDB300EDFF48 /* FrameWork */ = {
isa = PBXGroup;
children = (
DB1438711BCB3E1300620843 /* SWRevealViewController */,
DB2DEAC21BBF8C4200713002 /* ParallaxHeaderView */,
DB2DEAA71BBF8B1800713002 /* SDCycleScrollView */,
DB803AA21BBE66C40081E032 /* AwsomeNavigationBar */,
DB803A9E1BBE5BA30081E032 /* GradientView */,
DB4518DC1BBCE8870097A25A /* myUILabel */,
DBC516091BBCCFCF00EDFF48 /* JSAnimated */,
);
name = ThirdParty;
name = FrameWork;
sourceTree = "<group>";
};
DBC516091BBCCFCF00EDFF48 /* JSAnimated */ = {
Expand Down Expand Up @@ -404,6 +420,7 @@
DB2DEABF1BBF8B1800713002 /* SDCycleScrollView.m in Sources */,
DB2DEABC1BBF8B1800713002 /* TADotView.m in Sources */,
DB803AA11BBE5BC50081E032 /* GradientView.m in Sources */,
DB1438741BCB3E1300620843 /* SWRevealViewController.m in Sources */,
DB2DEAC71BBFCCD600713002 /* MainTableViewController.swift in Sources */,
DBC9BF111BC2268000B72D69 /* WebViewController.swift in Sources */,
DB2DEABE1BBF8B1800713002 /* SDCollectionViewCell.m in Sources */,
Expand All @@ -416,6 +433,7 @@
DB803AA51BBE66E30081E032 /* UINavigationBar+Awesome.m in Sources */,
DB2DEABA1BBF8B1800713002 /* TAAbstractDotView.m in Sources */,
DB803A9D1BBE57D50081E032 /* PaletteViewController.swift in Sources */,
DB1438761BCB45E100620843 /* SideMenuViewController.swift in Sources */,
DB2DEAC01BBF8B1800713002 /* UIView+SDExtension.m in Sources */,
DB2DEABD1BBF8B1800713002 /* TAPageControl.m in Sources */,
DB2DEAB91BBF8B1800713002 /* NSData+SDDataCache.m in Sources */,
Expand Down
92 changes: 91 additions & 1 deletion zhihuDaily 2.0/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15B30a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="eJm-Aj-C4A">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15B30a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="9Uf-XC-sul">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
Expand Down Expand Up @@ -259,6 +259,96 @@
</objects>
<point key="canvasLocation" x="339" y="1113"/>
</scene>
<!--Side Menu View Controller-->
<scene sceneID="T6w-N8-2lF">
<objects>
<viewController id="9Uf-XC-sul" customClass="SideMenuViewController" customModule="知乎日报" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Oif-wS-z0C"/>
<viewControllerLayoutGuide type="bottom" id="CZJ-wo-xdN"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="lyh-Pf-dIX">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bre-Vx-jSP">
<rect key="frame" x="0.0" y="0.0" width="600" height="125"/>
<animations/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="125" id="Ij9-a4-DC2"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Pq2-DD-NKH">
<rect key="frame" x="0.0" y="555" width="600" height="45"/>
<animations/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="O1R-D3-hoe"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="m1f-5Q-aY8">
<rect key="frame" x="0.0" y="125" width="600" height="430"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="wzT-Gi-oKW">
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wzT-Gi-oKW" id="1Yj-oW-2xN">
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
</tableViewCellContentView>
<animations/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="4Re-Z0-XTi">
<rect key="frame" x="0.0" y="72" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4Re-Z0-XTi" id="Jpp-fM-WGs">
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
</tableViewCellContentView>
<animations/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="wRm-oO-LPr">
<rect key="frame" x="0.0" y="116" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wRm-oO-LPr" id="1zQ-l3-8bS">
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
</tableViewCellContentView>
<animations/>
</tableViewCell>
</prototypes>
<sections/>
</tableView>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="Pq2-DD-NKH" firstAttribute="bottom" secondItem="CZJ-wo-xdN" secondAttribute="top" id="3lO-Cw-Djb"/>
<constraint firstItem="Pq2-DD-NKH" firstAttribute="top" secondItem="m1f-5Q-aY8" secondAttribute="bottom" id="Kd2-Vp-pFd"/>
<constraint firstAttribute="trailing" secondItem="bre-Vx-jSP" secondAttribute="trailing" id="RVP-2S-V6r"/>
<constraint firstItem="m1f-5Q-aY8" firstAttribute="top" secondItem="bre-Vx-jSP" secondAttribute="bottom" id="SqU-pU-SKe"/>
<constraint firstItem="bre-Vx-jSP" firstAttribute="top" secondItem="lyh-Pf-dIX" secondAttribute="top" id="YQT-tJ-bVT"/>
<constraint firstAttribute="trailingMargin" secondItem="m1f-5Q-aY8" secondAttribute="trailing" constant="-20" id="iVR-G2-c6j"/>
<constraint firstItem="Pq2-DD-NKH" firstAttribute="leading" secondItem="bre-Vx-jSP" secondAttribute="leading" id="k5q-09-xg6"/>
<constraint firstItem="Pq2-DD-NKH" firstAttribute="trailing" secondItem="bre-Vx-jSP" secondAttribute="trailing" id="wLA-2C-aIs"/>
<constraint firstItem="m1f-5Q-aY8" firstAttribute="leading" secondItem="lyh-Pf-dIX" secondAttribute="leadingMargin" constant="-20" id="ygA-Be-ev2"/>
<constraint firstItem="bre-Vx-jSP" firstAttribute="leading" secondItem="lyh-Pf-dIX" secondAttribute="leading" id="zPq-DI-Pnb"/>
</constraints>
</view>
<connections>
<outlet property="tableView" destination="m1f-5Q-aY8" id="FSg-ie-c8m"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="THe-cY-I6e" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-463" y="407"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="3yj-7e-TfO">
<objects>
Expand Down
Loading

0 comments on commit 907d013

Please sign in to comment.