LoyaltyHistoryViewController accessibilities

Manos Chorianopoulos
Commit f64f315791114bac9b719a31003dbd6dd7700c39 f64f3157 1 parent 0dd3e314
Showing 2 changed files with 46 additions and 0 deletions
SwiftWarplyFramework/SwiftWarplyFramework/LoyaltyHistoryViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
--- a/SwiftWarplyFramework/SwiftWarplyFramework/LoyaltyHistoryViewController.swift
View file @f64f315
+++ b/SwiftWarplyFramework/SwiftWarplyFramework/LoyaltyHistoryViewController.swift
View file @f64f315
@@ -23,18 +23,21 @@ import SwiftEventBus
     @IBOutlet weak var dfyBadgeImage: UIImageView!
     @IBOutlet weak var dfyBadgeLabel: UILabel!
     @IBOutlet weak var dfyBannerLabel: UILabel!
+    @IBOutlet weak var dfyBannerButton: UIButton!
     @IBOutlet weak var marketBannerParentView: UIView!
     @IBOutlet weak var marketBannerInnerView: UIView!
     @IBOutlet weak var marketBadgeImage: UIImageView!
     @IBOutlet weak var marketBadgeLabel: UILabel!
     @IBOutlet weak var marketBannerLabel: UILabel!
+    @IBOutlet weak var marketBannerButton: UIButton!
     @IBOutlet weak var gfyBannerParentView: UIView!
     @IBOutlet weak var gfyBannerInnerView: UIView!
     @IBOutlet weak var couponBadgeImage: UIImageView!
     @IBOutlet weak var couponBadgeLabel: UILabel!
     @IBOutlet weak var gfyBannerLabel: UILabel!
+    @IBOutlet weak var gfyBannerButton: UIButton!
     @IBOutlet weak var boxBannerParentView: UIView!
     @IBOutlet weak var boxBannerInnerParentView: UIView!
@@ -42,6 +45,7 @@ import SwiftEventBus
     @IBOutlet weak var boxBadgeImage: UIImageView!
     @IBOutlet weak var boxBadgeLabel: UILabel!
     @IBOutlet weak var boxBannerLabel: UILabel!
+    @IBOutlet weak var boxBannerButton: UIButton!
     public var coupons:Array<swiftApi.CouponItemModel> = swiftApi().getCouponList()
     public var dfyCoupons:Array<swiftApi.ActiveDFYCouponModel> = swiftApi().getActiveDFYCoupons()
@@ -94,6 +98,8 @@ import SwiftEventBus
         setBackButton("ic_close_3")
         setNavigationTitle("Ιστορικό")
+        self.historySectionView.accessibilityElementsHidden = true
+        
         // === images === //
         sumBadgeImage.image = UIImage(named: "history_heart", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
@@ -136,6 +142,19 @@ import SwiftEventBus
         self.updateUI()
     }
+    public override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+//        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            UIAccessibility.post(notification: .screenChanged, argument: self.navigationItem.titleView)
+//        }
+        
+        // Re-enable table view accessibility after the announcement
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+            self.historySectionView.accessibilityElementsHidden = false
+        }
+    }
+    
 //    public override func viewWillDisappear(_ animated: Bool) {
 //        super.viewWillDisappear(animated)
 //
@@ -354,6 +373,29 @@ import SwiftEventBus
         boxAttributedString.append(boxNormalString)
         boxBannerLabel.attributedText = boxAttributedString
+        setupAccessibilty()
+    }
+    
+    func setupAccessibilty () {
+        dfyBannerButton.isAccessibilityElement = true
+        dfyBannerButton.accessibilityLabel = dfyBannerLabel?.text ?? ""
+        dfyBannerButton.accessibilityHint = "Διπλό πάτημα για άνοιγμα"
+        dfyBannerButton.accessibilityTraits = .button
+        
+        marketBannerButton.isAccessibilityElement = true
+        marketBannerButton.accessibilityLabel = marketBannerLabel?.text ?? ""
+        marketBannerButton.accessibilityHint = "Διπλό πάτημα για άνοιγμα"
+        marketBannerButton.accessibilityTraits = .button
+        
+        gfyBannerButton.isAccessibilityElement = true
+        gfyBannerButton.accessibilityLabel = gfyBannerLabel?.text ?? ""
+        gfyBannerButton.accessibilityHint = "Διπλό πάτημα για άνοιγμα"
+        gfyBannerButton.accessibilityTraits = .button
+    
+        boxBannerButton.isAccessibilityElement = true
+        boxBannerButton.accessibilityLabel = boxBannerLabel?.text ?? ""
+        boxBannerButton.accessibilityHint = "Διπλό πάτημα για άνοιγμα"
+        boxBannerButton.accessibilityTraits = .button
     }
     // MARK: - Actions
--- a/SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
View file @f64f315
+++ b/SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
View file @f64f315
@@ -2553,6 +2553,7 @@
                     <connections>
                         <outlet property="boxBadgeImage" destination="N64-1U-kqo" id="3na-N4-CId"/>
                         <outlet property="boxBadgeLabel" destination="iA9-tR-Hgg" id="ODX-ZK-p5o"/>
+                        <outlet property="boxBannerButton" destination="Gob-8i-BFa" id="Dez-ov-bpB"/>
                         <outlet property="boxBannerInnerParentView" destination="peZ-R0-M9v" id="PeH-6i-Z09"/>
                         <outlet property="boxBannerInnerView" destination="gw1-A6-saC" id="YxH-rb-cvw"/>
                         <outlet property="boxBannerLabel" destination="8e8-3x-tWd" id="Wec-Qi-Mdo"/>
@@ -2561,16 +2562,19 @@
                         <outlet property="couponBadgeLabel" destination="Yka-zq-f4R" id="w1j-eu-8kD"/>
                         <outlet property="dfyBadgeImage" destination="zGH-5Y-xb0" id="DD4-ef-4YZ"/>
                         <outlet property="dfyBadgeLabel" destination="brW-kC-Au6" id="uNa-Yi-Z7A"/>
+                        <outlet property="dfyBannerButton" destination="wA1-fE-Jq0" id="rzZ-cP-YbD"/>
                         <outlet property="dfyBannerInnerParentView" destination="k2K-eS-9Kc" id="mBb-l2-IZ7"/>
                         <outlet property="dfyBannerInnerView" destination="z4v-Pj-F2j" id="IhR-ld-2I0"/>
                         <outlet property="dfyBannerLabel" destination="NZD-EQ-zM8" id="LLu-4l-8RC"/>
                         <outlet property="dfyBannerParentView" destination="gpg-vO-M3t" id="p8y-aD-T61"/>
+                        <outlet property="gfyBannerButton" destination="OQk-lc-BF2" id="0wu-60-Bbc"/>
                         <outlet property="gfyBannerInnerView" destination="Vl0-Ut-pAv" id="k4C-Td-oZi"/>
                         <outlet property="gfyBannerLabel" destination="fib-pb-hxL" id="utC-j6-eAF"/>
                         <outlet property="gfyBannerParentView" destination="fvz-Hc-IR8" id="xd5-P6-I0N"/>
                         <outlet property="historySectionView" destination="1a0-WF-wSk" id="XAg-Fm-xUT"/>
                         <outlet property="marketBadgeImage" destination="0Yq-wr-Uch" id="Vi7-BW-DG4"/>
                         <outlet property="marketBadgeLabel" destination="TNl-dh-eez" id="gr5-Ts-2Zl"/>
+                        <outlet property="marketBannerButton" destination="q9f-tx-YjE" id="hEM-7q-Rpl"/>
                         <outlet property="marketBannerInnerView" destination="Wep-CV-giJ" id="1rc-Iy-Y4B"/>
                         <outlet property="marketBannerLabel" destination="fd8-yE-8OO" id="rfp-em-S3E"/>
                         <outlet property="marketBannerParentView" destination="EQg-Ij-vWV" id="AgZ-6n-3CQ"/>