mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Fix inconsistent modal usage
This commit is contained in:
parent
cb026c028b
commit
80eca1d1d3
|
@ -576,6 +576,7 @@
|
||||||
B891105E2320872800F15FCC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B891105B2320872800F15FCC /* GoogleService-Info.plist */; };
|
B891105E2320872800F15FCC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B891105B2320872800F15FCC /* GoogleService-Info.plist */; };
|
||||||
B891105F2320872800F15FCC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B891105B2320872800F15FCC /* GoogleService-Info.plist */; };
|
B891105F2320872800F15FCC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B891105B2320872800F15FCC /* GoogleService-Info.plist */; };
|
||||||
B894D0712339D6F300B4D94D /* DeviceLinkingModalDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */; };
|
B894D0712339D6F300B4D94D /* DeviceLinkingModalDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */; };
|
||||||
|
B894D0752339EDCF00B4D94D /* NukeDataModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B894D0742339EDCF00B4D94D /* NukeDataModal.swift */; };
|
||||||
B89841E322B7579F00B1BDC6 /* NewConversationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B89841E222B7579F00B1BDC6 /* NewConversationVC.swift */; };
|
B89841E322B7579F00B1BDC6 /* NewConversationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B89841E222B7579F00B1BDC6 /* NewConversationVC.swift */; };
|
||||||
B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; };
|
B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; };
|
||||||
B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB5ABC1884C002007CBB57 /* MessageUI.framework */; };
|
B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB5ABC1884C002007CBB57 /* MessageUI.framework */; };
|
||||||
|
@ -1382,6 +1383,7 @@
|
||||||
B885D5F52334A32100EE0D8E /* UIView+Constraint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Constraint.swift"; sourceTree = "<group>"; };
|
B885D5F52334A32100EE0D8E /* UIView+Constraint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Constraint.swift"; sourceTree = "<group>"; };
|
||||||
B891105B2320872800F15FCC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
|
B891105B2320872800F15FCC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
|
||||||
B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceLinkingModalDelegate.swift; sourceTree = "<group>"; };
|
B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceLinkingModalDelegate.swift; sourceTree = "<group>"; };
|
||||||
|
B894D0742339EDCF00B4D94D /* NukeDataModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NukeDataModal.swift; sourceTree = "<group>"; };
|
||||||
B89841E222B7579F00B1BDC6 /* NewConversationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewConversationVC.swift; sourceTree = "<group>"; };
|
B89841E222B7579F00B1BDC6 /* NewConversationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewConversationVC.swift; sourceTree = "<group>"; };
|
||||||
B90418E4183E9DD40038554A /* DateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateUtil.h; sourceTree = "<group>"; };
|
B90418E4183E9DD40038554A /* DateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateUtil.h; sourceTree = "<group>"; };
|
||||||
B90418E5183E9DD40038554A /* DateUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateUtil.m; sourceTree = "<group>"; };
|
B90418E5183E9DD40038554A /* DateUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateUtil.m; sourceTree = "<group>"; };
|
||||||
|
@ -2671,6 +2673,7 @@
|
||||||
B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */,
|
B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */,
|
||||||
B86BD08023399883000F5AE3 /* QRCodeModal.swift */,
|
B86BD08023399883000F5AE3 /* QRCodeModal.swift */,
|
||||||
B86BD08523399CEF000F5AE3 /* SeedModal.swift */,
|
B86BD08523399CEF000F5AE3 /* SeedModal.swift */,
|
||||||
|
B894D0742339EDCF00B4D94D /* NukeDataModal.swift */,
|
||||||
);
|
);
|
||||||
path = Settings;
|
path = Settings;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
@ -3909,6 +3912,7 @@
|
||||||
3496957321A301A100DCFE74 /* OWSBackupJob.m in Sources */,
|
3496957321A301A100DCFE74 /* OWSBackupJob.m in Sources */,
|
||||||
340FC8B3204DAC8D007AEB0F /* AppSettingsViewController.m in Sources */,
|
340FC8B3204DAC8D007AEB0F /* AppSettingsViewController.m in Sources */,
|
||||||
34C4E2572118957600BEA353 /* OWSWebRTCDataProtos.pb.swift in Sources */,
|
34C4E2572118957600BEA353 /* OWSWebRTCDataProtos.pb.swift in Sources */,
|
||||||
|
B894D0752339EDCF00B4D94D /* NukeDataModal.swift in Sources */,
|
||||||
346B66311F4E29B200E5122F /* CropScaleImageViewController.swift in Sources */,
|
346B66311F4E29B200E5122F /* CropScaleImageViewController.swift in Sources */,
|
||||||
45E5A6991F61E6DE001E4A8A /* MarqueeLabel.swift in Sources */,
|
45E5A6991F61E6DE001E4A8A /* MarqueeLabel.swift in Sources */,
|
||||||
34D1F0B01F867BFC0066283D /* OWSSystemMessageCell.m in Sources */,
|
34D1F0B01F867BFC0066283D /* OWSSystemMessageCell.m in Sources */,
|
||||||
|
|
57
Signal/src/Loki/Settings/NukeDataModal.swift
Normal file
57
Signal/src/Loki/Settings/NukeDataModal.swift
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
import NVActivityIndicatorView
|
||||||
|
|
||||||
|
@objc(LKNukeDataModal)
|
||||||
|
final class NukeDataModal : Modal {
|
||||||
|
|
||||||
|
// MARK: Lifecycle
|
||||||
|
override func populateContentView() {
|
||||||
|
// Label
|
||||||
|
let titleLabel = UILabel()
|
||||||
|
titleLabel.textColor = Theme.primaryColor
|
||||||
|
titleLabel.font = UIFont.ows_dynamicTypeHeadlineClamped
|
||||||
|
titleLabel.text = NSLocalizedString("Clear All Data", comment: "")
|
||||||
|
titleLabel.numberOfLines = 0
|
||||||
|
titleLabel.lineBreakMode = .byWordWrapping
|
||||||
|
titleLabel.textAlignment = .center
|
||||||
|
// Explanation label
|
||||||
|
let explanationLabel = UILabel()
|
||||||
|
explanationLabel.font = UIFont.ows_dynamicTypeCaption1Clamped
|
||||||
|
explanationLabel.text = NSLocalizedString("Are you sure you want to clear all your data? This will delete your entire account, including all conversations and your personal key pair.", comment: "")
|
||||||
|
explanationLabel.numberOfLines = 0
|
||||||
|
explanationLabel.textAlignment = .center
|
||||||
|
explanationLabel.lineBreakMode = .byWordWrapping
|
||||||
|
explanationLabel.textColor = UIColor.ows_white
|
||||||
|
// Button stack view
|
||||||
|
let nukeButton = OWSFlatButton.button(title: NSLocalizedString("OK", comment: ""), font: .ows_dynamicTypeBodyClamped, titleColor: .white, backgroundColor: .clear, target: self, selector: #selector(nuke))
|
||||||
|
nukeButton.setBackgroundColors(upColor: .clear, downColor: .clear)
|
||||||
|
let buttonStackView = UIStackView(arrangedSubviews: [ nukeButton, cancelButton ])
|
||||||
|
buttonStackView.axis = .horizontal
|
||||||
|
buttonStackView.distribution = .fillEqually
|
||||||
|
let buttonHeight = cancelButton.button.titleLabel!.font.pointSize * 48 / 17
|
||||||
|
nukeButton.set(.height, to: buttonHeight)
|
||||||
|
cancelButton.set(.height, to: buttonHeight)
|
||||||
|
// Stack view
|
||||||
|
let stackView = UIStackView(arrangedSubviews: [ UIView.spacer(withHeight: 2), titleLabel, explanationLabel, buttonStackView ])
|
||||||
|
stackView.axis = .vertical
|
||||||
|
stackView.spacing = 16
|
||||||
|
contentView.addSubview(stackView)
|
||||||
|
stackView.pin(.leading, to: .leading, of: contentView, withInset: 16)
|
||||||
|
stackView.pin(.top, to: .top, of: contentView, withInset: 16)
|
||||||
|
contentView.pin(.trailing, to: .trailing, of: stackView, withInset: 16)
|
||||||
|
contentView.pin(.bottom, to: .bottom, of: stackView, withInset: 16)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Interaction
|
||||||
|
@objc private func nuke() {
|
||||||
|
ThreadUtil.deleteAllContent()
|
||||||
|
SSKEnvironment.shared.identityManager.clearIdentityKey()
|
||||||
|
LokiAPI.clearRandomSnodePool()
|
||||||
|
let appDelegate = UIApplication.shared.delegate as! AppDelegate
|
||||||
|
appDelegate.stopLongPollerIfNeeded()
|
||||||
|
SSKEnvironment.shared.tsAccountManager.resetForReregistration()
|
||||||
|
let rootViewController = OnboardingController().initialViewController()
|
||||||
|
let navigationController = OWSNavigationController(rootViewController: rootViewController)
|
||||||
|
navigationController.isNavigationBarHidden = true
|
||||||
|
UIApplication.shared.keyWindow!.rootViewController = navigationController
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,6 +6,7 @@
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
|
|
||||||
// Separate iOS Frameworks from other imports.
|
// Separate iOS Frameworks from other imports.
|
||||||
|
#import "AppDelegate.h"
|
||||||
#import "AVAudioSession+OWS.h"
|
#import "AVAudioSession+OWS.h"
|
||||||
#import "AppSettingsViewController.h"
|
#import "AppSettingsViewController.h"
|
||||||
#import "AttachmentUploadView.h"
|
#import "AttachmentUploadView.h"
|
||||||
|
|
|
@ -529,23 +529,9 @@
|
||||||
|
|
||||||
- (void)clearAllData
|
- (void)clearAllData
|
||||||
{
|
{
|
||||||
NSString *title = NSLocalizedString(@"Clear All Data", @"");
|
LKNukeDataModal *nukeDataModal = [LKNukeDataModal new];
|
||||||
NSString *message = NSLocalizedString(@"Are you sure you want to clear all your data? This will delete your entire account, including all conversations and your personal key pair.", @"");
|
nukeDataModal.modalPresentationStyle = UIModalPresentationOverFullScreen;
|
||||||
UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
|
[self presentViewController:nukeDataModal animated:YES completion:nil];
|
||||||
[alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
|
|
||||||
[ThreadUtil deleteAllContent];
|
|
||||||
[SSKEnvironment.shared.identityManager clearIdentityKey];
|
|
||||||
[LKAPI clearRandomSnodePool];
|
|
||||||
AppDelegate *appDelegate = (AppDelegate *)UIApplication.sharedApplication.delegate;
|
|
||||||
[appDelegate stopLongPollerIfNeeded];
|
|
||||||
[SSKEnvironment.shared.tsAccountManager resetForReregistration];
|
|
||||||
UIViewController *rootViewController = [[OnboardingController new] initialViewController];
|
|
||||||
OWSNavigationController *navigationController = [[OWSNavigationController alloc] initWithRootViewController:rootViewController];
|
|
||||||
navigationController.navigationBarHidden = YES;
|
|
||||||
UIApplication.sharedApplication.keyWindow.rootViewController = navigationController;
|
|
||||||
}]];
|
|
||||||
[alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", @"") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { /* Do nothing */ }]];
|
|
||||||
[self presentAlert:alert];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)reregisterUser
|
- (void)reregisterUser
|
||||||
|
|
Loading…
Reference in a new issue