clear code

Share/ShareViewController.h

@@ -21,12 +21,10 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <MBProgressHUD/MBProgressHUD.h>
-
 #import "CCCellShareExt.h"
 #import "NCSelectDestination.h"
 
-@interface ShareViewController : UIViewController <UITableViewDelegate, MBProgressHUDDelegate, NCSelectDestinationDelegate, UITextFieldDelegate>
+@interface ShareViewController : UIViewController <UITableViewDelegate, NCSelectDestinationDelegate, UITextFieldDelegate>
 
 @property (nonatomic, strong) NSString *account;
 @property (nonatomic, strong) NSString *urlBase;

iOSClient/Settings/Acknowledgements.rtf

@@ -32,15 +32,6 @@ SwiftyJSON -
 ____________________________________________\
 \
 
-\f1\b MBProgressHUD
-\f0\b0 \
-\
-MIT License\
-\
-Copyright (c) Matej Bukovinski\
-____________________________________________\
-\
-
 \f1\b NYMnemonic - BIP 39 style mnemonic codes\
 
 \f0\b0 ____________________________________________\

iOSClient/Utility/NCPopupViewController.swift

@@ -87,12 +87,14 @@ public class NCPopupViewController: UIViewController {
      */
     public init(contentController: UIViewController, popupWidth: CGFloat? = nil, popupHeight: CGFloat? = nil) {
         super.init(nibName: nil, bundle: nil)
+        
         self.contentController = contentController
         self.contentView = contentController.view
         self.popupWidth = popupWidth
         self.popupHeight = popupHeight
         
-        commonInit()
+        modalPresentationStyle = .overFullScreen
+        modalTransitionStyle = .crossDissolve
     }
     
     /**
@@ -104,18 +106,15 @@ public class NCPopupViewController: UIViewController {
      */
     public init(contentView: UIView, popupWidth: CGFloat? = nil, popupHeight: CGFloat? = nil) {
         super.init(nibName: nil, bundle: nil)
+        
         self.contentView = contentView
         self.popupWidth = popupWidth
         self.popupHeight = popupHeight
         
-        commonInit()
-    }
-    
-    private func commonInit() {
         modalPresentationStyle = .overFullScreen
         modalTransitionStyle = .crossDissolve
     }
-
+    
     override public func viewDidLoad() {
         super.viewDidLoad()
 
@@ -130,12 +129,14 @@ public class NCPopupViewController: UIViewController {
     // MARK: - Setup
 
     private func addDismissGesture() {
+        
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissTapGesture(gesture:)))
         tapGesture.delegate = self
         view.addGestureRecognizer(tapGesture)
     }
     
     private func setupUI() {
+        
         containerView.translatesAutoresizingMaskIntoConstraints = false
         contentView?.translatesAutoresizingMaskIntoConstraints = false
         
@@ -155,6 +156,7 @@ public class NCPopupViewController: UIViewController {
     }
     
     private func setupViews() {
+        
         if let contentController = contentController {
             addChild(contentController)
         }
@@ -165,6 +167,7 @@ public class NCPopupViewController: UIViewController {
     }
     
     private func addViews() {
+        
         view.addSubview(containerView)
         
         if let contentView = contentView {
@@ -181,6 +184,7 @@ public class NCPopupViewController: UIViewController {
     // MARK: - Add constraints
     
     private func addSizeConstraints() {
+        
         if let popupWidth = popupWidth {
             let widthConstraint = NSLayoutConstraint(item: containerView, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1, constant: popupWidth)
             NSLayoutConstraint.activate([widthConstraint])
@@ -193,6 +197,7 @@ public class NCPopupViewController: UIViewController {
     }
     
     private func addCenterPositionConstraints() {
+        
         let centerXConstraint = NSLayoutConstraint(item: containerView, attribute: .centerX, relatedBy: .equal, toItem: view, attribute: .centerX, multiplier: 1, constant: 0)
         centerYConstraint = NSLayoutConstraint(item: containerView, attribute: .centerY, relatedBy: .equal, toItem: view, attribute: .centerY, multiplier: 1, constant: 0)
         NSLayoutConstraint.activate([centerXConstraint, centerYConstraint!])