keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix text got cut off unexpectedly in modals

Browse Source
pull/1023/head
Ryan ZHAO 7 months ago
parent 3ae766d07f
commit 3dc0ed255c
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File

3
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -1190,7 +1190,8 @@ extension ConversationVC:
body: .attributedText( body: .attributedText(
"urlOpenDescription" "urlOpenDescription"
.put(key: "url", value: url.absoluteString) .put(key: "url", value: url.absoluteString)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize)) .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize)),
canScroll: true
), ),
confirmTitle: "open".localized(), confirmTitle: "open".localized(),
confirmStyle: .danger, confirmStyle: .danger,

33
SessionUIKit/Components/ConfirmationModal.swift
Unescape Escape View File

@ -203,12 +203,12 @@ public class ConfirmationModal: Modal, UITextFieldDelegate {
closeButton.pin(.right, to: .right, of: contentView, withInset: -8) closeButton.pin(.right, to: .right, of: contentView, withInset: -8)
} }
private func layoutExplanationLabel(showScroll: Bool = true) { private func layoutExplanationLabel(_ canScroll: Bool = true) {
let labelWidth = view.frame.width - 4 * Values.veryLargeSpacing let labelWidth = view.frame.width - 4 * Values.veryLargeSpacing
let maxLabelSize = CGSize(width: labelWidth, height: CGFloat.greatestFiniteMagnitude) let maxLabelSize = CGSize(width: labelWidth, height: CGFloat.greatestFiniteMagnitude)
let expectedLabelSize = explanationLabel.sizeThatFits(maxLabelSize) let expectedLabelSize = explanationLabel.sizeThatFits(maxLabelSize)
let lineHeight = explanationLabel.font.lineHeight let lineHeight = explanationLabel.font.lineHeight
if showScroll { if canScroll {
explanationLabelContainerHeightConstraint.constant = min(expectedLabelSize.height, lineHeight * 5) explanationLabelContainerHeightConstraint.constant = min(expectedLabelSize.height, lineHeight * 5)
} else { } else {
explanationLabelContainerHeightConstraint.constant = expectedLabelSize.height explanationLabelContainerHeightConstraint.constant = expectedLabelSize.height
@ -242,22 +242,23 @@ public class ConfirmationModal: Modal, UITextFieldDelegate {
case .none: case .none:
mainStackView.spacing = Values.smallSpacing mainStackView.spacing = Values.smallSpacing
case .text(let text): case .text(let text, let canScroll):
mainStackView.spacing = Values.smallSpacing mainStackView.spacing = Values.smallSpacing
explanationLabel.text = text explanationLabel.text = text
explanationLabelContainer.isHidden = false explanationLabelContainer.isHidden = false
self.layoutExplanationLabel() self.layoutExplanationLabel(canScroll)
case .attributedText(let attributedText): case .attributedText(let attributedText, let canScroll):
mainStackView.spacing = Values.smallSpacing mainStackView.spacing = Values.smallSpacing
explanationLabel.attributedText = attributedText explanationLabel.attributedText = attributedText
explanationLabelContainer.isHidden = false explanationLabelContainer.isHidden = false
self.layoutExplanationLabel() self.layoutExplanationLabel(canScroll)
case .input(let explanation, let placeholder, let value, let clearButton, let onTextChanged): case .input(let explanation, let placeholder, let value, let clearButton, let onTextChanged):
explanationLabel.attributedText = explanation explanationLabel.attributedText = explanation
explanationLabelContainer.isHidden = (explanation == nil) explanationLabelContainer.isHidden = (explanation == nil)
self.layoutExplanationLabel(showScroll: false) let canScroll: Bool = false
self.layoutExplanationLabel(canScroll)
textField.placeholder = placeholder textField.placeholder = placeholder
textField.text = (value ?? "") textField.text = (value ?? "")
textField.clearButtonMode = (clearButton ? .always : .never) textField.clearButtonMode = (clearButton ? .always : .never)
@ -515,8 +516,14 @@ public extension ConfirmationModal.Info {
} }
case none case none
case text(String) case text(
case attributedText(NSAttributedString) _ text: String,
canScroll: Bool = false
)
case attributedText(
_ attributedText: NSAttributedString,
canScroll: Bool = false
)
case input( case input(
explanation: NSAttributedString?, explanation: NSAttributedString?,
placeholder: String, placeholder: String,
@ -538,8 +545,8 @@ public extension ConfirmationModal.Info {
public static func == (lhs: ConfirmationModal.Info.Body, rhs: ConfirmationModal.Info.Body) -> Bool { public static func == (lhs: ConfirmationModal.Info.Body, rhs: ConfirmationModal.Info.Body) -> Bool {
switch (lhs, rhs) { switch (lhs, rhs) {
case (.none, .none): return true case (.none, .none): return true
case (.text(let lhsText), .text(let rhsText)): return (lhsText == rhsText) case (.text(let lhsText, _), .text(let rhsText, _)): return (lhsText == rhsText)
case (.attributedText(let lhsText), .attributedText(let rhsText)): return (lhsText == rhsText) case (.attributedText(let lhsText, _), .attributedText(let rhsText, _)): return (lhsText == rhsText)
case (.input(let lhsExplanation, let lhsPlaceholder, let lhsInitialValue, let lhsClearButton, _), .input(let rhsExplanation, let rhsPlaceholder, let rhsInitialValue, let rhsClearButton, _)): case (.input(let lhsExplanation, let lhsPlaceholder, let lhsInitialValue, let lhsClearButton, _), .input(let rhsExplanation, let rhsPlaceholder, let rhsInitialValue, let rhsClearButton, _)):
return ( return (
@ -572,8 +579,8 @@ public extension ConfirmationModal.Info {
public func hash(into hasher: inout Hasher) { public func hash(into hasher: inout Hasher) {
switch self { switch self {
case .none: break case .none: break
case .text(let text): text.hash(into: &hasher) case .text(let text, _): text.hash(into: &hasher)
case .attributedText(let text): text.hash(into: &hasher) case .attributedText(let text, _): text.hash(into: &hasher)
case .input(let explanation, let placeholder, let initialValue, let clearButton, _): case .input(let explanation, let placeholder, let initialValue, let clearButton, _):
explanation.hash(into: &hasher) explanation.hash(into: &hasher)

Write Preview
Loading…
Cancel
Save