Reverted changes to unlock presenting and fixed settings display.
[FIXED] IASK display by not initializing the VC with the right nib.
This commit is contained in:
parent
4d5f609d72
commit
afafa473a7
2
External/Pearl
vendored
2
External/Pearl
vendored
@ -1 +1 @@
|
|||||||
Subproject commit ad9ed24071be86d9e1b2c577beba36a08e602637
|
Subproject commit e93f7c406b157df3a4538becd2bff8b9ee7b0be8
|
@ -18,5 +18,6 @@
|
|||||||
@property (weak, nonatomic) IBOutlet UITableViewCell *changeMPCell;
|
@property (weak, nonatomic) IBOutlet UITableViewCell *changeMPCell;
|
||||||
|
|
||||||
- (IBAction)didToggleSwitch:(UISwitch *)sender;
|
- (IBAction)didToggleSwitch:(UISwitch *)sender;
|
||||||
|
- (IBAction)settings:(id)sender;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -123,4 +123,9 @@
|
|||||||
[[MPAppDelegate get] forgetSavedKeyFor:[MPAppDelegate get].activeUser];
|
[[MPAppDelegate get] forgetSavedKeyFor:[MPAppDelegate get].activeUser];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (IBAction)settings:(UIBarButtonItem *)sender {
|
||||||
|
|
||||||
|
[self.navigationController pushViewController:[IASKAppSettingsViewController new] animated:YES];
|
||||||
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -192,8 +192,10 @@
|
|||||||
[self didToggleUserSelection];
|
[self didToggleUserSelection];
|
||||||
else
|
else
|
||||||
[self didSelectNewUserAvatar:avatar];
|
[self didSelectNewUserAvatar:avatar];
|
||||||
} else
|
} else {
|
||||||
|
self.selectedUser = nil;
|
||||||
[self didToggleUserSelection];
|
[self didToggleUserSelection];
|
||||||
|
}
|
||||||
} options:0];
|
} options:0];
|
||||||
|
|
||||||
[self.avatarToUser setObject:NilToNSNull(user) forKey:[NSValue valueWithNonretainedObject:avatar]];
|
[self.avatarToUser setObject:NilToNSNull(user) forKey:[NSValue valueWithNonretainedObject:avatar]];
|
||||||
@ -210,7 +212,7 @@
|
|||||||
[self.passwordField resignFirstResponder];
|
[self.passwordField resignFirstResponder];
|
||||||
else
|
else
|
||||||
if ([[MPAppDelegate get] signInAsUser:self.selectedUser usingMasterPassword:nil]) {
|
if ([[MPAppDelegate get] signInAsUser:self.selectedUser usingMasterPassword:nil]) {
|
||||||
[self performSegueWithIdentifier:@"MP_Unlock_Dismiss" sender:self];
|
[self dismissViewControllerAnimated:YES completion:nil];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -352,7 +354,7 @@
|
|||||||
dispatch_async(dispatch_get_main_queue(), ^{
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
if (unlocked) {
|
if (unlocked) {
|
||||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (long)(NSEC_PER_SEC * 0.5f)), dispatch_get_main_queue(), ^{
|
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (long)(NSEC_PER_SEC * 0.5f)), dispatch_get_main_queue(), ^{
|
||||||
[self performSegueWithIdentifier:@"MP_Unlock_Dismiss" sender:self];
|
[self dismissViewControllerAnimated:YES completion:nil];
|
||||||
});
|
});
|
||||||
} else
|
} else
|
||||||
if (self.passwordField.text.length)
|
if (self.passwordField.text.length)
|
||||||
|
@ -925,21 +925,12 @@ L4m3P4sSw0rD</string>
|
|||||||
<connections>
|
<connections>
|
||||||
<segue destination="PQa-Xl-A3x" kind="relationship" relationship="rootViewController" id="LUg-eF-JQd"/>
|
<segue destination="PQa-Xl-A3x" kind="relationship" relationship="rootViewController" id="LUg-eF-JQd"/>
|
||||||
<segue destination="qz3-eG-aEi" kind="modal" identifier="MP_Guide" id="vyG-wN-8hU"/>
|
<segue destination="qz3-eG-aEi" kind="modal" identifier="MP_Guide" id="vyG-wN-8hU"/>
|
||||||
|
<segue destination="Nbn-Rv-sP1" kind="modal" identifier="MP_Unlock" id="Dnr-C0-ZtN"/>
|
||||||
</connections>
|
</connections>
|
||||||
</navigationController>
|
</navigationController>
|
||||||
</objects>
|
</objects>
|
||||||
<point key="canvasLocation" x="-85" y="182"/>
|
<point key="canvasLocation" x="-85" y="182"/>
|
||||||
</scene>
|
</scene>
|
||||||
<!--App Settings View Controller-->
|
|
||||||
<scene sceneID="4E1-FA-zP1">
|
|
||||||
<objects>
|
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="Xkt-gh-nAq" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
|
||||||
<viewController id="Ypi-Ct-X6S" customClass="IASKAppSettingsViewController" sceneMemberID="viewController">
|
|
||||||
<navigationItem key="navigationItem" id="u18-ao-KIy"/>
|
|
||||||
</viewController>
|
|
||||||
</objects>
|
|
||||||
<point key="canvasLocation" x="1537" y="785"/>
|
|
||||||
</scene>
|
|
||||||
<!--Preferences View Controller - User Profile-->
|
<!--Preferences View Controller - User Profile-->
|
||||||
<scene sceneID="cMu-Lq-D10">
|
<scene sceneID="cMu-Lq-D10">
|
||||||
<objects>
|
<objects>
|
||||||
@ -1197,7 +1188,7 @@ L4m3P4sSw0rD</string>
|
|||||||
<navigationItem key="navigationItem" title="User Profile" id="reg-hh-9Ra">
|
<navigationItem key="navigationItem" title="User Profile" id="reg-hh-9Ra">
|
||||||
<barButtonItem key="rightBarButtonItem" title="Settings" id="Bac-IA-e0Z">
|
<barButtonItem key="rightBarButtonItem" title="Settings" id="Bac-IA-e0Z">
|
||||||
<connections>
|
<connections>
|
||||||
<segue destination="Ypi-Ct-X6S" kind="push" id="vLK-dS-gos"/>
|
<action selector="settings:" destination="oLN-6u-GLb" id="OqP-a1-tpq"/>
|
||||||
</connections>
|
</connections>
|
||||||
</barButtonItem>
|
</barButtonItem>
|
||||||
</navigationItem>
|
</navigationItem>
|
||||||
@ -1244,13 +1235,6 @@ L4m3P4sSw0rD</string>
|
|||||||
<image name="ui_textfield.png" width="158" height="34"/>
|
<image name="ui_textfield.png" width="158" height="34"/>
|
||||||
</resources>
|
</resources>
|
||||||
<classes>
|
<classes>
|
||||||
<class className="IASKAppSettingsViewController" superclassName="UITableViewController">
|
|
||||||
<source key="sourceIdentifier" type="project" relativePath="./Classes/IASKAppSettingsViewController.h"/>
|
|
||||||
<relationships>
|
|
||||||
<relationship kind="action" name="dismiss:"/>
|
|
||||||
<relationship kind="outlet" name="delegate"/>
|
|
||||||
</relationships>
|
|
||||||
</class>
|
|
||||||
<class className="MPGuideViewController" superclassName="UIViewController">
|
<class className="MPGuideViewController" superclassName="UIViewController">
|
||||||
<source key="sourceIdentifier" type="project" relativePath="./Classes/MPGuideViewController.h"/>
|
<source key="sourceIdentifier" type="project" relativePath="./Classes/MPGuideViewController.h"/>
|
||||||
<relationships>
|
<relationships>
|
||||||
@ -1292,6 +1276,7 @@ L4m3P4sSw0rD</string>
|
|||||||
<source key="sourceIdentifier" type="project" relativePath="./Classes/MPPreferencesViewController.h"/>
|
<source key="sourceIdentifier" type="project" relativePath="./Classes/MPPreferencesViewController.h"/>
|
||||||
<relationships>
|
<relationships>
|
||||||
<relationship kind="action" name="didToggleSwitch:" candidateClass="UISwitch"/>
|
<relationship kind="action" name="didToggleSwitch:" candidateClass="UISwitch"/>
|
||||||
|
<relationship kind="action" name="settings:"/>
|
||||||
<relationship kind="outlet" name="avatarTemplate" candidateClass="UIButton"/>
|
<relationship kind="outlet" name="avatarTemplate" candidateClass="UIButton"/>
|
||||||
<relationship kind="outlet" name="avatarsView" candidateClass="UIScrollView"/>
|
<relationship kind="outlet" name="avatarsView" candidateClass="UIScrollView"/>
|
||||||
<relationship kind="outlet" name="changeMPCell" candidateClass="UITableViewCell"/>
|
<relationship kind="outlet" name="changeMPCell" candidateClass="UITableViewCell"/>
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 136 KiB |
Loading…
Reference in New Issue
Block a user