Merge branch 'mbruce/bugfix' into 'develop'

BugFixes

See merge request BPHV_MIPS/vds_ios!207

VDS.xcodeproj/project.pbxproj

@@ -1377,7 +1377,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 59;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1414,7 +1414,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 59;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;

VDS.xcodeproj/xcshareddata/xcschemes/VDS.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EA33616B288B19200071C351"
+               BuildableName = "VDS.framework"
+               BlueprintName = "VDS"
+               ReferencedContainer = "container:VDS.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EA33616B288B19200071C351"
+            BuildableName = "VDS.framework"
+            BlueprintName = "VDS"
+            ReferencedContainer = "container:VDS.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

VDS/Components/TileContainer/TileContainer.swift

@@ -14,7 +14,7 @@ open class TileContainer: TileContainerBase<TileContainer.Padding> {
         
     /// Enum used to describe the padding choices used for this component.
     public enum Padding: DefaultValuing {
-        case padding2X
+        case padding3X
         case padding4X
         case padding6X
         case padding8X
@@ -25,8 +25,8 @@ open class TileContainer: TileContainerBase<TileContainer.Padding> {
         
         public var value: CGFloat {
             switch self {
-            case .padding2X:
+            case .padding3X:
-                return VDSLayout.space2X
+                return VDSLayout.space3X
             case .padding4X:
                 return VDSLayout.space4X
             case .padding6X:
@@ -239,12 +239,12 @@ open class TileContainerBase<PaddingType: DefaultValuing>: Control where Padding
 
         heightConstraint = layoutGuide.heightAnchor.constraint(equalToConstant: 0)
 
-        backgroundImageView
+        backgroundImageView.pinToSuperView()
-            .pinTop(layoutGuide.topAnchor)
-            .pinLeading(layoutGuide.leadingAnchor)
-            .pinTrailing(layoutGuide.trailingAnchor)
-            .pinBottom(layoutGuide.bottomAnchor, 0, .defaultLow)
 
+        backgroundImageView.setContentHuggingPriority(.defaultLow, for: .horizontal)
+        backgroundImageView.setContentHuggingPriority(.defaultLow, for: .vertical)
+        backgroundImageView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        backgroundImageView.setContentCompressionResistancePriority(.defaultLow, for: .vertical)
         backgroundImageView.isUserInteractionEnabled = false
         backgroundImageView.isHidden = true
         
@@ -286,15 +286,6 @@ open class TileContainerBase<PaddingType: DefaultValuing>: Control where Padding
         highlightView.backgroundColor = hightLightViewColorConfiguration.getColor(self)
         highlightView.isHidden = !isHighlighted
         
-        if let backgroundImage {
-            backgroundImageView.image = backgroundImage
-            backgroundImageView.isHidden = false
-            backgroundColor = imageFallbackColorConfiguration.getColor(self)
-        } else {
-            backgroundImageView.isHidden = true
-            backgroundColor = backgroundColorConfiguration.getColor(self)
-        }
-        
         layer.borderColor = borderColorConfiguration.getColor(self).cgColor
         layer.borderWidth = showBorder ? VDSFormControls.borderWidth : 0
 

VDS/SupportingFiles/ReleaseNotes.txt

@@ -1,6 +1,10 @@
 1.0.59
 ----------------
+- ONEAPP-7135 - DropdownSelect - Finished Development
 - CXTDT-540077 - BadgeIndicator Font
+- CXTDT-544383 - TileContainer - Removed spacing2x and replaced with spacing3x
+- CXTDT-544384 - TileContainer - BackgroundImage strecthing screen
+- CXTDT-546824 - Notification - Accessibility - Improper label for close notification button & icon
 
 1.0.58
 ----------------