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

Merge branch 'mbruce/bugfix' into refactor/tileContainer

Browse Source
This commit is contained in:
Matt Bruce 2024-06-27 15:14:44 -05:00
commit 16c2360324
6 changed files with 50 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
VDS/BaseClasses/Control.swift
View File

@ -129,7 +129,6 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
//-------------------------------------------------- //--------------------------------------------------
open var accessibilityAction: ((Control) -> Void)? open var accessibilityAction: ((Control) -> Void)?
private var _isAccessibilityElement: Bool = false
open override var isAccessibilityElement: Bool { open override var isAccessibilityElement: Bool {
get { get {
var block: AXBoolReturnBlock? var block: AXBoolReturnBlock?
@ -137,7 +136,7 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
// if #available(iOS 17, *) { // if #available(iOS 17, *) {
// block = isAccessibilityElementBlock // block = isAccessibilityElementBlock
// } // }
if block == nil { if block == nil {
block = bridge_isAccessibilityElementBlock block = bridge_isAccessibilityElementBlock
} }
@ -145,15 +144,14 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
if let block { if let block {
return block() return block()
} else { } else {
return _isAccessibilityElement return super.isAccessibilityElement
} }
} }
set { set {
_isAccessibilityElement = newValue super.isAccessibilityElement = newValue
} }
} }
private var _accessibilityLabel: String?
open override var accessibilityLabel: String? { open override var accessibilityLabel: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -168,15 +166,14 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityLabel return super.accessibilityLabel
} }
} }
set { set {
_accessibilityLabel = newValue super.accessibilityLabel = newValue
} }
} }
private var _accessibilityHint: String?
open override var accessibilityHint: String? { open override var accessibilityHint: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -191,15 +188,14 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityHint return super.accessibilityHint
} }
} }
set { set {
_accessibilityHint = newValue super.accessibilityHint = newValue
} }
} }
private var _accessibilityValue: String?
open override var accessibilityValue: String? { open override var accessibilityValue: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -215,11 +211,11 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
if let block{ if let block{
return block() return block()
} else { } else {
return _accessibilityValue return super.accessibilityValue
} }
} }
set { set {
_accessibilityValue = newValue super.accessibilityValue = newValue
} }
} }

22
VDS/BaseClasses/View.swift
View File

@ -96,7 +96,6 @@ open class View: UIView, ViewProtocol, UserInfoable {
//-------------------------------------------------- //--------------------------------------------------
open var accessibilityAction: ((View) -> Void)? open var accessibilityAction: ((View) -> Void)?
private var _isAccessibilityElement: Bool = false
open override var isAccessibilityElement: Bool { open override var isAccessibilityElement: Bool {
get { get {
var block: AXBoolReturnBlock? var block: AXBoolReturnBlock?
@ -112,22 +111,21 @@ open class View: UIView, ViewProtocol, UserInfoable {
if let block { if let block {
return block() return block()
} else { } else {
return _isAccessibilityElement return super.isAccessibilityElement
} }
} }
set { set {
_isAccessibilityElement = newValue super.isAccessibilityElement = newValue
} }
} }
private var _accessibilityLabel: String?
open override var accessibilityLabel: String? { open override var accessibilityLabel: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
// if #available(iOS 17, *) { // if #available(iOS 17, *) {
// block = accessibilityLabelBlock // block = accessibilityLabelBlock
// } // }
//
if block == nil { if block == nil {
block = bridge_accessibilityLabelBlock block = bridge_accessibilityLabelBlock
} }
@ -135,15 +133,14 @@ open class View: UIView, ViewProtocol, UserInfoable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityLabel return super.accessibilityLabel
} }
} }
set { set {
_accessibilityLabel = newValue super.accessibilityLabel = newValue
} }
} }
private var _accessibilityHint: String?
open override var accessibilityHint: String? { open override var accessibilityHint: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -158,15 +155,14 @@ open class View: UIView, ViewProtocol, UserInfoable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityHint return super.accessibilityHint
} }
} }
set { set {
_accessibilityHint = newValue super.accessibilityHint = newValue
} }
} }
private var _accessibilityValue: String?
open override var accessibilityValue: String? { open override var accessibilityValue: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -182,11 +178,11 @@ open class View: UIView, ViewProtocol, UserInfoable {
if let block{ if let block{
return block() return block()
} else { } else {
return _accessibilityValue return super.accessibilityValue
} }
} }
set { set {
_accessibilityValue = newValue super.accessibilityValue = newValue
} }
} }

25
VDS/Components/Buttons/ButtonBase.swift
View File

@ -114,11 +114,6 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
titleLabel?.adjustsFontSizeToFitWidth = false titleLabel?.adjustsFontSizeToFitWidth = false
titleLabel?.lineBreakMode = .byTruncatingTail titleLabel?.lineBreakMode = .byTruncatingTail
titleLabel?.numberOfLines = 1 titleLabel?.numberOfLines = 1
bridge_accessibilityLabelBlock = { [weak self] in
guard let self else { return nil }
return text
}
} }
open func updateView() { open func updateView() {
@ -182,7 +177,6 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
//-------------------------------------------------- //--------------------------------------------------
open var accessibilityAction: ((ButtonBase) -> Void)? open var accessibilityAction: ((ButtonBase) -> Void)?
private var _isAccessibilityElement: Bool = false
open override var isAccessibilityElement: Bool { open override var isAccessibilityElement: Bool {
get { get {
var block: AXBoolReturnBlock? var block: AXBoolReturnBlock?
@ -198,15 +192,14 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
if let block { if let block {
return block() return block()
} else { } else {
return _isAccessibilityElement return super.isAccessibilityElement
} }
} }
set { set {
_isAccessibilityElement = newValue super.isAccessibilityElement = newValue
} }
} }
private var _accessibilityLabel: String?
open override var accessibilityLabel: String? { open override var accessibilityLabel: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -221,15 +214,14 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityLabel return super.accessibilityLabel
} }
} }
set { set {
_accessibilityLabel = newValue super.accessibilityLabel = newValue
} }
} }
private var _accessibilityHint: String?
open override var accessibilityHint: String? { open override var accessibilityHint: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -244,15 +236,14 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityHint return super.accessibilityHint
} }
} }
set { set {
_accessibilityHint = newValue super.accessibilityHint = newValue
} }
} }
private var _accessibilityValue: String?
open override var accessibilityValue: String? { open override var accessibilityValue: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -268,11 +259,11 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
if let block{ if let block{
return block() return block()
} else { } else {
return _accessibilityValue return super.accessibilityValue
} }
} }
set { set {
_accessibilityValue = newValue super.accessibilityValue = newValue
} }
} }

24
VDS/Components/Label/Label.swift
View File

@ -214,10 +214,6 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
} }
open func setup() { open func setup() {
bridge_accessibilityLabelBlock = { [weak self] in
guard let self else { return "" }
return text
}
} }
open func reset() { open func reset() {
@ -498,7 +494,6 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
open var accessibilityAction: ((Label) -> Void)? open var accessibilityAction: ((Label) -> Void)?
private var _isAccessibilityElement: Bool = false
open override var isAccessibilityElement: Bool { open override var isAccessibilityElement: Bool {
get { get {
var block: AXBoolReturnBlock? var block: AXBoolReturnBlock?
@ -514,15 +509,14 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
if let block { if let block {
return block() return block()
} else { } else {
return _isAccessibilityElement return super.isAccessibilityElement
} }
} }
set { set {
_isAccessibilityElement = newValue super.isAccessibilityElement = newValue
} }
} }
private var _accessibilityLabel: String?
open override var accessibilityLabel: String? { open override var accessibilityLabel: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -537,15 +531,14 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityLabel return super.accessibilityLabel
} }
} }
set { set {
_accessibilityLabel = newValue super.accessibilityLabel = newValue
} }
} }
private var _accessibilityHint: String?
open override var accessibilityHint: String? { open override var accessibilityHint: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -560,15 +553,14 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityHint return super.accessibilityHint
} }
} }
set { set {
_accessibilityHint = newValue super.accessibilityHint = newValue
} }
} }
private var _accessibilityValue: String?
open override var accessibilityValue: String? { open override var accessibilityValue: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -584,11 +576,11 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
if let block{ if let block{
return block() return block()
} else { } else {
return _accessibilityValue return super.accessibilityValue
} }
} }
set { set {
_accessibilityValue = newValue super.accessibilityValue = newValue
} }
} }

20
VDS/Components/TextFields/InputField/TextField.swift
View File

@ -236,7 +236,6 @@ open class TextField: UITextField, ViewProtocol, Errorable {
//-------------------------------------------------- //--------------------------------------------------
open var accessibilityAction: ((TextField) -> Void)? open var accessibilityAction: ((TextField) -> Void)?
private var _isAccessibilityElement: Bool = false
open override var isAccessibilityElement: Bool { open override var isAccessibilityElement: Bool {
get { get {
var block: AXBoolReturnBlock? var block: AXBoolReturnBlock?
@ -252,15 +251,14 @@ open class TextField: UITextField, ViewProtocol, Errorable {
if let block { if let block {
return block() return block()
} else { } else {
return _isAccessibilityElement return super.isAccessibilityElement
} }
} }
set { set {
_isAccessibilityElement = newValue super.isAccessibilityElement = newValue
} }
} }
private var _accessibilityLabel: String?
open override var accessibilityLabel: String? { open override var accessibilityLabel: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -275,15 +273,14 @@ open class TextField: UITextField, ViewProtocol, Errorable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityLabel return super.accessibilityLabel
} }
} }
set { set {
_accessibilityLabel = newValue super.accessibilityLabel = newValue
} }
} }
private var _accessibilityHint: String?
open override var accessibilityHint: String? { open override var accessibilityHint: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -298,15 +295,14 @@ open class TextField: UITextField, ViewProtocol, Errorable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityHint return super.accessibilityHint
} }
} }
set { set {
_accessibilityHint = newValue super.accessibilityHint = newValue
} }
} }
private var _accessibilityValue: String?
open override var accessibilityValue: String? { open override var accessibilityValue: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -322,11 +318,11 @@ open class TextField: UITextField, ViewProtocol, Errorable {
if let block{ if let block{
return block() return block()
} else { } else {
return _accessibilityValue return super.accessibilityValue
} }
} }
set { set {
_accessibilityValue = newValue super.accessibilityValue = newValue
} }
} }

20
VDS/Components/TextFields/TextArea/TextView.swift
View File

@ -151,7 +151,6 @@ open class TextView: UITextView, ViewProtocol, Errorable {
//-------------------------------------------------- //--------------------------------------------------
open var accessibilityAction: ((TextView) -> Void)? open var accessibilityAction: ((TextView) -> Void)?
private var _isAccessibilityElement: Bool = false
open override var isAccessibilityElement: Bool { open override var isAccessibilityElement: Bool {
get { get {
var block: AXBoolReturnBlock? var block: AXBoolReturnBlock?
@ -167,15 +166,14 @@ open class TextView: UITextView, ViewProtocol, Errorable {
if let block { if let block {
return block() return block()
} else { } else {
return _isAccessibilityElement return super.isAccessibilityElement
} }
} }
set { set {
_isAccessibilityElement = newValue super.isAccessibilityElement = newValue
} }
} }
private var _accessibilityLabel: String?
open override var accessibilityLabel: String? { open override var accessibilityLabel: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -190,15 +188,14 @@ open class TextView: UITextView, ViewProtocol, Errorable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityLabel return super.accessibilityLabel
} }
} }
set { set {
_accessibilityLabel = newValue super.accessibilityLabel = newValue
} }
} }
private var _accessibilityHint: String?
open override var accessibilityHint: String? { open override var accessibilityHint: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -213,15 +210,14 @@ open class TextView: UITextView, ViewProtocol, Errorable {
if let block { if let block {
return block() return block()
} else { } else {
return _accessibilityHint return super.accessibilityHint
} }
} }
set { set {
_accessibilityHint = newValue super.accessibilityHint = newValue
} }
} }
private var _accessibilityValue: String?
open override var accessibilityValue: String? { open override var accessibilityValue: String? {
get { get {
var block: AXStringReturnBlock? var block: AXStringReturnBlock?
@ -237,11 +233,11 @@ open class TextView: UITextView, ViewProtocol, Errorable {
if let block{ if let block{
return block() return block()
} else { } else {
return _accessibilityValue return super.accessibilityValue
} }
} }
set { set {
_accessibilityValue = newValue super.accessibilityValue = newValue
} }
} }