From 5149a6d890ccef62f7323a3175421fbc78209488 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI <guitreize@gmail.com>
Date: Sat, 17 Jan 2015 23:00:34 +0100
Subject: [PATCH] Some accessibility fixes in Chat room

---
 Classes/Base.lproj/ChatRoomViewController.xib    |  3 +++
 Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib |  4 ++++
 Classes/LinphoneUI/UIChatRoomCell.m              | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Classes/Base.lproj/ChatRoomViewController.xib b/Classes/Base.lproj/ChatRoomViewController.xib
index 40fd59fd9..d80a70a26 100644
--- a/Classes/Base.lproj/ChatRoomViewController.xib
+++ b/Classes/Base.lproj/ChatRoomViewController.xib
@@ -174,6 +174,9 @@
                                     <rect key="frame" x="39" y="12" width="218" height="33"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    <accessibility key="accessibilityConfiguration" label="Message field">
+                                        <bool key="isElement" value="YES"/>
+                                    </accessibility>
                                 </view>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
index 28099191d..e525d95a6 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
@@ -45,6 +45,7 @@
                                     <rect key="frame" x="-8" y="-11" width="310" height="126"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    <accessibility key="accessibilityConfiguration" label="Chat Message"/>
                                     <color key="textColor" red="0.35686275360000003" green="0.3960784376" blue="0.43529412150000002" alpha="1" colorSpace="deviceRGB"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -79,6 +80,9 @@
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="chat_message_not_delivered.png" id="26" userLabel="status">
                             <rect key="frame" x="284" y="104" width="10" height="10"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                            <accessibility key="accessibilityConfiguration" label="Message status">
+                                <bool key="isElement" value="YES"/>
+                            </accessibility>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="18" userLabel="deleteButton">
                             <rect key="frame" x="250" y="0.0" width="44" height="44"/>
diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m
index 2686ce099..2ffa9a7e2 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.m
+++ b/Classes/LinphoneUI/UIChatRoomCell.m
@@ -197,17 +197,21 @@ static UIFont *CELL_FONT = nil;
     [dateFormatter release];
 
     LinphoneChatMessageState state = linphone_chat_message_get_state(chat);
+    BOOL outgoing = linphone_chat_message_is_outgoing(chat);
 
-    if( !linphone_chat_message_is_outgoing(chat) ){
+    if( !outgoing ){
         statusImage.hidden = TRUE; // not useful for incoming chats..
     } else if (state== LinphoneChatMessageStateInProgress) {
 		[statusImage setImage:[UIImage imageNamed:@"chat_message_inprogress.png"]];
+        [statusImage setAccessibilityValue:@"in progress"];
 		statusImage.hidden = FALSE;
 	} else if (state == LinphoneChatMessageStateDelivered) {
 		[statusImage setImage:[UIImage imageNamed:@"chat_message_delivered.png"]];
+        [statusImage setAccessibilityValue:@"delivered"];
 		statusImage.hidden = FALSE;
 	} else {
 		[statusImage setImage:[UIImage imageNamed:@"chat_message_not_delivered.png"]];
+        [statusImage setAccessibilityValue:@"not delivered"];
 		statusImage.hidden = FALSE;
 
         NSAttributedString* resend_text = [[NSAttributedString alloc]
@@ -216,6 +220,13 @@ static UIFont *CELL_FONT = nil;
         [dateLabel setAttributedText:resend_text];
         [resend_text release];
 	}
+    
+    if( outgoing){
+        [messageText setAccessibilityLabel:@"Outgoing message"];
+    } else {
+        [messageText setAccessibilityLabel:@"Incoming message"];
+    }
+    
 }
 
 - (void)setEditing:(BOOL)editing {