Преглед изворни кода

add NewChatViewController / change button icon to compose icon

Jonas Reinsch пре 7 година
родитељ
комит
73d4ec3756

+ 4 - 4
deltachat-ios/ChatListController.swift

@@ -75,14 +75,14 @@ class ChatListController: UIViewController {
         chatTableDelegate.chatPresenter = self
         chatTable.delegate = chatTableDelegate
         
-        let addButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(ChatListController.addChat))
+        let addButton = UIBarButtonItem(barButtonSystemItem: .compose, target: self, action: #selector(ChatListController.addChat))
         navigationItem.rightBarButtonItem = addButton
     }
     
     @objc func addChat() {
-        let ncc = NewContactController()
-        let nav = UINavigationController(rootViewController: ncc)
-        present(nav, animated: true, completion: nil)
+//        let ncv = NewChatViewController
+//        let nav = UINavigationController(rootViewController: ncv)
+//        present(nav, animated: true, completion: nil)
     }
     
     override func didReceiveMemoryWarning() {

+ 9 - 0
deltachat-ios/ContactViewController.swift

@@ -47,6 +47,15 @@ class ContactViewController: UIViewController {
         contactTable.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
         contactTable.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
         contactTable.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
+        
+        let addButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(ContactViewController.addContact))
+        navigationItem.rightBarButtonItem = addButton
+    }
+    
+    @objc func addContact() {
+        let ncc = NewContactController()
+        let nav = UINavigationController(rootViewController: ncc)
+        present(nav, animated: true, completion: nil)
     }
     
     override func didReceiveMemoryWarning() {

+ 102 - 0
deltachat-ios/NewChatViewController.swift

@@ -0,0 +1,102 @@
+//
+//  NewChatViewController.swift
+//  MessageKit
+//
+//  Created by Jonas Reinsch on 20.11.17.
+//
+
+import UIKit
+
+class NewChatViewController: UITableViewController {
+    
+    init() {
+        super.init(style: .plain)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Uncomment the following line to preserve selection between presentations
+        // self.clearsSelectionOnViewWillAppear = false
+
+        // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+        // self.navigationItem.rightBarButtonItem = self.editButtonItem
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+
+    // MARK: - Table view data source
+
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        // #warning Incomplete implementation, return the number of sections
+        return 0
+    }
+
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        // #warning Incomplete implementation, return the number of rows
+        return 0
+    }
+
+    /*
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifier", for: indexPath)
+
+        // Configure the cell...
+
+        return cell
+    }
+    */
+
+    /*
+    // Override to support conditional editing of the table view.
+    override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
+        // Return false if you do not want the specified item to be editable.
+        return true
+    }
+    */
+
+    /*
+    // Override to support editing the table view.
+    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
+        if editingStyle == .delete {
+            // Delete the row from the data source
+            tableView.deleteRows(at: [indexPath], with: .fade)
+        } else if editingStyle == .insert {
+            // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+        }    
+    }
+    */
+
+    /*
+    // Override to support rearranging the table view.
+    override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) {
+
+    }
+    */
+
+    /*
+    // Override to support conditional rearranging of the table view.
+    override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
+        // Return false if you do not want the item to be re-orderable.
+        return true
+    }
+    */
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destinationViewController.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}