support landscape on iPhone; Issue #38

MiniKeePass · Apr 24, 2012 · 40b903e · 40b903e
1 parent a7c5c87
commit 40b903e
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 18 deletions.
diff --git a/MiniKeePass/AutorotatingTableViewController.m b/MiniKeePass/AutorotatingTableViewController.m
@@ -16,7 +16,7 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
         shouldRotate = YES;
     } else {
-        shouldRotate = interfaceOrientation == UIInterfaceOrientationPortrait;
+        shouldRotate = interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown;
     }
 
     return shouldRotate;

diff --git a/MiniKeePass/AutorotatingViewController.m b/MiniKeePass/AutorotatingViewController.m
@@ -16,7 +16,7 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
         shouldRotate = YES;
     } else {
-        shouldRotate = interfaceOrientation == UIInterfaceOrientationPortrait;
+        shouldRotate = interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown;
     }
 
     return shouldRotate;

diff --git a/MiniKeePass/FormViewController.m b/MiniKeePass/FormViewController.m
@@ -159,7 +159,6 @@ - (void)resizeControlsForOrientation:(UIInterfaceOrientation)orientation {
 }
 
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {	
-    // Not sure why, but the non-UITableViewCell controls do not seem to get resized during rotation, so adjust here.
     [UIView animateWithDuration:duration animations:^{
         [self resizeControlsForOrientation:toInterfaceOrientation];
     }];

diff --git a/MiniKeePass/LockScreenController.h b/MiniKeePass/LockScreenController.h
@@ -19,7 +19,7 @@
 #import "PinViewController.h"
 #import "AutorotatingViewController.h"
 
-@interface LockScreenController : AutorotatingViewController <PinViewControllerDelegate> {
+@interface LockScreenController : UIViewController <PinViewControllerDelegate> {
     PinViewController *pinViewController;
     MiniKeePassAppDelegate *appDelegate;
     CGRect visibleFrame;

diff --git a/MiniKeePass/LockScreenController.m b/MiniKeePass/LockScreenController.m
@@ -82,6 +82,10 @@ - (void)setBackgroundForOrientation:(UIInterfaceOrientation)orientation {
 - (void)updateFramesForOrientation:(UIInterfaceOrientation)orientation {
 }
 
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation {
+    return UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad || toInterfaceOrientation == UIInterfaceOrientationPortrait;
+}
+
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     [UIView animateWithDuration:duration animations:^{
 //        [self updateFramesForOrientation:toInterfaceOrientation];

diff --git a/MiniKeePass/PinViewController.h b/MiniKeePass/PinViewController.h
@@ -24,6 +24,8 @@
     UITextField *textField;
     NSArray *pinTextFields;
     UILabel *textLabel;
+    UIToolbar *topBar;
+    UIToolbar *pinBar;
     id<PinViewControllerDelegate> delegate;
 }
 

diff --git a/MiniKeePass/PinViewController.m b/MiniKeePass/PinViewController.m
@@ -33,9 +33,8 @@ - (id)initWithText:(NSString*)text {
     self = [super init];
     if (self) {
         self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
-
-        MiniKeePassAppDelegate *appDelegate = (MiniKeePassAppDelegate *)[[UIApplication sharedApplication] delegate];        
-        CGFloat screenWidth = [appDelegate currentScreenWidth];
+
+        CGFloat frameWidth = CGRectGetWidth(self.view.frame);
 
         textField = [[UITextField alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
         textField.delegate = self;
@@ -48,7 +47,7 @@ - (id)initWithText:(NSString*)text {
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textDidChange:) name:UITextFieldTextDidChangeNotification object:textField];
 
         // Create topbar
-        textLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, screenWidth, 95)];
+        textLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, frameWidth, 95)];
         textLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
         textLabel.backgroundColor = [UIColor clearColor];
         textLabel.textColor = [UIColor whiteColor];
@@ -57,13 +56,12 @@ - (id)initWithText:(NSString*)text {
         textLabel.textAlignment = UITextAlignmentCenter;
         textLabel.text = text;
 
-        UIToolbar *topBar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, screenWidth, 95)];
+        topBar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, frameWidth, 95)];
         topBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
         topBar.barStyle = UIBarStyleBlackTranslucent;
         [topBar addSubview:textLabel];
 
         [self.view addSubview:topBar];
-        [topBar release];
 
         // Create PIN bar
         CGFloat pinTextFieldWidth = 61.0f;
@@ -72,8 +70,8 @@ - (id)initWithText:(NSString*)text {
 
         CGFloat textFieldViewWidth = pinTextFieldWidth * 4 + textFieldSpace * 3;
 
-        UIView *textFieldsView = [[UIView alloc] initWithFrame:CGRectMake((screenWidth - textFieldViewWidth) / 2, 22, textFieldViewWidth, pinTextFieldHeight)];
-        textFieldsView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+        UIView *textFieldsView = [[UIView alloc] initWithFrame:CGRectMake((frameWidth - textFieldViewWidth) / 2, 22, textFieldViewWidth, pinTextFieldHeight)];
+        textFieldsView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
 
         CGFloat xOrigin = 0;
 
@@ -99,13 +97,18 @@ - (id)initWithText:(NSString*)text {
         [pinTextField3 release];
         [pinTextField4 release];
 
-        UIToolbar *PINbar= [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, screenWidth, 95)];
-        PINbar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-        [PINbar setBarStyle:UIBarStyleBlackTranslucent];
-        [PINbar addSubview:textFieldsView];
+        pinBar= [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, frameWidth, 95)];
+        pinBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+        [pinBar setBarStyle:UIBarStyleBlackTranslucent];
+        [pinBar addSubview:textFieldsView];
 
-        textField.inputAccessoryView = PINbar;
-        [PINbar release];
+        textField.inputAccessoryView = pinBar;
+
+        UIInterfaceOrientation orientation = self.interfaceOrientation;
+        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone &&
+            UIInterfaceOrientationIsLandscape(orientation)) {
+            [self resizeToolbarsToInterfaceOrientation:orientation];
+        }
 
         // If the keyboard is dismissed, show it again.
 //        [[NSNotificationCenter defaultCenter] addObserver:self
@@ -118,13 +121,32 @@ - (id)initWithText:(NSString*)text {
 }
 
 - (void)dealloc {
+    [topBar release];
+    [pinBar release];
     [textField release];
     [pinTextFields release];
     [textLabel release];
     [delegate release];
     [super dealloc];
 }
 
+- (void)resizeToolbarsToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation {	
+    CGRect newFrame = topBar.frame;
+    newFrame.size.height = UIInterfaceOrientationIsPortrait(toInterfaceOrientation) ? 95 : 68;
+
+    topBar.frame = newFrame;
+    textLabel.frame = newFrame;
+    pinBar.frame = newFrame;    
+}
+
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+    // Nothing needs to be done for the iPad; return
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) return;
+    [UIView animateWithDuration:duration animations:^{
+        [self resizeToolbarsToInterfaceOrientation:toInterfaceOrientation];
+    }];
+}
+
 - (UIColor *)backgroundColor {
     return self.view.backgroundColor;
 }
@@ -183,6 +205,9 @@ - (void)checkPin:(id)sender {
 - (BOOL)becomeFirstResponder {
     [super becomeFirstResponder];
 
+    // When the PIN screen is presented from the lock screen the bars must be resized before presented
+    [self resizeToolbarsToInterfaceOrientation:self.interfaceOrientation];
+
     return [textField becomeFirstResponder];
 }