Skip to content

O
OrderPicky
Commit cad42707 by Angel FS
Options

address , carrier completed

parent f791246c
Showing with 604 additions and 19 deletions
OrderPicky.xcodeproj/project.pbxproj
......@@ -7,7 +7,14 @@
objects = {
/* Begin PBXBuildFile section */
040DB2F327B51E2100A1C34F /* PickDropVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 040DB2F227B51E2100A1C34F /* PickDropVC.swift */; };
040DB2F827B5264F00A1C34F /* AddressVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 040DB2F727B5264F00A1C34F /* AddressVC.swift */; };
0429CFFC27B3CD3B00F79B06 /* SignUpVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0429CFFB27B3CD3B00F79B06 /* SignUpVC.swift */; };
04500D2C27B3DE6600982455 /* AddAddressVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04500D2B27B3DE6600982455 /* AddAddressVC.swift */; };
04500D3127B430BA00982455 /* OrderDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04500D3027B430BA00982455 /* OrderDetailVC.swift */; };
0450753127B4E1180016448E /* PackageDetailsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0450753027B4E1180016448E /* PackageDetailsVC.swift */; };
0480F9E827B53E9E000F33A5 /* CarrierStatusVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480F9E727B53E9E000F33A5 /* CarrierStatusVC.swift */; };
0480F9ED27B55F87000F33A5 /* YourOrderVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480F9EC27B55F87000F33A5 /* YourOrderVC.swift */; };
181926AE27B0DAF00000A85C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 181926AD27B0DAF00000A85C /* Extensions.swift */; };
181926B327B0DAFA0000A85C /* validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 181926B227B0DAFA0000A85C /* validation.swift */; };
181926B827B0DB000000A85C /* snackBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 181926B727B0DB000000A85C /* snackBar.swift */; };
......@@ -45,7 +52,14 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
040DB2F227B51E2100A1C34F /* PickDropVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickDropVC.swift; sourceTree = "<group>"; };
040DB2F727B5264F00A1C34F /* AddressVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressVC.swift; sourceTree = "<group>"; };
0429CFFB27B3CD3B00F79B06 /* SignUpVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignUpVC.swift; sourceTree = "<group>"; };
04500D2B27B3DE6600982455 /* AddAddressVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAddressVC.swift; sourceTree = "<group>"; };
04500D3027B430BA00982455 /* OrderDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderDetailVC.swift; sourceTree = "<group>"; };
0450753027B4E1180016448E /* PackageDetailsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PackageDetailsVC.swift; sourceTree = "<group>"; };
0480F9E727B53E9E000F33A5 /* CarrierStatusVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarrierStatusVC.swift; sourceTree = "<group>"; };
0480F9EC27B55F87000F33A5 /* YourOrderVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YourOrderVC.swift; sourceTree = "<group>"; };
181926AD27B0DAF00000A85C /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
181926B227B0DAFA0000A85C /* validation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = validation.swift; sourceTree = "<group>"; };
181926B727B0DB000000A85C /* snackBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = snackBar.swift; sourceTree = "<group>"; };
......@@ -111,6 +125,13 @@
0429CFFB27B3CD3B00F79B06 /* SignUpVC.swift */,
1863386F27ABB82D00A7FD69 /* LoginVC.swift */,
18F1703327B38BA5009E0ACC /* OtpVC.swift */,
04500D2B27B3DE6600982455 /* AddAddressVC.swift */,
04500D3027B430BA00982455 /* OrderDetailVC.swift */,
0450753027B4E1180016448E /* PackageDetailsVC.swift */,
040DB2F227B51E2100A1C34F /* PickDropVC.swift */,
040DB2F727B5264F00A1C34F /* AddressVC.swift */,
0480F9E727B53E9E000F33A5 /* CarrierStatusVC.swift */,
0480F9EC27B55F87000F33A5 /* YourOrderVC.swift */,
);
path = Controller;
sourceTree = "<group>";
......@@ -453,13 +474,20 @@
files = (
181926B827B0DB000000A85C /* snackBar.swift in Sources */,
181926CD27B0E3250000A85C /* LoginCollectionCell.swift in Sources */,
0480F9ED27B55F87000F33A5 /* YourOrderVC.swift in Sources */,
0429CFFC27B3CD3B00F79B06 /* SignUpVC.swift in Sources */,
0450753127B4E1180016448E /* PackageDetailsVC.swift in Sources */,
04500D2C27B3DE6600982455 /* AddAddressVC.swift in Sources */,
0480F9E827B53E9E000F33A5 /* CarrierStatusVC.swift in Sources */,
1863387027ABB82D00A7FD69 /* LoginVC.swift in Sources */,
040DB2F327B51E2100A1C34F /* PickDropVC.swift in Sources */,
040DB2F827B5264F00A1C34F /* AddressVC.swift in Sources */,
181926BD27B0DB070000A85C /* colors.swift in Sources */,
1863386C27ABB82D00A7FD69 /* AppDelegate.swift in Sources */,
1863386E27ABB82D00A7FD69 /* SceneDelegate.swift in Sources */,
181926B327B0DAFA0000A85C /* validation.swift in Sources */,
18F1703427B38BA5009E0ACC /* OtpVC.swift in Sources */,
04500D3127B430BA00982455 /* OrderDetailVC.swift in Sources */,
181926AE27B0DAF00000A85C /* Extensions.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
OrderPicky.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,7 +7,7 @@
<key>OrderPicky.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>4</integer>
</dict>
</dict>
</dict>
......
OrderPicky.xcworkspace/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "F834D427-DF7F-46FA-8810-76BA0A2A6CE1"
type = "0"
version = "2.0">
</Bucket>
OrderPicky/Assets.xcassets/BILL.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "BILL.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/CART.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "CART1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/ORDER ACCEPT.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "ORDER ACCEPT.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/back.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "back.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/check/ADDRESS home.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "ADDRESS home.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/currentLocation.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "location.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/dropDown.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "dropDown.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/executive assigned.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "executive assigned.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/grocery.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "grocery.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/pencil.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "pencil.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/pick up icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "pick up icon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Assets.xcassets/sampleBill.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "sample-PDF-Invoice2-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
OrderPicky/Base.lproj/Main.storyboard
This source diff could not be displayed because it is too large. You can view the blob instead.
OrderPicky/Common/Extensions.swift
......@@ -82,14 +82,15 @@ extension UILabel
extension UIView {
func addDashedBorder(_ x : CGFloat , width : CGFloat)
func addDashedBorder(_ x : CGFloat , width : CGFloat , color : UIColor)
{
let color = UIColor.orange.cgColor
self.backgroundColor = .clear
let color = color.cgColor
let shapeLayer:CAShapeLayer = CAShapeLayer()
let frameSize = self.frame.size
let shapeRect = CGRect(x: 0, y: 0, width: width, height: frameSize.height)
shapeLayer.bounds = shapeRect
shapeLayer.position = CGPoint(x: 28, y: frameSize.height/2)
shapeLayer.position = CGPoint(x: 0, y: frameSize.height/2)
shapeLayer.fillColor = UIColor.clear.cgColor
shapeLayer.strokeColor = color
shapeLayer.lineWidth = 1
......@@ -102,9 +103,9 @@ extension UIView {
// OUTPUT 1
func dropShadow(scale: Bool = true) {
layer.masksToBounds = false
layer.shadowColor = UIColor.gray.cgColor
layer.shadowColor = UIColor.lightGray.cgColor
layer.shadowOpacity = 0.5
layer.shadowOffset = CGSize(width: 1, height: 1)
layer.shadowOffset = CGSize(width: -5, height: 5)
layer.shadowRadius = 5
/* layer.shadowPath = UIBezierPath(rect: bounds).cgPath
......
OrderPicky/Controller/AddAddressVC.swift 0 → 100644
//
// AddAddressVC.swift
// OrderPicky
//
// Created by ANGEL FS on 09/02/22.
//
import UIKit
class AddAddressVC: UIViewController {
@IBOutlet weak var searchBar: UISearchBar!
override func viewDidLoad() {
super.viewDidLoad()
self.viewLoadingProperties()
}
@IBAction func saveAddressTapped(_ sender: Any) {
let nextVC = self.storyboard?.instantiateViewController(withIdentifier: "orderDetail")as! OrderDetailVC
self.navigationController?.pushViewController(nextVC, animated: true)
}
}
extension AddAddressVC
{
func viewLoadingProperties()
{
self.searchBar.barTintColor = UIColor.white
self.searchBar.setBackgroundImage(UIImage.init(), for: UIBarPosition.any, barMetrics: UIBarMetrics.default)
UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).backgroundColor = UIColor.white
}
}
OrderPicky/Controller/AddressVC.swift 0 → 100644
//
// AddressVC.swift
// OrderPicky
//
// Created by ANGEL FS on 10/02/22.
//
import UIKit
class AddressVC: UIViewController {
@IBOutlet weak var locationOne: UIView!
@IBOutlet weak var dottedLine: UIView!
@IBOutlet weak var locationTwo: UIView!
@IBOutlet weak var detailAddView: UIView!
@IBOutlet weak var addDetailView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
self.viewLoadingProperties()
}
@IBAction func backBtnTapped(_ sender: Any) {
self.navigationController?.popViewController(animated: true)
}
@IBAction func location2EditTapped(_ sender: Any) {
let nextVC = self.storyboard?.instantiateViewController(withIdentifier: "carrierStatus")as! CarrierStatusVC
self.navigationController?.pushViewController(nextVC, animated: true)
}
}
extension AddressVC
{
func viewLoadingProperties()
{
self.locationOne.dropShadow()
self.dottedLine.addDashedBorder(1, width: 1, color: UIColor.themeColor)
self.locationTwo.dropShadow()
self.detailAddView.layer.borderWidth = 2
self.detailAddView.layer.borderColor = UIColor.black.cgColor
self.addDetailView.dropShadow()
}
}
OrderPicky/Controller/CarrierStatusVC.swift 0 → 100644
//
// CarrierStatusVC.swift
// OrderPicky
//
// Created by ANGEL FS on 10/02/22.
//
import UIKit
class CarrierStatusVC: UIViewController {
@IBOutlet weak var locationOne: UIView!
@IBOutlet weak var locationTwo: UIView!
@IBOutlet var dashedLine: [UIView]!
override func viewDidLoad() {
super.viewDidLoad()
self.viewLoadingProperties()
}
@IBAction func backBtnTapped(_ sender: Any) {
self.navigationController?.popViewController(animated: true)
}
}
extension CarrierStatusVC
{
func viewLoadingProperties()
{
self.locationOne.dropShadow()
self.locationTwo.dropShadow()
for (index,view) in self.dashedLine.enumerated()
{
if index == 0
{
view.addDashedBorder(1, width: 1, color: UIColor.themeColor)
}
else
{
view.addDashedBorder(1, width: 1, color: UIColor.lightGray)
}
}
}
}
OrderPicky/Controller/LoginVC.swift
......@@ -225,18 +225,18 @@ class LoginVC: UIViewController,UITextFieldDelegate {
{
let mob : String = (self.mobNo.text?.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines))!
let validMobile = self.valid.validaPhoneNumber(phoneNumber: mob)
if (validMobile == false)
{
// displayAlert(message: "Invalid mobile number")
DispatchQueue.main.async
{
// self.showSnackBar(Message:"Invalid mobile number" ,duration: .middle)
}
return
}
// let mob : String = (self.mobNo.text?.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines))!
// let validMobile = self.valid.validaPhoneNumber(phoneNumber: mob)
// if (validMobile == false)
// {
// // displayAlert(message: "Invalid mobile number")
// DispatchQueue.main.async
// {
// // self.showSnackBar(Message:"Invalid mobile number" ,duration: .middle)
// }
//
// return
// }
// postData(mobNo: self.mobNo.text!)
let vc = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "OtpVC") as! OtpVC
......
OrderPicky/Controller/OrderDetailVC.swift 0 → 100644
//
// OrderDetailVC.swift
// OrderPicky
//
// Created by ANGEL FS on 09/02/22.
//
import UIKit
class OrderDetailVC: UIViewController {
@IBOutlet var statusLine: [UIView]!
@IBOutlet weak var line1: UIView!
override func viewDidLoad() {
super.viewDidLoad()
self.viewLoadingProperties()
}
@IBAction func backBtnTapped(_ sender: Any) {
self.navigationController?.popViewController(animated: true)
}
@IBAction func payBtnTapped(_ sender: Any) {
let nextVC = self.storyboard?.instantiateViewController(withIdentifier: "packageDetail")as! PackageDetailsVC
self.navigationController?.pushViewController(nextVC, animated: true)
}
}
extension OrderDetailVC
{
func viewLoadingProperties()
{
for view in self.statusLine
{
view.addDashedBorder(1, width: 1, color: UIColor.themeColor)
}
}
}
OrderPicky/Controller/OtpVC.swift
......@@ -112,4 +112,10 @@ class OtpVC: UIViewController,UITextFieldDelegate {
self.navigationController?.popViewController(animated: true)
}
@IBAction func onTapVerifyBtn(_ sender: Any) {
let nextVc = self.storyboard?.instantiateViewController(withIdentifier: "addAddress")as! AddAddressVC
self.navigationController?.pushViewController(nextVc, animated: true)
}
}
OrderPicky/Controller/PackageDetailsVC.swift 0 → 100644
//
// PackageDetailsVC.swift
// OrderPicky
//
// Created by ANGEL FS on 10/02/22.
//
import UIKit
class PackageDetailsVC: UIViewController {
@IBOutlet weak var cmView: UIView!
@IBOutlet weak var packageTypeView: UIView!
@IBOutlet weak var lengthView: UIView!
@IBOutlet weak var widthView: UIView!
@IBOutlet weak var heightView: UIView!
@IBOutlet weak var instructionView: UIView!
@IBOutlet weak var wightView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
self.viewLoadingProperties()
}
@IBAction func backBtnTapped(_ sender: Any) {
self.navigationController?.popViewController(animated: true)
}
@IBAction func saveBtnTapped(_ sender: Any) {
let nextVC = self.storyboard?.instantiateViewController(withIdentifier: "pickDrop")as! PickDropVC
self.navigationController?.pushViewController(nextVC, animated: true)
}
}
extension PackageDetailsVC
{
func viewLoadingProperties()
{
self.packageTypeView.dropShadow()
self.cmView.dropShadow()
self.lengthView.dropShadow()
self.widthView.dropShadow()
self.heightView.dropShadow()
self.wightView.dropShadow()
self.instructionView.dropShadow()
}
}
OrderPicky/Controller/PickDropVC.swift 0 → 100644
//
// PickDropVC.swift
// OrderPicky
//
// Created by ANGEL FS on 10/02/22.
//
import UIKit
class PickDropVC: UIViewController {
@IBOutlet weak var locationOne: UIView!
@IBOutlet weak var dottedLine: UIView!
@IBOutlet weak var locationTwo: UIView!
@IBOutlet weak var taskDetailView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
self.viewLoadingProperties()
}
@IBAction func backBtnTapped(_ sender: Any) {
self.navigationController?.popViewController(animated: true)
}
@IBAction func proceedBtnTapped(_ sender: Any) {
let nextVC = self.storyboard?.instantiateViewController(withIdentifier: "address")as! AddressVC
self.navigationController?.pushViewController(nextVC, animated: true)
}
}
extension PickDropVC
{
func viewLoadingProperties()
{
self.locationOne.dropShadow()
self.dottedLine.addDashedBorder(1, width: 1, color: UIColor.themeColor)
self.locationTwo.dropShadow()
self.taskDetailView.dropShadow()
}
}
OrderPicky/Controller/YourOrderVC.swift 0 → 100644
//
// YourOrderVC.swift
// OrderPicky
//
// Created by ANGEL FS on 10/02/22.
//
import UIKit
class YourOrderVC: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
Pods/Pods.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -22,7 +22,7 @@
<key>Pods-OrderPickyTests.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>3</integer>
</dict>
</dict>
</dict>
......
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