From bf7110f5e25bb8fd446ec752aa425c0411995f2a Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Sun, 3 Jan 2021 13:55:04 -0800 Subject: [PATCH] wip --- Localizations/Localizable.strings | 3 ++- Views/CompositionAttachmentView.swift | 4 +-- Views/CompositionView.swift | 35 +++++++++++++++++++++------ 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/Localizations/Localizable.strings b/Localizations/Localizable.strings index dd55297..65a2917 100644 --- a/Localizations/Localizable.strings +++ b/Localizations/Localizable.strings @@ -39,7 +39,7 @@ "camera-access.open-system-settings" = "Open system settings"; "cancel" = "Cancel"; "compose.attachment.uploading" = "Uploading"; -"compose.attachment.remove" = "Remove"; +"compose.prompt" = "What's on your mind?"; "error" = "Error"; "favorites" = "Favorites"; "registration.review-terms-of-use-and-privacy-policy-%@" = "Please review %@'s Terms of Use and Privacy Policy to continue"; @@ -135,6 +135,7 @@ "notifications.poll-ended" = "A poll you have voted in has ended"; "notifications.your-poll-ended" = "Your poll has ended"; "notifications.unknown" = "Notification from %@"; +"remove" = "Remove"; "report" = "Report"; "report.hint" = "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:"; "report.placeholder" = "Additional comments"; diff --git a/Views/CompositionAttachmentView.swift b/Views/CompositionAttachmentView.swift index 7a52277..087537d 100644 --- a/Views/CompositionAttachmentView.swift +++ b/Views/CompositionAttachmentView.swift @@ -65,8 +65,8 @@ private extension CompositionAttachmentView { removeButton.menu = UIMenu( children: [ UIAction( - title: NSLocalizedString("compose.attachment.remove", comment: ""), - image: UIImage(systemName: "xmark.circle.fill"), + title: NSLocalizedString("remove", comment: ""), + image: UIImage(systemName: "trash"), attributes: .destructive, handler: { [weak self] _ in guard let self = self else { return } diff --git a/Views/CompositionView.swift b/Views/CompositionView.swift index 8cd7adc..9b84a74 100644 --- a/Views/CompositionView.swift +++ b/Views/CompositionView.swift @@ -9,6 +9,7 @@ final class CompositionView: UIView { let avatarImageView = UIImageView() let spoilerTextField = UITextField() let textView = UITextView() + let textViewPlaceholder = UILabel() let attachmentUploadView = AttachmentUploadView() let attachmentsCollectionView: UICollectionView @@ -92,8 +93,7 @@ private extension CompositionView { stackView.spacing = .defaultSpacing stackView.addArrangedSubview(spoilerTextField) - spoilerTextField.backgroundColor = .secondarySystemBackground - spoilerTextField.layer.cornerRadius = .defaultCornerRadius + spoilerTextField.borderStyle = .roundedRect spoilerTextField.adjustsFontForContentSizeCategory = true spoilerTextField.font = .preferredFont(forTextStyle: .body) spoilerTextField.placeholder = NSLocalizedString("status.spoiler-text-placeholder", comment: "") @@ -106,17 +106,24 @@ private extension CompositionView { }, for: .editingChanged) + let textViewFont = UIFont.preferredFont(forTextStyle: .body) + stackView.addArrangedSubview(textView) - textView.backgroundColor = .secondarySystemBackground - textView.layer.cornerRadius = .defaultCornerRadius textView.isScrollEnabled = false textView.adjustsFontForContentSizeCategory = true - textView.font = .preferredFont(forTextStyle: .body) -// textView.textContainer.lineFragmentPadding = 0 + textView.font = textViewFont + textView.textContainerInset = .zero + textView.textContainer.lineFragmentPadding = 0 textView.inputAccessoryView = inputAccessoryView textView.inputAccessoryView?.sizeToFit() textView.delegate = self - textView.setContentHuggingPriority(.required, for: .vertical) + + textView.addSubview(textViewPlaceholder) + textViewPlaceholder.translatesAutoresizingMaskIntoConstraints = false + textViewPlaceholder.adjustsFontForContentSizeCategory = true + textViewPlaceholder.font = .preferredFont(forTextStyle: .body) + textViewPlaceholder.textColor = .secondaryLabel + textViewPlaceholder.text = NSLocalizedString("compose.prompt", comment: "") stackView.addArrangedSubview(attachmentsCollectionView) attachmentsCollectionView.dataSource = attachmentsDataSource @@ -127,6 +134,14 @@ private extension CompositionView { textView.text = viewModel.text spoilerTextField.text = viewModel.contentWarning + let textViewBaselineConstraint = textView.topAnchor.constraint( + lessThanOrEqualTo: avatarImageView.centerYAnchor, + constant: -textViewFont.lineHeight / 2) + + viewModel.$text.map(\.isEmpty) + .sink { [weak self] in self?.textViewPlaceholder.isHidden = !$0 } + .store(in: &cancellables) + viewModel.$displayContentWarning .sink { [weak self] in guard let self = self else { return } @@ -138,6 +153,7 @@ private extension CompositionView { } self.spoilerTextField.isHidden = !$0 + textViewBaselineConstraint.isActive = !$0 } .store(in: &cancellables) @@ -164,9 +180,12 @@ private extension CompositionView { avatarImageView.leadingAnchor.constraint(equalTo: guide.leadingAnchor), avatarImageView.bottomAnchor.constraint(lessThanOrEqualTo: guide.bottomAnchor), stackView.leadingAnchor.constraint(equalTo: avatarImageView.trailingAnchor, constant: .defaultSpacing), - stackView.topAnchor.constraint(equalTo: guide.topAnchor), + stackView.topAnchor.constraint(greaterThanOrEqualTo: guide.topAnchor), stackView.trailingAnchor.constraint(equalTo: guide.trailingAnchor), stackView.bottomAnchor.constraint(lessThanOrEqualTo: guide.bottomAnchor), + textViewPlaceholder.leadingAnchor.constraint(equalTo: textView.leadingAnchor), + textViewPlaceholder.topAnchor.constraint(equalTo: textView.topAnchor), + textViewPlaceholder.trailingAnchor.constraint(equalTo: textView.trailingAnchor), attachmentsCollectionView.heightAnchor.constraint(equalToConstant: Self.attachmentCollectionViewHeight) ]