소스 검색

added close Button with functionality

Bastian van de Wetering 6 년 전
부모
커밋
aa956c5c56
23개의 변경된 파일160개의 추가작업 그리고 2개의 파일을 삭제
  1. 23 0
      Assets.xcassets/ic_close_18pt.imageset/Contents.json
  2. BIN
      Assets.xcassets/ic_close_18pt.imageset/ic_close_18pt.png
  3. BIN
      Assets.xcassets/ic_close_18pt.imageset/ic_close_18pt_2x.png
  4. BIN
      Assets.xcassets/ic_close_18pt.imageset/ic_close_18pt_3x.png
  5. 23 0
      Assets.xcassets/ic_close_36pt.imageset/Contents.json
  6. BIN
      Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt.png
  7. BIN
      Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt_2x.png
  8. BIN
      Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt_3x.png
  9. 5 2
      deltachat-ios/AccountSetupController.swift
  10. 23 0
      deltachat-ios/Assets.xcassets/ic_close_18pt-1.imageset/Contents.json
  11. BIN
      deltachat-ios/Assets.xcassets/ic_close_18pt-1.imageset/ic_close_18pt.png
  12. BIN
      deltachat-ios/Assets.xcassets/ic_close_18pt-1.imageset/ic_close_18pt_2x.png
  13. BIN
      deltachat-ios/Assets.xcassets/ic_close_18pt-1.imageset/ic_close_18pt_3x.png
  14. 20 0
      deltachat-ios/Assets.xcassets/ic_close_18pt.imageset/Contents.json
  15. 23 0
      deltachat-ios/Assets.xcassets/ic_close_18pt_2x.imageset/Contents.json
  16. BIN
      deltachat-ios/Assets.xcassets/ic_close_18pt_2x.imageset/ic_close_18pt.png
  17. BIN
      deltachat-ios/Assets.xcassets/ic_close_18pt_2x.imageset/ic_close_18pt_2x.png
  18. BIN
      deltachat-ios/Assets.xcassets/ic_close_18pt_2x.imageset/ic_close_18pt_3x.png
  19. 20 0
      deltachat-ios/Assets.xcassets/ic_close_18pt_3x.imageset/Contents.json
  20. 23 0
      deltachat-ios/Assets.xcassets/ic_close_36pt.imageset/Contents.json
  21. BIN
      deltachat-ios/Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt.png
  22. BIN
      deltachat-ios/Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt_2x.png
  23. BIN
      deltachat-ios/Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt_3x.png

+ 23 - 0
Assets.xcassets/ic_close_18pt.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+    "images": [
+        {
+            "filename": "ic_close_18pt.png",
+            "idiom": "universal",
+            "scale": "1x"
+        },
+        {
+            "filename": "ic_close_18pt_2x.png",
+            "idiom": "universal",
+            "scale": "2x"
+        },
+        {
+            "filename": "ic_close_18pt_3x.png",
+            "idiom": "universal",
+            "scale": "3x"
+        }
+    ],
+    "info": {
+        "author": "xcode",
+        "version": 1
+    }
+}

BIN
Assets.xcassets/ic_close_18pt.imageset/ic_close_18pt.png


BIN
Assets.xcassets/ic_close_18pt.imageset/ic_close_18pt_2x.png


BIN
Assets.xcassets/ic_close_18pt.imageset/ic_close_18pt_3x.png


+ 23 - 0
Assets.xcassets/ic_close_36pt.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+    "images": [
+        {
+            "filename": "ic_close_36pt.png",
+            "idiom": "universal",
+            "scale": "1x"
+        },
+        {
+            "filename": "ic_close_36pt_2x.png",
+            "idiom": "universal",
+            "scale": "2x"
+        },
+        {
+            "filename": "ic_close_36pt_3x.png",
+            "idiom": "universal",
+            "scale": "3x"
+        }
+    ],
+    "info": {
+        "author": "xcode",
+        "version": 1
+    }
+}

BIN
Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt.png


BIN
Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt_2x.png


BIN
Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt_3x.png


+ 5 - 2
deltachat-ios/AccountSetupController.swift

@@ -51,8 +51,6 @@ class AccountSetupController: UITableViewController {
 	private lazy var basicSectionCells:[UITableViewCell] = [emailCell, passwordCell]
 	private lazy var advancedSectionCells:[UITableViewCell] = [imapServerCell,imapUserCell,imapPortCell,imapSecurityCell,smtpServerCell,smtpUserCell,smtpPortCell,smtpPasswordCell,smtpSecurityCell]
 
-
-
     private var advancedSectionShowing: Bool = false
 
     init() {
@@ -66,6 +64,7 @@ class AccountSetupController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.title = "Login to your server"
+		self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Close", style: .plain, target: self, action: #selector(closeButtonPressed))
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Login", style: .done, target: self, action: #selector(loginButtonPressed))
     }
 
@@ -205,6 +204,10 @@ class AccountSetupController: UITableViewController {
         hudHandler.showBackupHud("Configuring account")
     }
 
+	@objc func closeButtonPressed() {
+		dismiss(animated: false, completion: nil)
+	}
+
     // returns true if needed
     private func showOAuthAlertIfNeeded(emailAddress: String) -> Bool {
         if oAuthDenied {

+ 23 - 0
deltachat-ios/Assets.xcassets/ic_close_18pt-1.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_18pt.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_18pt_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_18pt_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
deltachat-ios/Assets.xcassets/ic_close_18pt-1.imageset/ic_close_18pt.png


BIN
deltachat-ios/Assets.xcassets/ic_close_18pt-1.imageset/ic_close_18pt_2x.png


BIN
deltachat-ios/Assets.xcassets/ic_close_18pt-1.imageset/ic_close_18pt_3x.png


+ 20 - 0
deltachat-ios/Assets.xcassets/ic_close_18pt.imageset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

+ 23 - 0
deltachat-ios/Assets.xcassets/ic_close_18pt_2x.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_18pt.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_18pt_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_18pt_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
deltachat-ios/Assets.xcassets/ic_close_18pt_2x.imageset/ic_close_18pt.png


BIN
deltachat-ios/Assets.xcassets/ic_close_18pt_2x.imageset/ic_close_18pt_2x.png


BIN
deltachat-ios/Assets.xcassets/ic_close_18pt_2x.imageset/ic_close_18pt_3x.png


+ 20 - 0
deltachat-ios/Assets.xcassets/ic_close_18pt_3x.imageset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

+ 23 - 0
deltachat-ios/Assets.xcassets/ic_close_36pt.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_36pt.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_36pt_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_close_36pt_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
deltachat-ios/Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt.png


BIN
deltachat-ios/Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt_2x.png


BIN
deltachat-ios/Assets.xcassets/ic_close_36pt.imageset/ic_close_36pt_3x.png