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

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/vds_ios_sample into vasavk/carousel

Browse Source
This commit is contained in:
Vasavi Kanamarlapudi 2024-07-04 20:30:14 +05:30
commit 41c56485d4
7 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VDSSample.xcodeproj/project.pbxproj
View File

@ -717,7 +717,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 69;
CURRENT_PROJECT_VERSION = 70;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77;
GENERATE_INFOPLIST_FILE = YES;
@ -753,7 +753,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 69;
CURRENT_PROJECT_VERSION = 70;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77;
GENERATE_INFOPLIST_FILE = YES;

2
VDSSample/Supporting Files/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "VZ-My-Verizon-iOS-1024x1024.png",
"filename" : "Icon on stone.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"

BIN
VDSSample/Supporting Files/Resources/Assets.xcassets/AppIcon.appiconset/Icon on stone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 94 KiB

BIN
VDSSample/Supporting Files/Resources/Assets.xcassets/AppIcon.appiconset/VZ-My-Verizon-iOS-1024x1024.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

12
VDSSample/ViewControllers/BaseViewController.swift
View File

@ -252,8 +252,16 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
NotificationCenter.default.publisher(for: UIAccessibility.voiceOverStatusDidChangeNotification).sink { [weak self] _ in
if UIAccessibility.isVoiceOverRunning {
if let component = self?.component {
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
self?.loadCustomRotors()
DispatchQueue.main.asyncAfter(deadline: .now() + 1) { [weak self] in
guard let self else { return }
loadCustomRotors()
if let rotors = component.accessibilityCustomRotors {
if var accessibilityCustomRotors {
accessibilityCustomRotors.append(contentsOf: rotors)
} else {
accessibilityCustomRotors = rotors
}
}
UIAccessibility.post(notification: .screenChanged, argument: component)
}
}

3
VDSSample/ViewControllers/DatePickerViewController.swift
View File

@ -336,8 +336,7 @@ extension DatePickerViewController {
}
func updateCalendarModel() {
component.calendarModel = .init(surface: component.surface,
hideContainerBorder: containerBorderSwitch.isOn,
component.calendarModel = .init(hideContainerBorder: containerBorderSwitch.isOn,
hideCurrentDateIndicator: hideCurrentDateIndicatorSwitch.isOn,
activeDates: activeDates,
inactiveDates: inactiveDates,

15
VDSSample/ViewControllers/TileletViewController.swift
View File

@ -311,6 +311,7 @@ class TileletViewController: BaseViewController<Tilelet> {
var backgroundColor: BackgroundColor = .black
var maxWidthTextField = NumericField()
var isLinkSwitch = Toggle()
var descriptionIconAccessibilityTextField = TextField()
var gradientColorsFormStackView = FormSection().with { $0.isHidden = true }
@ -402,6 +403,7 @@ class TileletViewController: BaseViewController<Tilelet> {
}))
append(section: descriptionIconFormStackView)
descriptionIconFormStackView.addFormRow(label: "Icon", view: descriptionNamePickerSelectorView)
descriptionIconFormStackView.addFormRow(label: "Accessibility", view: descriptionIconAccessibilityTextField)
descriptionIconFormStackView.addFormRow(label: "Size", view: descriptionIconSizePickerSelectorView)
descriptionIconFormStackView.addFormRow(label: "Color", view: descriptionIconColorPickerSelectorView)
descriptionIconTokenFormStackView.addFormRow(label: "Token", view: descriptionIconTokenColorView)
@ -516,6 +518,12 @@ class TileletViewController: BaseViewController<Tilelet> {
self.setDescriptionIconForm()
}
descriptionIconAccessibilityTextField
.textPublisher
.sink { [weak self] text in
self?.setDescriptiveIconModel()
}.store(in: &subscribers)
showDirectionalIconSwitch.onChange = { [weak self] sender in
guard let self else { return }
self.setDirectionalIconForm()
@ -727,6 +735,11 @@ class TileletViewController: BaseViewController<Tilelet> {
let iconSize = descriptionIconSizePickerSelectorView.selectedItem
let iconName = descriptionNamePickerSelectorView.selectedItem
var iconColor: Tilelet.IconColor? = nil
var accessibleText: String?
if let at = descriptionIconAccessibilityTextField.text, !at.isEmpty {
accessibleText = at
}
switch descriptionIconColorPickerSelectorView.selectedItem {
case .token:
iconColor = .token(descriptionIconTokenColorView.selectedItem)
@ -735,7 +748,7 @@ class TileletViewController: BaseViewController<Tilelet> {
default:
break
}
component.descriptiveIconModel = .init(name: iconName, iconColor: iconColor, size: iconSize)
component.descriptiveIconModel = .init(name: iconName, iconColor: iconColor, size: iconSize, accessibleText: accessibleText ?? nil )
}
func setDirectionalIconModel() {