Merge pull request #182 from javitrujillo/master

Added support for iOS App Extensions

Author: rolandleth

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.8.9
+* Added support for iOS App Extensions:
+	* Now, if you add a macro to project settings (`LTH_APP_EXTENSIONS`), `LTHPasscodeViewController` doesn’t crash under an extension target.
+	* Also, with a new method, you can provide a view in which the lock is going to be presented and centered in.
+
 # 3.8.8
 * Fixed translations.
 

LTHPasscodeViewController/LTHPasscodeViewController.h

@@ -313,6 +313,13 @@
  @param logoutTitle The title of the Logout button.
  */
 - (void)showLockScreenWithAnimation:(BOOL)animated withLogout:(BOOL)hasLogout andLogoutTitle:(NSString*)logoutTitle;
+/**
+ @brief				Used for displaying the lock. The passcode view is added directly on the keyWindow.
+ @param superview   The superview where is to be presented, used to measure the center of the view.
+ @param hasLogout   Set to @c YES for a navBar with a Logout button, set to @c NO for no navBar.
+ @param logoutTitle The title of the Logout button.
+ */
+- (void)showLockScreenOver:(UIView *)superview withAnimation:(BOOL)animated withLogout:(BOOL)hasLogout andLogoutTitle:(NSString*)logoutTitle;
 /**
  @brief				   Used for enabling the passcode.
  @details              The back bar button is hidden by default. Set @c hidesBackButton to @c NO if you want it to be visible.

LTHPasscodeViewController/LTHPasscodeViewController.m

@@ -49,7 +49,11 @@
  Any help would be greatly appreciated.
  */
 
+#if defined(LTH_APP_EXTENSIONS)
+#define LTHMainWindow [UIApplication sharedApplication].keyWindow
+#else
 #define LTHMainWindow [UIApplication sharedApplication].windows[0]
+#endif
 
 @interface LTHPasscodeViewController () <UITextFieldDelegate>
 @property (nonatomic, strong) UIView      *coverView;
@@ -1005,47 +1009,51 @@ - (void)showLockscreenWithoutAnimation {
     [self showLockScreenWithAnimation:NO withLogout:NO andLogoutTitle:nil];
 }
 
-
 - (void)showLockScreenWithAnimation:(BOOL)animated withLogout:(BOOL)hasLogout andLogoutTitle:(NSString*)logoutTitle {
+    [self showLockScreenOver:LTHMainWindow withAnimation:animated withLogout:hasLogout andLogoutTitle:logoutTitle];
+}
+
+- (void)showLockScreenOver:(UIView *)superview withAnimation:(BOOL)animated withLogout:(BOOL)hasLogout andLogoutTitle:(NSString*)logoutTitle {
     [self _prepareAsLockScreen];
 
     // In case the user leaves the app while the lockscreen is already active.
     if (_isCurrentlyOnScreen) { return; }
     _isCurrentlyOnScreen = YES;
 
-    [LTHMainWindow addSubview: self.view];
+    [superview addSubview: self.view];
 
     // All this hassle because a view added to UIWindow does not rotate automatically
     // and if we would have added the view anywhere else, it wouldn't display properly
     // (having a modal on screen when the user leaves the app, for example).
     [self rotateAccordingToStatusBarOrientationAndSupportedOrientations];
+    CGPoint superviewCenter = CGPointMake(superview.center.x, superview.center.y);
     CGPoint newCenter;
     [self statusBarFrameOrOrientationChanged:nil];
     if (LTHiOS8) {
         self.view.center = CGPointMake(self.view.center.x, self.view.center.y * -1.f);
-        newCenter = CGPointMake(LTHMainWindow.center.x,
-                                LTHMainWindow.center.y + self.navigationController.navigationBar.frame.size.height / 2);
+        newCenter = CGPointMake(superviewCenter.x,
+                                superviewCenter.y + self.navigationController.navigationBar.frame.size.height / 2);
     }
     else {
         if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeLeft) {
             self.view.center = CGPointMake(self.view.center.x * -1.f, self.view.center.y);
-            newCenter = CGPointMake(LTHMainWindow.center.x - self.navigationController.navigationBar.frame.size.height / 2,
-                                    LTHMainWindow.center.y);
+            newCenter = CGPointMake(superviewCenter.x - self.navigationController.navigationBar.frame.size.height / 2,
+                                    superviewCenter.y);
         }
         else if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeRight) {
             self.view.center = CGPointMake(self.view.center.x * 2.f, self.view.center.y);
-            newCenter = CGPointMake(LTHMainWindow.center.x + self.navigationController.navigationBar.frame.size.height / 2,
-                                    LTHMainWindow.center.y);
+            newCenter = CGPointMake(superviewCenter.x + self.navigationController.navigationBar.frame.size.height / 2,
+                                    superviewCenter.y);
         }
         else if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationPortrait) {
             self.view.center = CGPointMake(self.view.center.x, self.view.center.y * -1.f);
-            newCenter = CGPointMake(LTHMainWindow.center.x,
-                                    LTHMainWindow.center.y - self.navigationController.navigationBar.frame.size.height / 2);
+            newCenter = CGPointMake(superviewCenter.x,
+                                    superviewCenter.y - self.navigationController.navigationBar.frame.size.height / 2);
         }
         else {
             self.view.center = CGPointMake(self.view.center.x, self.view.center.y * 2.f);
-            newCenter = CGPointMake(LTHMainWindow.center.x,
-                                    LTHMainWindow.center.y + self.navigationController.navigationBar.frame.size.height / 2);
+            newCenter = CGPointMake(superviewCenter.x,
+                                    superviewCenter.y + self.navigationController.navigationBar.frame.size.height / 2);
         }
     }
 
@@ -1834,12 +1842,12 @@ - (void)rotateAccordingToStatusBarOrientationAndSupportedOrientations {
     CGFloat angle = UIInterfaceOrientationAngleOfOrientation(orientation);
     CGAffineTransform transform = CGAffineTransformMakeRotation(angle);
 
-    [self setIfNotEqualTransform: transform
-                           frame: self.view.window.bounds];
+    [self setIfNotEqualTransform: transform];
 }
 
 
-- (void)setIfNotEqualTransform:(CGAffineTransform)transform frame:(CGRect)frame {
+- (void)setIfNotEqualTransform:(CGAffineTransform)transform {
+    CGRect frame = self.view.superview.frame;
     if(!CGAffineTransformEqualToTransform(self.view.transform, transform)) {
         self.view.transform = transform;
     }