Skip to content

Commit 7d71715

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
2 parents 6c1c90a + 1674144 commit 7d71715

7 files changed

Lines changed: 47 additions & 14 deletions

File tree

Demo.xcodeproj/project.pbxproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,8 @@
15281528
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO;
15291529
CLANG_WARN_UNREACHABLE_CODE = YES;
15301530
CODE_SIGN_ENTITLEMENTS = DemoSwift.entitlements;
1531-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1531+
CODE_SIGN_IDENTITY = "Apple Development: Iftekhar Qurashi (3384BN9735)";
1532+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Iftekhar Qurashi (3384BN9735)";
15321533
CODE_SIGN_STYLE = Manual;
15331534
DEVELOPMENT_TEAM = "";
15341535
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 7UUTF6T5P9;
@@ -1547,7 +1548,7 @@
15471548
OTHER_SWIFT_FLAGS = "$(inherited)";
15481549
PRODUCT_BUNDLE_IDENTIFIER = com.infoenumapps.IQKeyboardManagerSwift;
15491550
PRODUCT_NAME = DemoSwift;
1550-
PROVISIONING_PROFILE_SPECIFIER = "";
1551+
PROVISIONING_PROFILE_SPECIFIER = infoenumapps;
15511552
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = infoenumapps;
15521553
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
15531554
SUPPORTS_MACCATALYST = NO;
@@ -1596,7 +1597,7 @@
15961597
OTHER_SWIFT_FLAGS = "$(inherited)";
15971598
PRODUCT_BUNDLE_IDENTIFIER = com.infoenumapps.IQKeyboardManagerSwift;
15981599
PRODUCT_NAME = DemoSwift;
1599-
PROVISIONING_PROFILE_SPECIFIER = "";
1600+
PROVISIONING_PROFILE_SPECIFIER = infoenumapps;
16001601
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = infoenumapps;
16011602
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
16021603
SUPPORTS_MACCATALYST = NO;

IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.m

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ -(void)setTitle:(NSString *)title
111111
{
112112
[super setTitle:title];
113113
[_titleButton setTitle:title forState:UIControlStateNormal];
114+
[self updateAccessibility];
114115
}
115116

116117
-(void)setTitleColor:(UIColor*)titleColor
@@ -152,6 +153,25 @@ -(void)setInvocation:(NSInvocation *)invocation
152153
}
153154
}
154155

156+
-(void)updateAccessibility
157+
{
158+
if (self.title == nil || self.title.length == 0)
159+
{
160+
self.isAccessibilityElement = NO;
161+
self.accessibilityTraits = UIAccessibilityTraitNone;
162+
}
163+
else if (self.titleButton.isEnabled)
164+
{
165+
self.isAccessibilityElement = YES;
166+
self.accessibilityTraits = UIAccessibilityTraitButton;
167+
}
168+
else
169+
{
170+
self.isAccessibilityElement = YES;
171+
self.accessibilityTraits = UIAccessibilityTraitStaticText;
172+
}
173+
}
174+
155175
-(void)dealloc
156176
{
157177
self.customView = nil;

IQKeyboardManager/IQToolbar/IQToolbar.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ -(IQTitleBarButtonItem *)titleBarButton
104104
if (_titleBarButton == nil)
105105
{
106106
_titleBarButton = [[IQTitleBarButtonItem alloc] initWithTitle:nil];
107-
_titleBarButton.accessibilityLabel = @"Title";
108-
_titleBarButton.accessibilityIdentifier = _titleBarButton.accessibilityLabel;
109107
}
110108

111109
return _titleBarButton;

IQKeyboardManagerSwift/IQToolbar/IQTitleBarButtonItem.swift

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import UIKit
4141
@objc override open var title: String? {
4242
didSet {
4343
titleButton?.setTitle(title, for: .normal)
44+
updateAccessibility()
4445
}
4546
}
4647

@@ -89,7 +90,7 @@ import UIKit
8990
_titleView?.backgroundColor = UIColor.clear
9091

9192
titleButton = UIButton(type: .system)
92-
titleButton?.accessibilityTraits = .staticText
93+
titleButton?.isAccessibilityElement = false
9394
titleButton?.isEnabled = false
9495
titleButton?.titleLabel?.numberOfLines = 3
9596
titleButton?.setTitleColor(UIColor.lightGray, for: .disabled)
@@ -141,4 +142,17 @@ import UIKit
141142
@objc required public init?(coder aDecoder: NSCoder) {
142143
super.init(coder: aDecoder)
143144
}
145+
146+
private func updateAccessibility() {
147+
if title == nil || title?.isEmpty == true {
148+
isAccessibilityElement = false
149+
accessibilityTraits = .none
150+
} else if titleButton?.isEnabled == true {
151+
isAccessibilityElement = true
152+
accessibilityTraits = .button
153+
} else {
154+
isAccessibilityElement = true
155+
accessibilityTraits = .staticText
156+
}
157+
}
144158
}

IQKeyboardManagerSwift/IQToolbar/IQToolbar.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ import UIKit
112112
get {
113113
if privateTitleBarButton == nil {
114114
privateTitleBarButton = IQTitleBarButtonItem(title: nil)
115-
privateTitleBarButton?.accessibilityTraits = .staticText
116-
privateTitleBarButton?.accessibilityLabel = "Title"
117-
privateTitleBarButton?.accessibilityIdentifier = privateTitleBarButton?.accessibilityLabel
118115
}
119116
return privateTitleBarButton!
120117
}

Package.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import PackageDescription
55

66
let package = Package(
77
name: "IQKeyboardManagerSwift",
8+
platforms: [
9+
.iOS(.v13)
10+
],
811
products: [
912
.library(name: "IQKeyboardManagerSwift",
1013
targets: ["IQKeyboardManagerSwift"])

Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PODS:
22
- IQDropDownTextField (4.0.1)
33
- IQDropDownTextFieldSwift (4.0.1)
4-
- IQKeyboardManager (6.5.16)
5-
- IQKeyboardManagerSwift (7.0.0)
4+
- IQKeyboardManager (6.5.17)
5+
- IQKeyboardManagerSwift (7.0.1)
66
- RSKPlaceholderTextView (6.1.0)
77
- SwiftLint (0.53.0)
88

@@ -30,11 +30,11 @@ EXTERNAL SOURCES:
3030
SPEC CHECKSUMS:
3131
IQDropDownTextField: c3a149deb3c6c4bba5edd85d88b6e83e90e08f63
3232
IQDropDownTextFieldSwift: a194ca9853f29cb90c19af31fabe7d899b0049ca
33-
IQKeyboardManager: bbce647e5f90b5fc13249ffc5692fb1f4dfa0174
34-
IQKeyboardManagerSwift: bd69f3a49f6ead9cb6ce17723cf0c6c9b948d83e
33+
IQKeyboardManager: 904d013844bbae0abe073f015487bfebe5476335
34+
IQKeyboardManagerSwift: 7f6b1b1d1497855d2beea7f2f10ffcc6978525b1
3535
RSKPlaceholderTextView: 52f26e643b6f9bbf16f45cd2bbe2181b6dfe090c
3636
SwiftLint: 5ce4d6a8ff83f1b5fd5ad5dbf30965d35af65e44
3737

3838
PODFILE CHECKSUM: 9966f86afcdbf89c72d7dbb802be808fbb4a91d9
3939

40-
COCOAPODS: 1.13.0
40+
COCOAPODS: 1.14.3

0 commit comments

Comments
 (0)