Skip to content

F
Fengshui-Seller-iOS
Commit 1a3bb3d0 by Anand.suthar
Options

Fix issues

parent fd0d4f4f
Showing with 252 additions and 148 deletions
Bhagyashree.xcodeproj/project.pbxproj
......@@ -2061,7 +2061,7 @@
EC04CD312052CC0100B425BB = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 0920;
ProvisioningStyle = Manual;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.Push = {
enabled = 1;
......@@ -2834,11 +2834,11 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Bhagyashree/Bhagyashree.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = WC72QNYT4F;
INFOPLIST_FILE = Bhagyashree/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.gdi.yuanzhongsiu-seller";
PRODUCT_BUNDLE_IDENTIFIER = "com.gdi.yuanzhongsiu-seller-dev2";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -2858,11 +2858,11 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Bhagyashree/Bhagyashree.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = WC72QNYT4F;
INFOPLIST_FILE = Bhagyashree/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.gdi.yuanzhongsiu-seller";
PRODUCT_BUNDLE_IDENTIFIER = "com.gdi.yuanzhongsiu-seller-dev2";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
......
Bhagyashree.xcworkspace/xcuserdata/sunarcmac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -83,5 +83,85 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/Appointment/AppointmentExt.swift"
timestampString = "557220733.8655649"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "25"
endingLineNumber = "25"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/UserExt.swift"
timestampString = "557228254.156836"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "236"
endingLineNumber = "236"
landmarkName = "callAPI(oldPassword:newPassword:success:failure:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Controller/Me/ChangePasswordViewController.swift"
timestampString = "557228596.9233069"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "32"
endingLineNumber = "32"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Controller/Me/ChangePasswordViewController.swift"
timestampString = "557228598.131186"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "30"
endingLineNumber = "30"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/UserExt.swift"
timestampString = "557228607.042542"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "238"
endingLineNumber = "238"
landmarkName = "changePassword(oldPassword:newPassword:success:failure:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Bhagyashree/Info.plist
......@@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>8</string>
<string>9</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
......
Bhagyashree/Sunarc/Controller/Appointment/ServiceDetailViewController.swift
......@@ -54,16 +54,28 @@ class ServiceDetailViewController: UIViewController {
if let orderId = self.orderId {
self.appointment.detailOfComlpeted(orderId: orderId, success: {
self.serviceStatus = .completed
self.btnStartMeeting.isHidden = true
self.btnEditResult.isHidden = true
self.tblServiceDetail.reloadData()
self.showHideButtons()
}, failure: { (errorMessage) in
if errorMessage.count > 0 {
self.view.showToast(errorMessage, position: .bottom, popTime: 2.0, dismissOnTap: false)
}
self.showHideButtons()
})
}
}) { (errorMessage) in
self.view.showToast(errorMessage, position: .bottom, popTime: 2.0, dismissOnTap: false)
}
}
}
func showHideButtons() {
switch self.serviceStatus {
case .tbc:
self.btnStartMeeting.isHidden = false
......@@ -81,17 +93,8 @@ class ServiceDetailViewController: UIViewController {
self.btnStartMeeting.isHidden = true
self.btnEditResult.isHidden = true
}
}) { (errorMessage) in
self.view.showToast(errorMessage, position: .bottom, popTime: 2.0, dismissOnTap: false)
}
}
}
}
......
Bhagyashree/Sunarc/Controller/Appointment/VideoCallingViewController.swift
......@@ -25,9 +25,6 @@ class VideoCallingViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
print(orderId)
initializeAgoraEngine()
setupVideo()
setupLocalVideo()
......@@ -102,9 +99,6 @@ extension VideoCallingViewController {
agoraKit.setupLocalVideo(videoCanvas)
}
func joinChannel() {
self.view.showToast(orderId, position: .bottom, popTime: 2.0, dismissOnTap: false)
agoraKit.joinChannel(byToken: nil, channelId: orderId, info:nil, uid:0) {[weak self] (sid, uid, elapsed) -> Void in
// Join channel "demoChannel1"
if let weakSelf = self {
......
Bhagyashree/Sunarc/Controller/Home/HomePageViewController.swift
......@@ -122,11 +122,19 @@ extension HomePageViewController: UITableViewDelegate, UITableViewDataSource {
let order = dashboard.orders[indexPath.row-1]
if order.products.first?.serviceType == .BOOKING {
if order.status == .SERVICE_ONGOING {
let videoCallVC = Utils.viewController(storyboardName: "Appointment", ofType: VideoCallingViewController.self)
videoCallVC.orderId = order.orderId!
self.navigationController?.pushViewController(videoCallVC, animated: true)
} else {
let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
appointmentdetails.serviceStatus = .tbc
appointmentdetails.incrementId = order.incrementId
appointmentdetails.orderId = order.orderId
self.navigationController?.pushViewController(appointmentdetails, animated: true)
}
} else if order.products.first?.serviceType == .FAQ {
if order.status == .PROCESSING {
......@@ -194,31 +202,27 @@ class SellerProfileCell: UITableViewCell {
if statusSwitch.isOn == true {
Dashboard.goOnlineOffline(status: true, success: {
Database.database().reference().child("sellers").setValue(["\(User.customerId)": "online"])
self.delegate.showToast(message: "You are now online")
self.lblStatus.text = "Online"
// Dashboard.goOnlineOffline(status: true, success: {
// self.delegate.showToast(message: "You are now online")
// self.lblStatus.text = "Online"
// }) { (message) in
// self.delegate.showToast(message: message)
// statusSwitch.setOn(false, animated: true)
// }
}) { (message) in
self.delegate.showToast(message: message)
statusSwitch.setOn(false, animated: true)
}
} else {
Dashboard.goOnlineOffline(status: false, success: {
Database.database().reference().child("sellers").setValue(["\(User.customerId)": "offline"])
self.delegate.showToast(message: "You are now offline")
self.lblStatus.text = "Offline"
// Dashboard.goOnlineOffline(status: false, success: {
// self.delegate.showToast(message: "You are now offline")
// self.lblStatus.text = "Offline"
// }) { (message) in
// self.delegate.showToast(message: message)
// statusSwitch.setOn(true, animated: true)
// }
}) { (message) in
self.delegate.showToast(message: message)
statusSwitch.setOn(true, animated: true)
}
}
......
Bhagyashree/Sunarc/Controller/Home/OnlineEnquiryViewController.swift
......@@ -115,6 +115,7 @@ extension OnlineEnquiryViewController {
let actionYes = UIAlertAction(title: "Yes", style: .default) { (_) in
UpdateOrder.toComplete(orderId: self.orderId, success: {
self.ref.child("isServiceEnd").setValue(true)
self.navigationController?.popToRootViewController(animated: true)
}, failuer: { (errorMessage) in
self.view.showToast(errorMessage, position: .bottom, popTime: 2.0, dismissOnTap: false)
......
Bhagyashree/Sunarc/Controller/Me/ChangePasswordViewController.swift
......@@ -10,6 +10,10 @@ import UIKit
class ChangePasswordViewController: UIViewController {
@IBOutlet var txtCurrentPassword: UITextField!
@IBOutlet var txtNewPassword: UITextField!
@IBOutlet var txtConfirmPassword: UITextField!
override func viewDidLoad() {
super.viewDidLoad()
}
......@@ -20,4 +24,45 @@ class ChangePasswordViewController: UIViewController {
}
@IBAction func confirm() {
if self.validations() == false {
return
}
User.changePassword(oldPassword: txtCurrentPassword.text!, newPassword: txtNewPassword.text!, success: {
print("success")
}) { (errorMessage) in
print(errorMessage)
}
}
func validations() -> Bool {
if txtCurrentPassword.text?.count == 0 {
self.view.showToast("Please enter current password", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if txtNewPassword.text?.count == 0 {
self.view.showToast("Please enter new password", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if txtConfirmPassword.text?.count == 0 {
self.view.showToast("Please enter new password", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if txtCurrentPassword.text != txtConfirmPassword.text {
self.view.showToast("New password and current password should be same", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
return true
}
}
Bhagyashree/Sunarc/Model/Appointment/Appointment.swift
......@@ -102,6 +102,9 @@ class Appointment {
for image in images {
self.images = self.images + "," + image
}
if self.images.count > 0 {
self.images.removeFirst()
}
}
if let audios = json["reply_audio"] as? [String] {
self.audio = ""
......@@ -127,7 +130,7 @@ class Appointment {
var timing: String {
get {
if self.bookingFrom != nil && self.bookingTill != nil {
return self.bookingFrom!+self.bookingTill! // TO DO
return self.bookingFrom! + "-" + self.bookingTill! // TO DO
}
if self.bookingFrom != nil {
return self.bookingFrom!
......
Bhagyashree/Sunarc/Model/Appointment/AppointmentExt.swift
......@@ -22,6 +22,8 @@ extension Appointment {
HTTP().connectionWithRequestObjectFormUrl(api: API.VIEW_ORDER, parameters: parameters, method: .post, indicator: true, success: { (response) in
print(response)
if let validJSON = response as? [String: Any] {
self.initWithJSON(json: validJSON)
success()
......
Bhagyashree/Sunarc/Model/UserExt.swift
......@@ -228,6 +228,20 @@ extension User {
}
class func changePassword(oldPassword: String, newPassword: String, success: @escaping () -> Void, failure: @escaping (_ errorMessage: String) -> Void) {
let paramenters = ["currentPassword": oldPassword, "newPassword": newPassword]
HTTP().connectionWithRequestObject(api: API.CHANGE_PASWORD, parameters: paramenters, method: .put, indicator: true, success: { (response) in
print(response)
}) { (errorMessage) in
failure(errorMessage)
}
}
}
......
Bhagyashree/Sunarc/Other/HTTP/API.swift
......@@ -33,7 +33,7 @@ class API {
static let COMPLETED_SERVICE = "/rest/V1/service/completed"
static let CORPORATE_CULTURE = "/rest/V1/bannerInfo"
static let REGENERATE_TOKEN = "/rest/V1/customer/regenerate"
static let CHANGE_PASWORD = "/rest/V1/customers/me/password"
// Appointment
static let VIEW_ORDER = "mobikulmphttp/marketplace/viewOrder"
......
Bhagyashree/Sunarc/View/Appointment.storyboard
......@@ -584,7 +584,7 @@
<constraint firstAttribute="height" constant="70" id="VVO-LI-z6l"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fu5-VY-bcA" customClass="DrawView" customModule="Bhagyashree" customModuleProvider="target">
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fu5-VY-bcA" customClass="DrawView" customModule="Bhagyashree" customModuleProvider="target">
<rect key="frame" x="9" y="255" width="159" height="32"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Audio" translatesAutoresizingMaskIntoConstraints="NO" id="e0b-8x-2hk">
......
Bhagyashree/Sunarc/View/Me.storyboard
......@@ -1757,49 +1757,8 @@
<outlet property="viewHeight" destination="DNS-cr-5yU" id="0jk-JO-0hr"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vf3-rD-bdc">
<rect key="frame" x="28" y="105" width="318" height="44"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_icon" translatesAutoresizingMaskIntoConstraints="NO" id="SJo-cQ-tnD">
<rect key="frame" x="11" y="10" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="C5x-aN-Q1O"/>
<constraint firstAttribute="width" constant="20" id="tpF-wG-kBw"/>
</constraints>
</imageView>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile Number" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hqb-ky-fJ2">
<rect key="frame" x="44" y="7" width="266" height="30"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" returnKeyType="next"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wmS-az-0Oe">
<rect key="frame" x="0.0" y="43" width="318" height="0.5"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="bLr-X4-idN"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="wmS-az-0Oe" secondAttribute="trailing" id="5Sz-dN-rup"/>
<constraint firstItem="wmS-az-0Oe" firstAttribute="top" secondItem="hqb-ky-fJ2" secondAttribute="bottom" constant="6" id="ORO-0g-nsB"/>
<constraint firstItem="hqb-ky-fJ2" firstAttribute="top" secondItem="Vf3-rD-bdc" secondAttribute="top" constant="7" id="Rs1-W3-4uY"/>
<constraint firstAttribute="trailing" secondItem="hqb-ky-fJ2" secondAttribute="trailing" constant="8" id="SAA-6d-JKR"/>
<constraint firstItem="wmS-az-0Oe" firstAttribute="leading" secondItem="Vf3-rD-bdc" secondAttribute="leading" id="Tin-VC-gEH"/>
<constraint firstAttribute="bottom" secondItem="wmS-az-0Oe" secondAttribute="bottom" constant="0.5" id="jxV-OY-uaA"/>
<constraint firstItem="SJo-cQ-tnD" firstAttribute="top" secondItem="Vf3-rD-bdc" secondAttribute="top" constant="10" id="k83-uK-iAF"/>
<constraint firstAttribute="height" constant="44" id="k8O-Hk-Vhm"/>
<constraint firstItem="hqb-ky-fJ2" firstAttribute="leading" secondItem="SJo-cQ-tnD" secondAttribute="trailing" constant="13" id="spX-Iw-bdj"/>
<constraint firstItem="SJo-cQ-tnD" firstAttribute="leading" secondItem="Vf3-rD-bdc" secondAttribute="leading" constant="11" id="xp2-uw-P8A"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IR0-vK-Y6y">
<rect key="frame" x="28" y="157" width="318" height="44"/>
<rect key="frame" x="28" y="110" width="318" height="44"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Current Password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="JJr-S5-2Hj">
<rect key="frame" x="46" y="6" width="269" height="30"/>
......@@ -1810,15 +1769,15 @@
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="security_icon" translatesAutoresizingMaskIntoConstraints="NO" id="4qQ-Ft-8gD">
<rect key="frame" x="13" y="10" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="GYd-6W-Mwx"/>
<constraint firstAttribute="width" constant="20" id="rgU-Y2-gA4"/>
<constraint firstAttribute="height" constant="20" id="TBB-qT-lSL"/>
<constraint firstAttribute="width" constant="20" id="xpC-Hv-Wm1"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OAf-nB-hK4">
<rect key="frame" x="0.0" y="43" width="318" height="0.5"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="IIZ-OE-YjY"/>
<constraint firstAttribute="height" constant="0.5" id="wkd-F8-Z8X"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......@@ -1827,20 +1786,20 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="4qQ-Ft-8gD" firstAttribute="leading" secondItem="IR0-vK-Y6y" secondAttribute="leading" constant="13" id="G8y-dd-PXV"/>
<constraint firstItem="OAf-nB-hK4" firstAttribute="leading" secondItem="IR0-vK-Y6y" secondAttribute="leading" id="LeX-Rn-lyu"/>
<constraint firstAttribute="trailing" secondItem="JJr-S5-2Hj" secondAttribute="trailing" constant="3" id="MhB-Ez-Pr2"/>
<constraint firstItem="JJr-S5-2Hj" firstAttribute="leading" secondItem="4qQ-Ft-8gD" secondAttribute="trailing" constant="13" id="Rsj-ED-qse"/>
<constraint firstAttribute="height" constant="44" id="eGJ-E9-eTj"/>
<constraint firstItem="JJr-S5-2Hj" firstAttribute="top" secondItem="IR0-vK-Y6y" secondAttribute="top" constant="6" id="ffB-1U-d0V"/>
<constraint firstAttribute="bottom" secondItem="OAf-nB-hK4" secondAttribute="bottom" constant="0.5" id="hei-hR-JPR"/>
<constraint firstItem="OAf-nB-hK4" firstAttribute="top" secondItem="JJr-S5-2Hj" secondAttribute="bottom" constant="7" id="ox0-f7-YgQ"/>
<constraint firstItem="4qQ-Ft-8gD" firstAttribute="top" secondItem="IR0-vK-Y6y" secondAttribute="top" constant="10" id="uvK-1j-oJG"/>
<constraint firstAttribute="trailing" secondItem="OAf-nB-hK4" secondAttribute="trailing" id="vG8-Ck-ZYI"/>
<constraint firstAttribute="trailing" secondItem="OAf-nB-hK4" secondAttribute="trailing" id="Jmb-tl-MKo"/>
<constraint firstItem="JJr-S5-2Hj" firstAttribute="leading" secondItem="4qQ-Ft-8gD" secondAttribute="trailing" constant="13" id="aoH-sO-5FD"/>
<constraint firstAttribute="trailing" secondItem="JJr-S5-2Hj" secondAttribute="trailing" constant="3" id="bOI-NE-2Zk"/>
<constraint firstItem="OAf-nB-hK4" firstAttribute="leading" secondItem="IR0-vK-Y6y" secondAttribute="leading" id="dsJ-Il-DUR"/>
<constraint firstItem="OAf-nB-hK4" firstAttribute="top" secondItem="JJr-S5-2Hj" secondAttribute="bottom" constant="7" id="ihi-w8-Rih"/>
<constraint firstItem="4qQ-Ft-8gD" firstAttribute="top" secondItem="IR0-vK-Y6y" secondAttribute="top" constant="10" id="ivu-7F-jky"/>
<constraint firstAttribute="bottom" secondItem="OAf-nB-hK4" secondAttribute="bottom" constant="0.5" id="lyN-Ke-Zbz"/>
<constraint firstItem="JJr-S5-2Hj" firstAttribute="top" secondItem="IR0-vK-Y6y" secondAttribute="top" constant="6" id="qw1-Dv-PCE"/>
<constraint firstItem="4qQ-Ft-8gD" firstAttribute="leading" secondItem="IR0-vK-Y6y" secondAttribute="leading" constant="13" id="uph-iz-oRG"/>
<constraint firstAttribute="height" constant="44" id="yhf-lq-W6t"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Y1v-Es-rKr">
<rect key="frame" x="28" y="205" width="318" height="44"/>
<rect key="frame" x="28" y="158" width="318" height="44"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="New password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="sl6-sh-sSV">
<rect key="frame" x="46" y="6" width="269" height="30"/>
......@@ -1851,15 +1810,15 @@
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="security_icon" translatesAutoresizingMaskIntoConstraints="NO" id="DGK-rD-8vn">
<rect key="frame" x="13" y="10" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="MOh-jS-L7e"/>
<constraint firstAttribute="width" constant="20" id="Yf1-I6-fPN"/>
<constraint firstAttribute="height" constant="20" id="KxA-8P-u4P"/>
<constraint firstAttribute="width" constant="20" id="ofh-CA-BPs"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9At-Aq-DqC">
<rect key="frame" x="0.0" y="43" width="318" height="0.5"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="rmQ-MM-GlW"/>
<constraint firstAttribute="height" constant="0.5" id="pVT-LA-aZk"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......@@ -1868,20 +1827,20 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="sl6-sh-sSV" firstAttribute="top" secondItem="Y1v-Es-rKr" secondAttribute="top" constant="6" id="0nc-Sm-CVH"/>
<constraint firstItem="9At-Aq-DqC" firstAttribute="leading" secondItem="Y1v-Es-rKr" secondAttribute="leading" id="Lxj-Dk-QAj"/>
<constraint firstItem="9At-Aq-DqC" firstAttribute="top" secondItem="sl6-sh-sSV" secondAttribute="bottom" constant="7" id="QmX-iW-1fR"/>
<constraint firstAttribute="height" constant="44" id="Rqh-Fm-QIS"/>
<constraint firstAttribute="bottom" secondItem="9At-Aq-DqC" secondAttribute="bottom" constant="0.5" id="XCv-m7-OZA"/>
<constraint firstAttribute="trailing" secondItem="sl6-sh-sSV" secondAttribute="trailing" constant="3" id="gvW-ir-6bK"/>
<constraint firstItem="sl6-sh-sSV" firstAttribute="leading" secondItem="DGK-rD-8vn" secondAttribute="trailing" constant="13" id="hca-z7-sKb"/>
<constraint firstItem="DGK-rD-8vn" firstAttribute="top" secondItem="Y1v-Es-rKr" secondAttribute="top" constant="10" id="sp6-eT-wS0"/>
<constraint firstAttribute="trailing" secondItem="9At-Aq-DqC" secondAttribute="trailing" id="z6w-vk-wVA"/>
<constraint firstItem="DGK-rD-8vn" firstAttribute="leading" secondItem="Y1v-Es-rKr" secondAttribute="leading" constant="13" id="zHI-3q-0Dj"/>
<constraint firstItem="DGK-rD-8vn" firstAttribute="top" secondItem="Y1v-Es-rKr" secondAttribute="top" constant="10" id="6cn-sb-LFF"/>
<constraint firstAttribute="trailing" secondItem="sl6-sh-sSV" secondAttribute="trailing" constant="3" id="B0S-Q8-uzU"/>
<constraint firstItem="9At-Aq-DqC" firstAttribute="top" secondItem="sl6-sh-sSV" secondAttribute="bottom" constant="7" id="Hfn-q8-8r8"/>
<constraint firstItem="DGK-rD-8vn" firstAttribute="leading" secondItem="Y1v-Es-rKr" secondAttribute="leading" constant="13" id="JvF-qo-ElG"/>
<constraint firstAttribute="bottom" secondItem="9At-Aq-DqC" secondAttribute="bottom" constant="0.5" id="NH0-eJ-HTt"/>
<constraint firstAttribute="trailing" secondItem="9At-Aq-DqC" secondAttribute="trailing" id="TEV-jg-W4k"/>
<constraint firstItem="9At-Aq-DqC" firstAttribute="leading" secondItem="Y1v-Es-rKr" secondAttribute="leading" id="WvE-qW-gH8"/>
<constraint firstAttribute="height" constant="44" id="YnN-pw-szG"/>
<constraint firstItem="sl6-sh-sSV" firstAttribute="top" secondItem="Y1v-Es-rKr" secondAttribute="top" constant="6" id="c93-Qu-hOO"/>
<constraint firstItem="sl6-sh-sSV" firstAttribute="leading" secondItem="DGK-rD-8vn" secondAttribute="trailing" constant="13" id="gK9-0v-pt9"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jxe-cD-47o">
<rect key="frame" x="28" y="255" width="318" height="44"/>
<rect key="frame" x="28" y="208" width="318" height="44"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Confirm Password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VFb-zZ-plw">
<rect key="frame" x="46" y="5" width="258" height="30"/>
......@@ -1893,7 +1852,7 @@
<rect key="frame" x="0.0" y="43" width="318" height="0.5"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="2s2-cV-fgR"/>
<constraint firstAttribute="height" constant="0.5" id="okU-VA-f8b"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......@@ -1902,32 +1861,29 @@
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="security_icon" translatesAutoresizingMaskIntoConstraints="NO" id="BBv-MX-Baw">
<rect key="frame" x="13" y="11" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="0Lu-Vq-0u5"/>
<constraint firstAttribute="width" constant="20" id="EpX-1t-Viv"/>
<constraint firstAttribute="width" constant="20" id="WZc-8r-rt6"/>
<constraint firstAttribute="height" constant="20" id="hFo-rK-bOz"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="jJb-Hn-AJy" firstAttribute="leading" secondItem="jxe-cD-47o" secondAttribute="leading" id="1a9-pI-bg4"/>
<constraint firstItem="jJb-Hn-AJy" firstAttribute="top" secondItem="VFb-zZ-plw" secondAttribute="bottom" constant="8" id="3O8-aM-qQe"/>
<constraint firstItem="BBv-MX-Baw" firstAttribute="leading" secondItem="jxe-cD-47o" secondAttribute="leading" constant="13" id="DCa-A4-iTi"/>
<constraint firstItem="VFb-zZ-plw" firstAttribute="leading" secondItem="BBv-MX-Baw" secondAttribute="trailing" constant="13" id="T00-b3-eb1"/>
<constraint firstAttribute="trailing" secondItem="VFb-zZ-plw" secondAttribute="trailing" constant="14" id="eID-tw-t6n"/>
<constraint firstItem="VFb-zZ-plw" firstAttribute="top" secondItem="jxe-cD-47o" secondAttribute="top" constant="5" id="fCc-ux-qR6"/>
<constraint firstAttribute="bottom" secondItem="jJb-Hn-AJy" secondAttribute="bottom" constant="0.5" id="nuC-aY-sF9"/>
<constraint firstAttribute="trailing" secondItem="jJb-Hn-AJy" secondAttribute="trailing" id="r3J-qH-UXp"/>
<constraint firstAttribute="height" constant="44" id="tnH-db-9DC"/>
<constraint firstItem="BBv-MX-Baw" firstAttribute="top" secondItem="jxe-cD-47o" secondAttribute="top" constant="11" id="xZU-Q1-XOz"/>
<constraint firstItem="jJb-Hn-AJy" firstAttribute="leading" secondItem="jxe-cD-47o" secondAttribute="leading" id="3ZY-03-dpp"/>
<constraint firstItem="BBv-MX-Baw" firstAttribute="top" secondItem="jxe-cD-47o" secondAttribute="top" constant="11" id="5Ew-Ge-Wb8"/>
<constraint firstAttribute="height" constant="44" id="900-GT-Ndv"/>
<constraint firstAttribute="trailing" secondItem="jJb-Hn-AJy" secondAttribute="trailing" id="9WQ-mt-Fk0"/>
<constraint firstItem="BBv-MX-Baw" firstAttribute="leading" secondItem="jxe-cD-47o" secondAttribute="leading" constant="13" id="HhW-kQ-Jts"/>
<constraint firstItem="VFb-zZ-plw" firstAttribute="top" secondItem="jxe-cD-47o" secondAttribute="top" constant="5" id="Lnx-UG-zmh"/>
<constraint firstAttribute="bottom" secondItem="jJb-Hn-AJy" secondAttribute="bottom" constant="0.5" id="UQn-Ah-wP8"/>
<constraint firstItem="VFb-zZ-plw" firstAttribute="leading" secondItem="BBv-MX-Baw" secondAttribute="trailing" constant="13" id="Wk8-yB-bdT"/>
<constraint firstAttribute="trailing" secondItem="VFb-zZ-plw" secondAttribute="trailing" constant="14" id="ZIC-Ci-yzI"/>
<constraint firstItem="jJb-Hn-AJy" firstAttribute="top" secondItem="VFb-zZ-plw" secondAttribute="bottom" constant="8" id="qFU-ZW-PIJ"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2RO-1S-qkH" customClass="DrawButton" customModule="Bhagyashree" customModuleProvider="target">
<rect key="frame" x="82" y="339" width="210" height="36"/>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2RO-1S-qkH" customClass="DrawButton" customModule="Bhagyashree" customModuleProvider="target">
<rect key="frame" x="82" y="292" width="210" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.42745098040000001" blue="0.56078431370000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="Bsb-TG-RKo"/>
<constraint firstAttribute="width" constant="210" id="fyh-4w-Ccg"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
<state key="normal" title="Confirm">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......@@ -1937,30 +1893,33 @@
<real key="value" value="10"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="confirm" destination="17r-tI-H77" eventType="touchUpInside" id="tLu-YF-Ujs"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Y1v-Es-rKr" firstAttribute="top" secondItem="IR0-vK-Y6y" secondAttribute="bottom" constant="4" id="0Tz-E4-4ut"/>
<constraint firstItem="2RO-1S-qkH" firstAttribute="centerX" secondItem="kfl-7B-O6b" secondAttribute="centerX" id="4Cu-gG-MEe"/>
<constraint firstItem="IR0-vK-Y6y" firstAttribute="top" secondItem="Vf3-rD-bdc" secondAttribute="bottom" constant="8" id="7lS-5A-FPn"/>
<constraint firstItem="jxe-cD-47o" firstAttribute="top" secondItem="Y1v-Es-rKr" secondAttribute="bottom" constant="6" id="BUX-Lg-CKC"/>
<constraint firstItem="jxe-cD-47o" firstAttribute="leading" secondItem="kfl-7B-O6b" secondAttribute="leading" constant="28" id="Eib-HN-KW0"/>
<constraint firstItem="IR0-vK-Y6y" firstAttribute="leading" secondItem="kfl-7B-O6b" secondAttribute="leading" constant="28" id="1R3-x2-4nr"/>
<constraint firstItem="kfl-7B-O6b" firstAttribute="trailing" secondItem="Y1v-Es-rKr" secondAttribute="trailing" constant="29" id="EiK-q7-Tud"/>
<constraint firstItem="Y1v-Es-rKr" firstAttribute="leading" secondItem="kfl-7B-O6b" secondAttribute="leading" constant="28" id="FRw-Hj-YgJ"/>
<constraint firstItem="Alg-cj-2sN" firstAttribute="leading" secondItem="kfl-7B-O6b" secondAttribute="leading" id="J9S-Sm-Akz"/>
<constraint firstItem="IR0-vK-Y6y" firstAttribute="leading" secondItem="kfl-7B-O6b" secondAttribute="leading" constant="28" id="MQX-7w-Ms6"/>
<constraint firstItem="kfl-7B-O6b" firstAttribute="trailing" secondItem="jxe-cD-47o" secondAttribute="trailing" constant="29" id="S6S-13-djT"/>
<constraint firstItem="Y1v-Es-rKr" firstAttribute="leading" secondItem="kfl-7B-O6b" secondAttribute="leading" constant="28" id="SCQ-6o-Yku"/>
<constraint firstItem="Alg-cj-2sN" firstAttribute="top" secondItem="1dz-b6-rdD" secondAttribute="top" id="TPC-xE-8xn"/>
<constraint firstItem="Vf3-rD-bdc" firstAttribute="leading" secondItem="kfl-7B-O6b" secondAttribute="leading" constant="28" id="UGV-fb-V0D"/>
<constraint firstItem="kfl-7B-O6b" firstAttribute="trailing" secondItem="Vf3-rD-bdc" secondAttribute="trailing" constant="29" id="Xp5-K8-ZR9"/>
<constraint firstItem="kfl-7B-O6b" firstAttribute="trailing" secondItem="IR0-vK-Y6y" secondAttribute="trailing" constant="29" id="YGp-6p-2mg"/>
<constraint firstItem="2RO-1S-qkH" firstAttribute="top" secondItem="jxe-cD-47o" secondAttribute="bottom" constant="40" id="hHC-LS-Ube"/>
<constraint firstItem="jxe-cD-47o" firstAttribute="leading" secondItem="kfl-7B-O6b" secondAttribute="leading" constant="28" id="V7a-7G-J0M"/>
<constraint firstItem="IR0-vK-Y6y" firstAttribute="top" secondItem="Alg-cj-2sN" secondAttribute="bottom" constant="45" id="eIg-qR-eWo"/>
<constraint firstItem="Alg-cj-2sN" firstAttribute="trailing" secondItem="kfl-7B-O6b" secondAttribute="trailing" id="igz-9j-Xhe"/>
<constraint firstItem="kfl-7B-O6b" firstAttribute="trailing" secondItem="Y1v-Es-rKr" secondAttribute="trailing" constant="29" id="tEt-dl-VQL"/>
<constraint firstItem="Vf3-rD-bdc" firstAttribute="top" secondItem="Alg-cj-2sN" secondAttribute="bottom" constant="40" id="yob-Qi-9n2"/>
<constraint firstItem="kfl-7B-O6b" firstAttribute="trailing" secondItem="IR0-vK-Y6y" secondAttribute="trailing" constant="29" id="mRd-ip-QEE"/>
<constraint firstItem="jxe-cD-47o" firstAttribute="top" secondItem="Y1v-Es-rKr" secondAttribute="bottom" constant="6" id="o94-4i-1l0"/>
<constraint firstItem="Y1v-Es-rKr" firstAttribute="top" secondItem="IR0-vK-Y6y" secondAttribute="bottom" constant="4" id="qSg-ZZ-T5g"/>
<constraint firstItem="kfl-7B-O6b" firstAttribute="trailing" secondItem="jxe-cD-47o" secondAttribute="trailing" constant="29" id="wtR-oc-0AW"/>
</constraints>
<viewLayoutGuide key="safeArea" id="kfl-7B-O6b"/>
</view>
<connections>
<outlet property="txtConfirmPassword" destination="VFb-zZ-plw" id="htx-AC-YeS"/>
<outlet property="txtCurrentPassword" destination="JJr-S5-2Hj" id="QHU-ok-YPJ"/>
<outlet property="txtNewPassword" destination="sl6-sh-sSV" id="u1a-r3-Wiy"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Bd5-Ua-F52" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
......@@ -4340,6 +4299,5 @@
<image name="status-inprogress" width="200" height="200"/>
<image name="tbc" width="50" height="50"/>
<image name="terms" width="28" height="34"/>
<image name="user_icon" width="37" height="43"/>
</resources>
</document>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment