UI: account creation

- add switch button for account password
- move link to account explanation to popover help view
- fix constraints

Change-Id: I13e2da4b328f77a882bac679e744b8f2086a5344

src/AppDelegate.mm

@@ -31,6 +31,7 @@
 #import <account.h>
 #import <AvailableAccountModel.h>
 #import <api/lrc.h>
+#import <api/newaccountmodel.h>
 
 
 #if ENABLE_SPARKLE
@@ -258,17 +259,7 @@ static void ReachabilityCallback(SCNetworkReachabilityRef __unused target, SCNet
 
 - (BOOL) checkForRingAccount
 {
-    BOOL foundRingAcc = NO;
-    for (int i = 0 ; i < AccountModel::instance().rowCount() ; ++i) {
-        QModelIndex idx = AccountModel::instance().index(i);
-        Account* acc = AccountModel::instance().getAccountByModelIndex(idx);
-        if(acc->protocol() == Account::Protocol::RING && !acc->isNew()) {
-            if (acc->displayName().isEmpty())
-                acc->setDisplayName(acc->alias());
-            foundRingAcc = YES;
-        }
-    }
-    return foundRingAcc;
+    return !lrc->getAccountModel().getAccountList().empty();
 }
 
 -(void)applicationWillFinishLaunching:(NSNotification *)aNotification

src/RingWindowController.mm

@@ -513,6 +513,14 @@ NSString* const kOpenAccountToolBarItemIdentifier    = @"OpenAccountToolBarItemI
     [self.window beginSheet:wizard.window completionHandler:nil];
 }
 
+- (NSRect)window:(NSWindow *)window willPositionSheet:(NSWindow *)sheet
+       usingRect:(NSRect)rect
+{
+    float titleBarHeight = self.window.frame.size.height - [NSWindow contentRectForFrameRect:self.window.frame styleMask:self.window.styleMask].size.height;
+    rect.origin.y = self.window.frame.size.height;
+    return rect;
+}
+
 -(void) accountSettingsShouldOpen: (BOOL) open {
     if (open) {
         [settingsVC setSelectedAccount: [chooseAccountVC selectedAccount].id];

src/RingWizardChooseVC.h

@@ -45,6 +45,7 @@ typedef NS_ENUM(NSInteger, WizardAction) {
 - (void)showCancelButton:(BOOL)showCancel;
 
 - (void)showAdvancedButton:(BOOL)showAdvanced;
+- (void)updateFrame;
 
 @end
 

src/RingWizardChooseVC.mm

@@ -26,25 +26,33 @@
 @implementation RingWizardChooseVC {
 
 __unsafe_unretained IBOutlet NSButton* createSIPAccount;
+__unsafe_unretained IBOutlet NSLayoutConstraint* buttonTopConstraint;
 
 }
 
 @synthesize delegate;
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    [self.view setAutoresizingMask: NSViewHeightSizable];
-}
+#define heightWithAdvanced 220
+#define heightWithCancel 148
+#define heightWithCancelAndAdvanced 168
+#define defaultHeight 128
 
-- (void)showCancelButton:(BOOL)showCancel{
-    self.isCancelable = showCancel;
+- (void)showCancelButton:(BOOL)showCancel {
     [createSIPAccount setHidden: YES];
+    buttonTopConstraint.constant = showCancel ? 25 : 0;
+    self.isCancelable = showCancel;
 }
 
 - (void)showAdvancedButton:(BOOL)showAdvanced {
     self.withAdvancedOptions = showAdvanced;
 }
 
+- (void)updateFrame {
+    NSRect viewFrame = self.view.frame;
+    viewFrame.size.height = (self.isCancelable && self.withAdvancedOptions) ? heightWithCancelAndAdvanced : self.isCancelable  ? heightWithCancel : defaultHeight;
+    self.view.frame = viewFrame;
+}
+
 - (IBAction)createRingAccount:(id)sender
 {
     if ([self.delegate respondsToSelector:@selector(didCompleteWithAction:)]){
@@ -69,9 +77,13 @@ __unsafe_unretained IBOutlet NSButton* createSIPAccount;
 - (IBAction)showCreateSIP:(id)sender
 {
     if ([self.delegate respondsToSelector:@selector(didCompleteWithAction:)]){
+        buttonTopConstraint.constant = 57;
+        NSRect viewFrame = self.view.frame;
+        viewFrame.size.height = heightWithAdvanced;
+        self.view.frame = viewFrame;
         [delegate didCompleteWithAction:WIZARD_ACTION_ADVANCED];
+        [createSIPAccount setHidden: NO];
     }
-    [createSIPAccount setHidden: NO];
 }
 
 - (IBAction)addSIPAccount:(id)sender

src/RingWizardLinkAccountVC.h

@@ -29,6 +29,7 @@
 @property (nonatomic, weak) NSWindowController <RingWizardLinkDelegate>* delegate;
 @property (nonatomic, weak) NSString* pinValue;
 @property (nonatomic, weak) NSString* passwordValue;
+@property NSURL* backupFile;
 
 - (void)show;
 @end

src/RingWizardLinkAccountVC.mm

@@ -51,15 +51,16 @@
     __unsafe_unretained IBOutlet NSSecureTextField* passwordTextField;
 
     __unsafe_unretained IBOutlet NSButton* linkButton;
+    __unsafe_unretained IBOutlet NSPopover* helpPINContainer;
+    __unsafe_unretained IBOutlet NSPopover* helpArchiveFileContainer;
     NSString *fileButtonTitleBackup;
 
-    NSURL* backupFile;
     QMetaObject::Connection accountCreated;
     QMetaObject::Connection accountRemoved;
     std::string accountToCreate;
 }
 
-@synthesize accountModel;
+@synthesize accountModel, backupFile;
 
 -(id) initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil accountmodel:(lrc::api::NewAccountModel*) accountModel {
     if (self =  [self initWithNibName:nibNameOrNil bundle:nibBundleOrNil])
@@ -71,7 +72,6 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self.view setAutoresizingMask: NSViewHeightSizable];
     fileButtonTitleBackup = NSLocalizedString(@"Select archive",
                                               @"export account button title");
 }
@@ -83,7 +83,7 @@
     backupFile = nil;
     [pinTextField setStringValue:@""];
     [pinTextField setEnabled:YES];
-    [linkButton setEnabled:YES];
+    [linkButton setEnabled:NO];
     [passwordTextField setStringValue:@""];
 }
 
@@ -150,6 +150,16 @@
     }
 }
 
+- (IBAction)showPINHelp:(id)sender
+{
+    [helpPINContainer showRelativeToRect:[sender bounds] ofView:sender preferredEdge:NSMaxYEdge];
+}
+
+- (IBAction)showArchiveFileHelp:(id)sender
+{
+    [helpArchiveFileContainer showRelativeToRect:[sender bounds] ofView:sender preferredEdge:NSMaxYEdge];
+}
+
 /**
  * Set default values for preferences
  */

src/RingWizardNewAccountVC.h

@@ -23,6 +23,7 @@
 @protocol RingWizardNewDelegate <NSObject>
 - (void)didCreateAccountWithSuccess:(BOOL)success;
 - (void)showView:(NSView*)view;
+- (void) updateFrame:(float)height;
 @end
 
 @interface RingWizardNewAccountVC : NSViewController <LrcModelsProtocol>

src/RingWizardNewAccountVC.mm

@@ -37,7 +37,6 @@
 #import <account.h>
 #import <interfaces/pixmapmanipulatori.h>
 
-#import "AppDelegate.h"
 #import "Constants.h"
 #import "views/NSImage+Extensions.h"
 #import "views/NSColor+RingTheme.h"
@@ -67,6 +66,9 @@
 
     __unsafe_unretained IBOutlet NSPopover* helpBlockchainContainer;
     __unsafe_unretained IBOutlet NSPopover* helpPasswordContainer;
+    __unsafe_unretained IBOutlet NSLayoutConstraint* buttonTopConstraint;
+    __unsafe_unretained IBOutlet NSBox* passwordBox;
+    __unsafe_unretained IBOutlet NSButton* passwordButton;
 
     QMetaObject::Connection registeredNameFound;
     QMetaObject::Connection accountCreated;
@@ -86,6 +88,9 @@ NSInteger const ERROR_REPEAT_MISMATCH           = -2;
 
 @synthesize accountModel;
 
+#define heightWithCancelAndAdvanced 468
+#define defaultHeight 408
+
 -(id) initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil accountmodel:(lrc::api::NewAccountModel*) accountModel {
     if (self =  [self initWithNibName:nibNameOrNil bundle:nibBundleOrNil])
     {
@@ -94,11 +99,6 @@ NSInteger const ERROR_REPEAT_MISMATCH           = -2;
     return self;
 }
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    [self.view setAutoresizingMask: NSViewHeightSizable];
-}
-
 - (BOOL)produceError:(NSError**)error withCode:(NSInteger)code andMessage:(NSString*)message
 {
     if (error != NULL){
@@ -120,7 +120,6 @@ NSInteger const ERROR_REPEAT_MISMATCH           = -2;
 
 - (void)show
 {
-    AppDelegate* appDelegate = (AppDelegate *)[[NSApplication sharedApplication] delegate];
     [displayNameField setTag:DISPLAY_NAME_TAG];
     [registeredNameField setTag:BLOCKCHAIN_NAME_TAG];
     [displayNameField setStringValue: NSFullUserName()];
@@ -132,6 +131,16 @@ NSInteger const ERROR_REPEAT_MISMATCH           = -2;
     [self toggleSignupRing:nil];
     [addProfilePhotoImage setWantsLayer: YES];
     [photoView setBordered:YES];
+    [passwordButton setState: NSControlStateValueOff];
+    NSRect viewFrame = creationView.frame;
+    viewFrame.size.height = defaultHeight;
+    creationView.frame = viewFrame;
+
+    buttonTopConstraint.constant = 25;
+    [passwordBox setHidden: YES];
+    self.registeredName = @"";
+    self.password = @"";
+    self.repeatPassword = @"";
 
     [self display:creationView];
 }
@@ -329,6 +338,26 @@ NSInteger const ERROR_REPEAT_MISMATCH           = -2;
     }
 }
 
+- (IBAction)togglePasswordButton:(NSButton *)sender
+{
+    NSRect viewFrame = creationView.frame;
+    if([sender state] == NSControlStateValueOn) {
+        viewFrame.size.height = heightWithCancelAndAdvanced;
+        [self.delegate updateFrame: heightWithCancelAndAdvanced];
+        creationView.frame = viewFrame;
+        buttonTopConstraint.constant = 85;
+        [passwordBox setHidden: NO];
+    } else {
+        buttonTopConstraint.priority = 100;
+        viewFrame.size.height = defaultHeight;
+        [self.delegate updateFrame: defaultHeight];
+        creationView.frame = viewFrame;
+        buttonTopConstraint.constant = 25;
+        buttonTopConstraint.priority = 999;
+        [passwordBox setHidden: YES];
+    }
+}
+
 - (BOOL)withBlockchain
 {
     return self.signUpBlockchainState == NSOnState;

src/RingWizardWC.mm

@@ -33,6 +33,9 @@
 @interface RingWizardWC ()
 
 @property (retain, nonatomic)IBOutlet NSView* container;
+@property (retain, nonatomic)IBOutlet NSTextField* windowHeader;
+@property (retain, nonatomic)IBOutlet NSImageView* ringImage;
+@property (retain, nonatomic)IBOutlet NSLayoutConstraint* titleConstraint;
 
 @end
 @implementation RingWizardWC {
@@ -44,7 +47,7 @@
     BOOL withAdvanced;
 }
 
-@synthesize accountModel;
+@synthesize accountModel, ringImage, titleConstraint;
 
 -(id) initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil accountmodel:(lrc::api::NewAccountModel*) accountModel;
 {
@@ -78,72 +81,93 @@
     }
 }
 
-#define headerHeight 60
-#define minHeight 150
+#define headerHeight 70
+#define minHeight 140
 #define defaultMargin 5
-#define heightWithSIP 160
 - (void)showView:(NSView*)view
 {
     [self removeSubviews];
     NSRect frame = [self.container frame];
-    CGFloat height = withAdvanced ? minHeight : minHeight - 10;
+    CGFloat height = minHeight;
     float sizeFrame = MAX(height, view.frame.size.height);
     frame.size.height = sizeFrame;
-    [view setFrame:frame];
-
+    [view setFrame: frame];
     [self.container setFrame:frame];
-    float size = headerHeight + sizeFrame + defaultMargin;
+    float titleBarHeight = self.window.frame.size.height -
+    [NSWindow contentRectForFrameRect: self.window.frame styleMask:self.window.styleMask].size.height;
+    titleBarHeight = self.window.isSheet ? 0 : titleBarHeight;
+    float size = headerHeight + sizeFrame + titleBarHeight;
     NSRect frameWindows = self.window.frame;
     frameWindows.size.height = size;
     [self.window setFrame:frameWindows display:YES animate:YES];
-
     [self.container addSubview:view];
 }
 
-- (void) updateWindowHeight: (CGFloat) height {
-    NSRect frame = [self.container frame];
-    float sizeFrame = height;
-    frame.size.height = sizeFrame;
-    [self.container setFrame:frame];
-    float size = headerHeight + sizeFrame + defaultMargin;
+- (void) updateFrame:(float) height {
+    float titleBarHeight = self.window.frame.size.height -
+    [NSWindow contentRectForFrameRect: self.window.frame styleMask:self.window.styleMask].size.height;
+    titleBarHeight = self.window.isSheet ? 0 : titleBarHeight;
+    float size = headerHeight + height + titleBarHeight;
     NSRect frameWindows = self.window.frame;
     frameWindows.size.height = size;
     [self.window setFrame:frameWindows display:YES animate:YES];
 }
 
 - (void)showChooseWithCancelButton:(BOOL)showCancel andAdvanced:(BOOL)showAdvanced {
+    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Ring",
+                                                        @"Welcome title")];
+    [ringImage setHidden: NO];
+    titleConstraint.constant = -26.5;
+    [self showView:chooseActiontWC.view];
     [chooseActiontWC showCancelButton:showCancel];
     [chooseActiontWC showAdvancedButton:showAdvanced];
     isCancelable = showCancel;
     withAdvanced = showAdvanced;
-    NSRect frame = CGRectMake(0, 0, chooseActiontWC.view.frame.size.width, 0);
-    chooseActiontWC.view.frame = frame;
+    [chooseActiontWC updateFrame];
     [self showView:chooseActiontWC.view];
-
 }
 
 - (void)showChooseWithCancelButton:(BOOL)showCancel
 {
+    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Ring",
+                                                         @"Welcome title")];
+    [ringImage setHidden: NO];
+    titleConstraint.constant = -26.5;
+    [self showView:chooseActiontWC.view];
     [chooseActiontWC showCancelButton:showCancel];
     isCancelable = showCancel;
-    [self showView:chooseActiontWC.view];
 }
 
 - (void)showNewAccountVC
 {
+    [self.windowHeader setStringValue: NSLocalizedString(@"Create a new account",
+                                                         @"Welcome title")];
+    [chooseActiontWC showCancelButton: isCancelable];
+    [ringImage setHidden: YES];
+    titleConstraint.constant = 0;
     [self showView: newAccountWC.view];
     [newAccountWC show];
 }
 
 - (void)showLinkAccountVC
 {
+    [self.windowHeader setStringValue: NSLocalizedString(@"Link to an account",
+                                                         @"link account title")];
+    [ringImage setHidden: YES];
+    titleConstraint.constant = 0;
+    [chooseActiontWC showCancelButton: isCancelable];
     [self showView: linkAccountWC.view];
     [linkAccountWC show];
 }
 
 - (void)showSIPAccountVC
 {
+    [self.windowHeader setStringValue: NSLocalizedString(@"Add a SIP account",
+                                                         @"Welcome title")];
+    [ringImage setHidden: YES];
+    titleConstraint.constant = 0;
     [self showView: addSIPAccountVC.view];
+    [chooseActiontWC showAdvancedButton: NO];
     [addSIPAccountVC show];
 }
 
@@ -168,7 +192,7 @@
     } else if (action == WIZARD_ACTION_NEW) {
         [self showNewAccountVC];
     } else if (action == WIZARD_ACTION_ADVANCED) {
-        [self updateWindowHeight: heightWithSIP];
+        [self showView:chooseActiontWC.view];
     } else if (action == WIZARD_ACTION_SIP_ACCOUNT) {
         [self showSIPAccountVC];
     } else {
@@ -215,9 +239,7 @@
 #pragma - AddSIPAccountDelegate methods
 
 - (void)close {
-    [self.window close];
-    [NSApp endSheet:self.window];
-    [[NSApplication sharedApplication] removeWindowsItem:self.window];
+    [self showChooseWithCancelButton: isCancelable andAdvanced: withAdvanced];
 }
 
 @end

ui/Base.lproj/Localizable.strings

@@ -175,3 +175,11 @@
 /* export account button title */
 "Select archive" = "Select archive";
 
+/* link account title */
+"Link to an account" = "Link to an account";
+
+/* Welcome title */
+"Welcome to Ring" = "Welcome to Ring";
+"Create a new account" = "Create a new account";
+"Add a SIP account" = "Add a SIP account";
+

ui/Base.lproj/RingWizard.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -11,13 +11,16 @@
                 <outlet property="container" destination="T98-k1-e6X" id="ucm-VA-quB"/>
                 <outlet property="linkAccountWC" destination="Hlf-uv-gt6" id="GFL-I8-wsd"/>
                 <outlet property="newAccountWC" destination="M2H-0Y-6UW" id="w3w-Wd-TvD"/>
+                <outlet property="ringImage" destination="P7h-tj-klA" id="Zoe-Wj-hwU"/>
+                <outlet property="titleConstraint" destination="fkS-G9-SzY" id="Exp-Bl-doV"/>
                 <outlet property="window" destination="4LP-GX-BkH" id="Bgr-iZ-rif"/>
+                <outlet property="windowHeader" destination="EpY-Kl-fNa" id="vWf-25-bWR"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Ring" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" visibleAtLaunch="NO" animationBehavior="default" titleVisibility="hidden" id="4LP-GX-BkH" customClass="RingMainWindow">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" texturedBackground="YES"/>
+        <window title="Ring" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" visibleAtLaunch="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="4LP-GX-BkH" customClass="RingMainWindow">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" texturedBackground="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="599" y="440" width="450" height="318"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <view key="contentView" id="Wgr-xH-z0G">
@@ -28,10 +31,10 @@
                         <rect key="frame" x="0.0" y="0.0" width="450" height="318"/>
                     </visualEffectView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="9ok-Ga-Q8u" userLabel="header">
-                        <rect key="frame" x="0.0" y="258" width="450" height="60"/>
+                        <rect key="frame" x="0.0" y="248" width="450" height="70"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EpY-Kl-fNa">
-                                <rect key="frame" x="88" y="12" width="221" height="36"/>
+                                <rect key="frame" x="88" y="17" width="221" height="36"/>
                                 <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Welcome to Ring" id="2mM-yx-BfM">
                                     <font key="font" metaFont="system" size="30"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -39,7 +42,7 @@
                                 </textFieldCell>
                             </textField>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="P7h-tj-klA">
-                                <rect key="frame" x="315" y="7" width="45" height="46"/>
+                                <rect key="frame" x="315" y="12" width="45" height="46"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="45" id="XMY-BN-Ymg"/>
                                     <constraint firstAttribute="height" constant="46" id="i8K-g8-EfQ"/>
@@ -49,14 +52,14 @@
                         </subviews>
                         <constraints>
                             <constraint firstItem="P7h-tj-klA" firstAttribute="centerY" secondItem="9ok-Ga-Q8u" secondAttribute="centerY" id="82u-TT-jdV"/>
-                            <constraint firstAttribute="height" constant="60" id="bnc-Ui-EBV"/>
+                            <constraint firstAttribute="height" constant="70" id="bnc-Ui-EBV"/>
                             <constraint firstItem="P7h-tj-klA" firstAttribute="leading" secondItem="EpY-Kl-fNa" secondAttribute="trailing" constant="8" symbolic="YES" id="ckf-Wb-pkP"/>
                             <constraint firstItem="EpY-Kl-fNa" firstAttribute="centerX" secondItem="9ok-Ga-Q8u" secondAttribute="centerX" constant="-26.5" id="fkS-G9-SzY"/>
                             <constraint firstItem="EpY-Kl-fNa" firstAttribute="centerY" secondItem="9ok-Ga-Q8u" secondAttribute="centerY" id="i1N-4g-yOy"/>
                         </constraints>
                     </customView>
                     <view translatesAutoresizingMaskIntoConstraints="NO" id="T98-k1-e6X">
-                        <rect key="frame" x="0.0" y="0.0" width="450" height="258"/>
+                        <rect key="frame" x="0.0" y="0.0" width="450" height="248"/>
                     </view>
                 </subviews>
                 <constraints>
@@ -73,6 +76,7 @@
                     <constraint firstItem="9ok-Ga-Q8u" firstAttribute="leading" secondItem="Wgr-xH-z0G" secondAttribute="leading" id="zPn-Ld-oZC"/>
                 </constraints>
             </view>
+            <contentBorderThickness minY="0.0" maxY="0.0"/>
             <connections>
                 <outlet property="delegate" destination="-2" id="cKX-Z2-yDq"/>
             </connections>

ui/Base.lproj/RingWizardChoose.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="RingWizardChooseVC">
             <connections>
+                <outlet property="buttonTopConstraint" destination="qRn-oO-10Y" id="3a1-dP-qLm"/>
                 <outlet property="createSIPAccount" destination="Ivs-g5-gQs" id="Xdt-qd-UCr"/>
                 <outlet property="view" destination="uHQ-s7-X3y" id="1wM-Vd-wef"/>
             </connections>
@@ -15,13 +16,14 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <userDefaultsController representsSharedInstance="YES" id="ck0-Ru-0YG"/>
         <view id="uHQ-s7-X3y">
-            <rect key="frame" x="0.0" y="0.0" width="525" height="129"/>
+            <rect key="frame" x="0.0" y="0.0" width="525" height="168"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="UXp-us-Mbl">
                     <rect key="frame" x="435" y="17" width="72" height="29"/>
                     <constraints>
                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="BJn-n9-or6"/>
+                        <constraint firstAttribute="height" constant="24" id="Fh7-qA-9D4"/>
                     </constraints>
                     <buttonCell key="cell" type="bevel" title="Cancel" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="YJ3-7G-cU1">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -37,7 +39,10 @@
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcF-lX-ex4">
-                    <rect key="frame" x="160" y="82" width="205" height="29"/>
+                    <rect key="frame" x="160" y="131" width="205" height="29"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="24" id="kX1-30-jfa"/>
+                    </constraints>
                     <buttonCell key="cell" type="bevel" title="Create a Ring account" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k1T-a7-yZD">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -47,7 +52,10 @@
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cpk-ql-oGP">
-                    <rect key="frame" x="160" y="50" width="205" height="29"/>
+                    <rect key="frame" x="160" y="99" width="205" height="29"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="24" id="OX0-Ne-mlD"/>
+                    </constraints>
                     <buttonCell key="cell" type="bevel" title="Link this device to an account" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Z9K-mD-ucr">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -57,7 +65,7 @@
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QmU-Ya-gnp">
-                    <rect key="frame" x="225" y="20" width="76" height="17"/>
+                    <rect key="frame" x="225" y="69" width="76" height="17"/>
                     <buttonCell key="cell" type="bevel" title="Advanced..." bezelStyle="regularSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="9cQ-dy-J3x">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -72,7 +80,7 @@
                     </connections>
                 </button>
                 <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ivs-g5-gQs">
-                    <rect key="frame" x="160" y="-15" width="205" height="29"/>
+                    <rect key="frame" x="160" y="34" width="205" height="29"/>
                     <buttonCell key="cell" type="bevel" title="Add a SIP Account" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="H7M-ZV-CGK">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -94,8 +102,9 @@
                 <constraint firstItem="pcF-lX-ex4" firstAttribute="centerX" secondItem="uHQ-s7-X3y" secondAttribute="centerX" id="iq8-Px-R61"/>
                 <constraint firstItem="QmU-Ya-gnp" firstAttribute="centerX" secondItem="uHQ-s7-X3y" secondAttribute="centerX" id="kyQ-sv-2I2"/>
                 <constraint firstItem="pcF-lX-ex4" firstAttribute="leading" secondItem="cpk-ql-oGP" secondAttribute="leading" id="n6m-l1-sty"/>
+                <constraint firstItem="UXp-us-Mbl" firstAttribute="top" secondItem="QmU-Ya-gnp" secondAttribute="bottom" constant="25" id="qRn-oO-10Y"/>
                 <constraint firstItem="Ivs-g5-gQs" firstAttribute="leading" secondItem="pcF-lX-ex4" secondAttribute="leading" id="rrB-3i-N0R"/>
-                <constraint firstItem="pcF-lX-ex4" firstAttribute="top" secondItem="uHQ-s7-X3y" secondAttribute="top" constant="20" id="v64-PJ-sTS"/>
+                <constraint firstItem="pcF-lX-ex4" firstAttribute="top" secondItem="uHQ-s7-X3y" secondAttribute="top" constant="10" id="v64-PJ-sTS"/>
             </constraints>
             <point key="canvasLocation" x="-14.5" y="61"/>
         </view>