Merge branch 'release/0.3.12'

Adamant-im · Jun 21, 2018 · 17eea8e · 17eea8e
2 parents ac59bd9 + b4c7d32
commit 17eea8e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/Adamant/Stories/Account/AccountRoutes.swift b/Adamant/Stories/Account/AccountRoutes.swift
@@ -25,5 +25,7 @@ extension AdamantScene {
 			c.dialogService = r.resolve(DialogService.self)
 			return c
 		})
+
+		private init() {}
 	}
 }
diff --git a/Adamant/Stories/NodesEditor/NodesEditorRoutes.swift b/Adamant/Stories/NodesEditor/NodesEditorRoutes.swift
@@ -26,6 +26,8 @@ extension AdamantScene {
 			c.apiService = r.resolve(ApiService.self)
 			return c
 		})
+
+		private init() {}
 	}
 }
 
diff --git a/Adamant/Stories/NodesEditor/NodesListViewController.swift b/Adamant/Stories/NodesEditor/NodesListViewController.swift
@@ -80,14 +80,12 @@ class NodesListViewController: FormViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-		navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(editModeStart))
         navigationItem.title = String.adamantLocalized.nodesList.title
         navigationOptions = .Disabled
 
-        if self.navigationController?.viewControllers.count == 1 {
-            let cancelBtn = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(NodesListViewController.close))
-
-            self.navigationItem.setLeftBarButton(cancelBtn, animated: false)
+        if navigationController?.viewControllers.count == 1 {
+            let done = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(NodesListViewController.close))
+            navigationItem.rightBarButtonItem = done
         }
 
 
@@ -154,6 +152,8 @@ class NodesListViewController: FormViewController {
 		}
 	}
 
+	/*
+	Ячейки, удаляемые в режиме редактирования, никак не обрабатываются
 	@objc func editModeStart() {
 		navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(editModeStop))
 		tableView.setEditing(true, animated: true)
@@ -163,6 +163,7 @@ class NodesListViewController: FormViewController {
 		navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(editModeStart))
 		tableView.setEditing(false, animated: true)
 	}
+	*/
 }
 
 

diff --git a/Adamant/Stories/Shared/SharedRoutes.swift b/Adamant/Stories/Shared/SharedRoutes.swift
@@ -15,5 +15,7 @@ extension AdamantScene {
 			controller.dialogService = r.resolve(DialogService.self)
 			return controller
 		})
+
+		private init() {}
 	}
 }
diff --git a/Adamant/Stories/Transactions/TransactionsRoutes.swift b/Adamant/Stories/Transactions/TransactionsRoutes.swift
@@ -14,8 +14,8 @@ extension AdamantScene {
 			let c = TransactionsViewController(nibName: "TransactionsViewController", bundle: nil)
 			c.accountService = r.resolve(AccountService.self)
 			c.transfersProvider = r.resolve(TransfersProvider.self)
-      c.chatsProvider = r.resolve(ChatsProvider.self)
-      c.dialogService = r.resolve(DialogService.self)
+			c.chatsProvider = r.resolve(ChatsProvider.self)
+			c.dialogService = r.resolve(DialogService.self)
 			c.router = r.resolve(Router.self)
 			return c
 		})
@@ -28,5 +28,7 @@ extension AdamantScene {
             c.router = r.resolve(Router.self)
 			return c
 		})
+
+		private init() {}
 	}
 }