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

Merge branch 'bugfix/tab_bar_item_accessibility_text' into 'develop'

Browse Source 
accessibility

See merge request BPHV_MIPS/mvm_core_ui!664
This commit is contained in:
Suresh, Kamlesh Jain 2021-02-11 09:20:36 -05:00
commit 5a848cf47d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
View File

@ -54,6 +54,7 @@
var tabs: [UITabBarItem] = [] var tabs: [UITabBarItem] = []
for (index, tab) in model.tabs.enumerated() { for (index, tab) in model.tabs.enumerated() {
let tabBarItem = UITabBarItem(title: tab.title, image: MVMCoreCache.shared()?.getImageFromRegisteredBundles(tab.image), tag: index) let tabBarItem = UITabBarItem(title: tab.title, image: MVMCoreCache.shared()?.getImageFromRegisteredBundles(tab.image), tag: index)
tabBarItem.accessibilityLabel = tab.accessibilityText
if #available(iOS 13.0, *) { if #available(iOS 13.0, *) {
} else { } else {
tabBarItem.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3) tabBarItem.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3)

4
MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
View File

@ -63,11 +63,13 @@ public class TabBarItemModel: Codable {
var title: String? var title: String?
var image: String var image: String
var action: ActionModelProtocol var action: ActionModelProtocol
var accessibilityText: String?
private enum CodingKeys: String, CodingKey { private enum CodingKeys: String, CodingKey {
case title case title
case image case image
case action case action
case accessibilityText
} }
public init(with title: String?, image: String, action: ActionModelProtocol) { public init(with title: String?, image: String, action: ActionModelProtocol) {
@ -81,6 +83,7 @@ public class TabBarItemModel: Codable {
title = try typeContainer.decodeIfPresent(String.self, forKey: .title) title = try typeContainer.decodeIfPresent(String.self, forKey: .title)
image = try typeContainer.decode(String.self, forKey: .image) image = try typeContainer.decode(String.self, forKey: .image)
action = try typeContainer.decodeModel(codingKey: .action) action = try typeContainer.decodeModel(codingKey: .action)
accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
} }
public func encode(to encoder: Encoder) throws { public func encode(to encoder: Encoder) throws {
@ -88,5 +91,6 @@ public class TabBarItemModel: Codable {
try container.encodeIfPresent(title, forKey: .title) try container.encodeIfPresent(title, forKey: .title)
try container.encode(image, forKey: .image) try container.encode(image, forKey: .image)
try container.encodeModel(action, forKey: .action) try container.encodeModel(action, forKey: .action)
try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
} }
} }