Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add textViewContainerInset as new parameter #500

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add textViewContainerInset as new parameter #500

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8393ab
Add textViewContainerInset as new parameter
ngunngun Oct 27, 2022
bf3845a
Update SCLAlertView.podspec
ngunngun Oct 31, 2022
4a7f38b
Revert "Add textViewContainerInset as new parameter"
ngunngun Oct 31, 2022
5b0e140
Revert "Revert "Add textViewContainerInset as new parameter""
ngunngun Oct 31, 2022
5fe8b6a
Revert "Update SCLAlertView.podspec"
ngunngun Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions SCLAlertView/SCLAlertView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,15 @@ open class SCLAlertView: UIViewController {
var dynamicAnimatorActive : Bool
var buttonsLayout: SCLAlertButtonLayout
var textViewAlignment: NSTextAlignment = .center
var textViewContainerInset: UIEdgeInsets = .zero

// Actions
var hideWhenBackgroundViewIsTapped: Bool

// Activity indicator
var activityIndicatorStyle: UIActivityIndicatorView.Style

public init(kDefaultShadowOpacity: CGFloat = 0.7, kCircleTopPosition: CGFloat = 0.0, kCircleBackgroundTopPosition: CGFloat = 6.0, kCircleHeight: CGFloat = 56.0, kCircleIconHeight: CGFloat = 20.0, kTitleHeight:CGFloat = 25.0, kWindowWidth: CGFloat = 240.0, kWindowHeight: CGFloat = 178.0, kTextHeight: CGFloat = 90.0, kTextFieldHeight: CGFloat = 30.0, kTextViewdHeight: CGFloat = 80.0, kButtonHeight: CGFloat = 35.0, kTitleFont: UIFont = UIFont.systemFont(ofSize: 20), kTitleMinimumScaleFactor: CGFloat = 1.0, kTextFont: UIFont = UIFont.systemFont(ofSize: 14), kButtonFont: UIFont = UIFont.boldSystemFont(ofSize: 14), showCloseButton: Bool = true, showCircularIcon: Bool = true, shouldAutoDismiss: Bool = true, contentViewCornerRadius: CGFloat = 5.0, fieldCornerRadius: CGFloat = 3.0, buttonCornerRadius: CGFloat = 3.0, hideWhenBackgroundViewIsTapped: Bool = false, circleBackgroundColor: UIColor = UIColor.white, contentViewColor: UIColor = UIColorFromRGB(0xFFFFFF), contentViewBorderColor: UIColor = UIColorFromRGB(0xCCCCCC), titleColor: UIColor = UIColorFromRGB(0x4D4D4D), subTitleColor: UIColor = UIColorFromRGB(0x4D4D4D), margin: Margin = Margin(), dynamicAnimatorActive: Bool = false, disableTapGesture: Bool = false, buttonsLayout: SCLAlertButtonLayout = .vertical, activityIndicatorStyle: UIActivityIndicatorView.Style = .white, textViewAlignment: NSTextAlignment = .center) {
public init(kDefaultShadowOpacity: CGFloat = 0.7, kCircleTopPosition: CGFloat = 0.0, kCircleBackgroundTopPosition: CGFloat = 6.0, kCircleHeight: CGFloat = 56.0, kCircleIconHeight: CGFloat = 20.0, kTitleHeight:CGFloat = 25.0, kWindowWidth: CGFloat = 240.0, kWindowHeight: CGFloat = 178.0, kTextHeight: CGFloat = 90.0, kTextFieldHeight: CGFloat = 30.0, kTextViewdHeight: CGFloat = 80.0, kButtonHeight: CGFloat = 35.0, kTitleFont: UIFont = UIFont.systemFont(ofSize: 20), kTitleMinimumScaleFactor: CGFloat = 1.0, kTextFont: UIFont = UIFont.systemFont(ofSize: 14), kButtonFont: UIFont = UIFont.boldSystemFont(ofSize: 14), showCloseButton: Bool = true, showCircularIcon: Bool = true, shouldAutoDismiss: Bool = true, contentViewCornerRadius: CGFloat = 5.0, fieldCornerRadius: CGFloat = 3.0, buttonCornerRadius: CGFloat = 3.0, hideWhenBackgroundViewIsTapped: Bool = false, circleBackgroundColor: UIColor = UIColor.white, contentViewColor: UIColor = UIColorFromRGB(0xFFFFFF), contentViewBorderColor: UIColor = UIColorFromRGB(0xCCCCCC), titleColor: UIColor = UIColorFromRGB(0x4D4D4D), subTitleColor: UIColor = UIColorFromRGB(0x4D4D4D), margin: Margin = Margin(), dynamicAnimatorActive: Bool = false, disableTapGesture: Bool = false, buttonsLayout: SCLAlertButtonLayout = .vertical, activityIndicatorStyle: UIActivityIndicatorView.Style = .white, textViewAlignment: NSTextAlignment = .center, textViewContainerInset: UIEdgeInsets = .zero) {

self.kDefaultShadowOpacity = kDefaultShadowOpacity
self.kCircleTopPosition = kCircleTopPosition
Expand Down Expand Up @@ -260,6 +261,7 @@ open class SCLAlertView: UIViewController {
self.activityIndicatorStyle = activityIndicatorStyle

self.textViewAlignment = textViewAlignment
self.textViewContainerInset = textViewContainerInset
}

mutating func setkWindowHeight(_ kWindowHeight:CGFloat) {
Expand Down Expand Up @@ -375,7 +377,7 @@ open class SCLAlertView: UIViewController {
viewText.isEditable = false
viewText.isSelectable = false
viewText.textAlignment = appearance.textViewAlignment
viewText.textContainerInset = UIEdgeInsets.zero
viewText.textContainerInset = appearance.textViewContainerInset
viewText.textContainer.lineFragmentPadding = 0;
viewText.font = appearance.kTextFont
// Colours
Expand Down