Merge branch 'develop' into feature/carousel_swipeActionTagging
* develop: split color change moved nav_back and nav_close images to CoreUI image registry This fixes squishing issue in iPhone 11
@ -37,6 +37,8 @@ import Foundation
|
||||
//--------------------------------------------------
|
||||
override open func setupView() {
|
||||
super.setupView()
|
||||
leftLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
|
||||
leftLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
|
||||
leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
|
||||
addMolecule(stack)
|
||||
stack.restack()
|
||||
@ -65,12 +67,6 @@ import Foundation
|
||||
leftLabel.setFontStyle(.Title2XLarge)
|
||||
}
|
||||
|
||||
open override func layoutSubviews() {
|
||||
super.layoutSubviews()
|
||||
// This fixes a defect body text where it doesn't layout correctly.
|
||||
eyebrowHeadlineBodyLink.body.preferredMaxLayoutWidth = eyebrowHeadlineBodyLink.frame.width
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Accessibility
|
||||
//--------------------------------------------------
|
||||
|
||||
@ -56,7 +56,7 @@ import Foundation
|
||||
// Add buttons
|
||||
var tabs: [UITabBarItem] = []
|
||||
for (index, tab) in model.tabs.enumerated() {
|
||||
let tabBarItem = UITabBarItem(title: tab.title, image: UIImage(named: tab.image, in: MVMCoreCache.shared()?.bundleToUseForImages(), compatibleWith: nil), tag: index)
|
||||
let tabBarItem = UITabBarItem(title: tab.title, image: MVMCoreCache.shared()?.getImageFromRegisteredBundles(tab.image), tag: index)
|
||||
tabs.append(tabBarItem)
|
||||
}
|
||||
setItems(tabs, animated: false)
|
||||
|
||||
@ -38,7 +38,7 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule
|
||||
|
||||
/// Convenience function that creates a BarButtonItem for the model.
|
||||
public func createNavigationItemButton(delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> UIBarButtonItem {
|
||||
let imageName = UIImage(named: image, in: MVMCoreCache.shared()?.bundleToUseForImages(), compatibleWith: nil)
|
||||
return ImageBarButtonItem.create(with: imageName, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
|
||||
let uiImage = MVMCoreCache.shared()?.getImageFromRegisteredBundles(image)
|
||||
return ImageBarButtonItem.create(with: uiImage, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
|
||||
}
|
||||
}
|
||||
|
||||
@ -918,7 +918,7 @@ CGFloat const PanelAnimationDuration = 0.2;
|
||||
self.extendedDrawers = MFExtendedDrawerLeft | MFExtendedDrawerRight;
|
||||
self.prioritizedExtendedPanel = MFExtendedDrawerLeft;
|
||||
|
||||
self.view.backgroundColor = [UIColor blackColor];
|
||||
self.view.backgroundColor = [UIColor whiteColor];
|
||||
}
|
||||
|
||||
- (void)viewDidLayoutSubviews {
|
||||
|
||||
|
Before Width: | Height: | Size: 242 B |
|
Before Width: | Height: | Size: 414 B |
|
Before Width: | Height: | Size: 588 B |
|
Before Width: | Height: | Size: 215 B |
|
Before Width: | Height: | Size: 374 B |
|
Before Width: | Height: | Size: 535 B |
@ -2,17 +2,17 @@
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "back.png",
|
||||
"filename" : "nav_back.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "back@2x.png",
|
||||
"filename" : "nav_back@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "back@3x.png",
|
||||
"filename" : "nav_back@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png
vendored
Normal file
|
After Width: | Height: | Size: 183 B |
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png
vendored
Normal file
|
After Width: | Height: | Size: 335 B |
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png
vendored
Normal file
|
After Width: | Height: | Size: 488 B |
@ -2,17 +2,17 @@
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "closeXBlack.png",
|
||||
"filename" : "nav_close.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "closeXBlack@2x.png",
|
||||
"filename" : "nav_close@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "closeXBlack@3x.png",
|
||||
"filename" : "nav_close@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png
vendored
Normal file
|
After Width: | Height: | Size: 268 B |
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png
vendored
Normal file
|
After Width: | Height: | Size: 488 B |
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png
vendored
Normal file
|
After Width: | Height: | Size: 738 B |
@ -13,7 +13,7 @@ public extension MVMCoreUICommonViewsUtility {
|
||||
/// Add the close button (x) to the top right of the view. TODO: update this logic.
|
||||
@objc static func addCloseButton(to view: UIView, action: @escaping ButtonAction, centeredVertically: Bool = false) -> Button {
|
||||
let button = Button()
|
||||
if let image = MVMCoreUIUtility.imageNamed("closeXBlack")?.withRenderingMode(.alwaysTemplate) {
|
||||
if let image = MVMCoreUIUtility.imageNamed("nav_close")?.withRenderingMode(.alwaysTemplate) {
|
||||
button.setImage(image, for: .normal)
|
||||
}
|
||||
button.tintColor = .black
|
||||
|
||||