From 2ca758ff6eea9325e9ce95aafd7c27004237ddd2 Mon Sep 17 00:00:00 2001
From: Benjamin Verdier <benjamin.verdier@belledonne-communications.com>
Date: Fri, 29 Jun 2018 14:00:00 +0200
Subject: [PATCH] add support of text + image in bubble photo cell

---
 .../Base.lproj/UIChatBubblePhotoCell.xib      | 40 +++++++++++--------
 .../Base.lproj/UIChatBubbleTextCell.xib       |  4 +-
 Classes/LinphoneUI/UIChatBubbleTextCell.h     |  1 +
 Classes/LinphoneUI/UIChatBubbleTextCell.m     | 19 +++++++--
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/Classes/LinphoneUI/Base.lproj/UIChatBubblePhotoCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatBubblePhotoCell.xib
index ec2e12142..50403d66f 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatBubblePhotoCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatBubblePhotoCell.xib
@@ -28,6 +28,7 @@
                 <outlet property="imdmIcon" destination="LPj-VT-0fH" id="yYh-pv-EJs"/>
                 <outlet property="imdmLabel" destination="44j-me-Iqi" id="m5R-Dm-V8g"/>
                 <outlet property="messageImageView" destination="yMW-cT-bpU" id="MNr-F2-abQ"/>
+                <outlet property="messageText" destination="cx9-0K-P9L" id="kPh-s4-Ioy"/>
                 <outlet property="openRecognizer" destination="NYA-II-xYn" id="pVM-vD-4Rg"/>
                 <outlet property="playButton" destination="cvc-tl-Pcf" id="eKJ-2T-LUl"/>
                 <outlet property="resendRecognizer" destination="5ZI-Ip-lGl" id="G2r-On-6mV"/>
@@ -37,15 +38,15 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="UGz-WT-BUv">
-            <rect key="frame" x="0.0" y="0.0" width="377" height="301"/>
+            <rect key="frame" x="0.0" y="0.0" width="377" height="351"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y7i-Gm-AdY" userLabel="innerView">
-                    <rect key="frame" x="6" y="5" width="365" height="291"/>
+                    <rect key="frame" x="6" y="5" width="365" height="341"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" alpha="0.20000000298023224" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="color_A.png" translatesAutoresizingMaskIntoConstraints="NO" id="U2P-5n-gg8" userLabel="backgroundColorImage">
-                            <rect key="frame" x="0.0" y="0.0" width="365" height="291"/>
+                            <rect key="frame" x="0.0" y="0.0" width="365" height="341"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                         </imageView>
                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="avatar.png" translatesAutoresizingMaskIntoConstraints="NO" id="hD2-19-7IH" userLabel="avatarImage" customClass="UIRoundedImageView">
@@ -65,11 +66,11 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8I3-n2-0kS" userLabel="view">
-                            <rect key="frame" x="39" y="55" width="298" height="190"/>
+                            <rect key="frame" x="39" y="55" width="298" height="230"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="linphone_logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="yMW-cT-bpU" userLabel="image" customClass="UILoadingImageView">
-                                    <rect key="frame" x="0.0" y="0.0" width="298" height="122"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="298" height="148"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <gestureRecognizers/>
                                 </imageView>
@@ -82,15 +83,15 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GmN-7v-uuO" userLabel="imageSubView">
-                                    <rect key="frame" x="0.0" y="128" width="297" height="62"/>
+                                    <rect key="frame" x="0.0" y="155" width="297" height="75"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                                     <subviews>
                                         <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="USm-wC-GvG" userLabel="transferProgress">
-                                            <rect key="frame" x="10" y="29" width="277" height="2"/>
+                                            <rect key="frame" x="10" y="42" width="277" height="2"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                         </progressView>
                                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N75-gL-R6t" userLabel="downloadButton" customClass="UIRoundBorderedButton">
-                                            <rect key="frame" x="84" y="33" width="115" height="27"/>
+                                            <rect key="frame" x="84" y="46" width="115" height="27"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <accessibility key="accessibilityConfiguration" label="Download"/>
                                             <state key="normal" title="DOWNLOAD" backgroundImage="color_G.png">
@@ -102,7 +103,7 @@
                                             </connections>
                                         </button>
                                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6dl-Nz-rdv" userLabel="cancelButton" customClass="UIRoundBorderedButton">
-                                            <rect key="frame" x="84" y="33" width="115" height="27"/>
+                                            <rect key="frame" x="84" y="46" width="115" height="27"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <accessibility key="accessibilityConfiguration" label="Cancel"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -119,11 +120,11 @@
                             </subviews>
                         </view>
                         <view clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" preservesSuperviewLayoutMargins="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VYJ-RC-Jmg" userLabel="finalAssetView">
-                            <rect key="frame" x="8" y="55" width="349" height="213"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                            <rect key="frame" x="0.0" y="55" width="365" height="230"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gzv-K4-5OL" userLabel="finalImage">
-                                    <rect key="frame" x="0.0" y="0.0" width="349" height="213"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="365" height="230"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <gestureRecognizers/>
                                 </imageView>
@@ -147,7 +148,7 @@
                             </connections>
                         </view>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="color_A.png" translatesAutoresizingMaskIntoConstraints="NO" id="6dA-3U-OPW" userLabel="bottomBarColor">
-                            <rect key="frame" x="0.0" y="290" width="365" height="1"/>
+                            <rect key="frame" x="0.0" y="340" width="365" height="1"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         </imageView>
                         <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" hidesWhenStopped="YES" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="Eab-ND-ix3" userLabel="statusInprogressSpinner">
@@ -159,15 +160,22 @@
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Delivery failed"/>
                         </imageView>
+                        <textView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" text="Lore ipsum..." translatesAutoresizingMaskIntoConstraints="NO" id="cx9-0K-P9L" userLabel="messageText" customClass="UITextViewNoDefine">
+                            <rect key="frame" x="8" y="285" width="349" height="47"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            <dataDetectorType key="dataDetectorTypes" link="YES"/>
+                        </textView>
                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Delivered" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="44j-me-Iqi" userLabel="imdmLabel">
-                            <rect key="frame" x="283" y="274" width="64" height="20"/>
+                            <rect key="frame" x="283" y="324" width="64" height="20"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                             <color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="valid_default.png" translatesAutoresizingMaskIntoConstraints="NO" id="LPj-VT-0fH" userLabel="imdmIcon">
-                            <rect key="frame" x="349" y="276" width="13" height="13"/>
+                            <rect key="frame" x="349" y="326" width="13" height="13"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Delivery failed"/>
                         </imageView>
@@ -180,7 +188,7 @@
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="-73.5" y="246.5"/>
+            <point key="canvasLocation" x="-73.5" y="271.5"/>
         </view>
         <tapGestureRecognizer id="5ZI-Ip-lGl" userLabel="resendClick">
             <connections>
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib
index d268ae5b5..3540175ea 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.h b/Classes/LinphoneUI/UIChatBubbleTextCell.h
index 26966cbb5..18f5d879c 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.h
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.h
@@ -55,5 +55,6 @@
 + (CGSize)ViewHeightForMessage:(LinphoneChatMessage *)chat withWidth:(int)width;
 + (NSString *)TextMessageForChat:(LinphoneChatMessage *)message;
 + (CGSize)computeBoundingBox:(NSString *)text size:(CGSize)size font:(UIFont *)font;
++ (NSString *)ContactDateForChat:(LinphoneChatMessage *)message;
 
 @end
diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m
index 3ba03cf5f..68d3a5f32 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.m
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m
@@ -96,9 +96,11 @@
 	const LinphoneContent *last_content = linphone_chat_message_get_file_transfer_information(message);
 	// Last message was a file transfer (image) so display a picture...
 	if (url || last_content) {
+        if (linphone_chat_message_get_text_content(message))
+            return [NSString stringWithUTF8String:linphone_chat_message_get_text_content(message)];
 		return @"🗻";
 	} else {
-		const char *text = linphone_chat_message_get_text_content(message) ?: "";
+        const char *text = linphone_chat_message_get_text_content(message) ?: "";
 		return [NSString stringWithUTF8String:text] ?: [NSString stringWithCString:text encoding:NSASCIIStringEncoding]
 														   ?: NSLocalizedString(@"(invalid string)", nil);
 	}
@@ -127,6 +129,7 @@
 	_statusInProgressSpinner.accessibilityLabel = @"Delivery in progress";
 
 	if (_messageText) {
+        LOGD(_messageText.text);
 		[_messageText setHidden:FALSE];
 		/* We need to use an attributed string here so that data detector don't mess
 		 * with the text style. See http://stackoverflow.com/a/20669356 */
@@ -372,7 +375,16 @@ static const CGFloat CELL_MESSAGE_Y_MARGIN = 52; // 44;
             CGSize originalImageSize = CGSizeMake([asset pixelWidth], [asset pixelHeight]);
             size = [self getMediaMessageSizefromOriginalSize:originalImageSize withWidth:width];
             //This fixes the image being too small. I think the issue comes form the fact that the display is retina. This should probably be changed in the future.
-            size.height += CELL_MESSAGE_X_MARGIN;
+            size.height += 40;
+            size.width -= CELL_MESSAGE_X_MARGIN;
+            
+            if (![messageText isEqualToString:@"🗻"]) {
+                CGSize textSize = [self computeBoundingBox:messageText
+                                                      size:CGSizeMake(width - CELL_MESSAGE_X_MARGIN - 4, CGFLOAT_MAX)
+                                                      font:messageFont];
+                size.height += textSize.height;
+                size.width = MAX(textSize.width, size.width);
+            }
         }
 	}
     
@@ -424,10 +436,11 @@ static const CGFloat CELL_MESSAGE_Y_MARGIN = 52; // 44;
 
 + (CGSize)getMediaMessageSizefromOriginalSize:(CGSize)originalSize withWidth:(int)width {
     CGSize mediaSize = CGSizeMake(0, 0);
-    int availableWidth = width - CELL_MESSAGE_X_MARGIN;
+    int availableWidth = width;
     if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation])) {
         availableWidth = availableWidth /3;
     }
+    //availableWidth -= CELL_MESSAGE_X_MARGIN;
     int newHeight = originalSize.height;
     float originalAspectRatio = originalSize.width / originalSize.height;
     // We resize in width and crop in height