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

Merge branch 'bugfix/tooltip' into 'develop'

Browse Source 
updated version for testflight release

See merge request BPHV_MIPS/vds_ios_sample!38
This commit is contained in:
Bruce, Matt R 2023-05-08 21:18:55 +00:00
commit ce6ac3c28a
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VDSSample.xcodeproj/project.pbxproj
View File

@ -638,7 +638,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 16;
CURRENT_PROJECT_VERSION = 17;
DEVELOPMENT_TEAM = FCMA4QKS77;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = VDSSample/Info.plist;
@ -647,7 +647,7 @@
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -668,7 +668,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 16;
CURRENT_PROJECT_VERSION = 17;
DEVELOPMENT_TEAM = FCMA4QKS77;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = VDSSample/Info.plist;
@ -677,7 +677,7 @@
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",

19
VDSSample/ViewControllers/TrailingTooltipLabel.swift
View File

@ -22,12 +22,6 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
picker: self.picker)
}()
lazy var sizePickerSelectorView = {
PickerSelectorView(title: Tooltip.Size.medium.rawValue,
picker: self.picker,
items: Tooltip.Size.allCases)
}()
lazy var textPositionPickerSelectorView = {
PickerSelectorView(title: TextPosition.left.rawValue,
picker: self.picker,
@ -63,8 +57,6 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
addFormRow(label: "Font Category", view: fontCategoryPickerSelectorView)
addFormRow(label: "Text Size", view: textSizePickerSelectorView)
addFormRow(label: "Text", view: textField)
addFormRow(label: "Tooltip Size", view: sizePickerSelectorView)
addFormRow(label: "Tooltip Title", view: titleTextField)
addFormRow(label: "Tooltip Content", view: contentTextField)
addFormRow(label: "Tooltip Close Button Text", view: closeButtonTextField)
@ -107,8 +99,7 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
}
func setupModel() {
component.labelText = "Label Component"
component.labelTextStyle = .featureSmall
component.labelText = "5G Ultra Wideband is available in your area"
component.tooltipTitle = "5G Ultra Wideband is available in your area."
component.tooltipContent = "$799.99 (128 GB only) device payment purchase w/new or upgrade smartphone line on postpaid 5G Unlimited plans only req'd. Less up to $800 trade-in/promo credit applied over 36 mos.; promo credit ends if eligibility req’s are no longer met; 0% APR. Trade-in conditions apply.$799.99 (128 GB only) device payment purchase w/new or upgrade smartphone line on postpaid 5G Unlimited plans only req'd. Less up to $800 trade-in."
@ -119,10 +110,8 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
textField.text = component.labelText
//set the font
fontCategory = .feature
fontCategoryPickerSelectorView.text = "Feature"
fontCategory = .body
textSize = .small
textSizePickerSelectorView.text = "Small"
//setup UI
surfacePickerSelectorView.text = component.surface.rawValue
@ -179,9 +168,5 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
self?.fontCategory = item
}
sizePickerSelectorView.onPickerDidSelect = { [weak self] item in
self?.component.tooltipSize = item
}
}
}