TouchInstinct
/
iOS-Slide-Menu
301
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97 from aryaxt/Develop 

Version 1.4.4
This commit is contained in:
Aryan Ghassemi 2014-11-28 14:18:00 -08:00
parent 5aa1fbcd94 43f62e7321
commit 810457bb73
7 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SlideMenu/Helper Classes/FriendsViewController.m
View File

@ -20,11 +20,6 @@
return YES;
}
- (BOOL)slideNavigationControllerShouldDisplayRightMenu
{
return NO;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 20;

3
SlideMenu/Helper Classes/LeftMenuViewController.m
View File

@ -32,9 +32,6 @@
UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"leftMenu.jpg"]];
self.tableView.backgroundView = imageView;
self.view.layer.borderWidth = .6;
self.view.layer.borderColor = [UIColor lightGrayColor].CGColor;
}
#pragma mark - UITableView Delegate & Datasrouce -

3
SlideMenu/Helper Classes/RightMenuViewController.m
View File

@ -20,9 +20,6 @@
UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"rightMenu.jpg"]];
self.tableView.backgroundView = imageView;
self.view.layer.borderWidth = .6;
self.view.layer.borderColor = [UIColor lightGrayColor].CGColor;
}
#pragma mark - UITableView Delegate & Datasrouce -

2
SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m
View File

@ -63,7 +63,7 @@
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))
{
rect.origin.x = self.slideMovement;
rect.origin.x = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;
}
else
{

14
SlideMenu/Source/SlideNavigationController.m
View File

@ -851,4 +851,18 @@ static SlideNavigationController *singletonInstance;
_menuRevealAnimator = menuRevealAnimator;
}
- (void)setLeftMenu:(UIViewController *)leftMenu
{
[_leftMenu.view removeFromSuperview];
_leftMenu = leftMenu;
}
- (void)setRightMenu:(UIViewController *)rightMenu
{
[_rightMenu.view removeFromSuperview];
_rightMenu = rightMenu;
}
@end

26
SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="yzD-f0-X8n">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="yzD-f0-X8n">
<dependencies>
<deployment defaultVersion="1536" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<scenes>
<!--Left Menu View Controller-->
@ -70,7 +70,7 @@
</objects>
<point key="canvasLocation" x="11" y="49"/>
</scene>
<!--Home View Controller - Home-->
<!--Home-->
<scene sceneID="7Hl-22-JcN">
<objects>
<viewController storyboardIdentifier="HomeViewController" id="mAB-md-uek" customClass="HomeViewController" sceneMemberID="viewController">
@ -227,7 +227,7 @@
</objects>
<point key="canvasLocation" x="1040" y="-222"/>
</scene>
<!--View Controller - No Menu-->
<!--No Menu-->
<scene sceneID="b5b-is-lY2">
<objects>
<viewController id="Tha-f2-JWx" sceneMemberID="viewController">
@ -253,7 +253,7 @@
</objects>
<point key="canvasLocation" x="1503" y="-222"/>
</scene>
<!--View Controller - Login-->
<!--Login-->
<scene sceneID="fe8-Xu-DEa">
<objects>
<viewController id="Rnc-YT-XEu" sceneMemberID="viewController">
@ -289,13 +289,14 @@
<navigationItem key="navigationItem" title="Login" id="huN-S6-yGa"/>
<connections>
<segue destination="nrg-5w-bbF" kind="push" identifier="FakeSegue" id="Rkp-YM-Gz0"/>
<segue destination="qY1-Jo-UbZ" kind="push" identifier="FakeSegue33" id="37q-Mo-UFN"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="QC9-GK-F3v" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="499" y="49"/>
</scene>
<!--Profile View Controller - Profile-->
<!--Profile-->
<scene sceneID="xeE-nX-pb6">
<objects>
<viewController storyboardIdentifier="ProfileViewController" id="nrg-5w-bbF" customClass="ProfileViewController" sceneMemberID="viewController">
@ -334,7 +335,7 @@
</objects>
<point key="canvasLocation" x="1044" y="437"/>
</scene>
<!--Friends View Controller - Friends-->
<!--Friends-->
<scene sceneID="Hbs-BS-FvF">
<objects>
<tableViewController storyboardIdentifier="FriendsViewController" title="Friends" id="qY1-Jo-UbZ" customClass="FriendsViewController" sceneMemberID="viewController">
@ -370,13 +371,16 @@
<outlet property="delegate" destination="qY1-Jo-UbZ" id="FT7-ey-Dka"/>
</connections>
</tableView>
<navigationItem key="navigationItem" id="aah-ni-z8T">
<barButtonItem key="rightBarButtonItem" title="Random Button" id="UsL-My-2Pu"/>
</navigationItem>
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="TeQ-ZL-OLP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1042" y="1101"/>
</scene>
<!--View Controller - Friends-->
<!--Friends-->
<scene sceneID="yJW-sY-3g9">
<objects>
<viewController title="Friends" id="yDw-XY-MRH" sceneMemberID="viewController">
@ -401,7 +405,7 @@
</objects>
<point key="canvasLocation" x="1503" y="1100"/>
</scene>
<!--Profile Detail View Controller - Right Menu Only-->
<!--Right Menu Only-->
<scene sceneID="w1a-xD-Zgv">
<objects>
<viewController storyboardIdentifier="ProfileDetailViewController" id="BLR-mt-TZ9" customClass="ProfileDetailViewController" sceneMemberID="viewController">
@ -473,4 +477,4 @@
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>
</document>

4
iOS-Slide-Menu.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'iOS-Slide-Menu'
s.version = '1.4.3'
s.version = '1.4.4'
s.summary = 'A Slide Menu for iOS'
s.homepage = 'https://github.com/aryaxt/iOS-Slide-Menu'
s.license = {
@ -8,7 +8,7 @@ Pod::Spec.new do |s|
:file => 'License.txt'
}
s.author = {'Aryan Ghassemi' => 'https://github.com/aryaxt/iOS-Slide-Menu'}
s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.3'}
s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.4'}
s.platform = :ios, '6.0'
s.source_files = 'SlideMenu/Source/*.{h,m}', 'SlideMenu/Source/Animations/*.{h,m}', 'SlideMenu/Source/Assets/*.{png}'
s.resources = ['SlideMenu/Source/Assets/**/*']