Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Remove image upload description #1550

Merged
merged 2 commits into from
Feb 22, 2018
Merged

Remove image upload description #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e22e5e8
Remove description field on image upload
jamuc Feb 20, 2018
edfea42
Use title text as alt name if available
jamuc Feb 20, 2018
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
40 changes: 6 additions & 34 deletions Classes/Image Upload/ImageUpload.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -20,19 +19,19 @@
<sections>
<tableViewSection id="s1r-s0-sed">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="120" id="bPq-Rw-PLO">
<rect key="frame" x="0.0" y="35" width="375" height="120"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="300" id="bPq-Rw-PLO">
<rect key="frame" x="0.0" y="35" width="375" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bPq-Rw-PLO" id="ItG-Cs-Vvc">
<rect key="frame" x="0.0" y="0.0" width="375" height="119.5"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="299.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="d7E-xB-fht">
<rect key="frame" x="0.0" y="0.0" width="375" height="119"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="299.5"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QMZ-yn-I5R">
<rect key="frame" x="0.0" y="0.0" width="375" height="119.5"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="299.5"/>
<connections>
<action selector="didPressPreviewImage" destination="fex-dK-757" eventType="touchUpInside" id="pwI-Uk-KaF"/>
</connections>
Expand All @@ -55,7 +54,7 @@
<tableViewSection headerTitle="TITLE" id="8bB-fg-hEC">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="qHM-9o-Ifd">
<rect key="frame" x="0.0" y="211" width="375" height="44"/>
<rect key="frame" x="0.0" y="391" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qHM-9o-Ifd" id="J4O-t2-43c">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
Expand All @@ -78,32 +77,6 @@
</tableViewCell>
</cells>
</tableViewSection>
<tableViewSection headerTitle="DESCRIPTION" id="nli-98-Nxa">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="150" id="FD5-IO-LTm">
<rect key="frame" x="0.0" y="311" width="375" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FD5-IO-LTm" id="58C-S9-icB">
<rect key="frame" x="0.0" y="0.0" width="375" height="149.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="iqO-9E-R2C" customClass="MessageTextView" customModule="MessageViewController">
<rect key="frame" x="16" y="8" width="343" height="133.5"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</subviews>
<constraints>
<constraint firstItem="iqO-9E-R2C" firstAttribute="top" secondItem="58C-S9-icB" secondAttribute="top" constant="8" id="CxK-BZ-dH5"/>
<constraint firstAttribute="bottom" secondItem="iqO-9E-R2C" secondAttribute="bottom" constant="8" id="gD8-pz-f3L"/>
<constraint firstAttribute="trailing" secondItem="iqO-9E-R2C" secondAttribute="trailing" constant="16" id="kfh-DG-Twc"/>
<constraint firstItem="iqO-9E-R2C" firstAttribute="leading" secondItem="58C-S9-icB" secondAttribute="leading" constant="16" id="kqI-9T-iR3"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
</cells>
</tableViewSection>
</sections>
<connections>
<outlet property="dataSource" destination="fex-dK-757" id="jyz-X2-QEj"/>
Expand All @@ -122,7 +95,6 @@
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
<connections>
<outlet property="bodyTextView" destination="iqO-9E-R2C" id="aaV-Ga-YE8"/>
<outlet property="previewImageView" destination="d7E-xB-fht" id="vag-wx-uwe"/>
<outlet property="titleTextField" destination="IrO-7N-7EE" id="8Xt-hT-Ycb"/>
</connections>
Expand Down
30 changes: 6 additions & 24 deletions Classes/Image Upload/ImageUploadTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ class ImageUploadTableViewController: UITableViewController {
}
}
@IBOutlet private var titleTextField: UITextField!
@IBOutlet private var bodyTextView: MessageTextView!

private var bodyPlaceholder: String?
private var bodyTextColor: UIColor?

private var image: UIImage! // Set through the create function
private var username: String?
Expand All @@ -41,12 +37,6 @@ class ImageUploadTableViewController: UITableViewController {
return raw
}

private var descriptionText: String? {
let raw = bodyTextView.text.trimmingCharacters(in: .whitespacesAndNewlines)
if raw.isEmpty { return nil }
return raw
}

class func create(_ image: UIImage, username: String?, delegate: ImageUploadDelegate) -> ImageUploadTableViewController? {
let storyboard = UIStoryboard(name: "ImageUpload", bundle: nil)

Expand All @@ -67,8 +57,6 @@ class ImageUploadTableViewController: UITableViewController {
// Set the preview image
previewImageView.image = image

// Set title field delegate so return moves to next field
titleTextField.delegate = self

// Set the right button item to spinning until we have compression info
setRightBarItemSpinning()
Expand All @@ -78,12 +66,6 @@ class ImageUploadTableViewController: UITableViewController {

// Setup view colors and styles
let placeholderText = NSLocalizedString("Optional", comment: "")
bodyTextView.placeholderText = placeholderText
bodyTextView.placeholderTextColor = Styles.Colors.Gray.light.color
bodyTextView.font = Styles.Text.body.preferredFont
bodyTextView.textContainerInset = .zero
bodyTextView.textContainer.lineFragmentPadding = 0

titleTextField.textColor = Styles.Colors.Gray.dark.color
titleTextField.font = Styles.Text.body.preferredFont
titleTextField.attributedPlaceholder = NSAttributedString(
Expand All @@ -93,6 +75,7 @@ class ImageUploadTableViewController: UITableViewController {
.font: Styles.Text.body.preferredFont
]
)
titleTextField.delegate = self

// Compress and encode the image in the background to speed up the upload process
image.compressAndEncode { [weak self] result in
Expand Down Expand Up @@ -143,7 +126,7 @@ class ImageUploadTableViewController: UITableViewController {
self.dismiss(animated: trueUnlessReduceMotionEnabled)
}

if titleText == nil && descriptionText == nil {
if titleText == nil {
dismissBlock()
return
}
Expand Down Expand Up @@ -192,7 +175,7 @@ class ImageUploadTableViewController: UITableViewController {
return
}

var name = "GitHawk Upload"
var name = self?.titleText ?? "GitHawk Upload"

if let username = self?.username {
name += " by \(username)"
Expand All @@ -203,7 +186,7 @@ class ImageUploadTableViewController: UITableViewController {
base64Image: compressionData,
name: name,
title: self?.titleText ?? "",
description: self?.descriptionText ?? "") { [weak self] result in
description: "") { [weak self] result in

switch result {
case .error:
Expand All @@ -226,11 +209,10 @@ class ImageUploadTableViewController: UITableViewController {
}

// MARK: UITextFieldDelegate

extension ImageUploadTableViewController: UITextFieldDelegate {
/// Called when the user taps return on the title field, moves their cursor to the body
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
bodyTextView.becomeFirstResponder()
return false
view.endEditing(true)
return true
}
}