Showing
8 changed files
with
53 additions
and
2 deletions
| ... | @@ -51,6 +51,7 @@ let package = Package( | ... | @@ -51,6 +51,7 @@ let package = Package( |
| 51 | .process("cells/ProfileCouponTableViewCell/ProfileCouponTableViewCell.xib"), | 51 | .process("cells/ProfileCouponTableViewCell/ProfileCouponTableViewCell.xib"), |
| 52 | .process("cells/ProfileFilterCollectionViewCell/ProfileFilterCollectionViewCell.xib"), | 52 | .process("cells/ProfileFilterCollectionViewCell/ProfileFilterCollectionViewCell.xib"), |
| 53 | .process("screens/CouponViewController/CouponViewController.xib"), | 53 | .process("screens/CouponViewController/CouponViewController.xib"), |
| 54 | + .process("screens/CouponsetViewController/CouponsetViewController.xib"), | ||
| 54 | .process("screens/ProfileViewController/ProfileViewController.xib"), | 55 | .process("screens/ProfileViewController/ProfileViewController.xib"), |
| 55 | .process("screens/CampaignViewController/CampaignViewController.xib"), | 56 | .process("screens/CampaignViewController/CampaignViewController.xib"), |
| 56 | .process("cells/MyRewardsOfferCollectionViewCell/MyRewardsOfferCollectionViewCell.xib"), | 57 | .process("cells/MyRewardsOfferCollectionViewCell/MyRewardsOfferCollectionViewCell.xib"), | ... | ... |
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| 3 | +<plist version="1.0"> | ||
| 4 | +<dict> | ||
| 5 | + <key>SchemeUserState</key> | ||
| 6 | + <dict> | ||
| 7 | + <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> | ||
| 8 | + <dict> | ||
| 9 | + <key>orderHint</key> | ||
| 10 | + <integer>1</integer> | ||
| 11 | + </dict> | ||
| 12 | + </dict> | ||
| 13 | +</dict> | ||
| 14 | +</plist> |
| ... | @@ -71,6 +71,8 @@ | ... | @@ -71,6 +71,8 @@ |
| 71 | 1EDBAF112DE8443B00911E79 /* ProfileHeaderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDBAF0E2DE8443B00911E79 /* ProfileHeaderTableViewCell.swift */; }; | 71 | 1EDBAF112DE8443B00911E79 /* ProfileHeaderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDBAF0E2DE8443B00911E79 /* ProfileHeaderTableViewCell.swift */; }; |
| 72 | 1EDD0ABD2E0D308A005E162B /* XIBLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDD0ABC2E0D308A005E162B /* XIBLoader.swift */; }; | 72 | 1EDD0ABD2E0D308A005E162B /* XIBLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDD0ABC2E0D308A005E162B /* XIBLoader.swift */; }; |
| 73 | 1EDD0AC62E0D68B6005E162B /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = 1EDD0AC52E0D68B6005E162B /* SQLite */; }; | 73 | 1EDD0AC62E0D68B6005E162B /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = 1EDD0AC52E0D68B6005E162B /* SQLite */; }; |
| 74 | + 622DA0AE2F51CAEE00308AB8 /* CouponsetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 622DA0AD2F51CAEE00308AB8 /* CouponsetViewController.xib */; }; | ||
| 75 | + 622DA0AF2F51CAEE00308AB8 /* CouponsetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 622DA0AC2F51CAEE00308AB8 /* CouponsetViewController.swift */; }; | ||
| 74 | 7630AD9A6242D60846D6750C /* Pods_SwiftWarplyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D5F56DD4E5371A50AD2D87 /* Pods_SwiftWarplyFramework.framework */; }; | 76 | 7630AD9A6242D60846D6750C /* Pods_SwiftWarplyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D5F56DD4E5371A50AD2D87 /* Pods_SwiftWarplyFramework.framework */; }; |
| 75 | A07936762885E9CC00064122 /* UIColorExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A07936752885E9CC00064122 /* UIColorExtensions.swift */; }; | 77 | A07936762885E9CC00064122 /* UIColorExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A07936752885E9CC00064122 /* UIColorExtensions.swift */; }; |
| 76 | E6A77853282933340045BBA8 /* SwiftWarplyFramework.docc in Sources */ = {isa = PBXBuildFile; fileRef = E6A77852282933340045BBA8 /* SwiftWarplyFramework.docc */; }; | 78 | E6A77853282933340045BBA8 /* SwiftWarplyFramework.docc in Sources */ = {isa = PBXBuildFile; fileRef = E6A77852282933340045BBA8 /* SwiftWarplyFramework.docc */; }; |
| ... | @@ -146,6 +148,8 @@ | ... | @@ -146,6 +148,8 @@ |
| 146 | 1EDBAF0E2DE8443B00911E79 /* ProfileHeaderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileHeaderTableViewCell.swift; sourceTree = "<group>"; }; | 148 | 1EDBAF0E2DE8443B00911E79 /* ProfileHeaderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileHeaderTableViewCell.swift; sourceTree = "<group>"; }; |
| 147 | 1EDBAF0F2DE8443B00911E79 /* ProfileHeaderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProfileHeaderTableViewCell.xib; sourceTree = "<group>"; }; | 149 | 1EDBAF0F2DE8443B00911E79 /* ProfileHeaderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProfileHeaderTableViewCell.xib; sourceTree = "<group>"; }; |
| 148 | 1EDD0ABC2E0D308A005E162B /* XIBLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XIBLoader.swift; sourceTree = "<group>"; }; | 150 | 1EDD0ABC2E0D308A005E162B /* XIBLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XIBLoader.swift; sourceTree = "<group>"; }; |
| 151 | + 622DA0AC2F51CAEE00308AB8 /* CouponsetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CouponsetViewController.swift; sourceTree = "<group>"; }; | ||
| 152 | + 622DA0AD2F51CAEE00308AB8 /* CouponsetViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CouponsetViewController.xib; sourceTree = "<group>"; }; | ||
| 149 | A07936752885E9CC00064122 /* UIColorExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorExtensions.swift; sourceTree = "<group>"; }; | 153 | A07936752885E9CC00064122 /* UIColorExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorExtensions.swift; sourceTree = "<group>"; }; |
| 150 | A9B7BE01A4E812DE49866EF8 /* Pods-SwiftWarplyFramework.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftWarplyFramework.debug.xcconfig"; path = "Target Support Files/Pods-SwiftWarplyFramework/Pods-SwiftWarplyFramework.debug.xcconfig"; sourceTree = "<group>"; }; | 154 | A9B7BE01A4E812DE49866EF8 /* Pods-SwiftWarplyFramework.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftWarplyFramework.debug.xcconfig"; path = "Target Support Files/Pods-SwiftWarplyFramework/Pods-SwiftWarplyFramework.debug.xcconfig"; sourceTree = "<group>"; }; |
| 151 | B9EB8A451EF0C5AD75094EEE /* Pods-SwiftWarplyFramework.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftWarplyFramework.release.xcconfig"; path = "Target Support Files/Pods-SwiftWarplyFramework/Pods-SwiftWarplyFramework.release.xcconfig"; sourceTree = "<group>"; }; | 155 | B9EB8A451EF0C5AD75094EEE /* Pods-SwiftWarplyFramework.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftWarplyFramework.release.xcconfig"; path = "Target Support Files/Pods-SwiftWarplyFramework/Pods-SwiftWarplyFramework.release.xcconfig"; sourceTree = "<group>"; }; |
| ... | @@ -319,6 +323,7 @@ | ... | @@ -319,6 +323,7 @@ |
| 319 | 1EA8E5B42DDF315600CD3418 /* screens */ = { | 323 | 1EA8E5B42DDF315600CD3418 /* screens */ = { |
| 320 | isa = PBXGroup; | 324 | isa = PBXGroup; |
| 321 | children = ( | 325 | children = ( |
| 326 | + 622DA0AB2F51CA9100308AB8 /* CouponsetViewController */, | ||
| 322 | 1EBE45642E02DDF90055A0D4 /* CampaignViewController */, | 327 | 1EBE45642E02DDF90055A0D4 /* CampaignViewController */, |
| 323 | 1E917CD32DDF6472002221D8 /* MyRewardsViewController */, | 328 | 1E917CD32DDF6472002221D8 /* MyRewardsViewController */, |
| 324 | 1E917CD82DDF687E002221D8 /* CouponViewController */, | 329 | 1E917CD82DDF687E002221D8 /* CouponViewController */, |
| ... | @@ -425,6 +430,15 @@ | ... | @@ -425,6 +430,15 @@ |
| 425 | path = ProfileFilterCollectionViewCell; | 430 | path = ProfileFilterCollectionViewCell; |
| 426 | sourceTree = "<group>"; | 431 | sourceTree = "<group>"; |
| 427 | }; | 432 | }; |
| 433 | + 622DA0AB2F51CA9100308AB8 /* CouponsetViewController */ = { | ||
| 434 | + isa = PBXGroup; | ||
| 435 | + children = ( | ||
| 436 | + 622DA0AC2F51CAEE00308AB8 /* CouponsetViewController.swift */, | ||
| 437 | + 622DA0AD2F51CAEE00308AB8 /* CouponsetViewController.xib */, | ||
| 438 | + ); | ||
| 439 | + path = CouponsetViewController; | ||
| 440 | + sourceTree = "<group>"; | ||
| 441 | + }; | ||
| 428 | 98AD36FA62350CEABCD961A7 /* Frameworks */ = { | 442 | 98AD36FA62350CEABCD961A7 /* Frameworks */ = { |
| 429 | isa = PBXGroup; | 443 | isa = PBXGroup; |
| 430 | children = ( | 444 | children = ( |
| ... | @@ -598,6 +612,7 @@ | ... | @@ -598,6 +612,7 @@ |
| 598 | 1E116F682DE845B1009AE791 /* ProfileFilterCollectionViewCell.xib in Resources */, | 612 | 1E116F682DE845B1009AE791 /* ProfileFilterCollectionViewCell.xib in Resources */, |
| 599 | 1EB4F4252DE09AAC00D934C0 /* MyRewardsBannerOffersScrollTableViewCell.xib in Resources */, | 613 | 1EB4F4252DE09AAC00D934C0 /* MyRewardsBannerOffersScrollTableViewCell.xib in Resources */, |
| 600 | 1EA8E5C02DDF427A00CD3418 /* PingLCG-Bold.otf in Resources */, | 614 | 1EA8E5C02DDF427A00CD3418 /* PingLCG-Bold.otf in Resources */, |
| 615 | + 622DA0AE2F51CAEE00308AB8 /* CouponsetViewController.xib in Resources */, | ||
| 601 | 1E64E1832DE48E0600543217 /* MyRewardsOfferCollectionViewCell.xib in Resources */, | 616 | 1E64E1832DE48E0600543217 /* MyRewardsOfferCollectionViewCell.xib in Resources */, |
| 602 | 1EA8E5C12DDF427A00CD3418 /* PingLCG-Light.otf in Resources */, | 617 | 1EA8E5C12DDF427A00CD3418 /* PingLCG-Light.otf in Resources */, |
| 603 | 1EA8E5C22DDF427A00CD3418 /* PingLCG-Regular.otf in Resources */, | 618 | 1EA8E5C22DDF427A00CD3418 /* PingLCG-Regular.otf in Resources */, |
| ... | @@ -660,6 +675,7 @@ | ... | @@ -660,6 +675,7 @@ |
| 660 | 1E089E062DF87CED007459F1 /* Endpoints.swift in Sources */, | 675 | 1E089E062DF87CED007459F1 /* Endpoints.swift in Sources */, |
| 661 | 1E089E072DF87CED007459F1 /* NetworkService.swift in Sources */, | 676 | 1E089E072DF87CED007459F1 /* NetworkService.swift in Sources */, |
| 662 | 1EBE45672E02DE9A0055A0D4 /* CampaignViewController.swift in Sources */, | 677 | 1EBE45672E02DE9A0055A0D4 /* CampaignViewController.swift in Sources */, |
| 678 | + 622DA0AF2F51CAEE00308AB8 /* CouponsetViewController.swift in Sources */, | ||
| 663 | 1E089DFE2DF87C39007459F1 /* Coupon.swift in Sources */, | 679 | 1E089DFE2DF87C39007459F1 /* Coupon.swift in Sources */, |
| 664 | 1E089DFF2DF87C39007459F1 /* OfferModel.swift in Sources */, | 680 | 1E089DFF2DF87C39007459F1 /* OfferModel.swift in Sources */, |
| 665 | 1ED41E4C2DE0C24D00836ABA /* MyRewardsBannerOfferCollectionViewCell.swift in Sources */, | 681 | 1ED41E4C2DE0C24D00836ABA /* MyRewardsBannerOfferCollectionViewCell.swift in Sources */, | ... | ... |
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| 3 | +<plist version="1.0"> | ||
| 4 | +<dict> | ||
| 5 | + <key>SchemeUserState</key> | ||
| 6 | + <dict> | ||
| 7 | + <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> | ||
| 8 | + <dict> | ||
| 9 | + <key>orderHint</key> | ||
| 10 | + <integer>0</integer> | ||
| 11 | + </dict> | ||
| 12 | + </dict> | ||
| 13 | +</dict> | ||
| 14 | +</plist> |
No preview for this file type
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
| ... | @@ -565,6 +565,13 @@ import UIKit | ... | @@ -565,6 +565,13 @@ import UIKit |
| 565 | // self.navigationController?.pushViewController(vc, animated: true) | 565 | // self.navigationController?.pushViewController(vc, animated: true) |
| 566 | print("CouponViewController navigation commented out - will handle later") | 566 | print("CouponViewController navigation commented out - will handle later") |
| 567 | } | 567 | } |
| 568 | + | ||
| 569 | + private func openCouponsetViewController(with couponSet: CouponSetItemModel) { | ||
| 570 | + let vc = SwiftWarplyFramework.CouponsetViewController(nibName: "CouponsetViewController", bundle: Bundle.frameworkBundle) | ||
| 571 | + vc.couponSet = couponSet | ||
| 572 | + | ||
| 573 | + self.navigationController?.pushViewController(vc, animated: true) | ||
| 574 | + } | ||
| 568 | 575 | ||
| 569 | private func openProfileViewController() { | 576 | private func openProfileViewController() { |
| 570 | let vc = SwiftWarplyFramework.ProfileViewController(nibName: "ProfileViewController", bundle: Bundle.frameworkBundle) | 577 | let vc = SwiftWarplyFramework.ProfileViewController(nibName: "ProfileViewController", bundle: Bundle.frameworkBundle) |
| ... | @@ -680,7 +687,6 @@ extension MyRewardsViewController: MyRewardsOffersScrollTableViewCellDelegate { | ... | @@ -680,7 +687,6 @@ extension MyRewardsViewController: MyRewardsOffersScrollTableViewCellDelegate { |
| 680 | } | 687 | } |
| 681 | 688 | ||
| 682 | func didSelectCouponSet(_ couponSet: CouponSetItemModel) { | 689 | func didSelectCouponSet(_ couponSet: CouponSetItemModel) { |
| 683 | - // New logic for CouponSetItemModel - will handle navigation later | 690 | + openCouponsetViewController(with: couponSet) |
| 684 | - print("CouponSet selected: \(couponSet._name)") | ||
| 685 | } | 691 | } |
| 686 | } | 692 | } | ... | ... |
-
Please register or login to post a comment