diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj index 2579803..a7a5ffa 100644 --- a/WOKA.xcodeproj/project.pbxproj +++ b/WOKA.xcodeproj/project.pbxproj @@ -144,6 +144,11 @@ 52B8D4E02C04A25E00ED65F3 /* UIView+Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B8D4D62C04A25D00ED65F3 /* UIView+Container.swift */; }; 52B8D4E12C04A25E00ED65F3 /* BasicTransitionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B8D4D72C04A25E00ED65F3 /* BasicTransitionAnimator.swift */; }; 52B8D4E22C04A25E00ED65F3 /* Segue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B8D4D82C04A25E00ED65F3 /* Segue.swift */; }; + 52BBFCB22C52730C00F7D0D1 /* AddressListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BBFCB12C52730C00F7D0D1 /* AddressListVC.swift */; }; + 52BBFCB42C5275E100F7D0D1 /* AddressListVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BBFCB32C5275E100F7D0D1 /* AddressListVM.swift */; }; + 52BBFCB62C52764B00F7D0D1 /* AddressListDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BBFCB52C52764B00F7D0D1 /* AddressListDM.swift */; }; + 52BBFCB92C52782600F7D0D1 /* AddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BBFCB72C52782600F7D0D1 /* AddressCell.swift */; }; + 52BBFCBA2C52782600F7D0D1 /* AddressCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52BBFCB82C52782600F7D0D1 /* AddressCell.xib */; }; 52BC3BE22C0E02EE002FACA6 /* FaqVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BE12C0E02EE002FACA6 /* FaqVC.swift */; }; 52BC3BE52C0E0326002FACA6 /* FaqCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BE32C0E0326002FACA6 /* FaqCell.swift */; }; 52BC3BE62C0E0326002FACA6 /* FaqCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52BC3BE42C0E0326002FACA6 /* FaqCell.xib */; }; @@ -462,6 +467,11 @@ 52B8D4D62C04A25D00ED65F3 /* UIView+Container.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Container.swift"; sourceTree = ""; }; 52B8D4D72C04A25E00ED65F3 /* BasicTransitionAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTransitionAnimator.swift; sourceTree = ""; }; 52B8D4D82C04A25E00ED65F3 /* Segue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Segue.swift; sourceTree = ""; }; + 52BBFCB12C52730C00F7D0D1 /* AddressListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressListVC.swift; sourceTree = ""; }; + 52BBFCB32C5275E100F7D0D1 /* AddressListVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressListVM.swift; sourceTree = ""; }; + 52BBFCB52C52764B00F7D0D1 /* AddressListDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressListDM.swift; sourceTree = ""; }; + 52BBFCB72C52782600F7D0D1 /* AddressCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressCell.swift; sourceTree = ""; }; + 52BBFCB82C52782600F7D0D1 /* AddressCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AddressCell.xib; sourceTree = ""; }; 52BC3BE12C0E02EE002FACA6 /* FaqVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaqVC.swift; sourceTree = ""; }; 52BC3BE32C0E0326002FACA6 /* FaqCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaqCell.swift; sourceTree = ""; }; 52BC3BE42C0E0326002FACA6 /* FaqCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FaqCell.xib; sourceTree = ""; }; @@ -1115,6 +1125,7 @@ children = ( 52A6DCC42C4F8EA800F63C51 /* CartListVC.swift */, 525861D12C4FC6C000C33C79 /* CartPaymentOptionsVC.swift */, + 52BBFCB12C52730C00F7D0D1 /* AddressListVC.swift */, ); path = Controller; sourceTree = ""; @@ -1124,6 +1135,7 @@ children = ( 52A6DCC62C4F8FD000F63C51 /* CartListVM.swift */, 525861D32C4FCCB500C33C79 /* CartPaymentOptionsVM.swift */, + 52BBFCB32C5275E100F7D0D1 /* AddressListVM.swift */, ); path = ViewModel; sourceTree = ""; @@ -1137,6 +1149,8 @@ 525861D62C4FD38D00C33C79 /* CartPaymentOptionsCell.xib */, 525861DB2C4FE7A100C33C79 /* CouponCell.swift */, 525861DC2C4FE7A100C33C79 /* CouponCell.xib */, + 52BBFCB72C52782600F7D0D1 /* AddressCell.swift */, + 52BBFCB82C52782600F7D0D1 /* AddressCell.xib */, ); path = View; sourceTree = ""; @@ -1147,6 +1161,7 @@ 52A6DCC82C4F906900F63C51 /* CartListingDM.swift */, 525861D92C4FE71100C33C79 /* CouponListDM.swift */, 525861DF2C4FF16700C33C79 /* CouponApplyDM.swift */, + 52BBFCB52C52764B00F7D0D1 /* AddressListDM.swift */, ); path = Model; sourceTree = ""; @@ -1795,6 +1810,7 @@ 523ED2672BDA2BC900CFED02 /* Assets.xcassets in Resources */, 9C007F242C25603800F798C2 /* WebSeriesEpisodeCell.xib in Resources */, 527AC6FE2C173A5100434FB7 /* SongListCell.xib in Resources */, + 52BBFCBA2C52782600F7D0D1 /* AddressCell.xib in Resources */, 523ED26A2BDA2BC900CFED02 /* Base in Resources */, 52C8B05B2BDA5924003B51D0 /* WokaSplashSound.m4a in Resources */, 525861D72C4FD38D00C33C79 /* CartPaymentOptionsCell.xib in Resources */, @@ -1953,6 +1969,7 @@ 523ED2622BDA2BC700CFED02 /* SplashVC.swift in Sources */, 9CDC343C2BDBBC6B00093089 /* SelectAgeVC.swift in Sources */, 52A6DCAC2C4E5A1100F63C51 /* ShopCategoryVC.swift in Sources */, + 52BBFCB22C52730C00F7D0D1 /* AddressListVC.swift in Sources */, 525327D02BFCBC4A00F64283 /* ExploreWokaVC.swift in Sources */, 52C8B0542BDA4BD1003B51D0 /* RoundCorner.swift in Sources */, 522242662BFC74380085C632 /* MyListVC.swift in Sources */, @@ -2073,8 +2090,10 @@ 5222426A2BFC7AFC0085C632 /* SideMenuVC.swift in Sources */, 527AC7012C182DCE00434FB7 /* TimeStringToSeconds.swift in Sources */, 9CBCB29D2BE4D6BB007D7934 /* LoginVM.swift in Sources */, + 52BBFCB42C5275E100F7D0D1 /* AddressListVM.swift in Sources */, 524C42312C0499560016A11C /* NotificationCenterReloads.swift in Sources */, 9C8C4FAE2C1315410017DD3B /* WebViewVC.swift in Sources */, + 52BBFCB62C52764B00F7D0D1 /* AddressListDM.swift in Sources */, 52BC3BE22C0E02EE002FACA6 /* FaqVC.swift in Sources */, 9C21F81E2C37E3CA0050BFCC /* AVPlayerVC.swift in Sources */, 52A981D02C1AFEE8000E0BEC /* MyListVM.swift in Sources */, @@ -2082,6 +2101,7 @@ 528E5F222C24660F00E33E4E /* SeasonCategoryCell.swift in Sources */, 525954272BE9178F00191286 /* UserDataDM.swift in Sources */, 52A6DCB62C4E748100F63C51 /* ShopSubCategoryDM.swift in Sources */, + 52BBFCB92C52782600F7D0D1 /* AddressCell.swift in Sources */, 9C27E1652BDB6FBC00EC1DA9 /* StoryBoardID.swift in Sources */, 9CB3D08B2C37BBA50062869D /* KaraokeListingVC.swift in Sources */, 52FDBA782BFF23F4009D7AC7 /* TimePeriod.swift in Sources */, diff --git a/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/Contents.json new file mode 100644 index 0000000..1c3c2b9 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "radio-button.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "radio-button@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "radio-button@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button.png b/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button.png new file mode 100644 index 0000000..c4f5492 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button.png differ diff --git a/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button@2x.png b/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button@2x.png new file mode 100644 index 0000000..60605fe Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button@3x.png b/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button@3x.png new file mode 100644 index 0000000..278605b Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Shop/RadioOff.imageset/radio-button@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/Contents.json new file mode 100644 index 0000000..80ab4c8 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "radio.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "radio@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "radio@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio.png b/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio.png new file mode 100644 index 0000000..4376743 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio.png differ diff --git a/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio@2x.png b/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio@2x.png new file mode 100644 index 0000000..e849b3f Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio@3x.png b/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio@3x.png new file mode 100644 index 0000000..fe4d744 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Shop/RadioOn.imageset/radio@3x.png differ diff --git a/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard b/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard index 5f5439b..3bf5794 100644 --- a/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard +++ b/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard @@ -43,25 +43,25 @@ - + - + - + @@ -80,7 +80,7 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -403,10 +505,7 @@ - - - - + @@ -421,5 +520,8 @@ + + + diff --git a/WOKA/Cart/Controller/AddressListVC.swift b/WOKA/Cart/Controller/AddressListVC.swift new file mode 100644 index 0000000..29dd906 --- /dev/null +++ b/WOKA/Cart/Controller/AddressListVC.swift @@ -0,0 +1,67 @@ +// +// AddressListVC.swift +// WOKA +// +// Created by MacBook Pro on 25/07/24. +// + +import UIKit + +class AddressListVC: UIViewController { + + @IBOutlet weak var innerView: UIView! + @IBOutlet weak var tableView: UITableView! + @IBOutlet weak var useSelectedAddBtn : LocalisedElementsButton! + @IBOutlet weak var addNewAddressBtn : LocalisedElementsButton! + + var vm = AddressListVM() + + override func viewDidLoad() { + super.viewDidLoad() + vm.vc = self + vm.initView() + + navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default) + navigationController?.navigationBar.shadowImage = UIImage() + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + navigationController?.setNavigationBarHidden(false, animated: animated) + } + + override func viewDidAppear(_ animated: Bool) { + self.navigationController?.setColor(color: .white) + + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + self.navigationController?.setNavigationBarHidden(true, animated: animated) + } + + override func viewDidDisappear(_ animated: Bool) { + super.viewDidDisappear(animated) + + // Customize the navigation bar's appearance + self.navigationController?.setColor(color: .black) + } + + @IBAction func btnTapped(_ sender: LocalisedElementsButton) { + } +} + +// MARK: - TableView DataSource , Delegates + +extension AddressListVC : TableViewSRC{ + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return vm.addressData.count + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell = tableView.dequeueReusableCell(withIdentifier: K.CellIdentifier.Cart.addressCell) as! AddressCell + let data = vm.addressData[indexPath.row] + cell.setData(data: data) + return cell + } +} diff --git a/WOKA/Cart/Controller/CartPaymentOptionsVC.swift b/WOKA/Cart/Controller/CartPaymentOptionsVC.swift index c566fc7..d1c1e96 100644 --- a/WOKA/Cart/Controller/CartPaymentOptionsVC.swift +++ b/WOKA/Cart/Controller/CartPaymentOptionsVC.swift @@ -69,6 +69,10 @@ class CartPaymentOptionsVC: UIViewController { } @IBAction func confirmBtnTapped(_ sender: LocalisedElementsButton) { + let sb = UIStoryboard(name: K.StoryBoard.cart, bundle: nil) + let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.Cart.addressListVC) as! AddressListVC + self.navigationController?.pushViewController(vcPush, animated: true) +// vm.createOrder() } @IBAction func applyBtnTapped(_ sender: UIButton) { diff --git a/WOKA/Cart/Model/AddressListDM.swift b/WOKA/Cart/Model/AddressListDM.swift new file mode 100644 index 0000000..bb23c62 --- /dev/null +++ b/WOKA/Cart/Model/AddressListDM.swift @@ -0,0 +1,25 @@ +// +// AddressListDM.swift +// WOKA +// +// Created by MacBook Pro on 25/07/24. +// + +import Foundation + +// MARK: - AddressListDM +struct AddressListDM: Codable { + let id: Int? + let addressName, addressType, address, city: String? + let state, pincode, country, phoneNo: String? + let email: String? + + enum CodingKeys: String, CodingKey { + case id + case addressName = "address_name" + case addressType = "address_type" + case address, city, state, pincode, country + case phoneNo = "phone_no" + case email + } +} diff --git a/WOKA/Cart/View/AddressCell.swift b/WOKA/Cart/View/AddressCell.swift new file mode 100644 index 0000000..5028084 --- /dev/null +++ b/WOKA/Cart/View/AddressCell.swift @@ -0,0 +1,38 @@ +// +// AddressCell.swift +// WOKA +// +// Created by MacBook Pro on 25/07/24. +// + +import UIKit + +class AddressCell: UITableViewCell { + + @IBOutlet weak var addressName: LocalisedElementsLabel! + @IBOutlet weak var addressLine: LocalisedElementsLabel! + @IBOutlet weak var phoneNo: LocalisedElementsLabel! + @IBOutlet weak var expecteDelivery: LocalisedElementsLabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + + func setData(data : AddressListDM){ + self.addressName.text = data.addressName + let address = data.address ?? "" + let city = data.city ?? "" + let state = data.state ?? "" + let pincode = data.pincode ?? "" + self.addressLine.text = address + city + state + ",\n" + pincode + self.phoneNo.text = "Phone No. : " + (data.phoneNo ?? "+0") + self.expecteDelivery.text = data.addressName + } +} diff --git a/WOKA/Cart/View/AddressCell.xib b/WOKA/Cart/View/AddressCell.xib new file mode 100644 index 0000000..744ebc0 --- /dev/null +++ b/WOKA/Cart/View/AddressCell.xib @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + Exo2-Bold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WOKA/Cart/View/CartPaymentOptionsCell.xib b/WOKA/Cart/View/CartPaymentOptionsCell.xib index 16187d4..7f6d958 100644 --- a/WOKA/Cart/View/CartPaymentOptionsCell.xib +++ b/WOKA/Cart/View/CartPaymentOptionsCell.xib @@ -53,16 +53,16 @@ - + -