Merge pull request #59 from RyoAbe/fix_voiceover

Add VoiceOver Support
recruit-lifestyle · Sep 20, 2018 · 43abb2b · 43abb2b
2 parents d8a8812 + e80fdfe
commit 43abb2b
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 0 deletions.
diff --git a/Localizable/en.lproj/Localizable.strings b/Localizable/en.lproj/Localizable.strings
@@ -0,0 +1,10 @@
+/* 
+  Localizable.strings
+  Pods
+
+  Created by 阿部 諒 on 2018/08/03.
+
+*/
+
+"PasswordDotViewAccessibilityLabel" = "Passcode Field";
+"PasswordDotViewAccessibilityValue" = "%d of %d entered";
diff --git a/Localizable/ja.lproj/Localizable.strings b/Localizable/ja.lproj/Localizable.strings
@@ -0,0 +1,10 @@
+/* 
+  Localizable.strings
+  Pods
+
+  Created by 阿部 諒 on 2018/08/03.
+
+*/
+
+"PasswordDotViewAccessibilityLabel" = "パスコード";
+"PasswordDotViewAccessibilityValue" = "%d個ちゅう%d個が入力されています";
diff --git a/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj b/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj b/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		1D7E32E52142604800A5227D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		3DA1702F1AC31AA3EDCA5FE7 /* Pods_SmileLock_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SmileLock_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7C52457304DEFE4405D2D34B /* Pods-SmileLock-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SmileLock-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SmileLock-Example/Pods-SmileLock-Example.debug.xcconfig"; sourceTree = "<group>"; };
 		B7A42F861CD2588B00FEB7B0 /* BlurPasswordLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlurPasswordLoginViewController.swift; sourceTree = "<group>"; };
@@ -395,6 +396,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				B7E3A1B71CCC6449005F680E /* Base */,
+				1D7E32E52142604800A5227D /* ja */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
@@ -406,6 +408,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -454,6 +457,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

diff --git a/SmileLock-Example/SmileLock-Example/ja.lproj/LaunchScreen.strings b/SmileLock-Example/SmileLock-Example/ja.lproj/LaunchScreen.strings
@@ -0,0 +1 @@
+
diff --git a/SmileLock/Classes/PasswordDotView.swift b/SmileLock/Classes/PasswordDotView.swift
@@ -14,6 +14,8 @@ open class PasswordDotView: UIView {
     @IBInspectable
     open var inputDotCount = 0 {
         didSet {
+            let format = Bundle(for: type(of: self)).localizedString(forKey: "PasswordDotViewAccessibilityValue", value: nil, table: nil)
+            accessibilityValue = String(format: format, totalDotCount, inputDotCount)
             setNeedsDisplay()
         }
     }
@@ -69,6 +71,8 @@ open class PasswordDotView: UIView {
     open override func awakeFromNib() {
         super.awakeFromNib()
         backgroundColor = UIColor.clear
+        isAccessibilityElement = true
+        accessibilityLabel = Bundle(for: type(of: self)).localizedString(forKey: "PasswordDotViewAccessibilityLabel", value: nil, table: nil)
     }
     open override func layoutSubviews() {
         super.layoutSubviews()

diff --git a/SmileLock/Classes/PasswordInputView.swift b/SmileLock/Classes/PasswordInputView.swift
@@ -152,12 +152,14 @@ private extension PasswordInputView {
         //configure label
         NSLayoutConstraint.addEqualConstraintsFromSubView(label, toSuperView: self)
         label.textAlignment = .center
+        label.isAccessibilityElement = false
 
         //configure button
         NSLayoutConstraint.addEqualConstraintsFromSubView(button, toSuperView: self)
         button.isExclusiveTouch = true
         button.addTarget(self, action: #selector(PasswordInputView.touchDown), for: [.touchDown])
         button.addTarget(self, action: #selector(PasswordInputView.touchUp), for: [.touchUpInside, .touchDragOutside, .touchCancel, .touchDragExit])
+        button.accessibilityValue = numberString
     }
 
     //MARK: Animation