Skip to content

Commit

Permalink
fix version number in *.h/*.m files
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaschengdev committed Sep 1, 2013
1 parent 6335ba3 commit e6d23ae
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 22 deletions.
4 changes: 2 additions & 2 deletions WYPopoverController/WYPopoverController.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Version 0.1.0
Version 0.1.1
WYPopoverController is available under the MIT license.
Expand Down Expand Up @@ -27,7 +27,7 @@

#define WYPOPOVER_DEFAULT_TINT_COLOR [UIColor colorWithRed:55.f/255.f green:63.f/255.f blue:71.f/255.f alpha:1.f]
#define WYPOPOVER_DEFAULT_OVERLAY_COLOR [UIColor clearColor]
#define WYPOPOVER_DEFAULT_ANIMATION_DURATION 0.15f
#define WYPOPOVER_DEFAULT_ANIMATION_DURATION 0.20f
#define WYPOPOVER_MIN_POPOVER_SIZE CGSizeMake(200, 200)

typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
Expand Down
6 changes: 1 addition & 5 deletions WYPopoverController/WYPopoverController.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Version 0.1.0
Version 0.1.1
WYPopoverController is available under the MIT license.
Expand Down Expand Up @@ -1130,8 +1130,6 @@ - (void)presentPopover
{
CGRect rootViewFrame = self.rootViewFrame;

NSLog(@"%@", NSStringFromCGRect(rootViewFrame));

CGRect viewFrame = [overlayView convertRect:rect fromView:inView];

UIView* contentView = viewController.view;
Expand Down Expand Up @@ -1621,8 +1619,6 @@ - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
return result;
}];

//NSLog(@"%@", areas);

for (NSUInteger i = 0; i < [areas count]; i++)
{
WYPopoverArea* area = (WYPopoverArea*)[areas objectAtIndex:i];
Expand Down
2 changes: 1 addition & 1 deletion WYPopoverController/WYStoryboardPopoverSegue.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Version 0.1.0
Version 0.1.1
WYPopoverController is available under the MIT license.
Expand Down
2 changes: 1 addition & 1 deletion WYPopoverController/WYStoryboardPopoverSegue.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Version 0.1.0
Version 0.1.1
WYPopoverController is available under the MIT license.
Expand Down
22 changes: 17 additions & 5 deletions demos/Demo/WYPopoverDemo/WYAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
{
//UIPopoverController

// Customize Appearance 1
//Appearance 1 (white popover)
//
/*
{
WYPopoverBackgroundView* appearance = [WYPopoverBackgroundView appearance];
[appearance setTintColor:[UIColor whiteColor]];
Expand Down Expand Up @@ -48,8 +49,18 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
UITextAttributeTextShadowOffset: [NSValue valueWithUIOffset:UIOffsetMake(0, -1)]
}];
}
*/

//Appearance 2 (orange popover)
//
/*
{
WYPopoverBackgroundView* appearance = [WYPopoverBackgroundView appearance];
[appearance setTintColor:[UIColor orangeColor]];
}
*/

// Appearance 2
//Appearance 3 (flat green popover)
//
/*
{
Expand Down Expand Up @@ -77,9 +88,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
[appearance setFillTopColor:greenColor];
[appearance setFillBottomColor:greenColor];
[appearance setStrokeColor:greenColor];
UINavigationBar* appearance2 = [UINavigationBar appearanceWhenContainedIn:[UINavigationController class], nil];
[appearance2 setTitleTextAttributes:@{
}
{
UINavigationBar* appearance = [UINavigationBar appearanceWhenContainedIn:[WYPopoverBackgroundView class], [UINavigationController class], nil];
[appearance setTitleTextAttributes:@{
UITextAttributeTextColor : [UIColor whiteColor],
UITextAttributeTextShadowColor: [UIColor clearColor],
UITextAttributeTextShadowOffset: [NSValue valueWithUIOffset:UIOffsetMake(0, -1)]
Expand Down
16 changes: 8 additions & 8 deletions demos/Demo/WYPopoverDemo/WYStoryboard.storyboard
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="2.0" toolsVersion="3084" systemVersion="12C2037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="gLa-Bk-mnS">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12C2037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="CfQ-21-QrR">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
Expand Down Expand Up @@ -165,25 +165,25 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dH0-gX-oc0" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3469" y="-75"/>
<point key="canvasLocation" x="3995" y="-75"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="ez1-Fd-Rrk">
<scene sceneID="hxz-90-QMO">
<objects>
<navigationController id="gLa-Bk-mnS" sceneMemberID="viewController">
<navigationController id="CfQ-21-QrR" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="oZX-Bg-Mte">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="jvd-q5-5vM">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
<connections>
<segue destination="SH8-yS-R5W" kind="relationship" relationship="rootViewController" id="jLZ-cd-8VC"/>
<segue destination="SH8-yS-R5W" kind="relationship" relationship="rootViewController" id="aul-Q6-aUB"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="No1-Wk-N4W" userLabel="First Responder" sceneMemberID="firstResponder"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="kBA-To-Nhz" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2943" y="-75"/>
<point key="canvasLocation" x="3469" y="-75"/>
</scene>
</scenes>
<classes>
Expand Down

0 comments on commit e6d23ae

Please sign in to comment.