Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve accessibility #64

Merged
merged 3 commits into from
Feb 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Classes/PHFComposeBarView.m
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ @interface PHFComposeBarView ()
@property (strong, nonatomic, readonly) UIView *topLineView;
@property (strong, nonatomic, readonly) UILabel *charCountLabel;
@property (strong, nonatomic) PHFDelegateChain *delegateChain;
@property (strong, nonatomic, readonly) UIButton *textContainer;
@property (strong, nonatomic, readonly) UIView *textContainer;
@property (assign, nonatomic) CGFloat previousTextHeight;
@end

Expand Down Expand Up @@ -332,14 +332,13 @@ - (UILabel *)charCountLabel {
@synthesize textContainer = _textContainer;
// Returns the text container which contains the actual text view, the
// placeholder and the image view that contains the text field image.
- (UIButton *)textContainer {
- (UIView *)textContainer {
if (!_textContainer) {
CGRect textContainerFrame = CGRectMake(kHorizontalSpacing,
kTextContainerTopMargin,
[self bounds].size.width - kHorizontalSpacing * 3 - kButtonRightMargin,
[self bounds].size.height - kTextContainerTopMargin - kTextContainerBottomMargin);
_textContainer = [UIButton buttonWithType:UIButtonTypeCustom];
[_textContainer setFrame:textContainerFrame];
_textContainer = [[UIView alloc] initWithFrame:textContainerFrame];
[_textContainer setClipsToBounds:YES];
[_textContainer setBackgroundColor:[UIColor colorWithWhite:0.98f alpha:1.0f]];
[_textContainer setAutoresizingMask:UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight];
Expand Down Expand Up @@ -368,8 +367,6 @@ - (UIButton *)textContainer {
kPlaceholderHeight);
[[self placeholderLabel] setFrame:placeholderFrame];
[_textContainer addSubview:[self placeholderLabel]];

[_textContainer addTarget:[self textView] action:@selector(becomeFirstResponder) forControlEvents:UIControlEventTouchUpInside];
}

return _textContainer;
Expand Down
133 changes: 133 additions & 0 deletions Example/PHFComposeBarViewExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
1DBC25A68A9E3C5F83BAD5FB /* libPods-PHFComposeBarViewExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4321B006EFBB5D494B0F7F3 /* libPods-PHFComposeBarViewExample.a */; };
4A8DE8891E3FE510004788A4 /* PHFComposeBarViewExampleUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A8DE8881E3FE510004788A4 /* PHFComposeBarViewExampleUITests.m */; };
D51C5F8B172D322D0046E65C /* PHFComposeBarView_TextView.m in Sources */ = {isa = PBXBuildFile; fileRef = D51C5F7D172D322D0046E65C /* PHFComposeBarView_TextView.m */; };
D51C5F8C172D322D0046E65C /* PHFComposeBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = D51C5F7F172D322D0046E65C /* PHFComposeBarView.m */; };
D51C5F9F172D3F880046E65C /* Camera@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D51C5F9D172D3F880046E65C /* Camera@2x.png */; };
Expand All @@ -24,8 +25,21 @@
D5365C3E172D1F7F0059FF04 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D5365C3D172D1F7F0059FF04 /* ViewController.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
4A8DE88B1E3FE510004788A4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D5365C19172D1F7F0059FF04 /* Project object */;
proxyType = 1;
remoteGlobalIDString = D5365C20172D1F7F0059FF04;
remoteInfo = PHFComposeBarViewExample;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
04D186753C1711C11E429D77 /* Pods-PHFComposeBarViewExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PHFComposeBarViewExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PHFComposeBarViewExample/Pods-PHFComposeBarViewExample.debug.xcconfig"; sourceTree = "<group>"; };
4A8DE8861E3FE510004788A4 /* PHFComposeBarViewExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PHFComposeBarViewExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4A8DE8881E3FE510004788A4 /* PHFComposeBarViewExampleUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PHFComposeBarViewExampleUITests.m; sourceTree = "<group>"; };
4A8DE88A1E3FE510004788A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9678FDF76205B59A79A7E68C /* Pods-PHFComposeBarViewExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PHFComposeBarViewExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-PHFComposeBarViewExample/Pods-PHFComposeBarViewExample.release.xcconfig"; sourceTree = "<group>"; };
D51C5F7C172D322D0046E65C /* PHFComposeBarView_TextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PHFComposeBarView_TextView.h; sourceTree = "<group>"; };
D51C5F7D172D322D0046E65C /* PHFComposeBarView_TextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PHFComposeBarView_TextView.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -53,6 +67,13 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
4A8DE8831E3FE510004788A4 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D5365C1E172D1F7F0059FF04 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -76,6 +97,15 @@
name = Pods;
sourceTree = "<group>";
};
4A8DE8871E3FE510004788A4 /* PHFComposeBarViewExampleUITests */ = {
isa = PBXGroup;
children = (
4A8DE8881E3FE510004788A4 /* PHFComposeBarViewExampleUITests.m */,
4A8DE88A1E3FE510004788A4 /* Info.plist */,
);
path = PHFComposeBarViewExampleUITests;
sourceTree = "<group>";
};
D51C5F7B172D322D0046E65C /* Classes */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -112,6 +142,7 @@
children = (
D51C5F97172D32970046E65C /* PHFComposeBarView */,
D5365C2A172D1F7F0059FF04 /* PHFComposeBarViewExample */,
4A8DE8871E3FE510004788A4 /* PHFComposeBarViewExampleUITests */,
D5365C23172D1F7F0059FF04 /* Frameworks */,
D5365C22172D1F7F0059FF04 /* Products */,
2A1910B04C2AF2E60D160532 /* Pods */,
Expand All @@ -122,6 +153,7 @@
isa = PBXGroup;
children = (
D5365C21172D1F7F0059FF04 /* PHFComposeBarViewExample.app */,
4A8DE8861E3FE510004788A4 /* PHFComposeBarViewExampleUITests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -167,6 +199,24 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
4A8DE8851E3FE510004788A4 /* PHFComposeBarViewExampleUITests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4A8DE88F1E3FE510004788A4 /* Build configuration list for PBXNativeTarget "PHFComposeBarViewExampleUITests" */;
buildPhases = (
4A8DE8821E3FE510004788A4 /* Sources */,
4A8DE8831E3FE510004788A4 /* Frameworks */,
4A8DE8841E3FE510004788A4 /* Resources */,
);
buildRules = (
);
dependencies = (
4A8DE88C1E3FE510004788A4 /* PBXTargetDependency */,
);
name = PHFComposeBarViewExampleUITests;
productName = PHFComposeBarViewExampleUITests;
productReference = 4A8DE8861E3FE510004788A4 /* PHFComposeBarViewExampleUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
D5365C20172D1F7F0059FF04 /* PHFComposeBarViewExample */ = {
isa = PBXNativeTarget;
buildConfigurationList = D5365C44172D1F7F0059FF04 /* Build configuration list for PBXNativeTarget "PHFComposeBarViewExample" */;
Expand Down Expand Up @@ -195,6 +245,13 @@
attributes = {
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = "Philipe Fatio";
TargetAttributes = {
4A8DE8851E3FE510004788A4 = {
CreatedOnToolsVersion = 8.2.1;
ProvisioningStyle = Automatic;
TestTargetID = D5365C20172D1F7F0059FF04;
};
};
};
buildConfigurationList = D5365C1C172D1F7F0059FF04 /* Build configuration list for PBXProject "PHFComposeBarViewExample" */;
compatibilityVersion = "Xcode 3.2";
Expand All @@ -209,11 +266,19 @@
projectRoot = "";
targets = (
D5365C20172D1F7F0059FF04 /* PHFComposeBarViewExample */,
4A8DE8851E3FE510004788A4 /* PHFComposeBarViewExampleUITests */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
4A8DE8841E3FE510004788A4 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D5365C1F172D1F7F0059FF04 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -277,6 +342,14 @@
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
4A8DE8821E3FE510004788A4 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4A8DE8891E3FE510004788A4 /* PHFComposeBarViewExampleUITests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D5365C1D172D1F7F0059FF04 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -292,6 +365,14 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
4A8DE88C1E3FE510004788A4 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D5365C20172D1F7F0059FF04 /* PHFComposeBarViewExample */;
targetProxy = 4A8DE88B1E3FE510004788A4 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
D5365C2D172D1F7F0059FF04 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
Expand All @@ -304,6 +385,50 @@
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
4A8DE88D1E3FE510004788A4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = PHFComposeBarViewExampleUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.philipefatio.PHFComposeBarViewExampleUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_TARGET_NAME = PHFComposeBarViewExample;
};
name = Debug;
};
4A8DE88E1E3FE510004788A4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = PHFComposeBarViewExampleUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.philipefatio.PHFComposeBarViewExampleUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_TARGET_NAME = PHFComposeBarViewExample;
};
name = Release;
};
D5365C42172D1F7F0059FF04 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -408,6 +533,14 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
4A8DE88F1E3FE510004788A4 /* Build configuration list for PBXNativeTarget "PHFComposeBarViewExampleUITests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4A8DE88D1E3FE510004788A4 /* Debug */,
4A8DE88E1E3FE510004788A4 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
D5365C1C172D1F7F0059FF04 /* Build configuration list for PBXProject "PHFComposeBarViewExample" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
6 changes: 6 additions & 0 deletions Example/PHFComposeBarViewExample/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ - (PHFComposeBarView *)composeBarView {
[_composeBarView setPlaceholder:@"Type something..."];
[_composeBarView setUtilityButtonImage:[UIImage imageNamed:@"Camera"]];
[_composeBarView setDelegate:self];

[[_composeBarView placeholderLabel] setAccessibilityIdentifier:@"Placeholder"];
[[_composeBarView textView] setAccessibilityIdentifier:@"Input"];
[[_composeBarView button] setAccessibilityIdentifier:@"Submit"];
[[_composeBarView utilityButton] setAccessibilityIdentifier:@"Utility"];
}

return _composeBarView;
Expand All @@ -169,6 +174,7 @@ - (UITextView *)textView {
UIEdgeInsets insets = UIEdgeInsetsMake(0.0f, 0.0f, PHFComposeBarViewInitialHeight, 0.0f);
[_textView setContentInset:insets];
[_textView setScrollIndicatorInsets:insets];
[_textView setAccessibilityIdentifier:@"Main"];
[_textView setText:@"Welcome to the Demo!\n\nThis is just some placeholder text to give you a better feeling of how the compose bar can be used along other components."];

UIView *bubbleView = [[UIView alloc] initWithFrame:CGRectMake(80.0f, 480.0f, 220.0f, 60.0f)];
Expand Down
22 changes: 22 additions & 0 deletions Example/PHFComposeBarViewExampleUITests/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?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>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// PHFComposeBarViewExampleUITests.m
// PHFComposeBarViewExampleUITests
//
// Created by Philipe Fatio on 30.01.17.
// Copyright © 2017 Philipe Fatio. All rights reserved.
//

#import <XCTest/XCTest.h>

@interface PHFComposeBarViewExampleUITests : XCTestCase

@end

@implementation PHFComposeBarViewExampleUITests

- (void)setUp {
[super setUp];
self.continueAfterFailure = NO;
}

- (void)tearDown {
[super tearDown];
}

- (void)testExample {
NSString *message = @"Here is some sample text. It's a few lines long but not too long. I think that should do it.";

XCUIApplication *app = [[XCUIApplication alloc] init];
[app launch];

[[app staticTexts][@"Placeholder"] tap];
[[app textViews][@"Input"] typeText:message];
[[app buttons][@"Submit"] tap];

NSString *output = [[app textViews][@"Main"] value];
XCTAssert([output containsString:message], "Message text not found in output.");

[[app buttons][@"Utility"] tap];
output = [[app textViews][@"Main"] value];
XCTAssert([output containsString:@"Utility button pressed"], "Message text not found in output.");
}

@end
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,9 @@ properties and their descriptions.
### Author

Philipe Fatio ([@fphilipe](http://twitter.com/fphilipe))

### Sponsors

These people and companies have sponsored the development so far:

- [Liveminds](https://liveminds.com) ([\#64](https://github.com/fphilipe/PHFComposeBarView/pull/64))