Showing
5 changed files
with
241 additions
and
20 deletions
... | @@ -65,6 +65,7 @@ | ... | @@ -65,6 +65,7 @@ |
65 | 1EDD4F892AE937AA00A6B5A6 /* LoyaltyHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDD4F882AE937AA00A6B5A6 /* LoyaltyHistoryViewController.swift */; }; | 65 | 1EDD4F892AE937AA00A6B5A6 /* LoyaltyHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDD4F882AE937AA00A6B5A6 /* LoyaltyHistoryViewController.swift */; }; |
66 | 1EE67DA32AE2AF2B0057C8CC /* UnifiedCouponsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EE67DA22AE2AF2B0057C8CC /* UnifiedCouponsViewController.swift */; }; | 66 | 1EE67DA32AE2AF2B0057C8CC /* UnifiedCouponsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EE67DA22AE2AF2B0057C8CC /* UnifiedCouponsViewController.swift */; }; |
67 | 1EEC5C582CC15C4600CF3CAC /* PopupMerchantsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EEC5C572CC15C4600CF3CAC /* PopupMerchantsViewController.swift */; }; | 67 | 1EEC5C582CC15C4600CF3CAC /* PopupMerchantsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EEC5C572CC15C4600CF3CAC /* PopupMerchantsViewController.swift */; }; |
68 | + 1EFBAB942CC65C9B001DFF75 /* PopupMerchantCategoriesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EFBAB932CC65C9B001DFF75 /* PopupMerchantCategoriesViewController.swift */; }; | ||
68 | 7630AD9A6242D60846D6750C /* Pods_SwiftWarplyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D5F56DD4E5371A50AD2D87 /* Pods_SwiftWarplyFramework.framework */; }; | 69 | 7630AD9A6242D60846D6750C /* Pods_SwiftWarplyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D5F56DD4E5371A50AD2D87 /* Pods_SwiftWarplyFramework.framework */; }; |
69 | A02F34052882B6E60086465F /* TelcoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A02F34042882B6E60086465F /* TelcoViewController.swift */; }; | 70 | A02F34052882B6E60086465F /* TelcoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A02F34042882B6E60086465F /* TelcoViewController.swift */; }; |
70 | A04D31DE288FF670000E43B5 /* HistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04D31DD288FF670000E43B5 /* HistoryViewController.swift */; }; | 71 | A04D31DE288FF670000E43B5 /* HistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04D31DD288FF670000E43B5 /* HistoryViewController.swift */; }; |
... | @@ -261,6 +262,7 @@ | ... | @@ -261,6 +262,7 @@ |
261 | 1EDD4F882AE937AA00A6B5A6 /* LoyaltyHistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoyaltyHistoryViewController.swift; sourceTree = "<group>"; }; | 262 | 1EDD4F882AE937AA00A6B5A6 /* LoyaltyHistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoyaltyHistoryViewController.swift; sourceTree = "<group>"; }; |
262 | 1EE67DA22AE2AF2B0057C8CC /* UnifiedCouponsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnifiedCouponsViewController.swift; sourceTree = "<group>"; }; | 263 | 1EE67DA22AE2AF2B0057C8CC /* UnifiedCouponsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnifiedCouponsViewController.swift; sourceTree = "<group>"; }; |
263 | 1EEC5C572CC15C4600CF3CAC /* PopupMerchantsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupMerchantsViewController.swift; sourceTree = "<group>"; }; | 264 | 1EEC5C572CC15C4600CF3CAC /* PopupMerchantsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupMerchantsViewController.swift; sourceTree = "<group>"; }; |
265 | + 1EFBAB932CC65C9B001DFF75 /* PopupMerchantCategoriesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupMerchantCategoriesViewController.swift; sourceTree = "<group>"; }; | ||
264 | A02F34042882B6E60086465F /* TelcoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TelcoViewController.swift; sourceTree = "<group>"; }; | 266 | A02F34042882B6E60086465F /* TelcoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TelcoViewController.swift; sourceTree = "<group>"; }; |
265 | A04D31DD288FF670000E43B5 /* HistoryViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HistoryViewController.swift; sourceTree = "<group>"; }; | 267 | A04D31DD288FF670000E43B5 /* HistoryViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HistoryViewController.swift; sourceTree = "<group>"; }; |
266 | A079366D2885D07700064122 /* AnalysisChildViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalysisChildViewController.swift; sourceTree = "<group>"; }; | 268 | A079366D2885D07700064122 /* AnalysisChildViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalysisChildViewController.swift; sourceTree = "<group>"; }; |
... | @@ -576,6 +578,7 @@ | ... | @@ -576,6 +578,7 @@ |
576 | 1EEC5C572CC15C4600CF3CAC /* PopupMerchantsViewController.swift */, | 578 | 1EEC5C572CC15C4600CF3CAC /* PopupMerchantsViewController.swift */, |
577 | 1E56DF722CC249B300F71882 /* MerchantTableViewCell.swift */, | 579 | 1E56DF722CC249B300F71882 /* MerchantTableViewCell.swift */, |
578 | 1E56DF742CC2620000F71882 /* PopupMerchantsFooterTableViewCell.swift */, | 580 | 1E56DF742CC2620000F71882 /* PopupMerchantsFooterTableViewCell.swift */, |
581 | + 1EFBAB932CC65C9B001DFF75 /* PopupMerchantCategoriesViewController.swift */, | ||
579 | E6A77860282933E40045BBA8 /* MyApi.h */, | 582 | E6A77860282933E40045BBA8 /* MyApi.h */, |
580 | E6A778DC282933E60045BBA8 /* MyApi.m */, | 583 | E6A778DC282933E60045BBA8 /* MyApi.m */, |
581 | E6A77862282933E50045BBA8 /* MyEmptyClass.swift */, | 584 | E6A77862282933E50045BBA8 /* MyEmptyClass.swift */, |
... | @@ -1092,6 +1095,7 @@ | ... | @@ -1092,6 +1095,7 @@ |
1092 | 1E7B9A5829F6ACF400B37E13 /* WalletBannersTableViewCell.swift in Sources */, | 1095 | 1E7B9A5829F6ACF400B37E13 /* WalletBannersTableViewCell.swift in Sources */, |
1093 | E6A778FF282933E60045BBA8 /* WLBeacon.m in Sources */, | 1096 | E6A778FF282933E60045BBA8 /* WLBeacon.m in Sources */, |
1094 | 1E029A4329E0031600CC7447 /* UnifiedCouponBCFooterTableViewCell.swift in Sources */, | 1097 | 1E029A4329E0031600CC7447 /* UnifiedCouponBCFooterTableViewCell.swift in Sources */, |
1098 | + 1EFBAB942CC65C9B001DFF75 /* PopupMerchantCategoriesViewController.swift in Sources */, | ||
1095 | E6A7791A282933E60045BBA8 /* WLAPPActionHandler.m in Sources */, | 1099 | E6A7791A282933E60045BBA8 /* WLAPPActionHandler.m in Sources */, |
1096 | E6A778E1282933E60045BBA8 /* CouponViewController.swift in Sources */, | 1100 | E6A778E1282933E60045BBA8 /* CouponViewController.swift in Sources */, |
1097 | E6A77924282933E70045BBA8 /* NSString+SSToolkitAdditions.m in Sources */, | 1101 | E6A77924282933E70045BBA8 /* NSString+SSToolkitAdditions.m in Sources */, | ... | ... |
No preview for this file type
... | @@ -5215,30 +5215,30 @@ | ... | @@ -5215,30 +5215,30 @@ |
5215 | <autoresizingMask key="autoresizingMask"/> | 5215 | <autoresizingMask key="autoresizingMask"/> |
5216 | <subviews> | 5216 | <subviews> |
5217 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="35i-Iq-TId"> | 5217 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="35i-Iq-TId"> |
5218 | - <rect key="frame" x="10" y="0.0" width="394" height="64.5"/> | 5218 | + <rect key="frame" x="10" y="0.0" width="394" height="42"/> |
5219 | <subviews> | 5219 | <subviews> |
5220 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="58G-jP-FMr"> | 5220 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="58G-jP-FMr"> |
5221 | - <rect key="frame" x="0.0" y="0.0" width="394" height="64.5"/> | 5221 | + <rect key="frame" x="0.0" y="0.0" width="394" height="42"/> |
5222 | </imageView> | 5222 | </imageView> |
5223 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jcR-bh-Fhz"> | 5223 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jcR-bh-Fhz"> |
5224 | - <rect key="frame" x="20" y="10" width="79" height="44.5"/> | 5224 | + <rect key="frame" x="20" y="10" width="79" height="22"/> |
5225 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 5225 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
5226 | </imageView> | 5226 | </imageView> |
5227 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDK-3b-8MQ"> | 5227 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDK-3b-8MQ"> |
5228 | - <rect key="frame" x="104" y="10" width="10" height="44.5"/> | 5228 | + <rect key="frame" x="104" y="10" width="10" height="22"/> |
5229 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 5229 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
5230 | <constraints> | 5230 | <constraints> |
5231 | <constraint firstAttribute="width" constant="10" id="sq7-pL-kd5"/> | 5231 | <constraint firstAttribute="width" constant="10" id="sq7-pL-kd5"/> |
5232 | </constraints> | 5232 | </constraints> |
5233 | </view> | 5233 | </view> |
5234 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mOO-dc-RyS"> | 5234 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mOO-dc-RyS"> |
5235 | - <rect key="frame" x="119" y="-13" width="255" height="20"/> | 5235 | + <rect key="frame" x="119" y="-24.5" width="255" height="20"/> |
5236 | <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> | 5236 | <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> |
5237 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | 5237 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
5238 | <nil key="highlightedColor"/> | 5238 | <nil key="highlightedColor"/> |
5239 | </label> | 5239 | </label> |
5240 | <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="NmF-B8-BxN"> | 5240 | <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="NmF-B8-BxN"> |
5241 | - <rect key="frame" x="119" y="12" width="255" height="40.5"/> | 5241 | + <rect key="frame" x="119" y="1" width="255" height="40.5"/> |
5242 | <subviews> | 5242 | <subviews> |
5243 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9CO-TF-h6H"> | 5243 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9CO-TF-h6H"> |
5244 | <rect key="frame" x="0.0" y="0.0" width="127.5" height="40.5"/> | 5244 | <rect key="frame" x="0.0" y="0.0" width="127.5" height="40.5"/> |
... | @@ -5259,13 +5259,13 @@ | ... | @@ -5259,13 +5259,13 @@ |
5259 | </constraints> | 5259 | </constraints> |
5260 | </stackView> | 5260 | </stackView> |
5261 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u51-sv-YiH"> | 5261 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u51-sv-YiH"> |
5262 | - <rect key="frame" x="119" y="57.5" width="255" height="15"/> | 5262 | + <rect key="frame" x="119" y="46.5" width="255" height="15"/> |
5263 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> | 5263 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
5264 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | 5264 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
5265 | <nil key="highlightedColor"/> | 5265 | <nil key="highlightedColor"/> |
5266 | </label> | 5266 | </label> |
5267 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G6f-Nu-2R5"> | 5267 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G6f-Nu-2R5"> |
5268 | - <rect key="frame" x="119" y="57.5" width="61.5" height="21"/> | 5268 | + <rect key="frame" x="119" y="46.5" width="61.5" height="21"/> |
5269 | <subviews> | 5269 | <subviews> |
5270 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LGs-y6-UbY"> | 5270 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LGs-y6-UbY"> |
5271 | <rect key="frame" x="5" y="3" width="15" height="15"/> | 5271 | <rect key="frame" x="5" y="3" width="15" height="15"/> |
... | @@ -5343,17 +5343,17 @@ | ... | @@ -5343,17 +5343,17 @@ |
5343 | </connections> | 5343 | </connections> |
5344 | </tableViewCell> | 5344 | </tableViewCell> |
5345 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework"> | 5345 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework"> |
5346 | - <rect key="frame" x="0.0" y="1013.5" width="414" height="220"/> | 5346 | + <rect key="frame" x="0.0" y="1013.5" width="414" height="44"/> |
5347 | <autoresizingMask key="autoresizingMask"/> | 5347 | <autoresizingMask key="autoresizingMask"/> |
5348 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5"> | 5348 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5"> |
5349 | - <rect key="frame" x="0.0" y="0.0" width="414" height="220"/> | 5349 | + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> |
5350 | <autoresizingMask key="autoresizingMask"/> | 5350 | <autoresizingMask key="autoresizingMask"/> |
5351 | <subviews> | 5351 | <subviews> |
5352 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4W-1e-9fQ"> | 5352 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4W-1e-9fQ"> |
5353 | - <rect key="frame" x="0.0" y="0.0" width="414" height="220"/> | 5353 | + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> |
5354 | <subviews> | 5354 | <subviews> |
5355 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kdi-w7-eKZ"> | 5355 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kdi-w7-eKZ"> |
5356 | - <rect key="frame" x="77" y="20" width="260" height="50"/> | 5356 | + <rect key="frame" x="77" y="20" width="260" height="33"/> |
5357 | <constraints> | 5357 | <constraints> |
5358 | <constraint firstAttribute="height" constant="50" id="SUG-HC-XQH"/> | 5358 | <constraint firstAttribute="height" constant="50" id="SUG-HC-XQH"/> |
5359 | <constraint firstAttribute="width" constant="260" id="WTS-Qk-0M1"/> | 5359 | <constraint firstAttribute="width" constant="260" id="WTS-Qk-0M1"/> |
... | @@ -5368,7 +5368,7 @@ | ... | @@ -5368,7 +5368,7 @@ |
5368 | </connections> | 5368 | </connections> |
5369 | </button> | 5369 | </button> |
5370 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BrE-JO-TPr"> | 5370 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BrE-JO-TPr"> |
5371 | - <rect key="frame" x="77" y="80" width="260" height="50"/> | 5371 | + <rect key="frame" x="77" y="63" width="260" height="33"/> |
5372 | <constraints> | 5372 | <constraints> |
5373 | <constraint firstAttribute="height" constant="50" id="NrC-VW-t5Y"/> | 5373 | <constraint firstAttribute="height" constant="50" id="NrC-VW-t5Y"/> |
5374 | <constraint firstAttribute="width" constant="260" id="lZv-96-aOE"/> | 5374 | <constraint firstAttribute="width" constant="260" id="lZv-96-aOE"/> |
... | @@ -5383,7 +5383,7 @@ | ... | @@ -5383,7 +5383,7 @@ |
5383 | </connections> | 5383 | </connections> |
5384 | </button> | 5384 | </button> |
5385 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sq7-ea-Nx2"> | 5385 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sq7-ea-Nx2"> |
5386 | - <rect key="frame" x="103.5" y="150" width="207" height="40"/> | 5386 | + <rect key="frame" x="103.5" y="-10" width="207" height="24"/> |
5387 | <constraints> | 5387 | <constraints> |
5388 | <constraint firstAttribute="height" constant="40" id="UgG-aB-OOw"/> | 5388 | <constraint firstAttribute="height" constant="40" id="UgG-aB-OOw"/> |
5389 | </constraints> | 5389 | </constraints> |
... | @@ -5398,7 +5398,7 @@ | ... | @@ -5398,7 +5398,7 @@ |
5398 | </connections> | 5398 | </connections> |
5399 | </button> | 5399 | </button> |
5400 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kkr-9H-ZSx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> | 5400 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kkr-9H-ZSx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> |
5401 | - <rect key="frame" x="20" y="190" width="374" height="0.0"/> | 5401 | + <rect key="frame" x="20" y="14" width="374" height="0.0"/> |
5402 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 5402 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
5403 | <constraints> | 5403 | <constraints> |
5404 | <constraint firstAttribute="height" id="oLt-F6-WA7"/> | 5404 | <constraint firstAttribute="height" id="oLt-F6-WA7"/> |
... | @@ -6583,6 +6583,129 @@ | ... | @@ -6583,6 +6583,129 @@ |
6583 | </objects> | 6583 | </objects> |
6584 | <point key="canvasLocation" x="5412" y="-555"/> | 6584 | <point key="canvasLocation" x="5412" y="-555"/> |
6585 | </scene> | 6585 | </scene> |
6586 | + <!--Popup Merchant Categories View Controller--> | ||
6587 | + <scene sceneID="BjE-gk-qfV"> | ||
6588 | + <objects> | ||
6589 | + <viewController storyboardIdentifier="PopupMerchantCategoriesViewController" hidesBottomBarWhenPushed="YES" id="ecE-vH-QNF" customClass="PopupMerchantCategoriesViewController" customModule="SwiftWarplyFramework" customModuleProvider="target" sceneMemberID="viewController"> | ||
6590 | + <view key="view" contentMode="scaleToFill" id="RBA-fy-PW5"> | ||
6591 | + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> | ||
6592 | + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | ||
6593 | + <subviews> | ||
6594 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z3G-LR-Caw" userLabel="Main View"> | ||
6595 | + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> | ||
6596 | + <subviews> | ||
6597 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JzI-pZ-MNc"> | ||
6598 | + <rect key="frame" x="0.0" y="672" width="414" height="224"/> | ||
6599 | + <subviews> | ||
6600 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jEM-IU-eiM" userLabel="Header View"> | ||
6601 | + <rect key="frame" x="20" y="15" width="374" height="20"/> | ||
6602 | + <subviews> | ||
6603 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Βρες το προϊον στα supermarket" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ybq-Lc-ajo"> | ||
6604 | + <rect key="frame" x="0.0" y="0.0" width="324" height="20"/> | ||
6605 | + <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> | ||
6606 | + <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
6607 | + <nil key="highlightedColor"/> | ||
6608 | + </label> | ||
6609 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xAb-b2-o7k"> | ||
6610 | + <rect key="frame" x="344" y="-5" width="30" height="30"/> | ||
6611 | + <constraints> | ||
6612 | + <constraint firstAttribute="width" constant="30" id="l9h-yH-nF9"/> | ||
6613 | + <constraint firstAttribute="height" constant="30" id="pBV-Cd-ego"/> | ||
6614 | + </constraints> | ||
6615 | + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | ||
6616 | + <state key="normal" image="ic_close_2"/> | ||
6617 | + <connections> | ||
6618 | + <action selector="closeButtonAction:" destination="ecE-vH-QNF" eventType="touchUpInside" id="BFS-v6-jwF"/> | ||
6619 | + <action selector="closeButtonAction:" destination="iwV-Nc-oRp" eventType="touchUpInside" id="dls-sm-hhL"/> | ||
6620 | + </connections> | ||
6621 | + </button> | ||
6622 | + </subviews> | ||
6623 | + <color key="backgroundColor" systemColor="systemBackgroundColor"/> | ||
6624 | + <constraints> | ||
6625 | + <constraint firstItem="Ybq-Lc-ajo" firstAttribute="leading" secondItem="jEM-IU-eiM" secondAttribute="leading" id="46I-7U-Ulb"/> | ||
6626 | + <constraint firstItem="xAb-b2-o7k" firstAttribute="centerY" secondItem="jEM-IU-eiM" secondAttribute="centerY" id="GcV-M2-J4V"/> | ||
6627 | + <constraint firstAttribute="bottom" secondItem="Ybq-Lc-ajo" secondAttribute="bottom" id="WOw-4M-kDQ"/> | ||
6628 | + <constraint firstItem="xAb-b2-o7k" firstAttribute="leading" secondItem="Ybq-Lc-ajo" secondAttribute="trailing" constant="20" id="ZeO-pQ-Lew"/> | ||
6629 | + <constraint firstAttribute="trailing" secondItem="xAb-b2-o7k" secondAttribute="trailing" id="dUI-5D-lZg"/> | ||
6630 | + <constraint firstItem="Ybq-Lc-ajo" firstAttribute="top" secondItem="jEM-IU-eiM" secondAttribute="top" id="rY9-wm-h5A"/> | ||
6631 | + </constraints> | ||
6632 | + </view> | ||
6633 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jn0-7E-Vpz"> | ||
6634 | + <rect key="frame" x="51" y="50" width="312" height="55"/> | ||
6635 | + <constraints> | ||
6636 | + <constraint firstAttribute="height" constant="55" id="8hL-nI-pET"/> | ||
6637 | + <constraint firstAttribute="width" constant="312" id="HyB-dA-8lF"/> | ||
6638 | + </constraints> | ||
6639 | + <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="16"/> | ||
6640 | + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | ||
6641 | + <state key="normal" title="Δες τα καταστήματα στο χάρτη"> | ||
6642 | + <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
6643 | + </state> | ||
6644 | + <connections> | ||
6645 | + <action selector="mapButtonAction:" destination="ecE-vH-QNF" eventType="touchUpInside" id="ouv-Tg-8VM"/> | ||
6646 | + <action selector="redeemButtomAction:" destination="CDt-eI-msA" eventType="touchUpInside" id="rJb-HZ-0dN"/> | ||
6647 | + </connections> | ||
6648 | + </button> | ||
6649 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wXX-H2-cJy"> | ||
6650 | + <rect key="frame" x="51" y="127" width="312" height="55"/> | ||
6651 | + <constraints> | ||
6652 | + <constraint firstAttribute="width" constant="312" id="IrT-Tj-Tg4"/> | ||
6653 | + <constraint firstAttribute="height" constant="55" id="cag-PL-ges"/> | ||
6654 | + </constraints> | ||
6655 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="16"/> | ||
6656 | + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | ||
6657 | + <state key="normal" title="Δες τα eshop"> | ||
6658 | + <color key="titleColor" red="0.31372549020000001" green="0.61960784310000006" blue="0.1843137255" alpha="1" colorSpace="calibratedRGB"/> | ||
6659 | + </state> | ||
6660 | + <connections> | ||
6661 | + <action selector="eshopsButtonAction:" destination="ecE-vH-QNF" eventType="touchUpInside" id="vea-u7-83s"/> | ||
6662 | + <action selector="mapButtonAction:" destination="CDt-eI-msA" eventType="touchUpInside" id="rjN-wt-ZaQ"/> | ||
6663 | + </connections> | ||
6664 | + </button> | ||
6665 | + </subviews> | ||
6666 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
6667 | + <constraints> | ||
6668 | + <constraint firstItem="jEM-IU-eiM" firstAttribute="top" secondItem="JzI-pZ-MNc" secondAttribute="top" constant="15" id="62V-Nw-Qgl"/> | ||
6669 | + <constraint firstAttribute="bottom" secondItem="wXX-H2-cJy" secondAttribute="bottom" constant="42" id="C6i-W5-oeG"/> | ||
6670 | + <constraint firstItem="jn0-7E-Vpz" firstAttribute="centerX" secondItem="JzI-pZ-MNc" secondAttribute="centerX" id="Cuj-Nn-1Gc"/> | ||
6671 | + <constraint firstAttribute="trailing" secondItem="jEM-IU-eiM" secondAttribute="trailing" constant="20" id="XNb-n6-rBl"/> | ||
6672 | + <constraint firstItem="jEM-IU-eiM" firstAttribute="leading" secondItem="JzI-pZ-MNc" secondAttribute="leading" constant="20" id="gPP-tC-QPE"/> | ||
6673 | + <constraint firstItem="jn0-7E-Vpz" firstAttribute="top" secondItem="jEM-IU-eiM" secondAttribute="bottom" constant="15" id="hmH-NM-zZV"/> | ||
6674 | + <constraint firstItem="wXX-H2-cJy" firstAttribute="centerX" secondItem="JzI-pZ-MNc" secondAttribute="centerX" id="iCc-1F-ylC"/> | ||
6675 | + <constraint firstItem="wXX-H2-cJy" firstAttribute="top" secondItem="jn0-7E-Vpz" secondAttribute="bottom" constant="22" id="rbP-SL-Ozy"/> | ||
6676 | + </constraints> | ||
6677 | + </view> | ||
6678 | + </subviews> | ||
6679 | + <color key="backgroundColor" red="0.1529411765" green="0.1529411765" blue="0.1529411765" alpha="0.57999999999999996" colorSpace="calibratedRGB"/> | ||
6680 | + <constraints> | ||
6681 | + <constraint firstItem="JzI-pZ-MNc" firstAttribute="leading" secondItem="z3G-LR-Caw" secondAttribute="leading" id="99Z-lr-WEI"/> | ||
6682 | + <constraint firstAttribute="bottom" secondItem="JzI-pZ-MNc" secondAttribute="bottom" id="DFf-Wt-cP5"/> | ||
6683 | + <constraint firstItem="JzI-pZ-MNc" firstAttribute="height" relation="lessThanOrEqual" secondItem="z3G-LR-Caw" secondAttribute="height" multiplier="0.7" id="QCP-vk-3i5"/> | ||
6684 | + <constraint firstAttribute="trailing" secondItem="JzI-pZ-MNc" secondAttribute="trailing" id="fsq-E4-i2h"/> | ||
6685 | + </constraints> | ||
6686 | + </view> | ||
6687 | + </subviews> | ||
6688 | + <viewLayoutGuide key="safeArea" id="SVu-GV-fJt"/> | ||
6689 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
6690 | + <constraints> | ||
6691 | + <constraint firstItem="z3G-LR-Caw" firstAttribute="leading" secondItem="RBA-fy-PW5" secondAttribute="leading" id="c3t-Js-F0q"/> | ||
6692 | + <constraint firstAttribute="bottom" secondItem="z3G-LR-Caw" secondAttribute="bottom" id="qEf-HF-yFG"/> | ||
6693 | + <constraint firstItem="z3G-LR-Caw" firstAttribute="top" secondItem="RBA-fy-PW5" secondAttribute="top" id="wfe-lV-QN9"/> | ||
6694 | + <constraint firstAttribute="trailing" secondItem="z3G-LR-Caw" secondAttribute="trailing" id="x54-eu-gYq"/> | ||
6695 | + </constraints> | ||
6696 | + </view> | ||
6697 | + <connections> | ||
6698 | + <outlet property="closeButton" destination="xAb-b2-o7k" id="Pcj-Xm-yCY"/> | ||
6699 | + <outlet property="eshopsButton" destination="wXX-H2-cJy" id="Rge-nz-CFC"/> | ||
6700 | + <outlet property="headerLabel" destination="Ybq-Lc-ajo" id="LDn-ay-yzp"/> | ||
6701 | + <outlet property="mapButton" destination="jn0-7E-Vpz" id="HR8-gv-jkU"/> | ||
6702 | + <outlet property="popupView" destination="z3G-LR-Caw" id="iPa-kN-AmH"/> | ||
6703 | + </connections> | ||
6704 | + </viewController> | ||
6705 | + <placeholder placeholderIdentifier="IBFirstResponder" id="OwD-fu-wY3" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/> | ||
6706 | + </objects> | ||
6707 | + <point key="canvasLocation" x="6207" y="-555"/> | ||
6708 | + </scene> | ||
6586 | <!--Coupon View Controller--> | 6709 | <!--Coupon View Controller--> |
6587 | <scene sceneID="yGm-Im-aAN"> | 6710 | <scene sceneID="yGm-Im-aAN"> |
6588 | <objects> | 6711 | <objects> | ... | ... |
1 | +// | ||
2 | +// PopupMerchantCategoriesViewController.swift | ||
3 | +// SwiftWarplyFramework | ||
4 | +// | ||
5 | +// Created by Manos Chorianopoulos on 21/10/24. | ||
6 | +// | ||
7 | + | ||
8 | +import UIKit | ||
9 | + | ||
10 | +class PopupMerchantCategoriesViewController: UIViewController { | ||
11 | + @IBOutlet weak var popupView: UIView! | ||
12 | + @IBOutlet weak var headerLabel: UILabel! | ||
13 | + @IBOutlet weak var closeButton: UIButton! | ||
14 | + @IBOutlet weak var mapButton: UIButton! | ||
15 | + @IBOutlet weak var eshopsButton: UIButton! | ||
16 | + | ||
17 | + public var headerText: String? = "" | ||
18 | + | ||
19 | + override func viewDidLoad() { | ||
20 | + super.viewDidLoad() | ||
21 | + | ||
22 | + popupView.clipsToBounds = true | ||
23 | + popupView.layer.cornerRadius = 16 | ||
24 | + popupView.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, right corner radius | ||
25 | + | ||
26 | + closeButton.setImage(UIImage(named: "ic_close_3.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | ||
27 | + closeButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | ||
28 | + | ||
29 | + headerLabel.text = self.headerText | ||
30 | + headerLabel.font = UIFont(name: "BTCosmo-Bold", size: 18) | ||
31 | + headerLabel.textColor = UIColor(rgb: 0x000000) | ||
32 | + headerLabel.isHidden = true | ||
33 | + | ||
34 | + mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17) | ||
35 | + mapButton.setTitle("Βρες το στα supermarket", for: .normal) | ||
36 | + mapButton.setTitleColor(.white, for: .normal) | ||
37 | + mapButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) | ||
38 | + mapButton.layer.cornerRadius = 16.0 | ||
39 | + mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 312, height: 55) | ||
40 | + | ||
41 | + eshopsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17) | ||
42 | + eshopsButton.setTitle("Δώρισέ το", for: .normal) | ||
43 | + eshopsButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) | ||
44 | + eshopsButton.layer.cornerRadius = 15.0 | ||
45 | + eshopsButton.frame = CGRect(x: 0.0, y: 0.0, width: 312, height: 55) | ||
46 | + eshopsButton.backgroundColor = .clear | ||
47 | + eshopsButton.layer.borderWidth = 2 | ||
48 | + eshopsButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor | ||
49 | + } | ||
50 | + | ||
51 | + // MARK: - UIButton Actions | ||
52 | + @IBAction func closeButtonAction(_ sender: Any) { | ||
53 | + self.dismiss(animated: true, completion: {}) | ||
54 | + } | ||
55 | + | ||
56 | + @IBAction func mapButtonAction(_ sender: Any) { | ||
57 | + swiftApi().logTrackersEvent("click", "SeeShops") | ||
58 | + | ||
59 | + let vc = SwiftWarplyFramework.MapsViewController(nibName: "MapsViewController", bundle: Bundle(for: MyEmptyClass.self)) | ||
60 | +// vc.couponSet = coupon?.couponset_data | ||
61 | + vc.isMarket = true | ||
62 | + self.navigationController?.pushViewController(vc, animated: true) | ||
63 | + | ||
64 | + } | ||
65 | + | ||
66 | + @IBAction func eshopsButtonAction(_ sender: Any) { | ||
67 | + | ||
68 | + let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self)) | ||
69 | + if let popupVC = storyboard.instantiateViewController(withIdentifier: "PopupMerchantsViewController") as? SwiftWarplyFramework.PopupMerchantsViewController { | ||
70 | + popupVC.modalPresentationStyle = .overCurrentContext | ||
71 | + popupVC.modalTransitionStyle = .crossDissolve | ||
72 | +// popupVC.coupon = coupon | ||
73 | + popupVC.headerText = "Δες τα eshop" | ||
74 | + popupVC.buttonTitle = "Δες το eshop" | ||
75 | +// popupVC.buttonIcon = "shopping_cart" | ||
76 | + popupVC.footerText = "Η διαθεσιμότητα ενδέχεται να διαφέρει ανάλογα με την τοποθεσία." | ||
77 | + | ||
78 | + self.present(popupVC, animated: true, completion: nil) | ||
79 | + } | ||
80 | + } | ||
81 | +} |
... | @@ -160,12 +160,25 @@ import SwiftEventBus | ... | @@ -160,12 +160,25 @@ import SwiftEventBus |
160 | } | 160 | } |
161 | 161 | ||
162 | @IBAction func mapButtonAction(_ sender: Any) { | 162 | @IBAction func mapButtonAction(_ sender: Any) { |
163 | - swiftApi().logTrackersEvent("click", "SeeShops") | 163 | + let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self)) |
164 | + if let popupVC = storyboard.instantiateViewController(withIdentifier: "PopupMerchantCategoriesViewController") as? SwiftWarplyFramework.PopupMerchantCategoriesViewController { | ||
165 | + popupVC.modalPresentationStyle = .overCurrentContext | ||
166 | + popupVC.modalTransitionStyle = .crossDissolve | ||
167 | +// popupVC.coupon = coupon | ||
168 | + | ||
169 | + self.present(popupVC, animated: true, completion: nil) | ||
170 | + } | ||
171 | + | ||
172 | + // ======= | ||
173 | + | ||
174 | +// swiftApi().logTrackersEvent("click", "SeeShops") | ||
164 | // | 175 | // |
165 | - let vc = SwiftWarplyFramework.MapsViewController(nibName: "MapsViewController", bundle: Bundle(for: MyEmptyClass.self)) | 176 | +// let vc = SwiftWarplyFramework.MapsViewController(nibName: "MapsViewController", bundle: Bundle(for: MyEmptyClass.self)) |
166 | -// vc.couponSet = coupon?.couponset_data | 177 | +//// vc.couponSet = coupon?.couponset_data |
167 | - vc.isMarket = true | 178 | +// vc.isMarket = true |
168 | - self.navigationController?.pushViewController(vc, animated: true) | 179 | +// self.navigationController?.pushViewController(vc, animated: true) |
180 | + | ||
181 | + // ======= | ||
169 | 182 | ||
170 | // if (mapBtnVisible == true) { | 183 | // if (mapBtnVisible == true) { |
171 | // swiftApi().logTrackersEvent("click", "SeeShops") | 184 | // swiftApi().logTrackersEvent("click", "SeeShops") | ... | ... |
-
Please register or login to post a comment