Fix UI7PopoverController

sinss · Sep 21, 2013 · c6fda6d · c6fda6d
1 parent a27f21c
commit c6fda6d
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 2 deletions.
diff --git a/Podfile b/Podfile
@@ -2,5 +2,5 @@ platform :ios, '5.0'
 
 pod 'FoundationExtension', '~> 0.43.1'
 pod 'SevenSwitch', '~> 1.3.0'
-pod 'GIKPopoverBackgroundView'
+pod 'GIKPopoverBackgroundView/Core'
 
diff --git a/Resources/PopoverBackgroundArrowDown.png b/Resources/PopoverBackgroundArrowDown.png
diff --git a/Resources/PopoverBackgroundArrowDown@2x.png b/Resources/PopoverBackgroundArrowDown@2x.png
diff --git a/Resources/PopoverBackgroundArrowDownRight.png b/Resources/PopoverBackgroundArrowDownRight.png
diff --git a/Resources/PopoverBackgroundArrowDownRight@2x.png b/Resources/PopoverBackgroundArrowDownRight@2x.png
diff --git a/Resources/PopoverBackgroundArrowSide.png b/Resources/PopoverBackgroundArrowSide.png
diff --git a/Resources/PopoverBackgroundArrowSide@2x.png b/Resources/PopoverBackgroundArrowSide@2x.png
diff --git a/Resources/PopoverBackgroundArrowSideBottom.png b/Resources/PopoverBackgroundArrowSideBottom.png
diff --git a/Resources/PopoverBackgroundArrowSideBottom@2x.png b/Resources/PopoverBackgroundArrowSideBottom@2x.png
diff --git a/Resources/PopoverBackgroundArrowSideTop.png b/Resources/PopoverBackgroundArrowSideTop.png
diff --git a/Resources/PopoverBackgroundArrowSideTop@2x.png b/Resources/PopoverBackgroundArrowSideTop@2x.png
diff --git a/Resources/PopoverBackgroundArrowUp.png b/Resources/PopoverBackgroundArrowUp.png
diff --git a/Resources/PopoverBackgroundArrowUp@2x.png b/Resources/PopoverBackgroundArrowUp@2x.png
diff --git a/Resources/PopoverBackgroundArrowUpRight.png b/Resources/PopoverBackgroundArrowUpRight.png
diff --git a/Resources/PopoverBackgroundArrowUpRight@2x.png b/Resources/PopoverBackgroundArrowUpRight@2x.png
diff --git a/UI7Kit.podspec b/UI7Kit.podspec
@@ -39,7 +39,6 @@ Pod::Spec.new do |s|
     'UI7View'                 => [%w(UI7View.{h,m})                ,  [                                                                                            ],  %w(          )],
     'UI7ViewController'       => [%w(UI7ViewController.{h,m})      ,  [%w(UI7Kit/UI7NavigationBar), %w(UI7Kit/UI7BarButtonItem)                                    ],  %w(          )],
     'UI7Window'               => [%w(UI7Window.{h,m})              ,  [%w(UI7Kit/UI7View)                                                                          ],  %w(          )],
-    'UI7PopoverController'    => [%w(UI7PopoverController.{h,m})   ,  [%w(GIKPopoverBackgroundView)                                                                ],  %w(QuartzCore)],
   }
   components.map do |component, values|
     s.subspec component do |c|
@@ -88,6 +87,13 @@ Pod::Spec.new do |s|
     end
   end
 
+  s.subspec 'UI7PopoverController' do |ss|
+    ss.source_files = 'UI7Kit/UI7PopoverController.{h,m}'
+    ss.resources = 'Resources/Popover*'
+    ss.dependency 'GIKPopoverBackgroundView/Core'
+    ss.framework 'QuartzCore'
+  end
+
   s.subspec 'Core' do |core|
     core.source_files           = 'UI7Kit/UI7{Kit,Utilities}*.{h,m}' 
     core.public_header_files    = 'UI7Kit/UI7{Kit,Utilities}*.h'
@@ -107,5 +113,6 @@ Pod::Spec.new do |s|
       all.dependency "UI7Kit/#{component}"
     end
     all.dependency 'UI7Kit/UI7Switch/SevenSwitch'
+    all.dependency 'UI7Kit/UI7PopoverController'
   end
 end
diff --git a/UI7Kit/UI7PopoverController.m b/UI7Kit/UI7PopoverController.m
@@ -7,6 +7,8 @@
 //
 
 #import <QuartzCore/QuartzCore.h>
+#import <UI7Kit/UI7Utilities.h>
+
 #import "UI7PopoverController.h"
 
 @implementation UIPopoverController (Patch)
@@ -43,10 +45,20 @@ - (id)initWithContentViewController:(UIViewController *)viewController {
 @end
 
 
+@interface UI7PopoverBackgroundView (Private)
+
+@property (strong, nonatomic) UIImageView *popoverBackground;
+
+@end
+
+
 @implementation UI7PopoverBackgroundView
 
 - (void)layoutSubviews {
+    self.backgroundColor = [UIColor whiteColor];
+    self.layer.cornerRadius = 10.0f;
     [super layoutSubviews];
+    //self.popoverBackground.image = [self.popoverBackground.image imageByFilledWithColor:[UIColor whiteColor]];
     self.layer.shadowRadius = 500.0f; // immitate dimming view
 }