Merge remote-tracking branch 'yackle/master'

yackle · Dec 18, 2017 · d6d2fbd · d6d2fbd
2 parents cb69f00 + 9b8b776
commit d6d2fbd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/CLImageEditor.podspec b/CLImageEditor.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "CLImageEditor"
-  s.version      = "0.2.1"
+  s.version      = "0.2.2"
   s.summary      = "CLImageEditor provides basic image editing features to iPhone apps."
 
   s.homepage     = "https://github.com/yackle/CLImageEditor"

diff --git a/CLImageEditor/CLImageEditorTheme.h b/CLImageEditor/CLImageEditorTheme.h
@@ -19,6 +19,7 @@
 @property (nonatomic, strong) UIColor  *toolbarTextColor;
 @property (nonatomic, strong) UIColor  *toolbarSelectedButtonColor;
 @property (nonatomic, strong) UIFont   *toolbarTextFont;
+@property (nonatomic, assign) BOOL statusBarHidden;
 @property (nonatomic, assign) UIStatusBarStyle statusBarStyle;
 
 + (CLImageEditorTheme*)theme;

diff --git a/CLImageEditor/CLImageEditorTheme.m b/CLImageEditor/CLImageEditorTheme.m
@@ -49,6 +49,7 @@ - (id)init
         self.toolbarTextColor               = [UIColor blackColor];
         self.toolbarSelectedButtonColor     = [[UIColor cyanColor] colorWithAlphaComponent:0.2];
         self.toolbarTextFont                = [UIFont systemFontOfSize:10];
+        self.statusBarHidden                = NO;
         self.statusBarStyle                 = UIStatusBarStyleDefault;
     }
     return self;

diff --git a/CLImageEditor/ViewController/_CLImageEditorViewController.m b/CLImageEditor/ViewController/_CLImageEditorViewController.m
@@ -615,9 +615,7 @@ - (NSUInteger)supportedInterfaceOrientations
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 #endif
 {
-    return (_currentTool == nil
-            ? UIInterfaceOrientationMaskAll
-            : (UIInterfaceOrientationMask)[UIApplication sharedApplication].statusBarOrientation);
+    return UIInterfaceOrientationMaskAll;
 }
 
 -(void)viewDidLayoutSubviews
@@ -628,6 +626,11 @@ -(void)viewDidLayoutSubviews
     [self scrollViewDidZoom:_scrollView];
 }
 
+- (BOOL)prefersStatusBarHidden
+{
+    return [[CLImageEditorTheme theme] statusBarHidden];
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
     return [[CLImageEditorTheme theme] statusBarStyle];

diff --git a/Demo/CLImageEditorDemo/CLImageEditorDemo/ViewController.m b/Demo/CLImageEditorDemo/CLImageEditorDemo/ViewController.m
@@ -36,6 +36,11 @@ - (void)viewDidLoad
     [[UINavigationBar appearance] setBarStyle:UIBarStyleBlack];
     [[UINavigationBar appearance] setTintColor:[UIColor whiteColor]];
     */
+}
+
+- (void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
     [self refreshImageView];
 }