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

Merge branch 'feature/tilet' into 'develop'

Browse Source 
updated to use bundle manager

See merge request BPHV_MIPS/vds_ios!38
This commit is contained in:
Bruce, Matt R 2023-01-27 18:45:17 +00:00
commit 9313654a79
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
VDS/Components/Label/Attributes/ImageLabelAttribute.swift
View File

@ -57,11 +57,7 @@ public struct ImageLabelAttribute: AttachmentLabelAttributeModel {
//get a local asset
if let imageName {
guard let bundle = Bundle(identifier: "com.vzw.vds") else {
throw Error.bundleNotFound
}
guard let image = UIImage(named: imageName, in: bundle, with: nil) else {
guard let image = BundleManager.shared.image(for: imageName) else {
throw Error.imageNotFound(imageName)
}

7
VDS/Components/TextFields/EntryField/EntryField.swift
View File

@ -234,7 +234,7 @@ open class EntryField: Control, Accessable {
}
open func getToolTipView() -> UIView? {
guard let tooltipTitle, let tooltipContent else {
guard let tooltipTitle, let tooltipContent, !tooltipTitle.isEmpty, !tooltipContent.isEmpty else {
return nil
}
@ -351,9 +351,10 @@ open class EntryField: Control, Accessable {
if let view = getToolTipView(), let oldText = updatedLabelText {
tooltipView = view
let toolTipAction = PassthroughSubject<Void, Never>()
let toolTipUpdateText = "\(oldText) " //create a little space between the final character and tooltip image
let toolTipUpdateText = "\(oldText) " //create a little space between the final character and tooltip image
let toolTipAttribute = ToolTipLabelAttribute(action: toolTipAction,
location: toolTipUpdateText.count,
location: toolTipUpdateText.count - 1,
length: 1,
tintColor: primaryColorConfig.getColor(self))
updatedLabelText = toolTipUpdateText