Merge branch 'release/1.0.0'

Author: RealBonus

Adamant.xcodeproj/project.pbxproj

@@ -46,11 +46,21 @@ struct AdamantResources {
 		Node(scheme: .http, host: "80.211.177.181", port: nil)
 	]
 
-	static let iosAppSupportEmail = "ios@adamant.im"
+	// Addresses
+	static let supportEmail = "ios@adamant.im"
+	static let ansReadmeUrl = "https://github.com/Adamant-im/AdamantNotificationService/blob/master/README.md"
 
-	// ANS Contact
-	static let ansAddress = "U10629337621822775991"
-	static let ansPublicKey = "188b24bd116a556ac8ba905bbbdaa16e237dfb14269f5a4f9a26be77537d977c"
+	// Contacts
+	struct contacts {
+		static let adamantBountyWallet = "U15423595369615486571"
+		static let adamantIco = "U7047165086065693428"
+		static let iosSupport = "U15738334853882270577"
+		
+		static let ansAddress = "U10629337621822775991"
+		static let ansPublicKey = "188b24bd116a556ac8ba905bbbdaa16e237dfb14269f5a4f9a26be77537d977c"
+		
+		private init() {}
+	}
 
 	private init() {}
 }
@@ -95,30 +105,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		let login = router.get(scene: AdamantScene.Login.login)
 		window!.rootViewController?.present(login, animated: false, completion: nil)
 
-		// MARK: 4. Async prepare pages
+		// MARK: 4. Prepare pages
 		if let tabbar = window?.rootViewController as? UITabBarController {
-			let accountRoot = router.get(scene: AdamantScene.Account.account)
-			let account = UINavigationController(rootViewController: accountRoot)
-			account.tabBarItem.title = String.adamantLocalized.tabItems.account
-			account.tabBarItem.image = #imageLiteral(resourceName: "wallet_tab")
-			
 			let chatListRoot = router.get(scene: AdamantScene.Chats.chatList)
 			let chatList = UINavigationController(rootViewController: chatListRoot)
 			chatList.tabBarItem.title = String.adamantLocalized.tabItems.chats
 			chatList.tabBarItem.image = #imageLiteral(resourceName: "chats_tab")
 
-			let settingsRoot = router.get(scene: AdamantScene.Settings.settings)
-			let settings = UINavigationController(rootViewController: settingsRoot)
-			settings.tabBarItem.title = String.adamantLocalized.tabItems.settings
-			settings.tabBarItem.image = #imageLiteral(resourceName: "settings_tab")
+			let accountRoot = router.get(scene: AdamantScene.Account.account)
+			let account = UINavigationController(rootViewController: accountRoot)
+			account.tabBarItem.title = String.adamantLocalized.tabItems.account
+			account.tabBarItem.image = #imageLiteral(resourceName: "account-tab")
 
-			account.tabBarItem.badgeColor = UIColor.adamantPrimary
 			chatList.tabBarItem.badgeColor = UIColor.adamantPrimary
-			settings.tabBarItem.badgeColor = UIColor.adamantPrimary
+			account.tabBarItem.badgeColor = UIColor.adamantPrimary
 
-			tabbar.setViewControllers([account, chatList, settings], animated: false)
+			tabbar.setViewControllers([chatList, account], animated: false)
 		}
 
+		
 		// MARK: 5 Reachability & Autoupdate
 		repeater = RepeaterService()
 
@@ -263,7 +268,7 @@ extension AppDelegate {
 			return
 		}
 
-		guard let encodedPayload = adamantCore.encodeMessage(payload, recipientPublicKey: AdamantResources.ansPublicKey, privateKey: keypair.privateKey) else {
+		guard let encodedPayload = adamantCore.encodeMessage(payload, recipientPublicKey: AdamantResources.contacts.ansPublicKey, privateKey: keypair.privateKey) else {
 			dialogService.showError(withMessage: "Failed to encode ANS signal. Payload: \(payload)", error: nil)
 			return
 		}
@@ -273,24 +278,14 @@ extension AppDelegate {
 			fatalError("can't get api service to register device token")
 		}
 
-		apiService.sendMessage(senderId: address, recipientId: AdamantResources.ansAddress, keypair: keypair, message: encodedPayload.message, type: ChatType.signal, nonce: encodedPayload.nonce) { [unowned self] result in
+		apiService.sendMessage(senderId: address, recipientId: AdamantResources.contacts.ansAddress, keypair: keypair, message: encodedPayload.message, type: ChatType.signal, nonce: encodedPayload.nonce) { [unowned self] result in
 			switch result {
 			case .success:
 				return
 
 			case .failure(let error):
 				self.notificationService?.setNotificationsMode(.disabled, completion: nil)
-				
-				switch error {
-				case .networkError, .notLogged:
-					self.dialogService.showWarning(withMessage: String.localizedStringWithFormat(String.adamantLocalized.application.deviceTokenSendFailed, error.localized))
-					
-				case .accountNotFound, .serverError:
-					self.dialogService.showError(withMessage: String.localizedStringWithFormat(String.adamantLocalized.application.deviceTokenSendFailed, error.localized), error: error)
-					 
-				case .internalError(let message, _):
-					self.dialogService.showError(withMessage: String.localizedStringWithFormat(String.adamantLocalized.application.deviceTokenSendFailed, message), error: error)
-				}
+				self.dialogService.showRichError(error: error)
 			}
 		}
 	}

Adamant/AppDelegate.swift

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Adamant/Assets/Assets.xcassets/Arrow.imageset/Arrow.png renamed to Adamant/Assets/Assets.xcassets/Buttons/Arrow.imageset/Arrow.png

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "account.png",
+      "filename" : "Downvote.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "account@2x.png",
+      "filename" : "Downvote@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "account@3x.png",
+      "filename" : "Downvote@3x.png",
       "scale" : "3x"
     }
   ],

Adamant/Assets/Assets.xcassets/Arrow.imageset/Arrow@2x.png renamed to Adamant/Assets/Assets.xcassets/Buttons/Arrow.imageset/Arrow@2x.png

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Share_button.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Share_button@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Share_button@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Arrow.imageset/Arrow@3x.png renamed to Adamant/Assets/Assets.xcassets/Buttons/Arrow.imageset/Arrow@3x.png

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "income.png",
+      "filename" : "Upvote.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "income@2x.png",
+      "filename" : "Upvote@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "income@3x.png",
+      "filename" : "Upvote@3x.png",
       "scale" : "3x"
     }
   ],

Adamant/Assets/Assets.xcassets/Arrow.imageset/Contents.json renamed to Adamant/Assets/Assets.xcassets/Buttons/Arrow.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "account-tab.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "account-tab@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "account-tab@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Arrow_innactive.imageset/Arrow_innactive.png renamed to Adamant/Assets/Assets.xcassets/Buttons/Arrow_innactive.imageset/Arrow_innactive.png

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "chats_tab.png",
+      "filename" : "tab_chats.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "chats_tab@2x.png",
+      "filename" : "tab_chats@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "chats_tab@3x.png",
+      "filename" : "tab_chats@3x.png",
       "scale" : "3x"
     }
   ],

Adamant/Assets/Assets.xcassets/Arrow_innactive.imageset/Arrow_innactive@2x.png renamed to Adamant/Assets/Assets.xcassets/Buttons/Arrow_innactive.imageset/Arrow_innactive@2x.png

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Adamant/Assets/Assets.xcassets/Arrow_innactive.imageset/Arrow_innactive@3x.png renamed to Adamant/Assets/Assets.xcassets/Buttons/Arrow_innactive.imageset/Arrow_innactive@3x.png

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "avatar-chat-placeholder.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "avatar-chat-placeholder@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "avatar-chat-placeholder@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Arrow_innactive.imageset/Contents.json renamed to Adamant/Assets/Assets.xcassets/Buttons/Arrow_innactive.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "avatar-placeholder.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "avatar-placeholder@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "avatar-placeholder@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Buttons/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "row_icon_placeholder.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "row_icon_placeholder@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "row_icon_placeholder@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Icons/account.imageset/Contents.json renamed to Adamant/Assets/Assets.xcassets/Buttons/Downvote.imageset/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}