From 03f9ad0646d91e7a93ee16dff2ec26549780aa8e Mon Sep 17 00:00:00 2001
From: Denys Rumiantsev <denys.rumiantsev@appflame.com>
Date: Tue, 8 Jun 2021 22:03:59 +0300
Subject: [PATCH 1/5] [WIP] ..

---
 .../CopyAndRename/Base.lproj/Main.storyboard  |  35 ++++-
 .../CopyAndRename/ViewController.swift        | 120 +++++++++++++++++-
 AccessibilityTask/Default/Info.plist          |   4 +-
 3 files changed, 144 insertions(+), 15 deletions(-)

diff --git a/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard b/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
index fc30069..523eb90 100644
--- a/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
+++ b/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -43,13 +43,16 @@
                                 </subviews>
                             </stackView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Поделись кусочком счастьяяяяя" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zEU-ZI-wCT">
-                                <rect key="frame" x="20" y="117" width="374" height="158"/>
+                                <rect key="frame" x="20" y="145.5" width="374" height="158"/>
+                                <accessibility key="accessibilityConfiguration" label="Поделись кусочком счастья">
+                                    <accessibilityTraits key="traits" staticText="YES" header="YES"/>
+                                </accessibility>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="44"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Подари кусочек пиццы своему другу. Напиши адрес и оплати, а мы пришлем ему письмо где получить." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TtQ-At-DX1">
-                                <rect key="frame" x="20" y="283" width="374" height="64.5"/>
+                                <rect key="frame" x="20" y="311.5" width="374" height="36"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -72,7 +75,7 @@
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="yWP-a2-xt7">
+                                                            <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="yWP-a2-xt7" customClass="AccessibleStepper" customModule="AccessibilityTask" customModuleProvider="target">
                                                                 <rect key="frame" x="191" y="0.0" width="94" height="32"/>
                                                                 <connections>
                                                                     <action selector="numberOfPiecesDidChange:" destination="BYZ-38-t0r" eventType="valueChanged" id="gN6-X5-RE7"/>
@@ -88,12 +91,18 @@
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Добавить открытку" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H2o-Of-sL8">
                                                                         <rect key="frame" x="7.5" y="0.0" width="154.5" height="20.5"/>
+                                                                        <accessibility key="accessibilityConfiguration">
+                                                                            <bool key="isElement" value="NO"/>
+                                                                        </accessibility>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                         <nil key="textColor"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="+25 ₽" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wgY-dk-u58">
                                                                         <rect key="frame" x="131" y="23.5" width="31" height="7.5"/>
+                                                                        <accessibility key="accessibilityConfiguration">
+                                                                            <bool key="isElement" value="NO"/>
+                                                                        </accessibility>
                                                                         <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
                                                                         <nil key="textColor"/>
                                                                         <nil key="highlightedColor"/>
@@ -102,6 +111,9 @@
                                                             </stackView>
                                                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="olH-Ix-iL8">
                                                                 <rect key="frame" x="236" y="0.0" width="51" height="31"/>
+                                                                <accessibility key="accessibilityConfiguration">
+                                                                    <accessibilityTraits key="traits" button="YES" playsSound="YES"/>
+                                                                </accessibility>
                                                                 <connections>
                                                                     <action selector="addPostcardDidChange:" destination="BYZ-38-t0r" eventType="valueChanged" id="ASM-DZ-KMs"/>
                                                                 </connections>
@@ -116,6 +128,9 @@
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Итого:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Saz-Id-lam">
                                                                         <rect key="frame" x="0.0" y="0.0" width="52" height="26"/>
+                                                                        <accessibility key="accessibilityConfiguration">
+                                                                            <bool key="isElement" value="NO"/>
+                                                                        </accessibility>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                         <nil key="textColor"/>
                                                                         <nil key="highlightedColor"/>
@@ -148,7 +163,7 @@
                                         </constraints>
                                         <edgeInsets key="layoutMargins" top="16" left="24" bottom="16" right="24"/>
                                     </view>
-                                    <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OVh-rC-f9k">
+                                    <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OVh-rC-f9k" customClass="PaymentButton" customModule="AccessibilityTask" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="195" width="333" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="rpF-bQ-h2G"/>
@@ -167,6 +182,9 @@
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="🍕" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2M8-qS-Wn9">
                                 <rect key="frame" x="259" y="130" width="108" height="120"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <accessibility key="accessibilityConfiguration">
+                                    <bool key="isElement" value="NO"/>
+                                </accessibility>
                                 <fontDescription key="fontDescription" type="system" pointSize="100"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -194,13 +212,18 @@
                     <connections>
                         <outlet property="addPostcardSwitch" destination="olH-Ix-iL8" id="N03-aU-wLo"/>
                         <outlet property="countStepper" destination="yWP-a2-xt7" id="HoK-ZJ-8bn"/>
+                        <outlet property="dummyFriendAddressLabel" destination="5GN-Fq-FXp" id="ncE-Vc-aaB"/>
                         <outlet property="emailErrorLabel" destination="Web-MJ-0sb" id="Ea2-Vi-jCf"/>
                         <outlet property="emailMistakeLabel" destination="Web-MJ-0sb" id="c3F-GQ-rDX"/>
                         <outlet property="emailTextField" destination="I5h-Yx-7Mn" id="jyl-8m-MuL"/>
                         <outlet property="numberOfPiecesLabel" destination="HCC-5j-QZB" id="Xx1-7t-7pE"/>
                         <outlet property="paymentButton" destination="OVh-rC-f9k" id="7Lx-e3-9da"/>
+                        <outlet property="piecesStackContainer" destination="e5f-XH-C3b" id="PfL-Np-cqB"/>
+                        <outlet property="postcardLabelsStackContainer" destination="xNB-r7-4Qy" id="CZ3-OT-aig"/>
+                        <outlet property="postcardStackContainer" destination="zVK-Hi-fn1" id="bfX-fS-px7"/>
                         <outlet property="priceContainer" destination="FD4-b1-Hiq" id="340-or-bLJ"/>
                         <outlet property="successModalView" destination="LZQ-Tx-Jet" id="vxg-uH-hbM"/>
+                        <outlet property="summaryContainer" destination="EUs-cv-P8v" id="JR5-DY-yCT"/>
                         <outlet property="totalLabel" destination="6zX-h5-d4K" id="Cgc-pH-8NH"/>
                     </connections>
                 </viewController>
diff --git a/AccessibilityTask/CopyAndRename/ViewController.swift b/AccessibilityTask/CopyAndRename/ViewController.swift
index 9155c20..20fa766 100644
--- a/AccessibilityTask/CopyAndRename/ViewController.swift
+++ b/AccessibilityTask/CopyAndRename/ViewController.swift
@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import Accessibility
 
 typealias Email = String
 extension Email {
@@ -53,6 +54,12 @@ class ShakeViewController: UIViewController {
 class ViewController: ShakeViewController {
 
     @IBOutlet weak var successModalView: UIView!
+    @IBOutlet private weak var dummyFriendAddressLabel: UILabel!
+    
+    @IBOutlet private weak var piecesStackContainer: UIStackView!
+    @IBOutlet private weak var postcardLabelsStackContainer: UIStackView!
+    @IBOutlet private weak var postcardStackContainer: UIStackView!
+    @IBOutlet private weak var summaryContainer: UIView!
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -66,6 +73,55 @@ class ViewController: ShakeViewController {
         
         onShake = fillMockData
         emailErrorLabel.isHidden = true
+        
+        let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(resignKeyboard))
+        view.addGestureRecognizer(tapRecognizer)
+        
+        setupAccessibility()
+        
+        // WARNING: REMOVE BEFORE PR!
+        fillMockData()
+        //
+    }
+    
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        
+        setupAccessibilityFrames()
+    }
+    
+    private func setupAccessibility() {
+        emailTextField.accessibilityLabel = "Адрес друга"
+        
+        countStepper.accessibilityTraits.formUnion(.adjustable)
+        countStepper.isAccessibilityElement = true
+        countStepper.accessibilityValue = "\(Int(countStepper.value)) кусочек. Итого: \(price) рублей"
+        countStepper.accessibilityLabel = "Количество кусочков"
+        
+        addPostcardSwitch.isAccessibilityElement = true
+        addPostcardSwitch.accessibilityLabel = "Добавить открытку за 25 рублей"
+        
+        totalLabel.accessibilityLabel = "Итого"
+        totalLabel.accessibilityValue = "\(price) рублей"
+    }
+    
+    private func setupAccessibilityFrames() {
+        dummyFriendAddressLabel.isAccessibilityElement = false
+        
+        let stepperA11yFrame = countStepper.accessibilityFrame.union(numberOfPiecesLabel.accessibilityFrame)
+        countStepper.accessibilityFrame = screenCoordinate(stepperA11yFrame, in: view)
+        numberOfPiecesLabel.isAccessibilityElement = false
+
+        let postcardSwitchA11yFrame = addPostcardSwitch.accessibilityFrame.union(postcardLabelsStackContainer.accessibilityFrame)
+        addPostcardSwitch.accessibilityFrame = screenCoordinate(postcardSwitchA11yFrame, in: view)
+    }
+    
+    private func screenCoordinate(_ value: CGRect, in view: UIView) -> CGRect {
+        UIAccessibility.convertToScreenCoordinates(value, in: view)
+    }
+    
+    @objc private func resignKeyboard() {
+        view.endEditing(true)
     }
     
     private func fillMockData() {
@@ -97,31 +153,44 @@ class ViewController: ShakeViewController {
     
     // MARK: - Price
     @IBOutlet weak var priceContainer: UIView!
-    @IBOutlet weak var countStepper: UIStepper!
+    @IBOutlet weak var countStepper: AccessibleStepper!
     @IBOutlet weak var numberOfPiecesLabel: UILabel!
     @IBAction func numberOfPiecesDidChange(_ sender: UIStepper) {
         numberOfPiecesLabel.text = "\(Int(sender.value)) кусочек"
         updateTotal()
+        setupAccessibility()
     }
     
     @IBOutlet weak var addPostcardSwitch: UISwitch!
     @IBAction func addPostcardDidChange(_ sender: Any) {
         updateTotal()
+        paymentButton.postcardAdded = addPostcardSwitch.isOn
+        DispatchQueue.main.async {
+            let non = self.addPostcardSwitch.isOn ? "" : " не"
+            let text = "Открытка\(non) добавлена. Итого: \(self.price) рублей"
+            UIAccessibility.post(notification: .announcement, argument: text)
+        }
     }
     
     @IBOutlet weak var totalLabel: UILabel!
-    private func updateTotal() {
-        var price = countStepper.value * 50
-        
+    var price: Int {
+        var value = countStepper.value * 50
         if addPostcardSwitch.isOn {
-            price += 25
+            value += 25
         }
-        totalLabel.text = "\(Int(price)) ₽"
+        return Int(value)
+    }
+    
+    private func updateTotal() {
+        totalLabel.text = "\(price) ₽"
+        
+        paymentButton.total = price
+        paymentButton.piecesCount = Int(countStepper.value)
     }
     
     
     // MARK: - Payment
-    @IBOutlet weak var paymentButton: UIButton!
+    @IBOutlet weak var paymentButton: PaymentButton!
     private var overlay: UIView!
     
     func startPayment() {
@@ -171,3 +240,40 @@ class ViewController: ShakeViewController {
     }
 }
 
+final class PaymentButton: UIButton {
+    var piecesCount: Int = 0
+    var postcardAdded: Bool = false
+    var total: Int = 0
+}
+
+extension PaymentButton: AXCustomContentProvider {
+
+    var accessibilityCustomContent: [AXCustomContent]! {
+        get {
+            let pieces = AXCustomContent(label: "Кусочков", value: String(describing: piecesCount))
+            var postcard: AXCustomContent?
+            if postcardAdded {
+                postcard = AXCustomContent(label: "С открыткой", value: "")
+            }
+            let total = AXCustomContent(label: "Итого", value: "\(total) рублей")
+            total.importance = .high
+            return [pieces, postcard, total].compactMap { $0 }
+        }
+        set(accessibilityCustomContent) { }
+    }
+    
+    
+}
+
+final class AccessibleStepper: UIStepper {
+
+    override func accessibilityIncrement() {
+        value += stepValue
+        sendActions(for: .valueChanged)
+    }
+
+    override func accessibilityDecrement() {
+        value -= stepValue
+        sendActions(for: .valueChanged)
+    }
+}
diff --git a/AccessibilityTask/Default/Info.plist b/AccessibilityTask/Default/Info.plist
index 10866ce..5b531f7 100644
--- a/AccessibilityTask/Default/Info.plist
+++ b/AccessibilityTask/Default/Info.plist
@@ -34,7 +34,7 @@
 					<key>UISceneDelegateClassName</key>
 					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
 					<key>UISceneStoryboardFile</key>
-					<string>StudentsViewController</string>
+					<string>Main</string>
 				</dict>
 			</array>
 		</dict>
@@ -44,7 +44,7 @@
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
-	<string>StudentsViewController</string>
+	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

From 8fafb5440a01b7f96bd417880e444e4a080294d8 Mon Sep 17 00:00:00 2001
From: Denys Rumiantsev <denys.rumiantsev@appflame.com>
Date: Tue, 8 Jun 2021 22:07:51 +0300
Subject: [PATCH 2/5] upd

---
 .../CopyAndRename/Base.lproj/Main.storyboard       |  3 ---
 .../CopyAndRename/ViewController.swift             | 14 +++++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard b/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
index 523eb90..bee5f03 100644
--- a/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
+++ b/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
@@ -111,9 +111,6 @@
                                                             </stackView>
                                                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="olH-Ix-iL8">
                                                                 <rect key="frame" x="236" y="0.0" width="51" height="31"/>
-                                                                <accessibility key="accessibilityConfiguration">
-                                                                    <accessibilityTraits key="traits" button="YES" playsSound="YES"/>
-                                                                </accessibility>
                                                                 <connections>
                                                                     <action selector="addPostcardDidChange:" destination="BYZ-38-t0r" eventType="valueChanged" id="ASM-DZ-KMs"/>
                                                                 </connections>
diff --git a/AccessibilityTask/CopyAndRename/ViewController.swift b/AccessibilityTask/CopyAndRename/ViewController.swift
index 20fa766..ecb677d 100644
--- a/AccessibilityTask/CopyAndRename/ViewController.swift
+++ b/AccessibilityTask/CopyAndRename/ViewController.swift
@@ -91,7 +91,7 @@ class ViewController: ShakeViewController {
     }
     
     private func setupAccessibility() {
-        emailTextField.accessibilityLabel = "Адрес друга"
+        emailTextField.accessibilityLabel = "E-mail друга"
         
         countStepper.accessibilityTraits.formUnion(.adjustable)
         countStepper.isAccessibilityElement = true
@@ -103,6 +103,9 @@ class ViewController: ShakeViewController {
         
         totalLabel.accessibilityLabel = "Итого"
         totalLabel.accessibilityValue = "\(price) рублей"
+        
+        paymentButton.total = price
+        paymentButton.piecesCount = Int(countStepper.value)
     }
     
     private func setupAccessibilityFrames() {
@@ -165,11 +168,6 @@ class ViewController: ShakeViewController {
     @IBAction func addPostcardDidChange(_ sender: Any) {
         updateTotal()
         paymentButton.postcardAdded = addPostcardSwitch.isOn
-        DispatchQueue.main.async {
-            let non = self.addPostcardSwitch.isOn ? "" : " не"
-            let text = "Открытка\(non) добавлена. Итого: \(self.price) рублей"
-            UIAccessibility.post(notification: .announcement, argument: text)
-        }
     }
     
     @IBOutlet weak var totalLabel: UILabel!
@@ -183,9 +181,7 @@ class ViewController: ShakeViewController {
     
     private func updateTotal() {
         totalLabel.text = "\(price) ₽"
-        
-        paymentButton.total = price
-        paymentButton.piecesCount = Int(countStepper.value)
+        setupAccessibility()
     }
     
     

From e69c6773fa260309fbb5954b257b4d6f7e1b34bb Mon Sep 17 00:00:00 2001
From: Denys Rumiantsev <denys.rumiantsev@appflame.com>
Date: Tue, 8 Jun 2021 22:35:17 +0300
Subject: [PATCH 3/5] next

---
 .../CopyAndRename/Base.lproj/Main.storyboard  |  2 +-
 .../CopyAndRename/ViewController.swift        | 31 +++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard b/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
index bee5f03..bce96dd 100644
--- a/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
+++ b/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
@@ -19,7 +19,7 @@
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="email" textAlignment="natural" minimumFontSize="17" clearButtonMode="unlessEditing" translatesAutoresizingMaskIntoConstraints="NO" id="I5h-Yx-7Mn">
                                 <rect key="frame" x="20" y="436" width="374" height="34"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits" keyboardType="emailAddress"/>
+                                <textInputTraits key="textInputTraits" keyboardType="emailAddress" returnKeyType="continue"/>
                                 <connections>
                                     <action selector="emailDidChanged:" destination="BYZ-38-t0r" eventType="editingChanged" id="PRc-qF-8XM"/>
                                     <action selector="emailEditiingDidEnd:" destination="BYZ-38-t0r" eventType="editingDidEnd" id="8mq-LC-TCR"/>
diff --git a/AccessibilityTask/CopyAndRename/ViewController.swift b/AccessibilityTask/CopyAndRename/ViewController.swift
index ecb677d..9628f67 100644
--- a/AccessibilityTask/CopyAndRename/ViewController.swift
+++ b/AccessibilityTask/CopyAndRename/ViewController.swift
@@ -51,7 +51,7 @@ class ShakeViewController: UIViewController {
     }
 }
 
-class ViewController: ShakeViewController {
+class ViewController: ShakeViewController, UITextFieldDelegate {
 
     @IBOutlet weak var successModalView: UIView!
     @IBOutlet private weak var dummyFriendAddressLabel: UILabel!
@@ -74,13 +74,15 @@ class ViewController: ShakeViewController {
         onShake = fillMockData
         emailErrorLabel.isHidden = true
         
+        emailTextField.delegate = self
+        
         let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(resignKeyboard))
         view.addGestureRecognizer(tapRecognizer)
         
         setupAccessibility()
         
         // WARNING: REMOVE BEFORE PR!
-        fillMockData()
+//        fillMockData()
         //
     }
     
@@ -104,6 +106,11 @@ class ViewController: ShakeViewController {
         totalLabel.accessibilityLabel = "Итого"
         totalLabel.accessibilityValue = "\(price) рублей"
         
+        if paymentButton.isEnabled {
+            paymentButton.accessibilityTraits.remove(.notEnabled)
+        } else {
+            paymentButton.accessibilityTraits.formUnion(.notEnabled)
+        }
         paymentButton.total = price
         paymentButton.piecesCount = Int(countStepper.value)
     }
@@ -115,8 +122,9 @@ class ViewController: ShakeViewController {
         countStepper.accessibilityFrame = screenCoordinate(stepperA11yFrame, in: view)
         numberOfPiecesLabel.isAccessibilityElement = false
 
-        let postcardSwitchA11yFrame = addPostcardSwitch.accessibilityFrame.union(postcardLabelsStackContainer.accessibilityFrame)
-        addPostcardSwitch.accessibilityFrame = screenCoordinate(postcardSwitchA11yFrame, in: view)
+        // Стэк-вью ломался :(
+//        let postcardSwitchA11yFrame = addPostcardSwitch.accessibilityFrame.union(postcardLabelsStackContainer.accessibilityFrame)
+//        addPostcardSwitch.accessibilityFrame = screenCoordinate(postcardSwitchA11yFrame, in: view)
     }
     
     private func screenCoordinate(_ value: CGRect, in view: UIView) -> CGRect {
@@ -147,10 +155,20 @@ class ViewController: ShakeViewController {
         }
     }
     
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        textField.resignFirstResponder()
+        return true
+    }
+    
     @IBOutlet weak var emailMistakeLabel: UILabel!
     @IBAction func emailEditiingDidEnd(_ sender: UITextField) {
         let email: Email = sender.text!
         emailMistakeLabel.isHidden = email.isValid
+        if email.isValid {
+            UIAccessibility.post(notification: .layoutChanged, argument: countStepper)
+        } else {
+            UIAccessibility.post(notification: .layoutChanged, argument: emailMistakeLabel)
+        }
     }
     
     
@@ -246,6 +264,9 @@ extension PaymentButton: AXCustomContentProvider {
 
     var accessibilityCustomContent: [AXCustomContent]! {
         get {
+            guard isEnabled else {
+                return []
+            }
             let pieces = AXCustomContent(label: "Кусочков", value: String(describing: piecesCount))
             var postcard: AXCustomContent?
             if postcardAdded {
@@ -257,8 +278,6 @@ extension PaymentButton: AXCustomContentProvider {
         }
         set(accessibilityCustomContent) { }
     }
-    
-    
 }
 
 final class AccessibleStepper: UIStepper {

From d5c1fd19e313cfb51929cb77e1c5e64cda2e30c5 Mon Sep 17 00:00:00 2001
From: Denys Rumiantsev <denys.rumiantsev@appflame.com>
Date: Tue, 8 Jun 2021 22:46:07 +0300
Subject: [PATCH 4/5] fin

---
 .../CopyAndRename/Base.lproj/Main.storyboard  |  8 ++++---
 .../CopyAndRename/ViewController.swift        | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard b/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
index bce96dd..d78f5bd 100644
--- a/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
+++ b/AccessibilityTask/CopyAndRename/Base.lproj/Main.storyboard
@@ -215,12 +215,11 @@
                         <outlet property="emailTextField" destination="I5h-Yx-7Mn" id="jyl-8m-MuL"/>
                         <outlet property="numberOfPiecesLabel" destination="HCC-5j-QZB" id="Xx1-7t-7pE"/>
                         <outlet property="paymentButton" destination="OVh-rC-f9k" id="7Lx-e3-9da"/>
-                        <outlet property="piecesStackContainer" destination="e5f-XH-C3b" id="PfL-Np-cqB"/>
                         <outlet property="postcardLabelsStackContainer" destination="xNB-r7-4Qy" id="CZ3-OT-aig"/>
-                        <outlet property="postcardStackContainer" destination="zVK-Hi-fn1" id="bfX-fS-px7"/>
                         <outlet property="priceContainer" destination="FD4-b1-Hiq" id="340-or-bLJ"/>
                         <outlet property="successModalView" destination="LZQ-Tx-Jet" id="vxg-uH-hbM"/>
-                        <outlet property="summaryContainer" destination="EUs-cv-P8v" id="JR5-DY-yCT"/>
+                        <outlet property="successTextLabel" destination="NWB-SH-Y8B" id="RY5-0q-7Oe"/>
+                        <outlet property="successTitleLabel" destination="GDA-hw-xIZ" id="8GN-17-1Bx"/>
                         <outlet property="totalLabel" destination="6zX-h5-d4K" id="Cgc-pH-8NH"/>
                     </connections>
                 </viewController>
@@ -246,6 +245,9 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="🍕" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Pmm-XS-jwV">
                             <rect key="frame" x="23" y="23" width="56" height="63"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <accessibility key="accessibilityConfiguration">
+                                <bool key="isElement" value="NO"/>
+                            </accessibility>
                             <fontDescription key="fontDescription" type="system" pointSize="52"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
diff --git a/AccessibilityTask/CopyAndRename/ViewController.swift b/AccessibilityTask/CopyAndRename/ViewController.swift
index 9628f67..4889786 100644
--- a/AccessibilityTask/CopyAndRename/ViewController.swift
+++ b/AccessibilityTask/CopyAndRename/ViewController.swift
@@ -56,10 +56,12 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
     @IBOutlet weak var successModalView: UIView!
     @IBOutlet private weak var dummyFriendAddressLabel: UILabel!
     
-    @IBOutlet private weak var piecesStackContainer: UIStackView!
+    
     @IBOutlet private weak var postcardLabelsStackContainer: UIStackView!
-    @IBOutlet private weak var postcardStackContainer: UIStackView!
-    @IBOutlet private weak var summaryContainer: UIView!
+    @IBOutlet private weak var successTitleLabel: UILabel!
+    @IBOutlet private weak var successTextLabel: UILabel!
+    
+    private lazy var indicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.large)
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -80,10 +82,6 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
         view.addGestureRecognizer(tapRecognizer)
         
         setupAccessibility()
-        
-        // WARNING: REMOVE BEFORE PR!
-//        fillMockData()
-        //
     }
     
     override func viewDidLayoutSubviews() {
@@ -93,7 +91,7 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
     }
     
     private func setupAccessibility() {
-        emailTextField.accessibilityLabel = "E-mail друга"
+        emailTextField.accessibilityLabel = "Адрес друга"
         
         countStepper.accessibilityTraits.formUnion(.adjustable)
         countStepper.isAccessibilityElement = true
@@ -113,6 +111,10 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
         }
         paymentButton.total = price
         paymentButton.piecesCount = Int(countStepper.value)
+        
+        indicator.accessibilityLabel = "Идет отправка счастья"
+        successTitleLabel.accessibilityLabel = [successTitleLabel.text!, successTextLabel.text!].joined(separator: ", ")
+        successTextLabel.isAccessibilityElement = false
     }
     
     private func setupAccessibilityFrames() {
@@ -218,15 +220,18 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
         
         addOverlay()
         
-        let indicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.large)
         indicator.startAnimating()
+        indicator.hidesWhenStopped = true
         overlay.addSubview(indicator)
         indicator.center = overlay.center
+        UIAccessibility.post(notification: .screenChanged, argument: indicator)
     }
     
     func finishPayment() {
+        indicator.stopAnimating()
         view.addSubview(successModalView)
         successModalView.isHidden = false
+        UIAccessibility.post(notification: .screenChanged, argument: successTitleLabel)
     }
     
     @IBAction func pay(_ sender: Any) {
@@ -251,6 +256,7 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
         }
         
         clearInput()
+        UIAccessibility.post(notification: .screenChanged, argument: emailTextField)
     }
 }
 

From f1c7776df4441c506a9cfb111c61ade262391fb8 Mon Sep 17 00:00:00 2001
From: Denys Rumiantsev <denys.rumiantsev@appflame.com>
Date: Tue, 8 Jun 2021 23:23:20 +0300
Subject: [PATCH 5/5] add plurals

---
 AccessibilityTask.xcodeproj/project.pbxproj   |  4 ++
 .../CopyAndRename/Localizable.stringsdict     | 46 +++++++++++++++++++
 .../CopyAndRename/ViewController.swift        | 27 +++++++++--
 3 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 AccessibilityTask/CopyAndRename/Localizable.stringsdict

diff --git a/AccessibilityTask.xcodeproj/project.pbxproj b/AccessibilityTask.xcodeproj/project.pbxproj
index c0513c1..a322873 100644
--- a/AccessibilityTask.xcodeproj/project.pbxproj
+++ b/AccessibilityTask.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 		1EE3772F25CB2644006DD12B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1EE3772D25CB2644006DD12B /* LaunchScreen.storyboard */; };
 		1EE3773A25CB2644006DD12B /* AccessibilityTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EE3773925CB2644006DD12B /* AccessibilityTaskTests.swift */; };
 		1EE3774525CB2644006DD12B /* AccessibilityTaskUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EE3774425CB2644006DD12B /* AccessibilityTaskUITests.swift */; };
+		43A15617267003B400CC7E12 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 43A15616267003B400CC7E12 /* Localizable.stringsdict */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -53,6 +54,7 @@
 		1EE3774025CB2644006DD12B /* AccessibilityTaskUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AccessibilityTaskUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		1EE3774425CB2644006DD12B /* AccessibilityTaskUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityTaskUITests.swift; sourceTree = "<group>"; };
 		1EE3774625CB2644006DD12B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		43A15616267003B400CC7E12 /* Localizable.stringsdict */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; path = Localizable.stringsdict; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -105,6 +107,7 @@
 			isa = PBXGroup;
 			children = (
 				1EE3772625CB2643006DD12B /* ViewController.swift */,
+				43A15616267003B400CC7E12 /* Localizable.stringsdict */,
 				1EE3772825CB2643006DD12B /* Main.storyboard */,
 			);
 			path = CopyAndRename;
@@ -264,6 +267,7 @@
 				1EE3772F25CB2644006DD12B /* LaunchScreen.storyboard in Resources */,
 				1EE3772C25CB2644006DD12B /* Assets.xcassets in Resources */,
 				1EE3772A25CB2643006DD12B /* Main.storyboard in Resources */,
+				43A15617267003B400CC7E12 /* Localizable.stringsdict in Resources */,
 				1ED06F2625E4D48A007D333B /* StudentsViewController.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/AccessibilityTask/CopyAndRename/Localizable.stringsdict b/AccessibilityTask/CopyAndRename/Localizable.stringsdict
new file mode 100644
index 0000000..be89742
--- /dev/null
+++ b/AccessibilityTask/CopyAndRename/Localizable.stringsdict
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>roubles</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@data@</string>
+		<key>data</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>u</string>
+			<key>one</key>
+			<string>%u рублей</string>
+			<key>zero</key>
+			<string>%u рублей</string>
+			<key>few</key>
+			<string>%u рубля</string>
+			<key>other</key>
+			<string>%u рублей</string>
+		</dict>
+	</dict>
+	<key>pieces</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@data@</string>
+		<key>data</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>u</string>
+			<key>zero</key>
+			<string>%u кусочков</string>
+			<key>one</key>
+			<string>%u кусочек</string>
+			<key>few</key>
+			<string>%u кусочка</string>
+			<key>other</key>
+			<string>%u кусочков</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/AccessibilityTask/CopyAndRename/ViewController.swift b/AccessibilityTask/CopyAndRename/ViewController.swift
index 4889786..e092e02 100644
--- a/AccessibilityTask/CopyAndRename/ViewController.swift
+++ b/AccessibilityTask/CopyAndRename/ViewController.swift
@@ -95,14 +95,14 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
         
         countStepper.accessibilityTraits.formUnion(.adjustable)
         countStepper.isAccessibilityElement = true
-        countStepper.accessibilityValue = "\(Int(countStepper.value)) кусочек. Итого: \(price) рублей"
+        countStepper.accessibilityValue = "\(piecesCountUniversal(count: Int(countStepper.value))). Итого: \(roublesCountUniversal(count: price))"
         countStepper.accessibilityLabel = "Количество кусочков"
         
         addPostcardSwitch.isAccessibilityElement = true
         addPostcardSwitch.accessibilityLabel = "Добавить открытку за 25 рублей"
         
         totalLabel.accessibilityLabel = "Итого"
-        totalLabel.accessibilityValue = "\(price) рублей"
+        totalLabel.accessibilityValue = roublesCountUniversal(count: price)
         
         if paymentButton.isEnabled {
             paymentButton.accessibilityTraits.remove(.notEnabled)
@@ -129,6 +129,15 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
 //        addPostcardSwitch.accessibilityFrame = screenCoordinate(postcardSwitchA11yFrame, in: view)
     }
     
+    private func piecesCountUniversal(count: Int) -> String {
+        let formatString : String = NSLocalizedString(
+            "pieces",
+            comment: ""
+        )
+        let resultString = String(format: formatString, count)
+        return resultString;
+    }
+    
     private func screenCoordinate(_ value: CGRect, in view: UIView) -> CGRect {
         UIAccessibility.convertToScreenCoordinates(value, in: view)
     }
@@ -179,7 +188,7 @@ class ViewController: ShakeViewController, UITextFieldDelegate {
     @IBOutlet weak var countStepper: AccessibleStepper!
     @IBOutlet weak var numberOfPiecesLabel: UILabel!
     @IBAction func numberOfPiecesDidChange(_ sender: UIStepper) {
-        numberOfPiecesLabel.text = "\(Int(sender.value)) кусочек"
+        numberOfPiecesLabel.text = piecesCountUniversal(count: Int(sender.value))
         updateTotal()
         setupAccessibility()
     }
@@ -278,7 +287,7 @@ extension PaymentButton: AXCustomContentProvider {
             if postcardAdded {
                 postcard = AXCustomContent(label: "С открыткой", value: "")
             }
-            let total = AXCustomContent(label: "Итого", value: "\(total) рублей")
+            let total = AXCustomContent(label: "Итого", value: roublesCountUniversal(count: total))
             total.importance = .high
             return [pieces, postcard, total].compactMap { $0 }
         }
@@ -298,3 +307,13 @@ final class AccessibleStepper: UIStepper {
         sendActions(for: .valueChanged)
     }
 }
+
+
+private func roublesCountUniversal(count: Int) -> String {
+    let formatString : String = NSLocalizedString(
+        "roubles",
+        comment: ""
+    )
+    let resultString = String(format: formatString, count)
+    return resultString;
+}