Merge branch 'develop' into 'feature/molecule_carousel'
# Conflicts: # MVMCoreUI/Molecules/StandardFooterView.swift # MVMCoreUI/Molecules/StandardHeaderView.swift
This commit is contained in:
commit
8842ca8113
@ -341,6 +341,25 @@ public typealias ActionBlock = () -> Void
|
|||||||
standardFontSize = 0
|
standardFontSize = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
///Appends an external link image to the end of the attributed string.
|
||||||
|
public func addExternalLinkIcon() {
|
||||||
|
|
||||||
|
let size = round(font.pointSize * 0.8)
|
||||||
|
|
||||||
|
guard let attributedText = self.attributedText else { return }
|
||||||
|
|
||||||
|
let fullString = NSMutableAttributedString(attributedString: attributedText)
|
||||||
|
|
||||||
|
let imageAttachment = NSTextAttachment()
|
||||||
|
imageAttachment.image = MVMCoreUIUtility.imageNamed("externalLink")
|
||||||
|
imageAttachment.bounds = CGRect(x: 0, y: 0, width: size, height: size)
|
||||||
|
|
||||||
|
fullString.append(NSAttributedString(string: " "))
|
||||||
|
fullString.append(NSAttributedString(attachment: imageAttachment))
|
||||||
|
self.attributedText = fullString
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Atomization
|
// MARK: - Atomization
|
||||||
|
|||||||
23
MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Contents.json
vendored
Normal file
23
MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "exportBlack.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "exportBlack@2x.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "exportBlack@3x.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack.png
vendored
Normal file
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 345 B |
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@2x.png
vendored
Normal file
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 589 B |
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@3x.png
vendored
Normal file
BIN
MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 869 B |
@ -50,4 +50,7 @@
|
|||||||
// Get the background color based on the type
|
// Get the background color based on the type
|
||||||
- (nonnull UIColor *)getBackgroundColorForType:(nullable NSString *)type;
|
- (nonnull UIColor *)getBackgroundColorForType:(nullable NSString *)type;
|
||||||
|
|
||||||
|
// Set the status bar color. Used for updating the status bar when the view changes.
|
||||||
|
- (void)setStatusBarColor:(nullable UIColor *)statusBarColor statusBarStyle:(UIStatusBarStyle)style;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user