From e22e5e8f63fa79d6a286453bd8fe88e7263a3efc Mon Sep 17 00:00:00 2001
From: Jason Franklin <jason.franklin@xing.com>
Date: Tue, 20 Feb 2018 13:49:44 +0100
Subject: [PATCH 1/2] Remove description field on image upload

---
 Classes/Image Upload/ImageUpload.storyboard   | 40 +++----------------
 .../ImageUploadTableViewController.swift      | 26 ++----------
 2 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/Classes/Image Upload/ImageUpload.storyboard b/Classes/Image Upload/ImageUpload.storyboard
index 426735ae8..8061868f8 100755
--- a/Classes/Image Upload/ImageUpload.storyboard	
+++ b/Classes/Image Upload/ImageUpload.storyboard	
@@ -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>
@@ -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>
@@ -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"/>
@@ -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"/>
@@ -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>
diff --git a/Classes/Image Upload/ImageUploadTableViewController.swift b/Classes/Image Upload/ImageUploadTableViewController.swift
index b975bed92..987baf9c6 100755
--- a/Classes/Image Upload/ImageUploadTableViewController.swift	
+++ b/Classes/Image Upload/ImageUploadTableViewController.swift	
@@ -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?
@@ -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)
 
@@ -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()
@@ -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(
@@ -143,7 +125,7 @@ class ImageUploadTableViewController: UITableViewController {
             self.dismiss(animated: trueUnlessReduceMotionEnabled)
         }
 
-        if titleText == nil && descriptionText == nil {
+        if titleText == nil {
             dismissBlock()
             return
         }
@@ -203,7 +185,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:
@@ -226,11 +208,9 @@ 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
+        return true
     }
 }

From edfea42213bf67a5e5d3253676d89a2f2642ede8 Mon Sep 17 00:00:00 2001
From: Jason Franklin <jason.franklin@xing.com>
Date: Tue, 20 Feb 2018 13:57:19 +0100
Subject: [PATCH 2/2] Use title text as alt name if available

---
 Classes/Image Upload/ImageUploadTableViewController.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Classes/Image Upload/ImageUploadTableViewController.swift b/Classes/Image Upload/ImageUploadTableViewController.swift
index 987baf9c6..93e9d8a2f 100755
--- a/Classes/Image Upload/ImageUploadTableViewController.swift	
+++ b/Classes/Image Upload/ImageUploadTableViewController.swift	
@@ -75,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
@@ -174,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)"
@@ -211,6 +212,7 @@ class ImageUploadTableViewController: UITableViewController {
 extension ImageUploadTableViewController: UITextFieldDelegate {
     /// Called when the user taps return on the title field, moves their cursor to the body
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        view.endEditing(true)
         return true
     }
 }