pull/68/head
Niels Andriesse 5 years ago
parent 8cd53106b8
commit 16ab9de5be

@ -195,7 +195,7 @@ final class DeviceLinkingModal : Modal, DeviceLinkingSessionDelegate {
}
}
@objc override func cancel() {
@objc override func close() {
guard let session = DeviceLinkingSession.current else {
return print("[Loki] Device linking session missing.") // Should never occur
}

@ -35,7 +35,10 @@ internal class Modal : UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = UIColor(hex: 0x000000).withAlphaComponent(Values.modalBackgroundOpacity)
cancelButton.addTarget(self, action: #selector(cancel), for: UIControl.Event.touchUpInside)
cancelButton.addTarget(self, action: #selector(close), for: UIControl.Event.touchUpInside)
let swipeGestureRecognizer = UISwipeGestureRecognizer(target: self, action: #selector(close))
swipeGestureRecognizer.direction = .down
view.addGestureRecognizer(swipeGestureRecognizer)
setUpViewHierarchy()
}
@ -69,11 +72,11 @@ internal class Modal : UIViewController {
if contentView.frame.contains(location) {
super.touchesBegan(touches, with: event)
} else {
cancel()
close()
}
}
@objc func cancel() {
@objc func close() {
dismiss(animated: true, completion: nil)
}
}

@ -541,9 +541,9 @@
- (void)showQRCode
{
LKQRCodeModal *qrCodeModal = [LKQRCodeModal new];
qrCodeModal.modalPresentationStyle = UIModalPresentationOverFullScreen;
[self presentViewController:qrCodeModal animated:YES completion:nil];
// LKQRCodeModal *qrCodeModal = [LKQRCodeModal new];
// qrCodeModal.modalPresentationStyle = UIModalPresentationOverFullScreen;
// [self presentViewController:qrCodeModal animated:YES completion:nil];
}
- (void)showSeed

Loading…
Cancel
Save