diff --git a/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift b/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift index 59ff0dfb98047a5a6fa7e70d80863cdf0f5dc83a..3d5c8f1d0c89df1df035a9718405bd48698878b5 100644 --- a/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift +++ b/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift @@ -23,6 +23,15 @@ import RxSwift import Reusable import SwiftyBeaver +extension UITextField { + func setPadding(_ left: CGFloat, _ right: CGFloat) { + self.leftView = UIView(frame: CGRect(x: 0, y: 0, width: left, height: self.frame.size.height)) + self.rightView = UIView(frame: CGRect(x: 0, y: 0, width: right, height: self.frame.size.height)) + self.leftViewMode = .always + self.rightViewMode = .always + } +} + class ConversationViewController: UIViewController, UITextFieldDelegate, StoryboardBased, ViewModelBased { let log = SwiftyBeaver.self @@ -49,6 +58,8 @@ class ConversationViewController: UIViewController, UITextFieldDelegate, Storybo self.messageAccessoryView.messageTextField.delegate = self + self.messageAccessoryView.messageTextField.setPadding(8.0, 8.0) + /* Register to keyboard notifications to adjust tableView insets when the keybaord appears or disappears diff --git a/Ring/Ring/Features/Conversations/Conversation/MessageAccessoryView.xib b/Ring/Ring/Features/Conversations/Conversation/MessageAccessoryView.xib index 65027b081e3ac504ae14a56552833c4049a90ee9..049ccf000c83d9ff66ff820660756c5ae0e724de 100644 --- a/Ring/Ring/Features/Conversations/Conversation/MessageAccessoryView.xib +++ b/Ring/Ring/Features/Conversations/Conversation/MessageAccessoryView.xib @@ -1,33 +1,43 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <device id="retina4_7" orientation="portrait"> <adaptation id="fullscreen"/> </device> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view contentMode="scaleToFill" id="Fja-dy-lIy" customClass="MessageAccessoryView" customModule="Ring" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="315" height="38"/> + <rect key="frame" x="0.0" y="0.0" width="315" height="54"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Write a message..." textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="AJA-0c-Rp7"> - <rect key="frame" x="4" y="4" width="307" height="30"/> + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="type your message..." textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="AJA-0c-Rp7"> + <rect key="frame" x="16" y="8" width="283" height="30"/> <nil key="textColor"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" type="system" pointSize="15"/> <textInputTraits key="textInputTraits" returnKeyType="send" enablesReturnKeyAutomatically="YES"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> + <integer key="value" value="15"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="color" keyPath="borderColor"> + <color key="value" red="0.81568627450980391" green="0.81568627450980391" blue="0.81568627450980391" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="borderWidth"> + <integer key="value" value="1"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> </textField> </subviews> - <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <constraints> - <constraint firstAttribute="bottom" secondItem="AJA-0c-Rp7" secondAttribute="bottom" constant="4" id="Gph-b4-ZJH"/> - <constraint firstAttribute="trailing" secondItem="AJA-0c-Rp7" secondAttribute="trailing" constant="4" id="UyK-3a-JcH"/> - <constraint firstItem="AJA-0c-Rp7" firstAttribute="top" secondItem="Fja-dy-lIy" secondAttribute="top" constant="4" id="mDu-cF-UdO"/> - <constraint firstItem="AJA-0c-Rp7" firstAttribute="leading" secondItem="Fja-dy-lIy" secondAttribute="leading" constant="4" id="tvd-4f-jdO"/> + <constraint firstAttribute="bottom" secondItem="AJA-0c-Rp7" secondAttribute="bottom" constant="16" id="Gph-b4-ZJH"/> + <constraint firstAttribute="trailing" secondItem="AJA-0c-Rp7" secondAttribute="trailing" constant="16" id="UyK-3a-JcH"/> + <constraint firstItem="AJA-0c-Rp7" firstAttribute="top" secondItem="Fja-dy-lIy" secondAttribute="top" constant="8" id="mDu-cF-UdO"/> + <constraint firstItem="AJA-0c-Rp7" firstAttribute="leading" secondItem="Fja-dy-lIy" secondAttribute="leading" constant="16" id="tvd-4f-jdO"/> </constraints> <nil key="simulatedStatusBarMetrics"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>