Merge branch 'release/0.2.7'

Author: RealBonus

Adamant/AppDelegate.swift

@@ -14,6 +14,7 @@ import SwinjectStoryboard
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
 	var window: UIWindow?
+	var repeater: RepeaterService!
 
 	// MARK: - Lifecycle
 
@@ -60,7 +61,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 		// MARK: 4 Autoupdate
 		let chatsProvider = container.resolve(ChatsProvider.self)!
-		let repeater = RepeaterService()
+		repeater = RepeaterService()
 		repeater.registerForegroundCall(label: "chatsProvider", interval: 3, queue: DispatchQueue.global(qos: .utility), callback: chatsProvider.update)
 
 
@@ -77,4 +78,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 		return true
 	}
+	
+	func applicationWillResignActive(_ application: UIApplication) {
+		repeater.pauseAll()
+	}
+	
+	func applicationDidEnterBackground(_ application: UIApplication) {
+		repeater.pauseAll()
+	}
+	
+	func applicationDidBecomeActive(_ application: UIApplication) {
+		repeater.resumeAll()
+	}
 }

Adamant/Assets/Assets.xcassets/Arrow.imageset/Arrow.png

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

Adamant/Assets/Assets.xcassets/Arrow.imageset/Arrow@2x.png

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

Adamant/Assets/Assets.xcassets/Arrow.imageset/Arrow@3x.png

@@ -54,6 +54,9 @@
 /* Shared alert Done message. Used anywhere */
 "Done" = "Готово";
 
+/* Wallet page: Inform user that sending tokens not allowed by Apple until the end of ICO */
+"Due to Apple restrictions, sending tokens is not allowed until the end of the ICO. For now, you can send tokens using WebApp at msg.adamant.im" = "Ввиду ограничений Apple, отправка токенов отключена до конца ICO. В данный момент вы можете отправлять токены с помощью WebApp по адресу msg.adamant.im";
+
 /* Login: notify user that he is trying to login without a passphrase */
 "Enter a passphrase!" = "Введите пароль";
 
@@ -64,7 +67,7 @@
 "Error" = "Ошибка";
 
 /* Chat: input bar: Estimated fee */
-"Estimated fee: %@" = "Ориентировочная комиссия: %@";
+"Estimated fee: %@" = "Примерная комиссия: %@";
 
 /* Transaction details: fee row. */
 "Fee" = "Комиссия";
@@ -84,6 +87,9 @@
 /* Login: generate new passphrase button */
 "Generate new passphrase" = "Создать новый";
 
+/* Wallet page: 'Transfer not allowed' alert 'go to WebApp button' */
+"Go to msg.adamant.im" = "Открыть msg.adamant.im";
+
 /* Transaction details: Id row. */
 "Id" = "Номер";
 
@@ -177,6 +183,9 @@
 /* Shared alert 'Settings' button. Used to go to system Settings app, on application settings page. Should be same as Settings application title. */
 "Settings" = "Настройки";
 
+/* Wallet page: 'Transfer not allowed' alert title */
+"Sorry!" = "Ой!";
+
 /* Shared alert 'Share' button. Used anywhere for presenting standart iOS 'Share' menu. */
 "Share" = "Поделиться";
 

Adamant/Assets/Assets.xcassets/Arrow.imageset/Contents.json

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.6</string>
+	<string>0.2.7</string>
 	<key>CFBundleVersion</key>
-	<string>13</string>
+	<string>14</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

Adamant/Assets/Assets.xcassets/Arrow_innactive.imageset/Arrow_innactive.png

@@ -68,7 +68,13 @@ class RepeaterService {
 	func pauseAll() {
 		pauseSemaphore.wait()
 
-		if isPaused { return }
+		defer {
+			pauseSemaphore.signal()
+		}
+		
+		if isPaused {
+			return
+		}
 
 		DispatchQueue.main.async {
 			for (_, client) in self.foregroundTimers {
@@ -78,14 +84,18 @@ class RepeaterService {
 		}
 
 		isPaused = true
-		
-		pauseSemaphore.signal()
 	}
 
-	func resume() {
+	func resumeAll() {
 		pauseSemaphore.wait()
 
-		if !isPaused { return }
+		defer {
+			pauseSemaphore.signal()
+		}
+		
+		if !isPaused {
+			return
+		}
 
 		DispatchQueue.main.async {
 			for (_, client) in self.foregroundTimers {
@@ -96,8 +106,6 @@ class RepeaterService {
 		}
 
 		isPaused = false
-		
-		pauseSemaphore.signal()
 	}
 
 	@objc private func timerFired(timer: Timer) {

Adamant/Assets/Assets.xcassets/Arrow_innactive.imageset/Arrow_innactive@2x.png

@@ -18,6 +18,10 @@ extension String.adamantLocalized {
 		static let rowInvest = NSLocalizedString("Invest in ICO", comment: "Wallet page: 'Invest in ICO' button")
 		static let rowLogout = NSLocalizedString("Logout", comment: "Wallet page: 'Logout' button")
 
+		static let sorryAlert = NSLocalizedString("Sorry!", comment: "Wallet page: 'Transfer not allowed' alert title")
+		static let webApp = NSLocalizedString("Go to msg.adamant.im", comment: "Wallet page: 'Transfer not allowed' alert 'go to WebApp button'")
+		static let transferNotAllowed = NSLocalizedString("Due to Apple restrictions, sending tokens is not allowed until the end of the ICO. For now, you can send tokens using WebApp at msg.adamant.im", comment: "Wallet page: Inform user that sending tokens not allowed by Apple until the end of ICO")
+		
 		static let sectionAccount = NSLocalizedString("Account", comment: "Wallet page: Account section title.")
 		static let sectionWallet = NSLocalizedString("Wallet", comment: "Wallet page: Wallet section title")
 		static let sectionActions = NSLocalizedString("Actions", comment: "Wallet page: Actions section title")
@@ -39,16 +43,18 @@ class AccountViewController: UIViewController {
 	private let showTransactionsSegue = "showTransactions"
 	private let showTransferSegue = "showTransfer"
 
+	private let webAppUrl = URL.init(string: "https://msg.adamant.im")
+	
 	private enum Sections: Int {
 		case account = 0, wallet, actions
 
 		static let total = 3
 	}
 
 	private enum WalletRows: Int {
-		case balance, /*sendTokens, */ invest
+		case balance, sendTokens, invest
 
-		static let total = 2
+		static let total = 3
 	}
 
 
@@ -177,8 +183,25 @@ extension AccountViewController: UITableViewDataSource, UITableViewDelegate {
 			case .balance:
 				performSegue(withIdentifier: showTransactionsSegue, sender: nil)
 
-//			case .sendTokens:
+			case .sendTokens:
 //				performSegue(withIdentifier: showTransferSegue, sender: nil)
+				// <Sending funds not allowed>
+				let alert = UIAlertController(title: String.adamantLocalized.account.sorryAlert, message: String.adamantLocalized.account.transferNotAllowed, preferredStyle: .alert)
+				
+				alert.addAction(UIAlertAction(title: String.adamantLocalized.alert.cancel, style: .cancel, handler: nil))
+				
+				if let url = self.webAppUrl {
+					alert.addAction(UIAlertAction(title: String.adamantLocalized.account.webApp, style: .default, handler: { [weak self] _ in
+						let safari  = SFSafariViewController(url: url)
+						safari.preferredControlTintColor = UIColor.adamantPrimary
+						self?.present(safari, animated: true, completion: nil)
+					}))
+				}
+				
+				present(alert, animated: true, completion: { [weak self] in
+					self?.tableView.deselectRow(at: indexPath, animated: true)
+				})
+				// </Sending funds not allowed>
 
 			case .invest:
 				guard let address = accountService.account?.address,
@@ -253,10 +276,10 @@ extension AccountViewController {
 				cell.detailTextLabel?.text = AdamantUtilities.format(balance: account.balance)
 				cell.imageView?.image = nil
 
-//			case .sendTokens:
-//				cell.textLabel?.text = String.adamantLocalized.account.rowSendTokens
-//				cell.detailTextLabel?.text = nil
-//				cell.imageView?.image = nil
+			case .sendTokens:
+				cell.textLabel?.text = String.adamantLocalized.account.rowSendTokens
+				cell.detailTextLabel?.text = nil
+				cell.imageView?.image = nil
 
 			case .invest:
 				cell.textLabel?.text = String.adamantLocalized.account.rowInvest

Adamant/Assets/Assets.xcassets/Arrow_innactive.imageset/Arrow_innactive@3x.png

@@ -67,14 +67,9 @@ class ChatViewController: MessagesViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-		guard let chatroom = chatroom else {
-			print("Failed to get chat controller")
-			return
-		}
-		
 		// MARK: 1. Initial configuration
 
-		if let partner = chatroom.partner {
+		if let partner = chatroom?.partner {
 			if let name = partner.name {
 				self.navigationItem.title = name
 			} else {
@@ -88,7 +83,7 @@ class ChatViewController: MessagesViewController {
 		maintainPositionOnKeyboardFrameChanged = true
 
 		DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-			guard let controller = self?.chatsProvider.getChatController(for: chatroom) else {
+			guard let chatroom = self?.chatroom, let controller = self?.chatsProvider.getChatController(for: chatroom) else {
 				return
 			}
 
@@ -110,36 +105,49 @@ class ChatViewController: MessagesViewController {
 
 		let bordersColor = UIColor(red: 200/255, green: 200/255, blue: 200/255, alpha: 1)
 		let size: CGFloat = 6.0
+		let buttonHeight: CGFloat = 36
+		let buttonWidth: CGFloat = 46
 
+		// Text & Colors
 		messageInputBar.inputTextView.placeholder = String.adamantLocalized.chat.messageInputPlaceholder
 		messageInputBar.separatorLine.backgroundColor = bordersColor
 		messageInputBar.inputTextView.placeholderTextColor = UIColor(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)
-		messageInputBar.inputTextView.textContainerInset = UIEdgeInsets(top: size, left: size*2, bottom: size, right: size*2)
-		messageInputBar.inputTextView.placeholderLabelInsets = UIEdgeInsets(top: size, left: size*2+4, bottom: size, right: size*2+4)
 		messageInputBar.inputTextView.layer.borderColor = bordersColor.cgColor
 		messageInputBar.inputTextView.layer.borderWidth = 1.0
 		messageInputBar.inputTextView.layer.cornerRadius = size*2
 		messageInputBar.inputTextView.layer.masksToBounds = true
+		
+		// Insets
+		messageInputBar.inputTextView.textContainerInset = UIEdgeInsets(top: size, left: size*2, bottom: size, right: buttonWidth + size/2)
+		messageInputBar.inputTextView.placeholderLabelInsets = UIEdgeInsets(top: size, left: size*2+4, bottom: size, right: buttonWidth + size/2+2)
 		messageInputBar.inputTextView.scrollIndicatorInsets = UIEdgeInsets(top: 8, left: 0, bottom: 8, right: 0)
+		messageInputBar.textViewPadding.right = -buttonWidth
 
-		messageInputBar.setStackViewItems([], forStack: .right, animated: false)
-		messageInputBar.setRightStackViewWidthConstant(to: 0, animated: false)
+		messageInputBar.setRightStackViewWidthConstant(to: buttonWidth, animated: false)
 
+		// Make feeLabel
 		let feeLabel = InputBarButtonItem()
 		self.feeLabel = feeLabel
 		feeLabel.isEnabled = false
 		feeLabel.titleLabel?.font = UIFont.adamantPrimary(size: 12)
 		feeLabel.alpha = 0
-		feeLabel.isHidden = true
 
-		messageInputBar.setStackViewItems([feeLabel, .flexibleSpace, messageInputBar.sendButton], forStack: .bottom, animated: false)
+		// Setup stack views
+		messageInputBar.setStackViewItems([messageInputBar.sendButton], forStack: .right, animated: false)
+		messageInputBar.setStackViewItems([feeLabel, .flexibleSpace], forStack: .bottom, animated: false)
+		
 		messageInputBar.sendButton.configure {
-			$0.setTitleColor(UIColor.adamantPrimary, for: .normal)
-			$0.setTitleColor(UIColor.adamantSecondary, for: .highlighted)
-			$0.title = String.adamantLocalized.chat.sendButton
+			
+			$0.layer.cornerRadius = size*2
+			$0.layer.borderWidth = 1
+			$0.layer.borderColor = bordersColor.cgColor
+			$0.setSize(CGSize(width: buttonWidth, height: buttonHeight), animated: false)
+			$0.title = nil
+			$0.image = #imageLiteral(resourceName: "Arrow")
+			$0.setImage(#imageLiteral(resourceName: "Arrow_innactive"), for: UIControlState.disabled)
 		}
 
-		if let delegate = delegate, let address = chatroom.partner?.address, let message = delegate.getPreservedMessageFor(address: address, thenRemoveIt: true) {
+		if let delegate = delegate, let address = chatroom?.partner?.address, let message = delegate.getPreservedMessageFor(address: address, thenRemoveIt: true) {
 			messageInputBar.inputTextView.text = message
 			setEstimatedFee(AdamantFeeCalculator.estimatedFeeFor(message: AdamantMessage.text(message)))
 		}
@@ -187,7 +195,6 @@ extension ChatViewController {
 			feeIsVisible = true
 			feeTimer = Timer.scheduledTimer(withTimeInterval: 3.0, repeats: false) { [weak self] _ in
 				DispatchQueue.main.async {
-					self?.feeLabel?.isHidden = false
 					UIView.animate(withDuration: 0.3, animations: {
 						self?.feeLabel?.alpha = 1
 					})
@@ -204,8 +211,6 @@ extension ChatViewController {
 
 			UIView.animate(withDuration: 0.3, animations: {
 				self.feeLabel?.alpha = 0
-			}, completion: { _ in
-				self.feeLabel?.isHidden = true
 			})
 
 			feeTimer = nil