From b370fbc95d38a73a5cb6602063822639fda180a7 Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Tue, 28 May 2019 14:41:54 +0530
Subject: [PATCH 01/10] Account VC Setup

---
 Podfile.lock                                  |  3 +-
 Susi.xcodeproj/project.pbxproj                | 17 +++++
 .../AccountVCMethods.swift                    | 23 +++++++
 .../AccountViewController.swift               | 28 +++++++++
 .../SettingsVCMethods.swift                   |  9 +++
 .../SettingsViewController.swift              |  4 +-
 Susi/Storyboards/Main.storyboard              | 62 ++++++++++++-------
 7 files changed, 120 insertions(+), 26 deletions(-)
 create mode 100644 Susi/Controllers/AccountViewController/AccountVCMethods.swift
 create mode 100644 Susi/Controllers/AccountViewController/AccountViewController.swift

diff --git a/Podfile.lock b/Podfile.lock
index a85d8c8d..94a46418 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -123,7 +123,6 @@ SPEC CHECKSUMS:
   SwiftValidators: 660ce9ef3f0358c25c3a6154f7edc02c7d4a0578
   Toast-Swift: 594b5c5e5129f15438e410207e43287f027b3c00
 
-PODFILE CHECKSUM: 9b8f14b1a46ec3d802c3eb0dbd813391f49a6f98
-
+PODFILE CHECKSUM: 22d5c21b254f853d49d5c16ae2738eaaa4338e5f
 
 COCOAPODS: 1.5.3
diff --git a/Susi.xcodeproj/project.pbxproj b/Susi.xcodeproj/project.pbxproj
index 3a7ffc73..5536c3e6 100644
--- a/Susi.xcodeproj/project.pbxproj
+++ b/Susi.xcodeproj/project.pbxproj
@@ -109,6 +109,8 @@
 		71DF0561EA8079C5C53174C1 /* Pods_Susi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C564B012515FE5529232089A /* Pods_Susi.framework */; };
 		80183F6F21D170BB00859F72 /* AboutVCMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80183F6E21D170BB00859F72 /* AboutVCMethods.swift */; };
 		807A754421D143A1008D4032 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 807A754321D143A1008D4032 /* AboutViewController.swift */; };
+		80E8C2CE229D2F400086F420 /* AccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80E8C2CD229D2F400086F420 /* AccountViewController.swift */; };
+		80E8C2D0229D2F6D0086F420 /* AccountVCMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80E8C2CF229D2F6D0086F420 /* AccountVCMethods.swift */; };
 		94889CA61F7CCD370028B8C3 /* GeneralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94889CA51F7CCD370028B8C3 /* GeneralViewController.swift */; };
 		94889CAE1F7CEAA80028B8C3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 94889CB01F7CEAA80028B8C3 /* Localizable.strings */; };
 		A0DEC06E21E0F40300659A5B /* SelectLanguageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0DEC06D21E0F40300659A5B /* SelectLanguageViewController.swift */; };
@@ -244,6 +246,8 @@
 		6DFC75B81EE077E9002F92BA /* ForgotPasswordViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForgotPasswordViewController.swift; sourceTree = "<group>"; };
 		80183F6E21D170BB00859F72 /* AboutVCMethods.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutVCMethods.swift; sourceTree = "<group>"; };
 		807A754321D143A1008D4032 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
+		80E8C2CD229D2F400086F420 /* AccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = "<group>"; };
+		80E8C2CF229D2F6D0086F420 /* AccountVCMethods.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountVCMethods.swift; sourceTree = "<group>"; };
 		94889CA51F7CCD370028B8C3 /* GeneralViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralViewController.swift; sourceTree = "<group>"; };
 		94889CAF1F7CEAA80028B8C3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		94889CB11F7CEAAA0028B8C3 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -563,6 +567,7 @@
 		6D4D9B501E768F2E0067459C /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
+				80E8C2CC229D2F110086F420 /* AccountViewController */,
 				A0DEC06C21E0F40300659A5B /* SelectLanguageController */,
 				807A754521D1639B008D4032 /* AboutViewController */,
 				406482FE20FCF2EF0014EB47 /* PlayerViewController */,
@@ -685,6 +690,15 @@
 			path = AboutViewController;
 			sourceTree = "<group>";
 		};
+		80E8C2CC229D2F110086F420 /* AccountViewController */ = {
+			isa = PBXGroup;
+			children = (
+				80E8C2CD229D2F400086F420 /* AccountViewController.swift */,
+				80E8C2CF229D2F6D0086F420 /* AccountVCMethods.swift */,
+			);
+			path = AccountViewController;
+			sourceTree = "<group>";
+		};
 		94889CAB1F7CEA620028B8C3 /* Localization */ = {
 			isa = PBXGroup;
 			children = (
@@ -809,6 +823,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 				ru,
@@ -1005,12 +1020,14 @@
 				40623B7F20D243910013FE60 /* Ratings.swift in Sources */,
 				6D395D1D1F58966900BCC3C5 /* SkillDetailExampleCell.swift in Sources */,
 				3BC1D8D5203B177E003E62F9 /* noConnectionViewController.swift in Sources */,
+				80E8C2D0229D2F6D0086F420 /* AccountVCMethods.swift in Sources */,
 				6D395D1F1F589CC000BCC3C5 /* SkillDetailVCMethods.swift in Sources */,
 				94889CA61F7CCD370028B8C3 /* GeneralViewController.swift in Sources */,
 				6DEE71121F2C9DC900A512CF /* AppNavigationController.swift in Sources */,
 				80183F6F21D170BB00859F72 /* AboutVCMethods.swift in Sources */,
 				40801EE320F33B4C0071860E /* VideoPlayerView.swift in Sources */,
 				6DE0025B1F3FF93A0065DB85 /* AnchorCell.swift in Sources */,
+				80E8C2CE229D2F400086F420 /* AccountViewController.swift in Sources */,
 				6D24B0961EE409DB0097418A /* SignUpVCMethods.swift in Sources */,
 				40DE743920E49F3A003C0116 /* AllFeedbackViewController.swift in Sources */,
 				407EFAC020C34C0000675A0B /* LanguagePickerController.swift in Sources */,
diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
new file mode 100644
index 00000000..b85f680b
--- /dev/null
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -0,0 +1,23 @@
+//
+//  AccountVCMethods.swift
+//  Susi
+//
+//  Created by Syed on 28/05/19.
+//  Copyright © 2019 FOSSAsia. All rights reserved.
+//
+
+import Foundation
+
+extension AccountViewController {
+    
+    @objc func dismissView() {
+        self.dismiss(animated: true, completion: nil)
+    }
+    
+    func setupTitle() {
+        navigationItem.titleLabel.text = "Account Settings"
+        navigationItem.titleLabel.textAlignment = .left
+        navigationItem.titleLabel.textColor = .white
+        navigationItem.leftViews = [backButton]
+    }
+}
diff --git a/Susi/Controllers/AccountViewController/AccountViewController.swift b/Susi/Controllers/AccountViewController/AccountViewController.swift
new file mode 100644
index 00000000..af4d2fe5
--- /dev/null
+++ b/Susi/Controllers/AccountViewController/AccountViewController.swift
@@ -0,0 +1,28 @@
+//
+//  AccountViewController.swift
+//  Susi
+//
+//  Created by Syed on 28/05/19.
+//  Copyright © 2019 FOSSAsia. All rights reserved.
+//
+
+import UIKit
+import Material
+
+class AccountViewController: UIViewController {
+    
+    lazy var backButton: IconButton = {
+        let ib = IconButton()
+        ib.image = Icon.cm.arrowBack
+        ib.tintColor = .white
+        ib.addTarget(self, action: #selector(dismissView), for: .touchUpInside)
+        return ib
+    }()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupTitle()
+    }
+    
+
+}
diff --git a/Susi/Controllers/SettingsController/SettingsVCMethods.swift b/Susi/Controllers/SettingsController/SettingsVCMethods.swift
index c6d451bd..7dfc515b 100644
--- a/Susi/Controllers/SettingsController/SettingsVCMethods.swift
+++ b/Susi/Controllers/SettingsController/SettingsVCMethods.swift
@@ -122,6 +122,15 @@ extension SettingsViewController {
         let nvc = AppNavigationController(rootViewController: vc)
         present(nvc, animated: true, completion: nil)
     }
+    
+    // Present Account View Controller
+    
+    func presentAccountController() {
+        let mainStoryboard = UIStoryboard(name: "Main", bundle: nil)
+        let vc = mainStoryboard.instantiateViewController(withIdentifier: "AccountViewController")
+        let nvc = AppNavigationController(rootViewController: vc)
+        present(nvc, animated: true, completion: nil)
+    }
 
     func presentDeviceActivity() {
         if let delegate = UIApplication.shared.delegate as? AppDelegate, delegate.currentUser != nil {
diff --git a/Susi/Controllers/SettingsController/SettingsViewController.swift b/Susi/Controllers/SettingsController/SettingsViewController.swift
index dacb2f3d..233d0526 100644
--- a/Susi/Controllers/SettingsController/SettingsViewController.swift
+++ b/Susi/Controllers/SettingsController/SettingsViewController.swift
@@ -134,7 +134,7 @@ class SettingsViewController: UITableViewController {
             if user == nil {
                 presentLoginScreen()
             } else {
-                // Will Connect to the Account Section.
+                presentAccountController()
             }
             } else if row == 1 {
                 presentResetPasswordController()
@@ -179,7 +179,7 @@ class SettingsViewController: UITableViewController {
                 userEmailTitle.text = user?.emailID
                 roundedCorner()
                 //Since account VC not available so, cell should be inactive
-                cell.isUserInteractionEnabled = false
+                cell.isUserInteractionEnabled = true
             }
         }
     }
diff --git a/Susi/Storyboards/Main.storyboard b/Susi/Storyboards/Main.storyboard
index ba18fbd4..ccc14952 100644
--- a/Susi/Storyboards/Main.storyboard
+++ b/Susi/Storyboards/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="0ek-IO-lKt">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="0ek-IO-lKt">
     <device id="retina5_9" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -320,7 +320,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fZv-XU-9rZ" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="141" width="343" height="30"/>
+                                <rect key="frame" x="16" y="93" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="email"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -338,7 +338,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="N3z-41-ZBS" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="215" width="343" height="30"/>
+                                <rect key="frame" x="16" y="167" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="password"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -353,7 +353,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TcY-GF-sf2" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="289" width="343" height="30"/>
+                                <rect key="frame" x="16" y="241" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="confirmPassword"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -368,7 +368,7 @@
                                 </connections>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="diq-Fb-8ST" customClass="RaisedButton" customModule="Material">
-                                <rect key="frame" x="16" y="395" width="343" height="44"/>
+                                <rect key="frame" x="16" y="347" width="343" height="44"/>
                                 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" identifier="signUp"/>
                                 <constraints>
@@ -379,7 +379,7 @@
                                 </state>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jll-vc-Hx1">
-                                <rect key="frame" x="6" y="44" width="72" height="72"/>
+                                <rect key="frame" x="6" y="44" width="24" height="24"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <state key="normal" image="back_arrow"/>
                                 <connections>
@@ -387,7 +387,7 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mlz-rv-BcH" customClass="M13Checkbox" customModule="M13Checkbox">
-                                <rect key="frame" x="16" y="349" width="24" height="24"/>
+                                <rect key="frame" x="16" y="301" width="24" height="24"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
@@ -418,7 +418,7 @@
                                 </connections>
                             </view>
                             <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="j46-3i-Hj3" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="48" y="345" width="311" height="30"/>
+                                <rect key="frame" x="48" y="297" width="311" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="4PP-I0-LPd"/>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="sZd-Mv-gyk"/>
@@ -431,7 +431,7 @@
                                 </userDefinedRuntimeAttributes>
                             </textField>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="8w1-Me-Ajd">
-                                <rect key="frame" x="142" y="456" width="92" height="37"/>
+                                <rect key="frame" x="142" y="408" width="92" height="37"/>
                             </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" name="iOSBlue"/>
@@ -520,40 +520,40 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="2xw-vb-Rd9">
-                                <rect key="frame" x="32" y="303" width="72" height="72"/>
+                                <rect key="frame" x="32" y="303" width="24" height="24.333333333333314"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Listening... say &quot;SUSI&quot;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZFw-Ph-8b4">
-                                <rect key="frame" x="127" y="305" width="216" height="68"/>
+                                <rect key="frame" x="79" y="305" width="264" height="20.333333333333314"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="MkY-mN-xiY">
-                                <rect key="frame" x="34" y="305" width="68" height="20"/>
+                                <rect key="frame" x="34" y="305" width="20" height="20"/>
                             </activityIndicatorView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="bWp-VC-efB">
-                                <rect key="frame" x="32" y="395" width="72" height="72"/>
+                                <rect key="frame" x="32" y="347.33333333333331" width="24" height="24"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Say &quot;SUSI&quot; again" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cbj-q3-I0O">
-                                <rect key="frame" x="127" y="397" width="216" height="21"/>
+                                <rect key="frame" x="79" y="349.33333333333331" width="264" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="kU6-Vs-OHY">
-                                <rect key="frame" x="34" y="397" width="68" height="20"/>
+                                <rect key="frame" x="34" y="349.33333333333331" width="20" height="20"/>
                             </activityIndicatorView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="FIR-6f-0Z4">
-                                <rect key="frame" x="32" y="487" width="72" height="72"/>
+                                <rect key="frame" x="32" y="391.33333333333331" width="24" height="24"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="grs-I7-eRe">
-                                <rect key="frame" x="34" y="489" width="68" height="20"/>
+                                <rect key="frame" x="34" y="393.33333333333331" width="20" height="20"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Say &quot;SUSI&quot; one last time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tIR-x8-YXs">
-                                <rect key="frame" x="127" y="442" width="216" height="21"/>
+                                <rect key="frame" x="79" y="394.33333333333331" width="264" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -3020,6 +3020,24 @@
             </objects>
             <point key="canvasLocation" x="6133.6000000000004" y="1053.6945812807883"/>
         </scene>
+        <!--AccountViewController-->
+        <scene sceneID="uQf-Tn-w11">
+            <objects>
+                <viewController storyboardIdentifier="AccountViewController" title="AccountViewController" id="w3l-fA-aNI" customClass="AccountViewController" customModule="Susi" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="s4X-I3-Ota"/>
+                        <viewControllerLayoutGuide type="bottom" id="5TP-3Y-DYm"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="VEn-23-95H">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="9mY-xY-v4Q" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="7154" y="1064"/>
+        </scene>
         <!--Navigation Controller-->
         <scene sceneID="g15-3o-WgW">
             <objects>
@@ -3089,11 +3107,11 @@
         </scene>
     </scenes>
     <resources>
-        <image name="back_arrow" width="72" height="72"/>
+        <image name="back_arrow" width="24" height="24"/>
         <image name="mail-icon" width="80" height="64"/>
-        <image name="manual_record" width="72" height="72"/>
+        <image name="manual_record" width="24" height="24"/>
         <image name="placeholder" width="800" height="600"/>
-        <image name="record" width="300" height="300"/>
+        <image name="record" width="100" height="100"/>
         <image name="star_empty" width="22" height="22"/>
         <image name="star_full" width="22" height="22"/>
         <image name="star_full_gray" width="12" height="12"/>

From 040ebfdc4cc480fef1efdc9b7165440dc5208add Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Tue, 28 May 2019 15:38:29 +0530
Subject: [PATCH 02/10] Set up User Details

---
 .../AccountVCMethods.swift                    | 17 +++++
 .../AccountViewController.swift               |  8 ++-
 Susi/Storyboards/Main.storyboard              | 68 +++++++++++++++----
 3 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
index b85f680b..ce0f2b70 100644
--- a/Susi/Controllers/AccountViewController/AccountVCMethods.swift
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -20,4 +20,21 @@ extension AccountViewController {
         navigationItem.titleLabel.textColor = .white
         navigationItem.leftViews = [backButton]
     }
+    
+    func setUpUserDetails() {
+        if let user = delegate?.currentUser {
+            let imageURL = URL(string: SettingsViewController.getAvatarPath(user.accessToken) )
+            userAvatarImageView.kf.setImage(with: imageURL)
+            userEmailLabel.text = user.emailID
+            roundedCorner()
+        }
+    }
+    
+    func roundedCorner() {
+        userAvatarImageView.layer.cornerRadius = 38.0
+        userAvatarImageView.layer.borderWidth = 1.0
+        userAvatarImageView.layer.borderColor = UIColor.iOSGray().cgColor
+        userAvatarImageView.layer.masksToBounds = true
+        userAvatarImageView.clipsToBounds = true
+    }
 }
diff --git a/Susi/Controllers/AccountViewController/AccountViewController.swift b/Susi/Controllers/AccountViewController/AccountViewController.swift
index af4d2fe5..7976bc30 100644
--- a/Susi/Controllers/AccountViewController/AccountViewController.swift
+++ b/Susi/Controllers/AccountViewController/AccountViewController.swift
@@ -11,6 +11,9 @@ import Material
 
 class AccountViewController: UIViewController {
     
+    
+    let delegate = UIApplication.shared.delegate as? AppDelegate
+    
     lazy var backButton: IconButton = {
         let ib = IconButton()
         ib.image = Icon.cm.arrowBack
@@ -19,10 +22,13 @@ class AccountViewController: UIViewController {
         return ib
     }()
 
+    @IBOutlet weak var userEmailLabel: UILabel!
+    @IBOutlet weak var userAvatarImageView: UIImageView!
     override func viewDidLoad() {
         super.viewDidLoad()
         setupTitle()
+        setUpUserDetails()
     }
     
-
+    
 }
diff --git a/Susi/Storyboards/Main.storyboard b/Susi/Storyboards/Main.storyboard
index ccc14952..890a0da6 100644
--- a/Susi/Storyboards/Main.storyboard
+++ b/Susi/Storyboards/Main.storyboard
@@ -320,7 +320,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fZv-XU-9rZ" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="93" width="343" height="30"/>
+                                <rect key="frame" x="16" y="91" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="email"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -338,7 +338,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="N3z-41-ZBS" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="167" width="343" height="30"/>
+                                <rect key="frame" x="16" y="165" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="password"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -353,7 +353,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TcY-GF-sf2" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="241" width="343" height="30"/>
+                                <rect key="frame" x="16" y="239" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="confirmPassword"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -368,7 +368,7 @@
                                 </connections>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="diq-Fb-8ST" customClass="RaisedButton" customModule="Material">
-                                <rect key="frame" x="16" y="347" width="343" height="44"/>
+                                <rect key="frame" x="16" y="345" width="343" height="44"/>
                                 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" identifier="signUp"/>
                                 <constraints>
@@ -379,7 +379,7 @@
                                 </state>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jll-vc-Hx1">
-                                <rect key="frame" x="6" y="44" width="24" height="24"/>
+                                <rect key="frame" x="6" y="44" width="16" height="22"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <state key="normal" image="back_arrow"/>
                                 <connections>
@@ -387,7 +387,7 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mlz-rv-BcH" customClass="M13Checkbox" customModule="M13Checkbox">
-                                <rect key="frame" x="16" y="301" width="24" height="24"/>
+                                <rect key="frame" x="16" y="299" width="24" height="24"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
@@ -418,7 +418,7 @@
                                 </connections>
                             </view>
                             <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="j46-3i-Hj3" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="48" y="297" width="311" height="30"/>
+                                <rect key="frame" x="48" y="295" width="311" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="4PP-I0-LPd"/>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="sZd-Mv-gyk"/>
@@ -431,7 +431,7 @@
                                 </userDefinedRuntimeAttributes>
                             </textField>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="8w1-Me-Ajd">
-                                <rect key="frame" x="142" y="408" width="92" height="37"/>
+                                <rect key="frame" x="142" y="406" width="92" height="37"/>
                             </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" name="iOSBlue"/>
@@ -533,7 +533,7 @@
                                 <rect key="frame" x="34" y="305" width="20" height="20"/>
                             </activityIndicatorView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="bWp-VC-efB">
-                                <rect key="frame" x="32" y="347.33333333333331" width="24" height="24"/>
+                                <rect key="frame" x="32" y="347.33333333333331" width="24" height="16"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Say &quot;SUSI&quot; again" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cbj-q3-I0O">
@@ -546,11 +546,11 @@
                                 <rect key="frame" x="34" y="349.33333333333331" width="20" height="20"/>
                             </activityIndicatorView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="FIR-6f-0Z4">
-                                <rect key="frame" x="32" y="391.33333333333331" width="24" height="24"/>
+                                <rect key="frame" x="32" y="383.33333333333331" width="24" height="16"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="grs-I7-eRe">
-                                <rect key="frame" x="34" y="393.33333333333331" width="20" height="20"/>
+                                <rect key="frame" x="34" y="385.33333333333331" width="20" height="20"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Say &quot;SUSI&quot; one last time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tIR-x8-YXs">
                                 <rect key="frame" x="79" y="394.33333333333331" width="264" height="21"/>
@@ -3031,12 +3031,56 @@
                     <view key="view" contentMode="scaleToFill" id="VEn-23-95H">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="DVV-HK-CkK">
+                                <rect key="frame" x="147" y="65" width="80" height="80"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="80" id="LXK-8m-thl"/>
+                                    <constraint firstAttribute="width" constant="80" id="qW3-xp-oBT"/>
+                                </constraints>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email/Username" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O82-y1-J3Q">
+                                <rect key="frame" x="16" y="153" width="343" height="21"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="21" id="H39-ba-peK"/>
+                                    <constraint firstAttribute="width" constant="343" id="ZTK-xp-qDe"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account Settings" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0ke-4f-wNK">
+                                <rect key="frame" x="16" y="210" width="343" height="21"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="343" id="bqJ-fI-Ub7"/>
+                                    <constraint firstAttribute="height" constant="21" id="yF3-Zp-sF3"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="8Ad-yh-ego"/>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="top" secondItem="DVV-HK-CkK" secondAttribute="bottom" constant="8" id="F3H-xX-91I"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="DVV-HK-CkK" secondAttribute="trailing" constant="132" id="Glc-BP-LRQ"/>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="MKz-ft-4wP"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="TIs-ss-FGp"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="top" secondItem="O82-y1-J3Q" secondAttribute="bottom" constant="36" id="VP1-Eb-4sG"/>
+                            <constraint firstItem="DVV-HK-CkK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" constant="131" id="mjN-k5-PA7"/>
+                            <constraint firstItem="DVV-HK-CkK" firstAttribute="top" secondItem="s4X-I3-Ota" secondAttribute="bottom" constant="21" id="n6p-CI-Ir2"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="uc1-W8-yDi"/>
+                        </constraints>
                     </view>
+                    <connections>
+                        <outlet property="userAvatarImageView" destination="DVV-HK-CkK" id="ivv-Kd-eR3"/>
+                        <outlet property="userEmailLabel" destination="O82-y1-J3Q" id="VKk-K1-3xn"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="9mY-xY-v4Q" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="7154" y="1064"/>
+            <point key="canvasLocation" x="7152.8000000000002" y="1063.3004926108374"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="g15-3o-WgW">

From 283eda8e598ceb0b68d136aabb71647da64f0ba7 Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Wed, 29 May 2019 02:46:05 +0530
Subject: [PATCH 03/10] Fix Constraints and settingButton

---
 .../AccountVCMethods.swift                    |  5 ++
 .../AccountViewController.swift               | 10 +++
 Susi/Storyboards/Main.storyboard              | 73 ++++++++++---------
 3 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
index ce0f2b70..9f9ce564 100644
--- a/Susi/Controllers/AccountViewController/AccountVCMethods.swift
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -19,6 +19,7 @@ extension AccountViewController {
         navigationItem.titleLabel.textAlignment = .left
         navigationItem.titleLabel.textColor = .white
         navigationItem.leftViews = [backButton]
+        navigationItem.rightViews = [settingsButton]
     }
     
     func setUpUserDetails() {
@@ -37,4 +38,8 @@ extension AccountViewController {
         userAvatarImageView.layer.masksToBounds = true
         userAvatarImageView.clipsToBounds = true
     }
+    
+   @objc func settingButtonClicked() {
+        
+    }
 }
diff --git a/Susi/Controllers/AccountViewController/AccountViewController.swift b/Susi/Controllers/AccountViewController/AccountViewController.swift
index 7976bc30..aa6b5073 100644
--- a/Susi/Controllers/AccountViewController/AccountViewController.swift
+++ b/Susi/Controllers/AccountViewController/AccountViewController.swift
@@ -21,9 +21,19 @@ class AccountViewController: UIViewController {
         ib.addTarget(self, action: #selector(dismissView), for: .touchUpInside)
         return ib
     }()
+    
+    lazy var settingsButton: IconButton = {
+        let ib = IconButton()
+        ib.image = Icon.check
+        ib.tintColor = .white
+        ib.layer.cornerRadius = 18.0
+        ib.addTarget(self, action: #selector(settingButtonClicked), for: .touchUpInside)
+        return ib
+    }()
 
     @IBOutlet weak var userEmailLabel: UILabel!
     @IBOutlet weak var userAvatarImageView: UIImageView!
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupTitle()
diff --git a/Susi/Storyboards/Main.storyboard b/Susi/Storyboards/Main.storyboard
index 890a0da6..72aba989 100644
--- a/Susi/Storyboards/Main.storyboard
+++ b/Susi/Storyboards/Main.storyboard
@@ -320,7 +320,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fZv-XU-9rZ" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="91" width="343" height="30"/>
+                                <rect key="frame" x="16" y="93" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="email"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -338,7 +338,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="N3z-41-ZBS" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="165" width="343" height="30"/>
+                                <rect key="frame" x="16" y="167" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="password"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -353,7 +353,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TcY-GF-sf2" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="239" width="343" height="30"/>
+                                <rect key="frame" x="16" y="241" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="confirmPassword"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -368,7 +368,7 @@
                                 </connections>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="diq-Fb-8ST" customClass="RaisedButton" customModule="Material">
-                                <rect key="frame" x="16" y="345" width="343" height="44"/>
+                                <rect key="frame" x="16" y="347" width="343" height="44"/>
                                 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" identifier="signUp"/>
                                 <constraints>
@@ -379,7 +379,7 @@
                                 </state>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jll-vc-Hx1">
-                                <rect key="frame" x="6" y="44" width="16" height="22"/>
+                                <rect key="frame" x="6" y="44" width="24" height="24"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <state key="normal" image="back_arrow"/>
                                 <connections>
@@ -387,7 +387,7 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mlz-rv-BcH" customClass="M13Checkbox" customModule="M13Checkbox">
-                                <rect key="frame" x="16" y="299" width="24" height="24"/>
+                                <rect key="frame" x="16" y="301" width="24" height="24"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
@@ -418,7 +418,7 @@
                                 </connections>
                             </view>
                             <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="j46-3i-Hj3" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="48" y="295" width="311" height="30"/>
+                                <rect key="frame" x="48" y="297" width="311" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="4PP-I0-LPd"/>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="sZd-Mv-gyk"/>
@@ -431,7 +431,7 @@
                                 </userDefinedRuntimeAttributes>
                             </textField>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="8w1-Me-Ajd">
-                                <rect key="frame" x="142" y="406" width="92" height="37"/>
+                                <rect key="frame" x="142" y="408" width="92" height="37"/>
                             </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" name="iOSBlue"/>
@@ -533,7 +533,7 @@
                                 <rect key="frame" x="34" y="305" width="20" height="20"/>
                             </activityIndicatorView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="bWp-VC-efB">
-                                <rect key="frame" x="32" y="347.33333333333331" width="24" height="16"/>
+                                <rect key="frame" x="32" y="347.33333333333331" width="24" height="24"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Say &quot;SUSI&quot; again" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cbj-q3-I0O">
@@ -546,11 +546,11 @@
                                 <rect key="frame" x="34" y="349.33333333333331" width="20" height="20"/>
                             </activityIndicatorView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="FIR-6f-0Z4">
-                                <rect key="frame" x="32" y="383.33333333333331" width="24" height="16"/>
+                                <rect key="frame" x="32" y="391.33333333333331" width="24" height="24"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="grs-I7-eRe">
-                                <rect key="frame" x="34" y="385.33333333333331" width="20" height="20"/>
+                                <rect key="frame" x="34" y="393.33333333333331" width="20" height="20"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Say &quot;SUSI&quot; one last time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tIR-x8-YXs">
                                 <rect key="frame" x="79" y="394.33333333333331" width="264" height="21"/>
@@ -3032,28 +3032,35 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="DVV-HK-CkK">
-                                <rect key="frame" x="147" y="65" width="80" height="80"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="80" id="LXK-8m-thl"/>
-                                    <constraint firstAttribute="width" constant="80" id="qW3-xp-oBT"/>
-                                </constraints>
-                            </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email/Username" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O82-y1-J3Q">
-                                <rect key="frame" x="16" y="153" width="343" height="21"/>
+                                <rect key="frame" x="16" y="143" width="343" height="21"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="21" id="H39-ba-peK"/>
-                                    <constraint firstAttribute="width" constant="343" id="ZTK-xp-qDe"/>
+                                    <constraint firstAttribute="width" constant="343" id="5gL-K3-dLf"/>
+                                    <constraint firstAttribute="height" constant="21" id="erT-Ns-pgN"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N1Y-Sg-WGK" userLabel="Image View">
+                                <rect key="frame" x="150" y="60" width="75" height="75"/>
+                                <subviews>
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="DVV-HK-CkK">
+                                        <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    </imageView>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="75" id="Hal-Id-kHN"/>
+                                    <constraint firstAttribute="width" constant="75" id="sCC-GX-Xgb"/>
+                                </constraints>
+                            </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account Settings" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0ke-4f-wNK">
-                                <rect key="frame" x="16" y="210" width="343" height="21"/>
+                                <rect key="frame" x="16" y="199" width="343" height="21"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="343" id="bqJ-fI-Ub7"/>
-                                    <constraint firstAttribute="height" constant="21" id="yF3-Zp-sF3"/>
+                                    <constraint firstAttribute="height" constant="21" id="Ed9-yJ-g34"/>
+                                    <constraint firstAttribute="width" constant="343" id="nBQ-NM-iOr"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                 <nil key="textColor"/>
@@ -3062,15 +3069,15 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="O82-y1-J3Q" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="8Ad-yh-ego"/>
-                            <constraint firstItem="O82-y1-J3Q" firstAttribute="top" secondItem="DVV-HK-CkK" secondAttribute="bottom" constant="8" id="F3H-xX-91I"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="DVV-HK-CkK" secondAttribute="trailing" constant="132" id="Glc-BP-LRQ"/>
-                            <constraint firstItem="O82-y1-J3Q" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="MKz-ft-4wP"/>
-                            <constraint firstItem="0ke-4f-wNK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="TIs-ss-FGp"/>
-                            <constraint firstItem="0ke-4f-wNK" firstAttribute="top" secondItem="O82-y1-J3Q" secondAttribute="bottom" constant="36" id="VP1-Eb-4sG"/>
-                            <constraint firstItem="DVV-HK-CkK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" constant="131" id="mjN-k5-PA7"/>
-                            <constraint firstItem="DVV-HK-CkK" firstAttribute="top" secondItem="s4X-I3-Ota" secondAttribute="bottom" constant="21" id="n6p-CI-Ir2"/>
-                            <constraint firstItem="0ke-4f-wNK" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="uc1-W8-yDi"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="3Gf-qD-ewe"/>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="8Af-Dd-abe"/>
+                            <constraint firstItem="N1Y-Sg-WGK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" constant="134" id="Ef8-vf-aG6"/>
+                            <constraint firstItem="N1Y-Sg-WGK" firstAttribute="top" secondItem="s4X-I3-Ota" secondAttribute="bottom" constant="16" id="IXC-8Y-VEg"/>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="top" secondItem="N1Y-Sg-WGK" secondAttribute="bottom" constant="8" id="g9Z-JF-SyW"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="N1Y-Sg-WGK" secondAttribute="trailing" constant="134" id="kkZ-JL-tVn"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="top" secondItem="O82-y1-J3Q" secondAttribute="bottom" constant="35" id="lOU-sE-lrq"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="mkx-gN-gF1"/>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="wbJ-Xv-nUB"/>
                         </constraints>
                     </view>
                     <connections>

From fe68096ad94d5ae4384bba3eca442702983fbba0 Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Mon, 3 Jun 2019 03:07:10 +0530
Subject: [PATCH 04/10] Account Setting Implemented

---
 .../AccountVCMethods.swift                    | 55 ++++++++++++++--
 .../AccountViewController.swift               | 31 ++++++++-
 .../SettingsViewController.swift              |  6 +-
 Susi/Helpers/ControllerConstants.swift        | 10 +++
 Susi/Storyboards/Main.storyboard              | 63 +++++++++++++++++++
 5 files changed, 159 insertions(+), 6 deletions(-)

diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
index 9f9ce564..96876da1 100644
--- a/Susi/Controllers/AccountViewController/AccountVCMethods.swift
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -8,14 +8,14 @@
 
 import Foundation
 
-extension AccountViewController {
+extension AccountViewController: UITextFieldDelegate {
     
     @objc func dismissView() {
         self.dismiss(animated: true, completion: nil)
     }
     
     func setupTitle() {
-        navigationItem.titleLabel.text = "Account Settings"
+        navigationItem.titleLabel.text = ControllerConstants.SettingParams.title
         navigationItem.titleLabel.textAlignment = .left
         navigationItem.titleLabel.textColor = .white
         navigationItem.leftViews = [backButton]
@@ -26,7 +26,11 @@ extension AccountViewController {
         if let user = delegate?.currentUser {
             let imageURL = URL(string: SettingsViewController.getAvatarPath(user.accessToken) )
             userAvatarImageView.kf.setImage(with: imageURL)
-            userEmailLabel.text = user.emailID
+            if UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) == nil {
+                userEmailLabel.text = user.emailID
+            } else {
+                userEmailLabel.text = UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) as? String
+            }
             roundedCorner()
         }
     }
@@ -38,8 +42,51 @@ extension AccountViewController {
         userAvatarImageView.layer.masksToBounds = true
         userAvatarImageView.clipsToBounds = true
     }
+    // Setting Action
     
    @objc func settingButtonClicked() {
-        
+    if  let user = delegate?.currentUser {
+        let param = [
+            ControllerConstants.SettingParams.userName: userNameTextField.text as AnyObject,
+            ControllerConstants.SettingParams.phoneNumber: phoneNumberTextField.text as AnyObject,
+            ControllerConstants.SettingParams.prefLanguage: prefLanguageTextField.text as AnyObject,
+            ControllerConstants.SettingParams.count: 3 as AnyObject,
+            ControllerConstants.SettingParams.accessToken: user.accessToken as AnyObject
+        ]
+        Client.sharedInstance.changeUserSettings(param) { (_, message) in
+            DispatchQueue.main.async {
+                UserDefaults.standard.set(self.userNameTextField.text, forKey: ControllerConstants.SettingParams.userName)
+                self.view.makeToast(message)
+            }
+        }
+    }
+    }
+    // Key Return on Hit
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        switch textField {
+        case userNameTextField:
+            _ =  phoneNumberTextField.becomeFirstResponder()
+        case phoneNumberTextField:
+            dismissKeyboard()        default:
+            textField.resignFirstResponder()
+        }
+        return true
+    }
+    
+    // Dismiss Keyboard
+    
+    @objc func dismissKeyboard() {
+        view.endEditing(true)
+    }
+    
+    // Add Delegates
+    
+    func addDelegates() {
+        userNameTextField.delegate = self
+        phoneNumberTextField.delegate = self
+        picker.dataSource = self
+        picker.delegate = self
     }
+    
 }
diff --git a/Susi/Controllers/AccountViewController/AccountViewController.swift b/Susi/Controllers/AccountViewController/AccountViewController.swift
index aa6b5073..3ec7c63f 100644
--- a/Susi/Controllers/AccountViewController/AccountViewController.swift
+++ b/Susi/Controllers/AccountViewController/AccountViewController.swift
@@ -9,7 +9,7 @@
 import UIKit
 import Material
 
-class AccountViewController: UIViewController {
+class AccountViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {
     
     
     let delegate = UIApplication.shared.delegate as? AppDelegate
@@ -30,7 +30,16 @@ class AccountViewController: UIViewController {
         ib.addTarget(self, action: #selector(settingButtonClicked), for: .touchUpInside)
         return ib
     }()
+   
+    var picker = UIPickerView()
+    
+    var preferredLanguage = ["Armenian (am-AM)","Chinese (zh-CH)","Deutsch (de-DE)"," Greek (gr-GR)","Hindi (hi-IN) ","Punjabi (pb-IN)","Nepali (np-NP)","Russian (ru-RU)","Spanish (es-SP)","French (fr-FR)","apanese (jp-JP) ","Dutch (nl-NL)","US Eng (en-US)"]
 
+    @IBOutlet weak var deleteAccountButton: UIButton!
+    
+    @IBOutlet weak var prefLanguageTextField: TextField!
+    @IBOutlet weak var phoneNumberTextField: TextField!
+    @IBOutlet weak var userNameTextField: TextField!
     @IBOutlet weak var userEmailLabel: UILabel!
     @IBOutlet weak var userAvatarImageView: UIImageView!
     
@@ -38,7 +47,27 @@ class AccountViewController: UIViewController {
         super.viewDidLoad()
         setupTitle()
         setUpUserDetails()
+        addDelegates()
+        prefLanguageTextField.inputView = picker
+    }
+    
+    //UIPickerView Deledate Functions
+    
+    func numberOfComponents(in pickerView: UIPickerView) -> Int {
+        return 1
     }
     
+    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+        return preferredLanguage.count
+    }
     
+    func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+        return preferredLanguage[row]
+    }
+
+    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+        prefLanguageTextField.text = preferredLanguage[row]
+        self.view.endEditing(false)
+    }
+
 }
diff --git a/Susi/Controllers/SettingsController/SettingsViewController.swift b/Susi/Controllers/SettingsController/SettingsViewController.swift
index 233d0526..d027439a 100644
--- a/Susi/Controllers/SettingsController/SettingsViewController.swift
+++ b/Susi/Controllers/SettingsController/SettingsViewController.swift
@@ -176,7 +176,11 @@ class SettingsViewController: UITableViewController {
             if indexPath.section == 6 && indexPath.row == 0 {
                 let imageURL = URL(string: SettingsViewController.getAvatarPath((user?.accessToken)!) )
                 userImage.kf.setImage(with: imageURL)
-                userEmailTitle.text = user?.emailID
+                if UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) == nil {
+                    userEmailTitle.text = user?.emailID
+                } else {
+                    userEmailTitle.text = UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) as? String
+                }
                 roundedCorner()
                 //Since account VC not available so, cell should be inactive
                 cell.isUserInteractionEnabled = true
diff --git a/Susi/Helpers/ControllerConstants.swift b/Susi/Helpers/ControllerConstants.swift
index 1f903bf2..607b6ddb 100644
--- a/Susi/Helpers/ControllerConstants.swift
+++ b/Susi/Helpers/ControllerConstants.swift
@@ -313,6 +313,16 @@ class ControllerConstants {
         static let unBookmarkSuccessMessage = "Bookmark Removed Successfully"
     }
     
+    struct SettingParams {
+        static let userName = "userName"
+        static let phoneNumber = "phoneNo"
+        static let prefLanguage = "prefLanguage"
+        static let timeZone = "timeZone"
+        static let accessToken = "access_token"
+        static let count = "count"
+        static let title = "Account Settings"
+    }
+    
 }
 
 
diff --git a/Susi/Storyboards/Main.storyboard b/Susi/Storyboards/Main.storyboard
index 72aba989..273da85b 100644
--- a/Susi/Storyboards/Main.storyboard
+++ b/Susi/Storyboards/Main.storyboard
@@ -3066,23 +3066,86 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Hew-9F-nQq" customClass="TextField" customModule="Material">
+                                <rect key="frame" x="16" y="267" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="KkV-Dp-oDF"/>
+                                    <constraint firstAttribute="width" constant="343" id="cXP-Lm-FSY"/>
+                                </constraints>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="User Name"/>
+                                </userDefinedRuntimeAttributes>
+                            </textField>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="kJQ-WH-5Y2" customClass="TextField" customModule="Material">
+                                <rect key="frame" x="16" y="330" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="343" id="dLp-7B-NYD"/>
+                                    <constraint firstAttribute="height" constant="30" id="gJV-hZ-AIY"/>
+                                </constraints>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" keyboardType="phonePad"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Phone Number"/>
+                                </userDefinedRuntimeAttributes>
+                            </textField>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Q0f-nA-mYs" customClass="TextField" customModule="Material">
+                                <rect key="frame" x="16" y="391" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="Fa8-V2-fjf"/>
+                                    <constraint firstAttribute="width" constant="343" id="p9r-YJ-vGC"/>
+                                </constraints>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Preferred Language"/>
+                                </userDefinedRuntimeAttributes>
+                            </textField>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jRb-ll-29A">
+                                <rect key="frame" x="16" y="608" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="LCn-yv-KOO"/>
+                                    <constraint firstAttribute="width" constant="343" id="h3p-QN-xvn"/>
+                                </constraints>
+                                <state key="normal" title="Click here to delete account"/>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
+                            <constraint firstItem="kJQ-WH-5Y2" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="2f4-jb-kDm"/>
                             <constraint firstItem="0ke-4f-wNK" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="3Gf-qD-ewe"/>
                             <constraint firstItem="O82-y1-J3Q" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="8Af-Dd-abe"/>
+                            <constraint firstItem="Hew-9F-nQq" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="B1o-Hs-J21"/>
                             <constraint firstItem="N1Y-Sg-WGK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" constant="134" id="Ef8-vf-aG6"/>
                             <constraint firstItem="N1Y-Sg-WGK" firstAttribute="top" secondItem="s4X-I3-Ota" secondAttribute="bottom" constant="16" id="IXC-8Y-VEg"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="top" secondItem="Q0f-nA-mYs" secondAttribute="bottom" constant="187" id="PcT-Lk-hFI"/>
+                            <constraint firstItem="Q0f-nA-mYs" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="QbU-hG-kAm"/>
+                            <constraint firstItem="Hew-9F-nQq" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="SPl-ve-eUV"/>
+                            <constraint firstItem="Hew-9F-nQq" firstAttribute="top" secondItem="0ke-4f-wNK" secondAttribute="bottom" constant="47" id="ZRM-ID-aXg"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="cC0-Ys-ncS"/>
+                            <constraint firstItem="Q0f-nA-mYs" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="eGw-0Q-cm7"/>
+                            <constraint firstItem="Q0f-nA-mYs" firstAttribute="top" secondItem="kJQ-WH-5Y2" secondAttribute="bottom" constant="31" id="eTI-H4-dMZ"/>
                             <constraint firstItem="O82-y1-J3Q" firstAttribute="top" secondItem="N1Y-Sg-WGK" secondAttribute="bottom" constant="8" id="g9Z-JF-SyW"/>
                             <constraint firstAttribute="trailingMargin" secondItem="N1Y-Sg-WGK" secondAttribute="trailing" constant="134" id="kkZ-JL-tVn"/>
                             <constraint firstItem="0ke-4f-wNK" firstAttribute="top" secondItem="O82-y1-J3Q" secondAttribute="bottom" constant="35" id="lOU-sE-lrq"/>
                             <constraint firstItem="0ke-4f-wNK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="mkx-gN-gF1"/>
+                            <constraint firstItem="kJQ-WH-5Y2" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="npA-oh-ait"/>
+                            <constraint firstItem="kJQ-WH-5Y2" firstAttribute="top" secondItem="Hew-9F-nQq" secondAttribute="bottom" constant="33" id="rv3-Se-PLs"/>
                             <constraint firstItem="O82-y1-J3Q" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="wbJ-Xv-nUB"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="yAg-QQ-cDg"/>
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="deleteAccountButton" destination="jRb-ll-29A" id="nKy-kj-X6x"/>
+                        <outlet property="phoneNumberTextField" destination="kJQ-WH-5Y2" id="CAK-9e-uvr"/>
+                        <outlet property="prefLanguageTextField" destination="Q0f-nA-mYs" id="e66-Sd-U26"/>
                         <outlet property="userAvatarImageView" destination="DVV-HK-CkK" id="ivv-Kd-eR3"/>
                         <outlet property="userEmailLabel" destination="O82-y1-J3Q" id="VKk-K1-3xn"/>
+                        <outlet property="userNameTextField" destination="Hew-9F-nQq" id="DkX-BH-69n"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="9mY-xY-v4Q" userLabel="First Responder" sceneMemberID="firstResponder"/>

From 3a9f3e79567513aaa313cb264fcf4f19eff3ff62 Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Mon, 3 Jun 2019 03:11:50 +0530
Subject: [PATCH 05/10] Fix Swift lint

---
 Susi/Controllers/AccountViewController/AccountVCMethods.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
index 96876da1..a275506f 100644
--- a/Susi/Controllers/AccountViewController/AccountVCMethods.swift
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -42,7 +42,8 @@ extension AccountViewController: UITextFieldDelegate {
         userAvatarImageView.layer.masksToBounds = true
         userAvatarImageView.clipsToBounds = true
     }
-    // Setting Action
+    
+    // Setting Action 
     
    @objc func settingButtonClicked() {
     if  let user = delegate?.currentUser {
@@ -61,6 +62,7 @@ extension AccountViewController: UITextFieldDelegate {
         }
     }
     }
+    
     // Key Return on Hit
     
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {

From 2511af44e8b517890ce473dc90d14d9f33485764 Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Mon, 3 Jun 2019 03:33:21 +0530
Subject: [PATCH 06/10] Fix Swift Lint

---
 Susi/Controllers/AccountViewController/AccountVCMethods.swift   | 1 +
 .../AccountViewController/AccountViewController.swift           | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
index a275506f..a273792e 100644
--- a/Susi/Controllers/AccountViewController/AccountVCMethods.swift
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -89,6 +89,7 @@ extension AccountViewController: UITextFieldDelegate {
         phoneNumberTextField.delegate = self
         picker.dataSource = self
         picker.delegate = self
+        prefLanguageTextField.inputView = picker
     }
     
 }
diff --git a/Susi/Controllers/AccountViewController/AccountViewController.swift b/Susi/Controllers/AccountViewController/AccountViewController.swift
index 3ec7c63f..0aab23c8 100644
--- a/Susi/Controllers/AccountViewController/AccountViewController.swift
+++ b/Susi/Controllers/AccountViewController/AccountViewController.swift
@@ -36,7 +36,6 @@ class AccountViewController: UIViewController, UIPickerViewDataSource, UIPickerV
     var preferredLanguage = ["Armenian (am-AM)","Chinese (zh-CH)","Deutsch (de-DE)"," Greek (gr-GR)","Hindi (hi-IN) ","Punjabi (pb-IN)","Nepali (np-NP)","Russian (ru-RU)","Spanish (es-SP)","French (fr-FR)","apanese (jp-JP) ","Dutch (nl-NL)","US Eng (en-US)"]
 
     @IBOutlet weak var deleteAccountButton: UIButton!
-    
     @IBOutlet weak var prefLanguageTextField: TextField!
     @IBOutlet weak var phoneNumberTextField: TextField!
     @IBOutlet weak var userNameTextField: TextField!
@@ -48,7 +47,6 @@ class AccountViewController: UIViewController, UIPickerViewDataSource, UIPickerV
         setupTitle()
         setUpUserDetails()
         addDelegates()
-        prefLanguageTextField.inputView = picker
     }
     
     //UIPickerView Deledate Functions

From 02eb6551e07d15df1911c07e5db138d6f921cfb9 Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Wed, 5 Jun 2019 18:36:50 +0530
Subject: [PATCH 07/10] Changes in Buttons

---
 .../AccountVCMethods.swift                    | 21 ++++++++++++++++++
 .../AccountViewController.swift               |  1 +
 Susi/Storyboards/Main.storyboard              | 22 ++++++++++++++-----
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
index a273792e..1f6f7774 100644
--- a/Susi/Controllers/AccountViewController/AccountVCMethods.swift
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -20,6 +20,7 @@ extension AccountViewController: UITextFieldDelegate {
         navigationItem.titleLabel.textColor = .white
         navigationItem.leftViews = [backButton]
         navigationItem.rightViews = [settingsButton]
+        deleteAccountButton.tintColor = .red
     }
     
     func setUpUserDetails() {
@@ -92,4 +93,24 @@ extension AccountViewController: UITextFieldDelegate {
         prefLanguageTextField.inputView = picker
     }
     
+    // Handle Delete Account Request.
+    
+    func handleDeleteAccountRequest() {
+        deleteAccountButton.addTarget(self, action: #selector(deleteAccount), for: .touchUpInside)
+    }
+    
+    @objc func deleteAccount() {
+        
+    }
+    
+    // Handle Upload Avatar
+    
+    func handleAvatarUpload() {
+        uploadAvatarButton.addTarget(self, action: #selector(uploadAvatar), for: .touchUpInside)
+    }
+    
+    @objc func uploadAvatar() {
+    
+    }
+    
 }
diff --git a/Susi/Controllers/AccountViewController/AccountViewController.swift b/Susi/Controllers/AccountViewController/AccountViewController.swift
index 0aab23c8..6ce1021e 100644
--- a/Susi/Controllers/AccountViewController/AccountViewController.swift
+++ b/Susi/Controllers/AccountViewController/AccountViewController.swift
@@ -35,6 +35,7 @@ class AccountViewController: UIViewController, UIPickerViewDataSource, UIPickerV
     
     var preferredLanguage = ["Armenian (am-AM)","Chinese (zh-CH)","Deutsch (de-DE)"," Greek (gr-GR)","Hindi (hi-IN) ","Punjabi (pb-IN)","Nepali (np-NP)","Russian (ru-RU)","Spanish (es-SP)","French (fr-FR)","apanese (jp-JP) ","Dutch (nl-NL)","US Eng (en-US)"]
 
+    @IBOutlet weak var uploadAvatarButton: UIButton!
     @IBOutlet weak var deleteAccountButton: UIButton!
     @IBOutlet weak var prefLanguageTextField: TextField!
     @IBOutlet weak var phoneNumberTextField: TextField!
diff --git a/Susi/Storyboards/Main.storyboard b/Susi/Storyboards/Main.storyboard
index 273da85b..a0616aa9 100644
--- a/Susi/Storyboards/Main.storyboard
+++ b/Susi/Storyboards/Main.storyboard
@@ -3108,11 +3108,19 @@
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jRb-ll-29A">
                                 <rect key="frame" x="16" y="608" width="343" height="30"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="LCn-yv-KOO"/>
-                                    <constraint firstAttribute="width" constant="343" id="h3p-QN-xvn"/>
+                                    <constraint firstAttribute="width" constant="343" id="Lnv-Ym-1LX"/>
+                                    <constraint firstAttribute="height" constant="30" id="k9r-1T-dVf"/>
                                 </constraints>
                                 <state key="normal" title="Click here to delete account"/>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8FB-uS-h3d">
+                                <rect key="frame" x="16" y="563" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="343" id="ICZ-HA-mQr"/>
+                                    <constraint firstAttribute="height" constant="30" id="y8h-Vn-rlv"/>
+                                </constraints>
+                                <state key="normal" title="Click here to upload image"/>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
@@ -3122,27 +3130,31 @@
                             <constraint firstItem="Hew-9F-nQq" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="B1o-Hs-J21"/>
                             <constraint firstItem="N1Y-Sg-WGK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" constant="134" id="Ef8-vf-aG6"/>
                             <constraint firstItem="N1Y-Sg-WGK" firstAttribute="top" secondItem="s4X-I3-Ota" secondAttribute="bottom" constant="16" id="IXC-8Y-VEg"/>
-                            <constraint firstItem="jRb-ll-29A" firstAttribute="top" secondItem="Q0f-nA-mYs" secondAttribute="bottom" constant="187" id="PcT-Lk-hFI"/>
                             <constraint firstItem="Q0f-nA-mYs" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="QbU-hG-kAm"/>
                             <constraint firstItem="Hew-9F-nQq" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="SPl-ve-eUV"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="SiU-b3-TVx"/>
                             <constraint firstItem="Hew-9F-nQq" firstAttribute="top" secondItem="0ke-4f-wNK" secondAttribute="bottom" constant="47" id="ZRM-ID-aXg"/>
-                            <constraint firstItem="jRb-ll-29A" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="cC0-Ys-ncS"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="cxa-l8-EPH"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="dXt-bD-fxx"/>
                             <constraint firstItem="Q0f-nA-mYs" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="eGw-0Q-cm7"/>
                             <constraint firstItem="Q0f-nA-mYs" firstAttribute="top" secondItem="kJQ-WH-5Y2" secondAttribute="bottom" constant="31" id="eTI-H4-dMZ"/>
                             <constraint firstItem="O82-y1-J3Q" firstAttribute="top" secondItem="N1Y-Sg-WGK" secondAttribute="bottom" constant="8" id="g9Z-JF-SyW"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="top" secondItem="Q0f-nA-mYs" secondAttribute="bottom" constant="142" id="k3L-dM-fUP"/>
                             <constraint firstAttribute="trailingMargin" secondItem="N1Y-Sg-WGK" secondAttribute="trailing" constant="134" id="kkZ-JL-tVn"/>
                             <constraint firstItem="0ke-4f-wNK" firstAttribute="top" secondItem="O82-y1-J3Q" secondAttribute="bottom" constant="35" id="lOU-sE-lrq"/>
                             <constraint firstItem="0ke-4f-wNK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="mkx-gN-gF1"/>
                             <constraint firstItem="kJQ-WH-5Y2" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="npA-oh-ait"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="top" secondItem="8FB-uS-h3d" secondAttribute="bottom" constant="15" id="pVJ-Ys-FsN"/>
                             <constraint firstItem="kJQ-WH-5Y2" firstAttribute="top" secondItem="Hew-9F-nQq" secondAttribute="bottom" constant="33" id="rv3-Se-PLs"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="uZn-5X-mfQ"/>
                             <constraint firstItem="O82-y1-J3Q" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="wbJ-Xv-nUB"/>
-                            <constraint firstItem="jRb-ll-29A" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="yAg-QQ-cDg"/>
                         </constraints>
                     </view>
                     <connections>
                         <outlet property="deleteAccountButton" destination="jRb-ll-29A" id="nKy-kj-X6x"/>
                         <outlet property="phoneNumberTextField" destination="kJQ-WH-5Y2" id="CAK-9e-uvr"/>
                         <outlet property="prefLanguageTextField" destination="Q0f-nA-mYs" id="e66-Sd-U26"/>
+                        <outlet property="uploadAvatarButton" destination="8FB-uS-h3d" id="1GW-wV-ff3"/>
                         <outlet property="userAvatarImageView" destination="DVV-HK-CkK" id="ivv-Kd-eR3"/>
                         <outlet property="userEmailLabel" destination="O82-y1-J3Q" id="VKk-K1-3xn"/>
                         <outlet property="userNameTextField" destination="Hew-9F-nQq" id="DkX-BH-69n"/>

From bc787d037640b8aa0e9e8e2994cdf344fd43b0ff Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Fri, 7 Jun 2019 03:17:33 +0530
Subject: [PATCH 08/10] Update Changes

---
 .../AccountVCMethods.swift                    |  4 +--
 Susi/Storyboards/Main.storyboard              | 30 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
index 1f6f7774..4836a161 100644
--- a/Susi/Controllers/AccountViewController/AccountVCMethods.swift
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -38,8 +38,8 @@ extension AccountViewController: UITextFieldDelegate {
     
     func roundedCorner() {
         userAvatarImageView.layer.cornerRadius = 38.0
-        userAvatarImageView.layer.borderWidth = 1.0
-        userAvatarImageView.layer.borderColor = UIColor.iOSGray().cgColor
+        userAvatarImageView.layer.borderWidth = 2.0
+        userAvatarImageView.layer.borderColor = UIColor.white.cgColor
         userAvatarImageView.layer.masksToBounds = true
         userAvatarImageView.clipsToBounds = true
     }
diff --git a/Susi/Storyboards/Main.storyboard b/Susi/Storyboards/Main.storyboard
index a0616aa9..ab78512a 100644
--- a/Susi/Storyboards/Main.storyboard
+++ b/Susi/Storyboards/Main.storyboard
@@ -3045,7 +3045,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N1Y-Sg-WGK" userLabel="Image View">
                                 <rect key="frame" x="150" y="60" width="75" height="75"/>
                                 <subviews>
-                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="DVV-HK-CkK">
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="DVV-HK-CkK">
                                         <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     </imageView>
@@ -3105,19 +3105,19 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Preferred Language"/>
                                 </userDefinedRuntimeAttributes>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jRb-ll-29A">
-                                <rect key="frame" x="16" y="608" width="343" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jRb-ll-29A">
+                                <rect key="frame" x="16" y="439" width="343" height="30"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="343" id="Lnv-Ym-1LX"/>
-                                    <constraint firstAttribute="height" constant="30" id="k9r-1T-dVf"/>
+                                    <constraint firstAttribute="width" constant="343" id="7yU-Dn-qmT"/>
+                                    <constraint firstAttribute="height" constant="30" id="XHZ-Mt-nps"/>
                                 </constraints>
                                 <state key="normal" title="Click here to delete account"/>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8FB-uS-h3d">
-                                <rect key="frame" x="16" y="563" width="343" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8FB-uS-h3d">
+                                <rect key="frame" x="16" y="470" width="343" height="30"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="343" id="ICZ-HA-mQr"/>
-                                    <constraint firstAttribute="height" constant="30" id="y8h-Vn-rlv"/>
+                                    <constraint firstAttribute="height" constant="30" id="0CL-NG-Lsj"/>
+                                    <constraint firstAttribute="width" constant="343" id="woE-UW-CBb"/>
                                 </constraints>
                                 <state key="normal" title="Click here to upload image"/>
                             </button>
@@ -3126,28 +3126,28 @@
                         <constraints>
                             <constraint firstItem="kJQ-WH-5Y2" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="2f4-jb-kDm"/>
                             <constraint firstItem="0ke-4f-wNK" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="3Gf-qD-ewe"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="7Hq-et-KK1"/>
                             <constraint firstItem="O82-y1-J3Q" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="8Af-Dd-abe"/>
                             <constraint firstItem="Hew-9F-nQq" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="B1o-Hs-J21"/>
                             <constraint firstItem="N1Y-Sg-WGK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" constant="134" id="Ef8-vf-aG6"/>
                             <constraint firstItem="N1Y-Sg-WGK" firstAttribute="top" secondItem="s4X-I3-Ota" secondAttribute="bottom" constant="16" id="IXC-8Y-VEg"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="M4z-zQ-caj"/>
                             <constraint firstItem="Q0f-nA-mYs" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="QbU-hG-kAm"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="Qck-Xl-eZ2"/>
                             <constraint firstItem="Hew-9F-nQq" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="SPl-ve-eUV"/>
-                            <constraint firstItem="jRb-ll-29A" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="SiU-b3-TVx"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="top" secondItem="jRb-ll-29A" secondAttribute="bottom" constant="1" id="SnP-yl-4Ng"/>
                             <constraint firstItem="Hew-9F-nQq" firstAttribute="top" secondItem="0ke-4f-wNK" secondAttribute="bottom" constant="47" id="ZRM-ID-aXg"/>
-                            <constraint firstItem="8FB-uS-h3d" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="cxa-l8-EPH"/>
-                            <constraint firstItem="8FB-uS-h3d" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="dXt-bD-fxx"/>
                             <constraint firstItem="Q0f-nA-mYs" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="eGw-0Q-cm7"/>
                             <constraint firstItem="Q0f-nA-mYs" firstAttribute="top" secondItem="kJQ-WH-5Y2" secondAttribute="bottom" constant="31" id="eTI-H4-dMZ"/>
                             <constraint firstItem="O82-y1-J3Q" firstAttribute="top" secondItem="N1Y-Sg-WGK" secondAttribute="bottom" constant="8" id="g9Z-JF-SyW"/>
-                            <constraint firstItem="8FB-uS-h3d" firstAttribute="top" secondItem="Q0f-nA-mYs" secondAttribute="bottom" constant="142" id="k3L-dM-fUP"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="top" secondItem="Q0f-nA-mYs" secondAttribute="bottom" constant="18" id="kaM-Rg-NDO"/>
                             <constraint firstAttribute="trailingMargin" secondItem="N1Y-Sg-WGK" secondAttribute="trailing" constant="134" id="kkZ-JL-tVn"/>
                             <constraint firstItem="0ke-4f-wNK" firstAttribute="top" secondItem="O82-y1-J3Q" secondAttribute="bottom" constant="35" id="lOU-sE-lrq"/>
                             <constraint firstItem="0ke-4f-wNK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="mkx-gN-gF1"/>
                             <constraint firstItem="kJQ-WH-5Y2" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="npA-oh-ait"/>
-                            <constraint firstItem="jRb-ll-29A" firstAttribute="top" secondItem="8FB-uS-h3d" secondAttribute="bottom" constant="15" id="pVJ-Ys-FsN"/>
                             <constraint firstItem="kJQ-WH-5Y2" firstAttribute="top" secondItem="Hew-9F-nQq" secondAttribute="bottom" constant="33" id="rv3-Se-PLs"/>
-                            <constraint firstItem="jRb-ll-29A" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="uZn-5X-mfQ"/>
                             <constraint firstItem="O82-y1-J3Q" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="wbJ-Xv-nUB"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="wbt-e9-508"/>
                         </constraints>
                     </view>
                     <connections>

From 958c4a97fbe71f2920520bf845395e349638b76e Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Fri, 7 Jun 2019 17:57:03 +0530
Subject: [PATCH 09/10] Add Outer Shadow to ImageView

---
 .../AccountViewController/AccountVCMethods.swift    | 13 ++++++++++++-
 .../AccountViewController.swift                     |  1 +
 Susi/Storyboards/Main.storyboard                    |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
index 4836a161..02332593 100644
--- a/Susi/Controllers/AccountViewController/AccountVCMethods.swift
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -33,17 +33,28 @@ extension AccountViewController: UITextFieldDelegate {
                 userEmailLabel.text = UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) as? String
             }
             roundedCorner()
+            outerViewShadow()
         }
     }
     
     func roundedCorner() {
         userAvatarImageView.layer.cornerRadius = 38.0
-        userAvatarImageView.layer.borderWidth = 2.0
+        userAvatarImageView.layer.borderWidth = 1.0
         userAvatarImageView.layer.borderColor = UIColor.white.cgColor
         userAvatarImageView.layer.masksToBounds = true
         userAvatarImageView.clipsToBounds = true
     }
     
+    // Outer View
+    
+    func outerViewShadow() {
+        outerView.layer.cornerRadius = 38.0
+        outerView.layer.shadowColor = UIColor.gray.cgColor
+        outerView.layer.shadowOpacity = 1
+        outerView.layer.shadowRadius = 10.0
+        outerView.layer.shadowOffset = CGSize.zero
+    }
+    
     // Setting Action 
     
    @objc func settingButtonClicked() {
diff --git a/Susi/Controllers/AccountViewController/AccountViewController.swift b/Susi/Controllers/AccountViewController/AccountViewController.swift
index 6ce1021e..b00fd541 100644
--- a/Susi/Controllers/AccountViewController/AccountViewController.swift
+++ b/Susi/Controllers/AccountViewController/AccountViewController.swift
@@ -35,6 +35,7 @@ class AccountViewController: UIViewController, UIPickerViewDataSource, UIPickerV
     
     var preferredLanguage = ["Armenian (am-AM)","Chinese (zh-CH)","Deutsch (de-DE)"," Greek (gr-GR)","Hindi (hi-IN) ","Punjabi (pb-IN)","Nepali (np-NP)","Russian (ru-RU)","Spanish (es-SP)","French (fr-FR)","apanese (jp-JP) ","Dutch (nl-NL)","US Eng (en-US)"]
 
+    @IBOutlet weak var outerView: UIView!
     @IBOutlet weak var uploadAvatarButton: UIButton!
     @IBOutlet weak var deleteAccountButton: UIButton!
     @IBOutlet weak var prefLanguageTextField: TextField!
diff --git a/Susi/Storyboards/Main.storyboard b/Susi/Storyboards/Main.storyboard
index ab78512a..28225eda 100644
--- a/Susi/Storyboards/Main.storyboard
+++ b/Susi/Storyboards/Main.storyboard
@@ -3152,6 +3152,7 @@
                     </view>
                     <connections>
                         <outlet property="deleteAccountButton" destination="jRb-ll-29A" id="nKy-kj-X6x"/>
+                        <outlet property="outerView" destination="N1Y-Sg-WGK" id="H4y-SO-HmP"/>
                         <outlet property="phoneNumberTextField" destination="kJQ-WH-5Y2" id="CAK-9e-uvr"/>
                         <outlet property="prefLanguageTextField" destination="Q0f-nA-mYs" id="e66-Sd-U26"/>
                         <outlet property="uploadAvatarButton" destination="8FB-uS-h3d" id="1GW-wV-ff3"/>

From 19a55722ccf2dfe906e08e6c0483e9c77e4f8389 Mon Sep 17 00:00:00 2001
From: baquer <baquerali@icloud.com>
Date: Fri, 14 Jun 2019 23:28:43 +0530
Subject: [PATCH 10/10] Update M13Checkbox Pod

---
 Podfile      |  2 +-
 Podfile.lock | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Podfile b/Podfile
index 211823c2..ac74e13b 100644
--- a/Podfile
+++ b/Podfile
@@ -21,7 +21,7 @@ target 'Susi' do
   pod 'SwiftDate', '~> 4.5.0'
   pod 'NVActivityIndicatorView'
   pod 'Fakery', '~> 3.3.0'
-  pod 'M13Checkbox', :git => 'https://github.com/Marxon13/M13Checkbox.git', :branch => 'swift_4_2'
+  pod 'M13Checkbox'
   pod 'ReachabilitySwift'
   pod 'Localize-Swift'
   pod 'paper-onboarding'
diff --git a/Podfile.lock b/Podfile.lock
index 94a46418..bc0635c6 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -11,7 +11,7 @@ PODS:
   - Ji/Ji-libxml (2.1.0)
   - Kingfisher (4.10.1)
   - Localize-Swift (2.0.0)
-  - M13Checkbox (3.2.2)
+  - M13Checkbox (3.4.0)
   - Material (2.17.0):
     - Material/Core (= 2.17.0)
   - Material/Core (2.17.0):
@@ -44,7 +44,7 @@ DEPENDENCIES:
   - FTPopOverMenu_Swift (~> 0.1.3)
   - Kingfisher (~> 4.10.0)
   - Localize-Swift
-  - M13Checkbox (from `https://github.com/Marxon13/M13Checkbox.git`, branch `swift_4_2`)
+  - M13Checkbox
   - Material (from `https://github.com/CosmicMind/Material.git`, branch `development`)
   - Motion (from `https://github.com/CosmicMind/Motion.git`, branch `development`)
   - NVActivityIndicatorView
@@ -67,6 +67,7 @@ SPEC REPOS:
     - Ji
     - Kingfisher
     - Localize-Swift
+    - M13Checkbox
     - NVActivityIndicatorView
     - paper-onboarding
     - ReachabilitySwift
@@ -79,9 +80,6 @@ SPEC REPOS:
     - Toast-Swift
 
 EXTERNAL SOURCES:
-  M13Checkbox:
-    :branch: swift_4_2
-    :git: https://github.com/Marxon13/M13Checkbox.git
   Material:
     :branch: development
     :git: https://github.com/CosmicMind/Material.git
@@ -90,9 +88,6 @@ EXTERNAL SOURCES:
     :git: https://github.com/CosmicMind/Motion.git
 
 CHECKOUT OPTIONS:
-  M13Checkbox:
-    :commit: c26efb918e40ae4662dc6659b60f7c5493e94807
-    :git: https://github.com/Marxon13/M13Checkbox.git
   Material:
     :commit: 4ab1b08c3365a00f409a210162ae72ed8425f299
     :git: https://github.com/CosmicMind/Material.git
@@ -109,7 +104,7 @@ SPEC CHECKSUMS:
   Ji: 21946da4e13425485ddd424edfaeeced0d80ad28
   Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0
   Localize-Swift: c798ec9286494866f7068f85f7c71283ac5bdab4
-  M13Checkbox: 82182615a76646475b451ebe448a998f77f8cc6e
+  M13Checkbox: 6f59404540ac98ba83a3d1afac335895a40c6a5d
   Material: 856e0168ab93fc477f875577c152c9e62f4ab869
   Motion: 3acabedc5a499f6b12deaa34deb68b425b005720
   NVActivityIndicatorView: ec7440a57af2450319d3a4181cca7da6fc127064
@@ -123,6 +118,6 @@ SPEC CHECKSUMS:
   SwiftValidators: 660ce9ef3f0358c25c3a6154f7edc02c7d4a0578
   Toast-Swift: 594b5c5e5129f15438e410207e43287f027b3c00
 
-PODFILE CHECKSUM: 22d5c21b254f853d49d5c16ae2738eaaa4338e5f
+PODFILE CHECKSUM: c0d3ac6392c31961b5f3a0108501cdaf990069ee
 
 COCOAPODS: 1.5.3