Merge branch 'release/1.3.2'

Author: RealBonus

Adamant.xcodeproj/project.pbxproj

@@ -28,6 +28,7 @@ extension String.adamantLocalized {
 extension StoreKey {
 	struct application {
 		static let deviceTokenHash = "app.deviceTokenHash"
+        static let welcomeScreensIsShown = "app.welcomeScreensIsShown"
 
 		private init() {}
 	}
@@ -118,15 +119,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		window!.rootViewController = UITabBarController()
 		window!.rootViewController?.view.backgroundColor = .white
 		window!.tintColor = UIColor.adamant.primary
-		
-		
-		// MARK: 3. Show login
-		
-		guard let router = container.resolve(Router.self) else {
-			fatalError("Failed to get Router")
-		}
-		
-		// MARK: 4. Prepare pages
+        
+        // MARK: 3. Prepare pages
+        guard let router = container.resolve(Router.self) else {
+            fatalError("Failed to get Router")
+        }
+        
 		if let tabbar = window?.rootViewController as? UITabBarController {
             // MARK: Chats
             let chats = UISplitViewController()
@@ -162,9 +160,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         window!.makeKeyAndVisible()
 
-        let login = router.get(scene: AdamantScene.Login.login)
+        // MARK: 4. Show login
+        let login = router.get(scene: AdamantScene.Login.login) as! LoginViewController
+        let welcomeIsShown = UserDefaults.standard.bool(forKey: StoreKey.application.welcomeScreensIsShown)
+        login.requestBiometryOnFirstTimeActive = welcomeIsShown
         window!.rootViewController?.present(login, animated: false, completion: nil)
-		
+        
+        if !welcomeIsShown {
+            let welcome = router.get(scene: AdamantScene.Onboard.welcome)
+            login.present(welcome, animated: true, completion: nil)
+            UserDefaults.standard.set(true, forKey: StoreKey.application.welcomeScreensIsShown)
+        }
+    
 		// MARK: 5 Reachability & Autoupdate
 		repeater = RepeaterService()
 

Adamant/AppDelegate.swift

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

Adamant/Assets/Assets.xcassets/Row/bitz_row_logo.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Row/bitz_row_logo.imageset/bitz_row_logo.png

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

Adamant/Assets/Assets.xcassets/Row/bitz_row_logo.imageset/bitz_row_logo@2x.png

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

Adamant/Assets/Assets.xcassets/Row/bitz_row_logo.imageset/bitz_row_logo@3x.png

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

Adamant/Assets/Assets.xcassets/Row/idcm_row_logo.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Row/idcm_row_logo.imageset/idcm_row_logo.png

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

Adamant/Assets/Assets.xcassets/Row/idcm_row_logo.imageset/idcm_row_logo@2x.png

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

Adamant/Assets/Assets.xcassets/Row/idcm_row_logo.imageset/idcm_row_logo@3x.png

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

Adamant/Assets/Assets.xcassets/Row/row_logo.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Row/row_logo.imageset/row_logo.png

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

Adamant/Assets/Assets.xcassets/Row/row_logo.imageset/row_logo@2x.png

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