mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed labelwithoutaccessibilitytraints.

Browse Source
This commit is contained in:
Christiano, Kevin 2019-04-23 13:34:51 -04:00
parent 4e6bd61ae6
commit 8ae77df354
3 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI.xcodeproj/project.pbxproj
View File

@ -160,7 +160,6 @@
DBC4391922442197001AB423 /* DashLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391722442197001AB423 /* DashLine.swift */; }; DBC4391922442197001AB423 /* DashLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391722442197001AB423 /* DashLine.swift */; };
DBC4391B224421A0001AB423 /* CaretButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391A224421A0001AB423 /* CaretButton.swift */; }; DBC4391B224421A0001AB423 /* CaretButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391A224421A0001AB423 /* CaretButton.swift */; };
DBC4392122491730001AB423 /* LabelWithInternalButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */; }; DBC4392122491730001AB423 /* LabelWithInternalButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */; };
DBE3596E22651FCB00AB87F5 /* LabelWithoutAccessibilityTraits.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBE3596D22651FCB00AB87F5 /* LabelWithoutAccessibilityTraits.swift */; };
DBEFFA04225A829700230692 /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB891E822253FA8500022516 /* Label.swift */; }; DBEFFA04225A829700230692 /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB891E822253FA8500022516 /* Label.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -322,7 +321,6 @@
DBC4391722442197001AB423 /* DashLine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DashLine.swift; sourceTree = "<group>"; }; DBC4391722442197001AB423 /* DashLine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DashLine.swift; sourceTree = "<group>"; };
DBC4391A224421A0001AB423 /* CaretButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretButton.swift; sourceTree = "<group>"; }; DBC4391A224421A0001AB423 /* CaretButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretButton.swift; sourceTree = "<group>"; };
DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelWithInternalButton.swift; sourceTree = "<group>"; }; DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelWithInternalButton.swift; sourceTree = "<group>"; };
DBE3596D22651FCB00AB87F5 /* LabelWithoutAccessibilityTraits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelWithoutAccessibilityTraits.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -591,7 +589,6 @@
DB891E822253FA8500022516 /* Label.swift */, DB891E822253FA8500022516 /* Label.swift */,
0198F7A02256A80A0066C936 /* MFRadioButton.h */, 0198F7A02256A80A0066C936 /* MFRadioButton.h */,
0198F7A22256A80A0066C936 /* MFRadioButton.m */, 0198F7A22256A80A0066C936 /* MFRadioButton.m */,
DBE3596D22651FCB00AB87F5 /* LabelWithoutAccessibilityTraits.swift */,
); );
path = Views; path = Views;
sourceTree = "<group>"; sourceTree = "<group>";
@ -916,7 +913,6 @@
D29DF28C21E7AC2B003B2FB9 /* ViewConstrainingView.m in Sources */, D29DF28C21E7AC2B003B2FB9 /* ViewConstrainingView.m in Sources */,
D29DF17B21E69E1F003B2FB9 /* PrimaryButton.m in Sources */, D29DF17B21E69E1F003B2FB9 /* PrimaryButton.m in Sources */,
D29DF11D21E684A9003B2FB9 /* MVMCoreUISplitViewController.m in Sources */, D29DF11D21E684A9003B2FB9 /* MVMCoreUISplitViewController.m in Sources */,
DBE3596E22651FCB00AB87F5 /* LabelWithoutAccessibilityTraits.swift in Sources */,
0198F79F225679880066C936 /* FormValidationProtocol.swift in Sources */, 0198F79F225679880066C936 /* FormValidationProtocol.swift in Sources */,
D29DF29821E7ADB8003B2FB9 /* MFScrollingViewController.m in Sources */, D29DF29821E7ADB8003B2FB9 /* MFScrollingViewController.m in Sources */,
D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */, D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */,

14
MVMCoreUI/Atoms/Views/Label.swift
View File

@ -26,20 +26,6 @@ import MVMCore
// Used for scaling the font in updateView. // Used for scaling the font in updateView.
private var originalAttributedString: NSAttributedString? private var originalAttributedString: NSAttributedString?
override open var accessibilityTraits: UIAccessibilityTraits {
get {
return super.accessibilityTraits
}
set(accessibilityTraits) {
if accessibilityTraits.rawValue & UIAccessibilityTraits.header.rawValue != 0 {
let noHeaderTraits = UIAccessibilityTraits(rawValue: accessibilityTraits.rawValue - UIAccessibilityTraits.header.rawValue)
super.accessibilityTraits = noHeaderTraits
} else {
super.accessibilityTraits = accessibilityTraits
}
}
}
@objc public var hasText: Bool { @objc public var hasText: Bool {
guard let text = text, let attributedText = attributedText else { return false } guard let text = text, let attributedText = attributedText else { return false }
return !text.isEmpty || !attributedText.string.isEmpty return !text.isEmpty || !attributedText.string.isEmpty

33
MVMCoreUI/Atoms/Views/LabelWithoutAccessibilityTraits.swift
View File

@ -1,33 +0,0 @@
//
// MFLabelWithoutAccessibilityTraits.swift
// MobileFirstFramework
//
// Created by Gujuluva Santharam, Ajai Prabhu on 06/01/17.
// Converted by Christiano, Kevin on 4/15/19.
// Copyright © 2019 Verizon Wireless. All rights reserved.
//
@objc open class LabelWithoutAccessibilityTraits: Label {
// Overriding accessibility traits setter to set none for this label
@objc override open var accessibilityTraits: UIAccessibilityTraits {
get {
return super.accessibilityTraits
}
set(accessibilityTraits) {
super.accessibilityTraits = .staticText
}
}
@objc override open class func label() -> LabelWithoutAccessibilityTraits {
let label = LabelWithoutAccessibilityTraits(frame: CGRect.zero)
label.translatesAutoresizingMaskIntoConstraints = false
label.backgroundColor = .clear
label.numberOfLines = 0
label.lineBreakMode = .byWordWrapping
return label
}
}