Skip to content

F
Fengshui-Seller-iOS
Commit cb84b66a by SunARcTech2
Options

Fix issues

parent 3830ec7c
Showing with 1087 additions and 315 deletions
.DS_Store
No preview for this file type
Bhagyashree.xcworkspace/xcuserdata/sunarctech2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -10,7 +10,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/Appointment/AppointmentExt.swift"
timestampString = "558794579.403734"
timestampString = "559566819.66458"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "25"
......@@ -41,13 +41,29 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/Home/HomeScreen/Order.swift"
timestampString = "558794579.403852"
filePath = "Bhagyashree/Sunarc/Model/Me/OrderDetailsExt.swift"
timestampString = "559480213.945861"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
landmarkName = "initWithJSON(json:)"
startingLineNumber = "22"
endingLineNumber = "22"
landmarkName = "getOrderDetail(incrementId:success:failure:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Other/HTTP/HTTP.swift"
timestampString = "559213005.3192461"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "326"
endingLineNumber = "326"
landmarkName = "uploadFileTmp(withThumbNail:api:filePath:type:result:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......
Bhagyashree/Fengshui.xcassets/close_icon-1.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "close_icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "pc_close_icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "pc_close_icon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Bhagyashree/Fengshui.xcassets/redDot.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "redDot.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Bhagyashree/Fengshui.xcassets/star.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "star.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Bhagyashree/Fengshui.xcassets/starLight.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "starLight.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Bhagyashree/Info.plist
......@@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>15</string>
<string>16</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
......
Bhagyashree/Sunarc/Controller/Appointment/CompletedServicesViewController.swift
......@@ -120,7 +120,7 @@ extension CompletedServicesViewController: UITableViewDelegate, UITableViewDataS
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Appointment/InvalidServicesViewController.swift
......@@ -54,7 +54,7 @@ class InvalidServicesViewController: BaseViewController {
if nextPage == true {
service.nextPage(serviceStatus: .COMPLETE, success: {
service.nextPage(serviceStatus: .CLOSED, success: {
self.tblInvalidServices.reloadData()
self.tblInvalidServices.mj_footer.endRefreshing()
}) { (error) in
......@@ -62,7 +62,7 @@ class InvalidServicesViewController: BaseViewController {
self.view.showToast(error, position: .bottom, popTime: 2.0, dismissOnTap: false )
}
} else {
service.getServices(serviceStatus: .COMPLETE, success: {
service.getServices(serviceStatus: .CLOSED, success: {
self.tblInvalidServices.reloadData()
self.tblInvalidServices.mj_header.endRefreshing()
}) { (errorMessage) in
......@@ -120,7 +120,7 @@ extension InvalidServicesViewController: UITableViewDelegate, UITableViewDataSou
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Appointment/MoreServicesViewController.swift
......@@ -177,14 +177,14 @@ class MoreServicesViewController: WMPageController {
override func menuView(_ menu: WMMenuView!, widthForItemAt index: Int) -> CGFloat {
switch index {
case 0:
// switch index {
// case 0:
return self.view.frame.size.width/4
case 1:
return self.view.frame.size.width/4 - 20
default:
return 150
}
// case 1:
// return self.view.frame.size.width/4 - 20
// default:
// return 150
// }
}
}
......
Bhagyashree/Sunarc/Controller/Appointment/OnGoingServicesViewController.swift
......@@ -126,7 +126,7 @@ extension OnGoingServicesViewController: UITableViewDelegate, UITableViewDataSou
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Appointment/ProcessingViewController.swift
......@@ -120,7 +120,7 @@ extension ProcessingViewController: UITableViewDelegate, UITableViewDataSource {
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Appointment/ServicesListViewController.swift
......@@ -125,7 +125,7 @@ extension ServicesListViewController: UITableViewDelegate, UITableViewDataSource
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/AuspiciousDateContainer.swift
......@@ -8,7 +8,7 @@
import UIKit
class AuspiciousDateContainer: BaseViewController {
class AuspiciousDateContainer: BaseViewController, GroundbreakingDateSelectionViewControllerDelegate, CompanyMovingDateSelectionViewControllerDelegate, MarriageDateSelectionViewControllerDelegate, RegsirationDateSelectionViewControllerDelegate, BusinessOpeningDateSelectionViewControllerDelegate, BedSettingDateSelectionViewControllerDelegate, HouseMovingDateSelectionViewControllerDelegate, GodSettingDateSelectionViewControllerDelegate {
@IBOutlet var groundbreakingDateSelection: UIView!
@IBOutlet var companyMovingDateSelection: UIView!
......@@ -18,6 +18,7 @@ class AuspiciousDateContainer: BaseViewController {
@IBOutlet var bedSettingDateSelection: UIView!
@IBOutlet var houseMovingDateSelection: UIView!
@IBOutlet var godSettingDateSelection: UIView!
@IBOutlet var lblTitle: UILabel!
// var seller: Seller?
var service: String?
......@@ -32,6 +33,9 @@ class AuspiciousDateContainer: BaseViewController {
self.navigationController?.popViewController(animated: true)
}
func serviceName(name: String) {
self.lblTitle.text = name
}
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
......@@ -41,48 +45,56 @@ class AuspiciousDateContainer: BaseViewController {
if segue.identifier == "GroundbreakingDateSelectionViewController" {
(segue.destination as! GroundbreakingDateSelectionViewController).incrementId = incrementId
(segue.destination as! GroundbreakingDateSelectionViewController).orderId = orderId
(segue.destination as! GroundbreakingDateSelectionViewController).delegate = self
}
case .MovingCompany:
companyMovingDateSelection.isHidden = false
if segue.identifier == "CompanyMovingDateSelectionViewController" {
(segue.destination as! CompanyMovingDateSelectionViewController).incrementId = incrementId
(segue.destination as! CompanyMovingDateSelectionViewController).orderId = orderId
(segue.destination as! CompanyMovingDateSelectionViewController).delegate = self
}
case .Marriage:
marriageDateSelection.isHidden = false
if segue.identifier == "MarriageDateSelectionViewController" {
(segue.destination as! MarriageDateSelectionViewController).incrementId = incrementId
(segue.destination as! MarriageDateSelectionViewController).orderId = orderId
(segue.destination as! MarriageDateSelectionViewController).delegate = self
}
case .Registration:
registrationDateSelection.isHidden = false
if segue.identifier == "RegsirationDateSelectionViewController" {
(segue.destination as! RegsirationDateSelectionViewController).incrementId = incrementId
(segue.destination as! RegsirationDateSelectionViewController).orderId = orderId
(segue.destination as! RegsirationDateSelectionViewController).delegate = self
}
case .StartOpeningBusiness:
businessOpeningDateSelection.isHidden = false
if segue.identifier == "BusinessOpeningDateSelectionViewController" {
(segue.destination as! BusinessOpeningDateSelectionViewController).incrementId = incrementId
(segue.destination as! BusinessOpeningDateSelectionViewController).orderId = orderId
(segue.destination as! BusinessOpeningDateSelectionViewController).delegate = self
}
case .BedSetting:
bedSettingDateSelection.isHidden = false
if segue.identifier == "BedSettingDateSelectionViewController" {
(segue.destination as! BedSettingDateSelectionViewController).incrementId = incrementId
(segue.destination as! BedSettingDateSelectionViewController).orderId = orderId
(segue.destination as! BedSettingDateSelectionViewController).delegate = self
}
case .MovingHouse:
houseMovingDateSelection.isHidden = false
if segue.identifier == "HouseMovingDateSelectionViewController" {
(segue.destination as! HouseMovingDateSelectionViewController).incrementId = incrementId
(segue.destination as! HouseMovingDateSelectionViewController).orderId = orderId
(segue.destination as! HouseMovingDateSelectionViewController).delegate = self
}
case .GODSetting:
godSettingDateSelection.isHidden = false
if segue.identifier == "GodSettingDateSelectionViewController" {
(segue.destination as! GodSettingDateSelectionViewController).incrementId = incrementId
(segue.destination as! GodSettingDateSelectionViewController).orderId = orderId
(segue.destination as! GodSettingDateSelectionViewController).delegate = self
}
default:
print("Form not found")
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/BedSettingDateSelectionViewController.swift
......@@ -8,6 +8,13 @@
import UIKit
protocol BedSettingDateSelectionViewControllerDelegate {
func serviceName(name: String)
}
class BedSettingDateSelectionViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
......@@ -24,6 +31,7 @@ class BedSettingDateSelectionViewController: BaseViewController {
var isWeekDay = false
var incrementId: String?
var orderId: String?
var delegate: BedSettingDateSelectionViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -33,7 +41,8 @@ class BedSettingDateSelectionViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Owner Name" {
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/BusinessOpeningDateSelectionViewController.swift
......@@ -9,6 +9,11 @@
import UIKit
protocol BusinessOpeningDateSelectionViewControllerDelegate {
func serviceName(name: String)
}
class BusinessOpeningDateSelectionViewController: BaseViewController {
......@@ -28,7 +33,8 @@ class BusinessOpeningDateSelectionViewController: BaseViewController {
var service: String?
var incrementId: String?
var orderId: String?
var delegate: BusinessOpeningDateSelectionViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -37,7 +43,8 @@ class BusinessOpeningDateSelectionViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Owner Name" {
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/CompanyMovingDateSelectionViewController.swift
......@@ -8,6 +8,10 @@
import UIKit
protocol CompanyMovingDateSelectionViewControllerDelegate {
func serviceName(name: String)
}
class CompanyMovingDateSelectionViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
......@@ -22,7 +26,7 @@ class CompanyMovingDateSelectionViewController: BaseViewController {
var incrementId: String?
var orderId: String?
var delegate: CompanyMovingDateSelectionViewControllerDelegate!
var isWeekday = false
override func viewDidLoad() {
......@@ -33,7 +37,8 @@ class CompanyMovingDateSelectionViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Owner Name" {
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/GodSettingDateSelectionViewController.swift
......@@ -8,6 +8,11 @@
import UIKit
protocol GodSettingDateSelectionViewControllerDelegate {
func serviceName(name: String)
}
class GodSettingDateSelectionViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
......@@ -24,6 +29,7 @@ class GodSettingDateSelectionViewController: BaseViewController {
var isWeekday = false
var incrementId: String?
var orderId: String?
var delegate: GodSettingDateSelectionViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -33,7 +39,8 @@ class GodSettingDateSelectionViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Owner Name" {
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/GroundbreakingDateSelectionViewController.swift
......@@ -8,6 +8,9 @@
import UIKit
protocol GroundbreakingDateSelectionViewControllerDelegate {
func serviceName(name: String)
}
class GroundbreakingDateSelectionViewController: BaseViewController {
......@@ -22,6 +25,7 @@ class GroundbreakingDateSelectionViewController: BaseViewController {
var incrementId: String?
var orderId: String?
var delegate: GroundbreakingDateSelectionViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -31,7 +35,8 @@ class GroundbreakingDateSelectionViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Owner Name" {
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/HouseMovingDateSelectionViewController.swift
......@@ -8,6 +8,13 @@
import UIKit
protocol HouseMovingDateSelectionViewControllerDelegate {
func serviceName(name: String)
}
class HouseMovingDateSelectionViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
......@@ -23,6 +30,7 @@ class HouseMovingDateSelectionViewController: BaseViewController {
var isWeekDay = false
var incrementId: String?
var orderId: String = "0"
var delegate: HouseMovingDateSelectionViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -32,7 +40,8 @@ class HouseMovingDateSelectionViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Owner Name" {
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/MarriageDateSelectionViewController.swift
......@@ -8,6 +8,11 @@
import UIKit
protocol MarriageDateSelectionViewControllerDelegate {
func serviceName(name: String)
}
class MarriageDateSelectionViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
......@@ -38,6 +43,7 @@ class MarriageDateSelectionViewController: BaseViewController {
var service: String?
var incrementId: String?
var orderId: String = "0"
var delegate: MarriageDateSelectionViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -47,7 +53,8 @@ class MarriageDateSelectionViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Husband Name" {
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/RegsirationDateSelectionViewController.swift
......@@ -8,6 +8,13 @@
import UIKit
protocol RegsirationDateSelectionViewControllerDelegate {
func serviceName(name: String)
}
class RegsirationDateSelectionViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
......@@ -25,7 +32,8 @@ class RegsirationDateSelectionViewController: BaseViewController {
var isWeekDay = false
var incrementId: String?
var orderId: String?
var delegate: RegsirationDateSelectionViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -34,7 +42,8 @@ class RegsirationDateSelectionViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Husband's Name" {
......
Bhagyashree/Sunarc/Controller/Forms/Fengshui Services/FengshuiServiceContainerViewController.swift
......@@ -8,10 +8,13 @@
import UIKit
class FengshuiServiceContainerViewController: UIViewController {
class FengshuiServiceContainerViewController: UIViewController, OnsiteFengshuiViewControllerDelegate, FloorPlanFengshuiViewControllerDelegate {
@IBOutlet var floorPlanView: UIView!
@IBOutlet var onsitePlanView: UIView!
@IBOutlet var lblTitle: UILabel!
// var seller: Seller?
var service: String?
......@@ -49,13 +52,19 @@ class FengshuiServiceContainerViewController: UIViewController {
(segue.destination as! OnsiteFengshuiViewController).categoryType = categoryType
(segue.destination as! OnsiteFengshuiViewController).incrementId = incrementId
(segue.destination as! OnsiteFengshuiViewController).orderId = orderId
(segue.destination as! OnsiteFengshuiViewController).delegate = self
} else if segue.identifier == "FloorPlanFengshuiViewController" {
(segue.destination as! FloorPlanFengshuiViewController).categoryType = categoryType
(segue.destination as! FloorPlanFengshuiViewController).incrementId = incrementId
(segue.destination as! FloorPlanFengshuiViewController).orderId = orderId
(segue.destination as! FloorPlanFengshuiViewController).delegate = self
}
}
func serviceName(name: String) {
lblTitle.text = name
}
}
......
Bhagyashree/Sunarc/Controller/Forms/Fengshui Services/FloorPlanFengshuiViewController.swift
......@@ -8,6 +8,8 @@
import UIKit
import Kingfisher
import INSPhotoGallery
enum PhotoFor: String {
......@@ -15,6 +17,11 @@ enum PhotoFor: String {
case bedroom
}
protocol FloorPlanFengshuiViewControllerDelegate {
func serviceName(name: String)
}
class FloorPlanFengshuiViewController: UIViewController {
var isGeomencyService = false
......@@ -22,6 +29,7 @@ class FloorPlanFengshuiViewController: UIViewController {
var categoryType: CategoryType = .OnsiteServiceGeomancy
var incrementId: String?
var orderId: String?
var delegate: FloorPlanFengshuiViewControllerDelegate!
@IBOutlet var txtFullAddress: UITextView!
@IBOutlet var txtFamilyMembers: UITextView!
......@@ -40,8 +48,10 @@ class FloorPlanFengshuiViewController: UIViewController {
return
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Full Address" {
......@@ -72,6 +82,44 @@ class FloorPlanFengshuiViewController: UIViewController {
@IBAction func previewImage1(gesture: UITapGestureRecognizer) {
if let image = imgHouseFrontImageView.image {
self.showImage(image: image)
}
}
@IBAction func previewImage2(gesture: UITapGestureRecognizer) {
if let image = imgBedRoomImageView.image {
self.showImage(image: image)
}
}
func showImage(image: UIImage) {
var photos = [INSPhoto]()
let photo = INSPhoto(image: image, thumbnailImage: nil)
photos.append(photo)
let galleryPreview = INSPhotosViewController(photos: photos, initialPhoto: nil, referenceView: self.navigationController?.view)
if let postInFullScreenView = Utils.viewFrom("PostInFullScreenView") as? PostInFullScreenView {
postInFullScreenView.setNeedsLayout()
postInFullScreenView.layoutIfNeeded()
galleryPreview.overlayView = postInFullScreenView
}
galleryPreview.referenceViewForPhotoWhenDismissingHandler = { photo in
return nil
}
self.present(galleryPreview, animated: true, completion: {
})
}
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
......
Bhagyashree/Sunarc/Controller/Forms/Fengshui Services/OnsiteFengshuiViewController.swift
......@@ -8,6 +8,10 @@
import UIKit
protocol OnsiteFengshuiViewControllerDelegate {
func serviceName(name: String)
}
class OnsiteFengshuiViewController: UIViewController {
var isGeomencyService = false
......@@ -22,7 +26,8 @@ class OnsiteFengshuiViewController: UIViewController {
var categoryType: CategoryType = .OnsiteServiceGeomancy
var incrementId: String?
var orderId: String?
var delegate: OnsiteFengshuiViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -31,7 +36,8 @@ class OnsiteFengshuiViewController: UIViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Full Address" {
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/CompanyNamingServiceViewController.swift
......@@ -8,6 +8,11 @@
import UIKit
protocol CompanyNamingServiceViewControllerDelegate {
func serviceName(name: String)
}
class CompanyNamingServiceViewController: BaseViewController {
......@@ -26,7 +31,7 @@ class CompanyNamingServiceViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
var zodiacPickerFor = 0
var orderId: String?
var delegate: CompanyNamingServiceViewControllerDelegate!
// var seller: Seller?
var service: String?
// var customOption = ServiceCustomOption()
......@@ -42,7 +47,8 @@ class CompanyNamingServiceViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Company Name " {
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/CompanyReNamingServiceViewController.swift
......@@ -8,6 +8,11 @@
import UIKit
protocol CompanyReNamingServiceViewControllerDelegate {
func serviceName(name: String)
}
class CompanyReNamingServiceViewController: BaseViewController {
......@@ -26,7 +31,7 @@ class CompanyReNamingServiceViewController: BaseViewController {
var incrementId: String?
var orderId: String?
var delegate: CompanyReNamingServiceViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -36,7 +41,8 @@ class CompanyReNamingServiceViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "Original Company Name" {
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/IndividualNamingServiceViewController.swift
......@@ -8,6 +8,10 @@
import UIKit
protocol IndividualNamingServiceViewControllerDelegate {
func serviceName(name: String)
}
class IndividualNamingServiceViewController: BaseViewController {
......@@ -32,6 +36,7 @@ class IndividualNamingServiceViewController: BaseViewController {
var zodiacPickerFor = 0
var incrementId: String?
var orderId: String?
var delegate: IndividualNamingServiceViewControllerDelegate!
// var seller: Seller?
var service: String?
......@@ -48,7 +53,8 @@ class IndividualNamingServiceViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "B.O.D" {
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/IndividualReNamingServiceViewController.swift
......@@ -8,6 +8,11 @@
import UIKit
protocol IndividualReNamingServiceViewControllerDelegate {
func serviceName(name: String)
}
class IndividualReNamingServiceViewController: BaseViewController {
@IBOutlet var txtOrignalName: UITextField!
......@@ -29,6 +34,7 @@ class IndividualReNamingServiceViewController: BaseViewController {
var zodiacPickerFor = 0
var incrementId: String?
var orderId: String?
var delegate: IndividualReNamingServiceViewControllerDelegate!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -38,7 +44,8 @@ class IndividualReNamingServiceViewController: BaseViewController {
}
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
FormDetail.get(incrementId: incrementId_, success: { (customOptions, productName) in
self.delegate.serviceName(name: productName)
for option in customOptions {
if option.option == "B.O.D" {
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/ScienceOfNamingContainerViewController.swift
......@@ -8,12 +8,13 @@
import UIKit
class ScienceOfNamingContainerViewController: BaseViewController {
class ScienceOfNamingContainerViewController: BaseViewController, IndividualNamingServiceViewControllerDelegate, IndividualReNamingServiceViewControllerDelegate, CompanyNamingServiceViewControllerDelegate, CompanyReNamingServiceViewControllerDelegate {
@IBOutlet var individualNamingServiceView: UIView!
@IBOutlet var individualReNamingServiceView: UIView!
@IBOutlet var companyNamingServiceView: UIView!
@IBOutlet var companyReNamingServiceView: UIView!
@IBOutlet var lblTitle: UILabel!
// var seller: Seller?
var service: String?
......@@ -39,24 +40,28 @@ class ScienceOfNamingContainerViewController: BaseViewController {
if segue.identifier == "IndividualNamingServiceViewController" {
(segue.destination as! IndividualNamingServiceViewController).incrementId = incrementId
(segue.destination as! IndividualNamingServiceViewController).orderId = orderId
(segue.destination as! IndividualNamingServiceViewController).delegate = self
}
case .IndividualNamingServiceReNamedChangeName:
individualReNamingServiceView.isHidden = false
if segue.identifier == "IndividualReNamingServiceViewController" {
(segue.destination as! IndividualReNamingServiceViewController).incrementId = incrementId
(segue.destination as! IndividualReNamingServiceViewController).orderId = orderId
(segue.destination as! IndividualReNamingServiceViewController).delegate = self
}
case .CompanyNamingServiceNamed:
companyNamingServiceView.isHidden = false
if segue.identifier == "CompanyNamingServiceViewController" {
(segue.destination as! CompanyNamingServiceViewController).incrementId = incrementId
(segue.destination as! CompanyNamingServiceViewController).orderId = orderId
(segue.destination as! CompanyNamingServiceViewController).delegate = self
}
case .CompanyNamingServiceReNamedChangeName:
companyReNamingServiceView.isHidden = false
if segue.identifier == "CompanyReNamingServiceViewController" {
(segue.destination as! CompanyReNamingServiceViewController).incrementId = incrementId
(segue.destination as! CompanyReNamingServiceViewController).orderId = orderId
(segue.destination as! CompanyReNamingServiceViewController).delegate = self
}
default:
print("Form not found")
......@@ -65,6 +70,10 @@ class ScienceOfNamingContainerViewController: BaseViewController {
}
func serviceName(name: String) {
self.lblTitle.text = name
}
}
......
Bhagyashree/Sunarc/Controller/Home/CompleteEnquiryViewController.swift
......@@ -98,7 +98,7 @@ extension CompleteEnquiryViewController: UITableViewDataSource, UITableViewDeleg
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = enquiry.enquiries[indexPath.row].incrementId!
enquiryDetailsViewController.orderId = enquiry.enquiries[indexPath.row].orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Home/EnquiryDetailsViewController.swift deleted 100644 → 0
//
// EnquiryDetailsViewController.swift
// FengShuiDesign
//
// Created by sunarc on 16/05/18.
// Copyright © 2018 sunarc. All rights reserved.
//
import UIKit
import Kingfisher
class EnquiryDetailsViewController: BaseViewController {
@IBOutlet var tblDetails: UITableView!
var incrementId = "0"
var orderId = "0"
var appointmentDetails = Appointment()
override func viewDidLoad() {
super.viewDidLoad()
appointmentDetails.getAppointmentDetails(incrementId: incrementId, success: {
self.tblDetails.reloadData()
}) { (errorMessage) in
self.view.showToast(errorMessage, position: .bottom, popTime: 2.0, dismissOnTap: false)
}
}
}
extension EnquiryDetailsViewController {
@IBAction func chatHistory() {
let chatViewController = Utils.viewController(storyboardName: "Home", ofType: OnlineEnquiryViewController.self)
chatViewController.orderId = orderId
chatViewController.isOrderCompleted = true
chatViewController.customerProfileImage = appointmentDetails.customerProfileImage
chatViewController.customerName = appointmentDetails.customerName!
chatViewController.customerId = appointmentDetails.customerId
self.navigationController?.pushViewController(chatViewController, animated: true)
}
@IBAction func back() {
self.navigationController?.popViewController(animated: true)
}
}
extension EnquiryDetailsViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 2
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.row == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "enquiryDetails") as! EnquiryDetailsCell
cell.appointmentDetails = appointmentDetails
return cell
}else{
let cell = tableView.dequeueReusableCell(withIdentifier: "review") as! EnquiryReviewCell
cell.appointmentDetails = appointmentDetails
return cell
}
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
}
}
class EnquiryDetailsCell: UITableViewCell {
@IBOutlet var imgCustomer: UIImageView!
@IBOutlet var lblName: UILabel!
@IBOutlet var lblPriceNew: UILabel!
@IBOutlet var lblPriceOld: UILabel!
@IBOutlet var lblDateTime: UILabel!
var appointmentDetails: Appointment? {
didSet {
if let appointmentDetails = appointmentDetails {
if let profileImage = appointmentDetails.customerProfileImage {
let url = URL(string: profileImage)
imgCustomer.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
lblName.text = appointmentDetails.customerName
lblPriceNew.text = appointmentDetails.orderTotal
// if let orderTotal = appointmentDetails.orderTotal {
// let attributedString = NSMutableAttributedString(string:orderTotal)
// attributedString.addAttribute(NSAttributedStringKey.baselineOffset, value: 0, range: NSMakeRange(0, attributedString.length))
// attributedString.addAttribute(NSAttributedStringKey.strikethroughStyle, value: NSNumber(value: NSUnderlineStyle.styleThick.rawValue), range: NSMakeRange(0, attributedString.length))
// attributedString.addAttribute(NSAttributedStringKey.strikethroughColor, value: UIColor.gray, range: NSMakeRange(0, attributedString.length))
// lblPriceOld.attributedText = attributedString
// }
}
}
}
@IBAction func chatHistory() {
}
}
class EnquiryReviewCell: UITableViewCell {
@IBOutlet var btnStar1: UIButton!
@IBOutlet var btnStar2: UIButton!
@IBOutlet var btnStar3: UIButton!
@IBOutlet var btnStar4: UIButton!
@IBOutlet var btnStar5: UIButton!
@IBOutlet var txtReview: UITextView!
@IBOutlet var lblDateTime: UILabel!
var appointmentDetails: Appointment? {
didSet {
if let appointmentDetails = appointmentDetails {
self.txtReview.text = appointmentDetails.reviewMessage
self.lblDateTime.text = appointmentDetails.reviewDateTime
if let rating = appointmentDetails.rating {
let ratingAsInt = Int(rating)!
if ratingAsInt > 0 {
btnStar1.setImage(UIImage(named: "filledStar"), for: .normal)
}
if ratingAsInt > 1 {
btnStar2.setImage(UIImage(named: "filledStar"), for: .normal)
}
if ratingAsInt > 2 {
btnStar3.setImage(UIImage(named: "filledStar"), for: .normal)
}
if ratingAsInt > 3 {
btnStar4.setImage(UIImage(named: "filledStar"), for: .normal)
}
if ratingAsInt > 4 {
btnStar5.setImage(UIImage(named: "filledStar"), for: .normal)
}
}
}
}
}
}
Bhagyashree/Sunarc/Controller/Home/FAQDetailsViewController.swift 0 → 100644
//
// FAQDetailsViewController.swift
// ShangMarket
//
// Created by sunarc on 15/06/18.
// Copyright © 2018 Sunarc. All rights reserved.
//
import UIKit
import Kingfisher
class FAQDetailsViewController: UIViewController {
@IBOutlet var tblFAQDetila: UITableView!
var orderId: String = ""
var incrementId: String = ""
let orderDetails = OrderDetails()
override func viewDidLoad() {
super.viewDidLoad()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
orderDetails.getOrderDetail(incrementId: incrementId, success: {
self.tblFAQDetila.reloadData()
}) { (errorMessage) in
self.view.showToast(errorMessage, position: .bottom, popTime: 2.0, dismissOnTap: false)
}
}
@IBAction func back() {
self.navigationController?.popViewController(animated: true)
}
@IBAction func review() {
self.performSegue(withIdentifier: "review", sender: self)
}
@IBAction func chatHistory() {
let chatVC = Utils.viewController(storyboardName: "Home", ofType: OnlineEnquiryViewController.self)
chatVC.orderId = orderId
chatVC.customerId = orderDetails.customerId ?? ""
chatVC.customerName = orderDetails.customerName ?? ""
chatVC.customerProfileImage = orderDetails.customerImage
chatVC.isOrderCompleted = true
self.navigationController?.pushViewController(chatVC, animated: true)
}
}
extension FAQDetailsViewController: UITableViewDelegate, UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int {
return 3
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if section == 0 {
return 1
} else if section == 1 {
return orderDetails.reviews.count == 0 ? 0 : 1
} else if section == 2 {
return orderDetails.reviews.count
}
return 0
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 {
let oderdetailCell = tableView.dequeueReusableCell(withIdentifier: "OrderdetailCell", for: indexPath) as! OrderdetailCell
oderdetailCell.orderDetilas = orderDetails
return oderdetailCell
} else if indexPath.section == 1 {
let fAQReviewTitleCell = tableView.dequeueReusableCell(withIdentifier: "FAQReviewTitleCell", for: indexPath) as! FAQReviewTitleCell
return fAQReviewTitleCell
} else if indexPath.section == 2 {
let fAQReviewCell = tableView.dequeueReusableCell(withIdentifier: "FAQReviewCell", for: indexPath) as! FAQReviewCell
fAQReviewCell.serviceReview = orderDetails.reviews[indexPath.row]
return fAQReviewCell
}
return UITableViewCell()
}
}
class OrderdetailCell: UITableViewCell {
@IBOutlet var lblMasterName: UILabel!
@IBOutlet var lblPrice: UILabel!
@IBOutlet var lblDateTime: UILabel!
@IBOutlet var imgSellerImage: UIImageView!
var orderDetilas: OrderDetails? {
didSet {
if let orderDetilas = orderDetilas {
self.lblMasterName.text = orderDetilas.customerName
self.lblPrice.text = orderDetilas.price
self.lblDateTime.text = orderDetilas.orderDate
if let image = orderDetilas.customerImage {
let url = URL(string: image)
imgSellerImage.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
}
}
}
}
class FAQReviewTitleCell: UITableViewCell {
}
class FAQReviewCell: UITableViewCell {
@IBOutlet var lblDateTime: UILabel!
@IBOutlet var lblMessage: UILabel!
@IBOutlet var imgRating1: UIImageView!
@IBOutlet var imgRating2: UIImageView!
@IBOutlet var imgRating3: UIImageView!
@IBOutlet var imgRating4: UIImageView!
@IBOutlet var imgRating5: UIImageView!
var serviceReview: ServiceReview? {
didSet {
if let serviceReview = serviceReview {
self.lblDateTime.text = serviceReview.date
self.lblMessage.text = serviceReview.message
if let rating = serviceReview.rating {
let ratingAsInt = Int(rating)
if ratingAsInt! > 0 {
imgRating1.image = UIImage(named: "star")
}
if ratingAsInt! > 1 {
imgRating2.image = UIImage(named: "star")
}
if ratingAsInt! > 2 {
imgRating3.image = UIImage(named: "star")
}
if ratingAsInt! > 3 {
imgRating4.image = UIImage(named: "star")
}
if ratingAsInt! > 4 {
imgRating5.image = UIImage(named: "star")
}
}
}
}
}
}
Bhagyashree/Sunarc/Controller/Home/HomePageViewController.swift
......@@ -21,7 +21,35 @@ class HomePageViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
let headerForLoading = MJRefreshNormalHeader {
self.dashboard.getDashboardData(success: {
self.tblSellerDashbord.reloadData()
self.tblSellerDashbord.mj_header.endRefreshing()
}) { (message) in
self.tblSellerDashbord.mj_header.endRefreshing()
self.view.showToast(message, position: .bottom, popTime: 1, dismissOnTap: false)
}
}
headerForLoading?.activityIndicatorViewStyle = .gray
headerForLoading?.lastUpdatedTimeLabel.isHidden = true
headerForLoading?.stateLabel.isHidden = true
tblSellerDashbord.mj_header = headerForLoading
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
tblSellerDashbord.mj_header.beginRefreshing()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
let ref = Database.database().reference().child("seller").child("\(User.customerId)")
ref.removeAllObservers()
ref.observe(DataEventType.value) { (snapshot) in
if let postDict = snapshot.value as? [String : AnyObject] {
if let status = postDict["userStatus"] as? String {
......@@ -33,6 +61,9 @@ class HomePageViewController: BaseViewController {
}
self.isThereAnyUnreadMessage = false
if let chatCountIds = postDict["chatCountId"] as? String {
print(" *** \(chatCountIds) *** ")
if chatCountIds.count > 0 {
if chatCountIds.components(separatedBy: ",").count > 0 {
self.isThereAnyUnreadMessage = true
......@@ -46,27 +77,6 @@ class HomePageViewController: BaseViewController {
Database.database().reference().child("seller").child("\(User.customerId)").child("userStatus").onDisconnectSetValue("offline")
let headerForLoading = MJRefreshNormalHeader {
self.dashboard.getDashboardData(success: {
self.tblSellerDashbord.reloadData()
self.tblSellerDashbord.mj_header.endRefreshing()
}) { (message) in
self.tblSellerDashbord.mj_header.endRefreshing()
self.view.showToast(message, position: .bottom, popTime: 1, dismissOnTap: false)
}
}
headerForLoading?.activityIndicatorViewStyle = .gray
headerForLoading?.lastUpdatedTimeLabel.isHidden = true
headerForLoading?.stateLabel.isHidden = true
tblSellerDashbord.mj_header = headerForLoading
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
tblSellerDashbord.mj_header.beginRefreshing()
}
}
......@@ -113,13 +123,8 @@ extension HomePageViewController: UITableViewDelegate, UITableViewDataSource {
cell.sellerImage.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
if isThereAnyUnreadMessage == true {
cell.imgUnreadMsg.image = UIImage(named: "email")
} else {
cell.imgUnreadMsg.image = UIImage(named: "email-box")
}
cell.imgRedDot.isHidden = isThereAnyUnreadMessage == true ? false : true
cell.lblStatus.text = User.isOnline == true ? "Online" : "Offline"
cell.switchMode.setOn(User.isOnline, animated: true)
......@@ -164,7 +169,7 @@ extension HomePageViewController: UITableViewDelegate, UITableViewDataSource {
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = order.incrementId!
enquiryDetailsViewController.orderId = order.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......@@ -209,6 +214,7 @@ class SellerProfileCell: UITableViewCell {
@IBOutlet var lblSellerName: UILabel!
@IBOutlet var lblSellerTitle: UILabel!
@IBOutlet var sellerImage: UIImageView!
@IBOutlet var imgRedDot: UIImageView!
@IBOutlet var lblYesterdayTransections: UILabel!
@IBOutlet var lblYesterdayIncome: UILabel!
@IBOutlet var lblThisWeekTransection: UILabel!
......
Bhagyashree/Sunarc/Controller/Home/OnlineEnquiryViewController.swift
......@@ -9,8 +9,9 @@
import UIKit
import FirebaseDatabase
import Kingfisher
import AVFoundation
class OnlineEnquiryViewController: UIViewController {
class OnlineEnquiryViewController: BaseViewController {
@IBOutlet var tblChat: UITableView!
@IBOutlet var txtComment: UITextView!
......@@ -30,6 +31,7 @@ class OnlineEnquiryViewController: UIViewController {
var customerName: String = ""
var customerId: String?
var chatCountId = ""
var recordingPermissionGranted = false
override func viewDidLoad() {
super.viewDidLoad()
......@@ -90,8 +92,16 @@ class OnlineEnquiryViewController: UIViewController {
}
}
}
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
AVAudioSession.sharedInstance().requestRecordPermission { (granted) in
self.recordingPermissionGranted = granted
print("granted = \(granted)")
}
}
......@@ -167,6 +177,15 @@ extension OnlineEnquiryViewController {
@IBAction func startRecordAudio() {
if recordingPermissionGranted == false {
//
// let alert = UIAlertController(title: "Permission required", message: "Microphone permissions is not granted, please to settings and enable microphone permission", preferredStyle: .alert)
//
// let
//
// return
}
Audio.startRecording(success: {
print("recording started")
}) { (errorMessage) in
......
Bhagyashree/Sunarc/Controller/Me/ChangePasswordViewController.swift
......@@ -65,9 +65,74 @@ class ChangePasswordViewController: UIViewController {
return false
}
return checkPasswordStrength()
}
func checkPasswordStrength() -> Bool {
var isLowerCaseCharAvailable = false
var isUpperCaseCharAvailable = false
var isDigitesAvailable = false
var specialCharAvailable = false
if txtConfirmPassword.text!.count < 8 {
self.view.showToast("Password should be 8 charecter long", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
var count = 0
let lowerCaseSet = CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyz")
if txtConfirmPassword.text?.rangeOfCharacter(from: lowerCaseSet) != nil {
isLowerCaseCharAvailable = true
count += 1
}
let upperCaseSet = CharacterSet(charactersIn: "ABCDEFGHIJKLMNOPQRSTUVWXYZ")
if txtConfirmPassword.text?.rangeOfCharacter(from: upperCaseSet) != nil {
isUpperCaseCharAvailable = true
count += 1
}
let digitesSet = CharacterSet(charactersIn: "0123456789")
if txtConfirmPassword.text?.rangeOfCharacter(from: digitesSet) != nil {
isDigitesAvailable = true
count += 1
}
let alohanumeric = CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
if txtConfirmPassword.text?.rangeOfCharacter(from: alohanumeric) == nil {
specialCharAvailable = true
count += 1
}
if count < 3 {
if isLowerCaseCharAvailable == false {
self.view.showToast("Password should containes one lowercase charector.", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if isUpperCaseCharAvailable == false {
self.view.showToast("Password should containes one uppercase charector.", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if isDigitesAvailable == false {
self.view.showToast("Password should containes one digit.", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if specialCharAvailable == false {
self.view.showToast("Password should containes special charector.", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
}
return true
}
}
......
Bhagyashree/Sunarc/Controller/Me/FeedBackViewController.swift
......@@ -15,6 +15,12 @@ class FeedBackViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
txtFeedback.becomeFirstResponder()
}
}
......
Bhagyashree/Sunarc/Controller/Me/MeViewController.swift
......@@ -13,7 +13,8 @@ class MeViewController: UIViewController {
@IBOutlet var imgProfile: UIImageView!
@IBOutlet var lblSellerName: UILabel!
@IBOutlet var lblSellerEmail: UILabel!
override func viewDidLoad() {
super.viewDidLoad()
self.updateProfileInfo()
......@@ -33,10 +34,12 @@ class MeViewController: UIViewController {
lblSellerName.text = sellerName
}
if let sellerImage = User.profileImage {
let url = URL(string: sellerImage)
imgProfile.kf.setImage(with: url, placeholder: UIImage(named: "profile_icon"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
if let email = User.customerEmail {
lblSellerEmail.text = email
}
}
......
Bhagyashree/Sunarc/Controller/Me/MyAllServiceOrderViewController.swift
......@@ -95,6 +95,27 @@ extension MyAllServiceOrderViewController: UITableViewDelegate, UITableViewDataS
cell.imgImage.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
switch service_.status {
case .CANCELED:
cell.imgStatus.image = UIImage(named: "cancelled")
case .CLOSED:
cell.imgStatus.image = UIImage(named: "closed")
case .COMPLETE:
cell.imgStatus.image = UIImage(named: "complete")
case .ONGOING:
cell.imgStatus.image = UIImage(named: "service_ongoing")
case .PENDING:
cell.imgStatus.image = UIImage(named: "pending")
case .PROCESSING:
cell.imgStatus.image = UIImage(named: "processing")
case .SERVICE_COMPLETE:
cell.imgStatus.image = UIImage(named: "complete")
case .SERVICE_ONGOING:
cell.imgStatus.image = UIImage(named: "service_ongoing")
case .SERVICE_UPLOAD_RESULT:
cell.imgStatus.image = UIImage(named: "service_upload_result")
}
return cell
}
......@@ -119,7 +140,7 @@ extension MyAllServiceOrderViewController: UITableViewDelegate, UITableViewDataS
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Me/MyCompletedOrdersViewController.swift
......@@ -118,7 +118,7 @@ extension MyCompletedOrdersViewController: UITableViewDelegate, UITableViewDataS
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Me/MyFollowersViewController.swift
......@@ -8,6 +8,7 @@
import UIKit
import MJRefresh
import Kingfisher
class MyFollowersViewController: BaseViewController {
......@@ -102,12 +103,19 @@ extension MyFollowersViewController: UITableViewDelegate, UITableViewDataSource
let follower = follwer.followers[indexPath.row]
let cell = tableView.dequeueReusableCell(withIdentifier: "followerCell", for: indexPath) as! SellersFollowerCell
cell.lblFollowerName.text = follower.fullName
if follower.gender == .MALE {
if let profileImage = follower.followerImage {
let url = URL(string: profileImage)
cell.imgFollwerImage.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
if follower.gender?.lowercased() == "male" {
cell.imgMaleFeMail.image = UIImage(named: "male")
} else if follower.gender == .FEMALE {
} else if follower.gender?.lowercased() == "female" {
cell.imgMaleFeMail.image = UIImage(named: "female")
}
......
Bhagyashree/Sunarc/Controller/Me/MyOngoingServiceOrderViewController.swift
......@@ -125,7 +125,7 @@ extension MyOngoingServiceOrderViewController: UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Me/MyUploadResultViewController.swift
......@@ -118,7 +118,7 @@ extension MyUploadResultViewController: UITableViewDelegate, UITableViewDataSour
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: FAQDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
......
Bhagyashree/Sunarc/Controller/Messages/NotificationsViewController.swift
......@@ -97,17 +97,18 @@ extension NotificationsViewController: UITableViewDataSource, UITableViewDelegat
class NotificationsCell: UITableViewCell {
@IBOutlet var lblMessage: UILabel!
@IBOutlet var lblTitle: UILabel!
@IBOutlet var lblDateTime: UILabel!
@IBOutlet var lblContent: UILabel!
var notification: MyNotification? {
didSet {
if let notification = notification {
self.lblMessage.text = notification.title
self.lblDateTime.text = notification.content
self.lblTitle.text = notification.title
self.lblContent.text = notification.content
self.lblDateTime.text = notification.dateTime
}
}
}
}
Bhagyashree/Sunarc/Controller/Other/LoginViewController.swift
......@@ -7,6 +7,7 @@
//
import UIKit
import SVProgressHUD
class LoginViewController: BaseViewController {
......@@ -14,6 +15,12 @@ class LoginViewController: BaseViewController {
@IBOutlet var txtPassword: UITextField!
@IBOutlet var imgCheckUncheck: UIImageView!
//mobikul's vars
var userEmail:String = ""
var whichApiToProcess:String = ""
// var isRemember = false
override func viewDidLoad() {
......@@ -41,7 +48,33 @@ extension LoginViewController {
// }
@IBAction func forgetPassword() {
let AC = UIAlertController(title:GlobalData.sharedInstance.language(key:"enteremail"), message: "", preferredStyle: .alert)
AC.addTextField { (textField) in
textField.placeholder = GlobalData.sharedInstance.language(key:"enteremail");
}
let okBtn = UIAlertAction(title: GlobalData.sharedInstance.language(key:"ok"), style: .default, handler: {(_ action: UIAlertAction) -> Void in
let textField = AC.textFields![0]
if((textField.text?.characters.count)! < 1){
// GlobalData.sharedInstance.showErrorSnackBar(msg:GlobalData.sharedInstance.language(key:"pleasefillemailid") )
self.view.showToast(GlobalData.sharedInstance.language(key: "pleasefillemailid"), position: .bottom, popTime: 2.0, dismissOnTap: true)
}else if !GlobalData.sharedInstance.checkValidEmail(data: textField.text!){
// GlobalData.sharedInstance.showErrorSnackBar(msg:GlobalData.sharedInstance.language(key: "pleaseentervalidemail"));
self.view.showToast(GlobalData.sharedInstance.language(key: "pleaseentervalidemail"), position: .bottom, popTime: 2.0, dismissOnTap: true)
}
else{
self.userEmail = textField.text!;
self.whichApiToProcess = "forgotpassword"
self.callingHttppApi();
}
})
let noBtn = UIAlertAction(title: GlobalData.sharedInstance.language(key:"cancel"), style:.destructive, handler: {(_ action: UIAlertAction) -> Void in
})
AC.addAction(okBtn)
AC.addAction(noBtn)
self.present(AC, animated: true, completion: { })
}
@IBAction func login() {
......@@ -117,3 +150,97 @@ extension LoginViewController: UITextFieldDelegate {
// mobikul's work
extension LoginViewController {
func callingHttppApi(){
// GlobalData.sharedInstance.showLoader()
SVProgressHUD.show()
self.view.isUserInteractionEnabled = false
var requstParams = [String:Any]();
requstParams["websiteId"] = "1"
if defaults.object(forKey: "storeId") != nil{
requstParams["storeId"] = defaults.object(forKey: "storeId") as! String
}
let quoteId = defaults.object(forKey:"quoteId");
let deviceToken = defaults.object(forKey:"deviceToken");
if(quoteId != nil){
requstParams["quoteId"] = quoteId
}
if deviceToken != nil{
requstParams["token"] = deviceToken
}
if(whichApiToProcess == "forgotpassword"){
requstParams["email"] = self.userEmail
GlobalData.sharedInstance.callingHttpRequest(params:requstParams, apiname:"mobikulhttp/customer/forgotpassword", currentView: self){success,responseObject in
if success == 1{
if responseObject?.object(forKey: "storeId") != nil{
let storeId:String = String(format: "%@", responseObject!.object(forKey: "storeId") as! CVarArg)
if storeId != "0"{
defaults .set(storeId, forKey: "storeId")
}
}
// GlobalData.sharedInstance.dismissLoader()
SVProgressHUD.dismiss()
self.view.isUserInteractionEnabled = true
let dict = JSON(responseObject as! NSDictionary)
print(dict)
if dict["success"].boolValue == true{
// GlobalData.sharedInstance.showSuccessSnackBar(msg: dict["message"].stringValue)
self.view.showToast(dict["message"].stringValue, position: .bottom, popTime: 2.0, dismissOnTap: true)
}else{
// GlobalData.sharedInstance.showErrorSnackBar(msg: dict["message"].stringValue)
self.view.showToast(dict["message"].stringValue, position: .bottom, popTime: 2.0, dismissOnTap: true)
}
}else if success == 2{
self.callingHttppApi()
GlobalData.sharedInstance.dismissLoader()
}
}
}
}
}
Bhagyashree/Sunarc/Model/Appointment/AppointmentExt.swift
......@@ -22,7 +22,6 @@ 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)
......
Bhagyashree/Sunarc/Model/Home/FormDetail.swift
......@@ -11,7 +11,7 @@ import SVProgressHUD
class FormDetail {
class func get(incrementId: String, success: @escaping (_ customOptions: [CustomOption]) -> Void, failure: @escaping (_ errorMessage: String) -> Void) {
class func get(incrementId: String, success: @escaping (_ customOptions: [CustomOption], _ productName: String) -> Void, failure: @escaping (_ errorMessage: String) -> Void) {
SVProgressHUD.show()
......@@ -29,6 +29,11 @@ class FormDetail {
if itemList.count > 0 {
var productName_ = ""
if let product = itemList[0]["productName"] as? String {
productName_ = product
}
if let customOptionsJSON = itemList[0]["customOption"] as? [[String: Any]] {
var options = [CustomOption]()
for customOptionJSON in customOptionsJSON {
......@@ -37,7 +42,7 @@ class FormDetail {
}
SVProgressHUD.dismiss()
success(options)
success(options, productName_)
return
}
......
Bhagyashree/Sunarc/Model/Home/HomeScreen/Order.swift
......@@ -32,8 +32,6 @@ class Order {
func initWithJSON(json: Any) {
print(json)
if let response = json as? [String: Any] {
self.orderId = response["orderId"] as? String
self.incrementId = response["incrementId"] as? String
......
Bhagyashree/Sunarc/Model/Me/Follower.swift
......@@ -8,11 +8,6 @@
import Foundation
enum Gender: String {
case MALE
case FEMALE
case NOTSPECIFIED
}
class Follower {
var customerId: String?
......@@ -20,7 +15,8 @@ class Follower {
var middleName: String?
var lastName: String?
var email: String?
var gender:Gender = Gender.NOTSPECIFIED
var followerImage: String?
var gender: String?
var maxPage: Int = 0
var currentPage: Int = 1
......@@ -28,17 +24,15 @@ class Follower {
var followers = [Follower]()
func initWithJSON(json: Any) {
if let jsonDict = json as? [String: Any] {
self.customerId = jsonDict["customer_id"] as? String
self.firstName = jsonDict["first_name"] as? String
self.middleName = jsonDict["middle_name"] as? String
self.lastName = jsonDict["last_name"] as? String
self.email = jsonDict["email"] as? String
if let genderFromResponse = jsonDict["gender"] as? String {
if let gender = Gender(rawValue: genderFromResponse) {
self.gender = gender
}
}
self.gender = jsonDict["gender"] as? String
self.followerImage = jsonDict["profile_image"] as? String
}
}
......
Bhagyashree/Sunarc/Model/Me/OrderDetails.swift 0 → 100644
//
// OrderDetails.swift
// ShangMarket
//
// Created by SunARcTech2 on 17/09/18.
// Copyright © 2018 Sunarc. All rights reserved.
//
import Foundation
class OrderDetails {
var orderDate: String?
var customerImage: String?
var customerName: String?
var customerId: String?
var price: String?
var reviews = [ServiceReview]()
func initWith(json: [String: Any]) {
self.customerImage = json["image"] as? String
self.customerName = json["master_name"] as? String
self.customerId = json["master_id"] as? String
self.price = json["price"] as? String
if let reviewsJSON = json["service_review"] as? [[String: Any]] {
reviews = [ServiceReview]()
for reviewJSON in reviewsJSON {
let review = ServiceReview(json: reviewJSON)
self.reviews.append(review)
}
}
}
}
class ServiceReview {
var date: String?
var message: String?
var nickName: String?
var rating: String?
init(json: [String: Any]) {
self.date = json["created_at"] as? String
self.message = json["detail"] as? String
self.nickName = json["nickname"] as? String
self.rating = json["rating"] as? String
}
}
Bhagyashree/Sunarc/Model/Me/OrderDetailsExt.swift 0 → 100644
//
// OrderDetailsExt.swift
// ShangMarket
//
// Created by SunARcTech2 on 17/09/18.
// Copyright © 2018 Sunarc. All rights reserved.
//
import Foundation
extension OrderDetails {
func getOrderDetail(incrementId: String, success: @escaping () -> Void, failure: @escaping (_ errorMessage: String) -> Void) {
var params = [String: Any]()
if let storeId = defaults.object(forKey:"storeId") as? String {
params["storeId"] = storeId
}
params["incrementId"] = incrementId
HTTP().connectionWithRequestObjectFormUrl(api: API.FAQ_ORDER_DETAILS, parameters: params, method: .post, indicator: true, success: { (result) in
if let json = result as? [String: Any] {
if let orderData = json["orderData"] as? [String: Any] {
if let itemList = orderData["itemList"] as? [[String: Any]] {
if let firstItem = itemList.first {
self.initWith(json: firstItem)
}
}
}
if let orderDate = json["orderDate"] as? String {
self.orderDate = orderDate
}
}
success()
}) { (errorMessage) in
failure(errorMessage)
}
}
}
Bhagyashree/Sunarc/Model/Me/ServiceExt.swift
......@@ -43,6 +43,8 @@ extension Service {
statusParameter = "service_ongoing"
} else if serviceStatus == .SERVICE_UPLOAD_RESULT {
statusParameter = "service_upload_result"
} else if serviceStatus == .CLOSED {
statusParameter = "closed"
}
parameters = ["customerId": User.customerId,
......
Bhagyashree/Sunarc/Model/Notifications/MyNotification.swift
......@@ -18,6 +18,7 @@ class MyNotification {
var id: String?
var notificationType: String?
var title: String?
var dateTime: String?
var maxRecords: Int = 0
var currentPage: Int = 1
......@@ -25,7 +26,6 @@ class MyNotification {
var notifications = [MyNotification]()
func initWithJSON(json: [String: Any]) {
if let banner = json["banner"] as? String {
self.banner = banner
}
......@@ -47,6 +47,8 @@ class MyNotification {
if let title = json["title"] as? String {
self.title = title
}
self.dateTime = json["created_at"] as? String
}
......
Bhagyashree/Sunarc/Model/Notifications/MyNotificationExt.swift
......@@ -32,7 +32,7 @@ extension MyNotification {
let parameters: [String: Any] = ["storeId": UserDefaults.standard.value(forKey: "storeId") as! String,
"customerId": User.customerId,
"page": self.currentPage
"pageNumber": self.currentPage
]
HTTP().connectionWithRequestObjectFormUrl(api: API.NOTIFICATION, parameters: parameters, method: .post, indicator: false, success: { (response) in
......@@ -41,8 +41,6 @@ extension MyNotification {
if let json = response as? [String: Any] {
if let notificationList = json["notificationList"] as? [[String: Any]] {
self.notifications = [MyNotification]()
for notification in notificationList {
let noti = MyNotification()
noti.initWithJSON(json: notification)
......
Bhagyashree/Sunarc/Other/Draw/NavigationBarView.swift
......@@ -11,19 +11,24 @@ import UIKit
class NavigationBarView: UIView {
@IBOutlet var viewHeight: NSLayoutConstraint!
var viewHeightt: CGFloat = 0.0
override func draw(_ rect: CGRect) {
super.draw(rect)
if UIDevice().userInterfaceIdiom == .phone && UIScreen.main.nativeBounds.height == 2436 {
if viewHeight.constant + CGFloat(20.0) > CGFloat(84.0) {
return
}
viewHeight.constant = viewHeight.constant + 20
}
}
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
let shadowPath = UIBezierPath(rect: self.bounds)
self.layer.cornerRadius = 0.0
self.layer.shadowColor = UIColor.black.cgColor
......@@ -32,7 +37,6 @@ class NavigationBarView: UIView {
self.layer.shadowRadius = 4.0 //Here your control your blur
self.layer.masksToBounds = false
self.layer.shadowPath = shadowPath.cgPath
}
}
Bhagyashree/Sunarc/Other/HTTP/API.swift
......@@ -34,7 +34,8 @@ class API {
static let CORPORATE_CULTURE = "/rest/V1/bannerInfo"
static let REGENERATE_TOKEN = "/rest/V1/customer/regenerate"
static let CHANGE_PASWORD = "/rest/V1/customers/me/password"
static let FAQ_ORDER_DETAILS = "mobikulhttp/customer/orderDetails"
// Appointment
static let VIEW_ORDER = "mobikulmphttp/marketplace/viewOrder"
static let RECOMEND_PRODUCTS = "/rest/V1/seller/recommendedproducts?page="
......
Bhagyashree/Sunarc/Other/INSPhoto/PostInFullScreenView.swift 0 → 100644
//
// PostInFullScreenView.swift
// Pocca
//
// Created by NTT on 3/7/17.
// Copyright © 2017 Techub. All rights reserved.
//
import UIKit
import INSPhotoGallery
class PostInFullScreenView: UIView {
weak var photosViewController: INSPhotosViewController?
@IBOutlet weak var lbContent: UILabel!
// Pass the touches down to other views
override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
if let hitView = super.hitTest(point, with: event), hitView != self {
return hitView
}
return nil
}
@IBAction func closeButtonTapped(_ sender: AnyObject) {
photosViewController?.dismiss(animated: true, completion: {
})
}
}
extension PostInFullScreenView: INSPhotosOverlayViewable {
func populateWithPhoto(_ photo: INSPhotoViewable) {
}
func setHidden(_ hidden: Bool, animated: Bool) {
if self.isHidden == hidden {
return
}
if animated {
self.isHidden = false
self.alpha = hidden ? 1.0 : 0.0
UIView.animate(withDuration: 0.2, delay: 0, options: [.allowAnimatedContent, .allowUserInteraction], animations: {
self.alpha = hidden ? 0.0 : 1.0
}, completion: { (finished: Bool) in
self.alpha = 1.0
self.isHidden = hidden
})
} else {
self.isHidden = hidden
}
}
}
Bhagyashree/Sunarc/Other/INSPhoto/PostInFullScreenView.xib 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="HelveticaNeue.ttc">
<string>HelveticaNeue</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="6VD-mk-UAe" customClass="PostInFullScreenView" customModule="SocialMedia" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EPQ-IU-4lS">
<rect key="frame" x="349" y="25" width="55" height="40"/>
<constraints>
<constraint firstAttribute="width" constant="55" id="7KC-Vx-Vd1"/>
<constraint firstAttribute="height" constant="40" id="ue0-x1-75r"/>
</constraints>
<state key="normal" image="close_icon"/>
<connections>
<action selector="closeButtonTapped:" destination="6VD-mk-UAe" eventType="touchUpInside" id="nDW-bv-cIs"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UOp-GP-wxp">
<rect key="frame" x="15" y="705" width="384" height="16"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="UOp-GP-wxp" firstAttribute="leading" secondItem="6VD-mk-UAe" secondAttribute="leading" constant="15" id="5Aq-Ab-ZAr"/>
<constraint firstItem="EPQ-IU-4lS" firstAttribute="top" secondItem="6VD-mk-UAe" secondAttribute="top" constant="25" id="K9q-4a-reb"/>
<constraint firstAttribute="trailing" secondItem="EPQ-IU-4lS" secondAttribute="trailing" constant="10" id="dzC-eP-2UG"/>
<constraint firstAttribute="trailing" secondItem="UOp-GP-wxp" secondAttribute="trailing" constant="15" id="jLI-Wl-5kD"/>
<constraint firstAttribute="bottom" secondItem="UOp-GP-wxp" secondAttribute="bottom" constant="15" id="yoZ-0S-w1Z"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="GC5-9t-J7B"/>
<connections>
<outlet property="lbContent" destination="UOp-GP-wxp" id="Np2-d3-eey"/>
</connections>
<point key="canvasLocation" x="-80" y="87"/>
</view>
</objects>
<resources>
<image name="close_icon" width="30" height="30"/>
</resources>
</document>
Bhagyashree/Sunarc/Other/Utils.swift
......@@ -30,6 +30,14 @@ class Utils {
return viewController as! T
}
class func viewFrom(_ nibName: String) -> UIView? {
let objects = Bundle.main.loadNibNamed(nibName, owner: nil, options: nil)
if objects!.count > 0 {
return objects![0] as? UIView
}
return nil
}
class func saveFile(data: Data, name: String, fileExtension: String) -> URL {
......
Bhagyashree/Sunarc/View/Appointment.storyboard
......@@ -2224,7 +2224,7 @@
</connections>
</view>
</subviews>
<color key="backgroundColor" red="0.89019607840000003" green="0.97254901959999995" blue="0.99607843139999996" alpha="0.50464469180000004" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="SFf-Yq-HAJ" firstAttribute="leading" secondItem="wZH-b0-CF9" secondAttribute="leading" id="Tq9-ds-wdt"/>
<constraint firstItem="SFf-Yq-HAJ" firstAttribute="top" secondItem="rG7-PT-MHf" secondAttribute="top" id="aYA-9i-vRR"/>
......@@ -2350,7 +2350,7 @@
</connections>
</tableView>
</subviews>
<color key="backgroundColor" red="0.89019607840000003" green="0.97254901959999995" blue="0.99607843139999996" alpha="0.50464469180000004" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="ar2-r6-eBS" firstAttribute="bottom" secondItem="0LU-NA-uQG" secondAttribute="bottom" id="7rp-dA-pjp"/>
<constraint firstItem="ar2-r6-eBS" firstAttribute="leading" secondItem="0LU-NA-uQG" secondAttribute="leading" id="Bwf-9u-Lx7"/>
......@@ -2472,7 +2472,7 @@
</connections>
</tableView>
</subviews>
<color key="backgroundColor" red="0.89019607840000003" green="0.97254901959999995" blue="0.99607843139999996" alpha="0.50464469180000004" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="MFZ-JI-cdZ" firstAttribute="bottom" secondItem="qJq-yp-Abz" secondAttribute="bottom" id="7No-fE-q4b"/>
<constraint firstItem="MFZ-JI-cdZ" firstAttribute="top" secondItem="qJq-yp-Abz" secondAttribute="top" id="XDC-DG-uPs"/>
......@@ -2594,7 +2594,7 @@
</connections>
</tableView>
</subviews>
<color key="backgroundColor" red="0.89019607840000003" green="0.97254901959999995" blue="0.99607843139999996" alpha="0.50464469180000004" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="37g-wV-xCA" firstAttribute="bottom" secondItem="Pk4-Ne-5Ef" secondAttribute="bottom" id="MGv-cH-x01"/>
<constraint firstItem="37g-wV-xCA" firstAttribute="trailing" secondItem="Pk4-Ne-5Ef" secondAttribute="trailing" id="qRh-1n-2i8"/>
......@@ -2736,7 +2736,7 @@
</connections>
</tableView>
</subviews>
<color key="backgroundColor" red="0.89019607840000003" green="0.97254901959999995" blue="0.99607843139999996" alpha="0.50464469180000004" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="c2b-aF-tf0" firstAttribute="top" secondItem="08Z-fP-MPA" secondAttribute="top" id="CR4-FH-7dy"/>
<constraint firstItem="c2b-aF-tf0" firstAttribute="bottom" secondItem="08Z-fP-MPA" secondAttribute="bottom" id="Wfh-AV-GQV"/>
......
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