Finish issue alexisakers#128

caocmai · Mar 5, 2021 · c561e1b · c561e1b
1 parent 7b35bb9
commit c561e1b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/Example/Swift/Bulletin/BulletinDataSource.swift b/Example/Swift/Bulletin/BulletinDataSource.swift
@@ -30,6 +30,11 @@ enum BulletinDataSource {
     static func makeIntroPage() -> FeedbackPageBLTNItem {
 
         let page = FeedbackPageBLTNItem(title: "Welcome to\nPetBoard")
+
+        page.titleAlignment = .right
+        page.descriptionAlignment = .right
+        page.imageContentMode = .right
+
         page.image = #imageLiteral(resourceName: "RoundedIcon")
         page.imageAccessibilityLabel = "😻"
         page.appearance = makeLightAppearance()

diff --git a/Sources/InterfaceBuilder/BLTNInterfaceBuilder.swift b/Sources/InterfaceBuilder/BLTNInterfaceBuilder.swift
@@ -24,11 +24,11 @@ import UIKit
      * Creates a standard title label.
      */
 
-    @objc(makeTitleLabelNextToCloseButton:)
-    open func makeTitleLabel(isNextToCloseButton: Bool) -> BLTNTitleLabelContainer {
+    @objc(makeTitleLabelNextToCloseButton:titleAlginment:)
+    open func makeTitleLabel(isNextToCloseButton: Bool, titleAlginment:  NSTextAlignment) -> BLTNTitleLabelContainer {
 
         let titleLabel = UILabel()
-        titleLabel.textAlignment = .center
+        titleLabel.textAlignment = titleAlginment
         titleLabel.textColor = appearance.titleTextColor
         titleLabel.accessibilityTraits.insert(.header)
         titleLabel.numberOfLines = 2
@@ -45,10 +45,10 @@ import UIKit
      * Creates a standard description label.
      */
 
-    @objc open func makeDescriptionLabel() -> UILabel {
+    @objc open func makeDescriptionLabel(descriptionAlginment: NSTextAlignment) -> UILabel {
 
         let descriptionLabel = UILabel()
-        descriptionLabel.textAlignment = .center
+        descriptionLabel.textAlignment = descriptionAlginment
         descriptionLabel.textColor = appearance.descriptionTextColor
         descriptionLabel.numberOfLines = 0
         descriptionLabel.font = appearance.makeDescriptionFont()

diff --git a/Sources/Models/BLTNPageItem.swift b/Sources/Models/BLTNPageItem.swift
@@ -26,6 +26,11 @@ import UIKit
 
     /// The title of the page.
     @objc public let title: String
+
+    /// The alignments of the title and description
+    public var titleAlignment: NSTextAlignment = .center
+    public var descriptionAlignment: NSTextAlignment = .center
+    public var imageContentMode: UIView.ContentMode = .scaleAspectFit
 
     /**
      * An image to display below the title.
@@ -179,7 +184,7 @@ import UIKit
 
         // Title
         let isNextToCloseButton = isDismissable && requiresCloseButton
-        let titleView = interfaceBuilder.makeTitleLabel(isNextToCloseButton: isNextToCloseButton)
+        let titleView = interfaceBuilder.makeTitleLabel(isNextToCloseButton: isNextToCloseButton, titleAlginment: titleAlignment)
         titleView.label.text = title
 
         self.titleLabel = titleView
@@ -189,7 +194,8 @@ import UIKit
         // Image View
         if let image = self.image {
             let imageView = UIImageView(image: image)
-            imageView.contentMode = .scaleAspectFit
+            imageView.contentMode = imageContentMode
+//            imageView.contentMode = .scaleAspectFit
             imageView.tintColor = appearance.imageViewTintColor
 
             if let accessibilityLabel = imageAccessibilityLabel {
@@ -206,13 +212,13 @@ import UIKit
 
         // Description Label
         if let attributedDescription = attributedDescriptionText {
-            let label = interfaceBuilder.makeDescriptionLabel()
+            let label = interfaceBuilder.makeDescriptionLabel(descriptionAlginment: descriptionAlignment)
             label.attributedText = attributedDescription
             contentViews.append(label)
             self.descriptionLabel = label
             insertComplementaryViews(makeViewsUnderDescription)
         } else if let description = descriptionText {
-            let label = interfaceBuilder.makeDescriptionLabel()
+            let label = interfaceBuilder.makeDescriptionLabel(descriptionAlginment: descriptionAlignment)
             label.text = description
             contentViews.append(label)
             self.descriptionLabel = label