Merge branch 'mbruce/bugfix' into 'develop'
bug fixes See merge request BPHV_MIPS/vds_ios!315
This commit is contained in:
commit
735749eaa5
@ -346,8 +346,15 @@ open class TileContainerBase<PaddingType: DefaultValuing & Valuing>: View where
|
|||||||
containerView.setAccessibilityLabel(for: views)
|
containerView.setAccessibilityLabel(for: views)
|
||||||
|
|
||||||
//append all children that are accessible
|
//append all children that are accessible
|
||||||
items.append(contentsOf: elements)
|
if containerView.isAccessibilityElement {
|
||||||
|
elements.forEach({ element in
|
||||||
|
if element.accessibilityTraits.contains(.button) || element.accessibilityTraits.contains(.link) {
|
||||||
|
items.append(element)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
items.append(contentsOf: elements)
|
||||||
|
}
|
||||||
return items
|
return items
|
||||||
}
|
}
|
||||||
set {}
|
set {}
|
||||||
|
|||||||
@ -104,7 +104,7 @@ open class Tilelet: TileContainerBase<Tilelet.Padding>, ParentViewProtocol {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private var backgroundColorSurface: Surface {
|
private var backgroundColorSurface: Surface {
|
||||||
backgroundColorConfiguration.getColor(self).surface
|
backgroundColorConfiguration.getColor(self).isDark() ? .dark : .light
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -187,10 +187,4 @@ extension UIColor {
|
|||||||
guard let found else { return nil}
|
guard let found else { return nil}
|
||||||
return found
|
return found
|
||||||
}
|
}
|
||||||
|
|
||||||
public var surface: Surface {
|
|
||||||
var greyScale: CGFloat = 0
|
|
||||||
getWhite(&greyScale, alpha: nil)
|
|
||||||
return greyScale < 0.5 ? .dark : .light
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user