From 86df5ee459e282787e006ce6b470e41582ad55ca Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 10 Jan 2013 10:43:21 +0100
Subject: [PATCH] Few changes to the interface for improved Russian localized
 app

---
 res/layout-FR/chat.xml                        | 143 ++++++++++++++++++
 res/layout-RU/chat.xml                        | 143 ++++++++++++++++++
 res/layout-small/menu_about_chat_button.xml   |   2 +-
 .../menu_about_settings_button.xml            |   2 +-
 res/layout-small/menu_chat_button.xml         |   2 +-
 res/layout-small/menu_contact_button.xml      |   2 +-
 res/layout-small/menu_history_button.xml      |   2 +-
 res/layout-small/menu_settings_button.xml     |   2 +-
 res/layout/menu_about_chat_button.xml         |   2 +-
 res/layout/menu_about_settings_button.xml     |   2 +-
 res/layout/menu_chat_button.xml               |   2 +-
 res/layout/menu_contact_button.xml            |   2 +-
 res/layout/menu_history_button.xml            |   2 +-
 res/layout/menu_settings_button.xml           |   2 +-
 res/values-RU/strings.xml                     |   2 +-
 15 files changed, 299 insertions(+), 13 deletions(-)
 create mode 100644 res/layout-FR/chat.xml
 create mode 100644 res/layout-RU/chat.xml

diff --git a/res/layout-FR/chat.xml b/res/layout-FR/chat.xml
new file mode 100644
index 000000000..0261f0a39
--- /dev/null
+++ b/res/layout-FR/chat.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:linphone="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+  	android:background="@drawable/background"
+    android:orientation="vertical" >
+    
+    <LinearLayout 
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:paddingTop="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+	    android:gravity="center"
+	    android:orientation="horizontal">
+        
+        <org.linphone.ui.AvatarWithShadow
+		    android:id="@+id/contactPicture"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    linphone:picture="@drawable/unknown_small" />
+	        
+        <TextView
+            android:id="@+id/contactName"
+            android:paddingLeft="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+	    	android:textColor="@android:color/black" />
+        
+    </LinearLayout>
+    
+    <ScrollView 
+        android:id="@+id/chatScrollView"
+        android:paddingTop="5dp"
+        android:layout_weight="1"
+	    android:layout_width="match_parent"
+	    android:layout_height="0dip">
+    
+        <RelativeLayout
+	        android:id="@+id/messages"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:paddingLeft="10dp"
+		    android:paddingRight="10dp">
+            
+        </RelativeLayout>
+        
+    </ScrollView>
+    
+    <RelativeLayout 
+        android:id="@+id/messageLayout"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="horizontal"
+	    android:background="@drawable/chat_field_background">
+        
+        <TextView
+            android:id="@+id/sendPicture"
+            android:text="@string/button_send_picture"
+            android:gravity="center"
+            android:textColor="@drawable/text_color"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:drawableTop="@drawable/chat_send_picture"
+            android:paddingLeft="5dp" />
+        
+        <TextView
+            android:id="@+id/sendMessage"
+            android:text="@string/button_send_message"
+            android:gravity="center"
+            android:textColor="@drawable/text_color"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:drawableTop="@drawable/chat_send_message"
+            android:paddingRight="5dp" />
+        
+        <EditText
+            android:id="@+id/message"
+            android:inputType="textMultiLine"
+            android:maxLines="3"
+            android:textColor="@android:color/black"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/sendPicture"
+            android:layout_toLeftOf="@id/sendMessage"
+            android:background="@android:color/transparent"
+            android:padding="20dp"/>
+        
+    </RelativeLayout>
+    
+    <RelativeLayout 
+        android:id="@+id/uploadLayout"
+        android:visibility="gone"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="horizontal"
+	    android:background="@drawable/chat_progressbar_background">
+        
+        <ImageView 
+            android:contentDescription="@string/content_description_cancel"
+            android:id="@+id/cancelUpload"
+            android:src="@drawable/chat_stop_upload"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:layout_alignParentRight="true" />
+        
+        <LinearLayout 
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/cancelUpload"
+            android:layout_toLeftOf="@id/cancelUpload"
+            android:paddingBottom="20dp"
+            android:orientation="vertical"
+            android:gravity="center">
+            
+            <TextView
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+            	android:gravity="center"
+                android:text="@string/uploading_image"
+            	android:textColor="@android:color/black"/>
+            
+	        <ProgressBar
+	            android:id="@+id/progressbar"
+	            android:layout_width="match_parent"
+	            android:layout_height="15dp"
+	     		style="@android:style/Widget.ProgressBar.Horizontal"
+	            android:paddingTop="2dp"
+	            android:paddingLeft="2dp"
+	            android:paddingRight="2dp" />
+        
+        </LinearLayout>
+        
+    </RelativeLayout>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-RU/chat.xml b/res/layout-RU/chat.xml
new file mode 100644
index 000000000..71fa3e15f
--- /dev/null
+++ b/res/layout-RU/chat.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:linphone="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+  	android:background="@drawable/background"
+    android:orientation="vertical" >
+    
+    <LinearLayout 
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:paddingTop="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+	    android:gravity="center"
+	    android:orientation="horizontal">
+        
+        <org.linphone.ui.AvatarWithShadow
+		    android:id="@+id/contactPicture"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    linphone:picture="@drawable/unknown_small" />
+	        
+        <TextView
+            android:id="@+id/contactName"
+            android:paddingLeft="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+	    	android:textColor="@android:color/black" />
+        
+    </LinearLayout>
+    
+    <ScrollView 
+        android:id="@+id/chatScrollView"
+        android:paddingTop="5dp"
+        android:layout_weight="1"
+	    android:layout_width="match_parent"
+	    android:layout_height="0dip">
+    
+        <RelativeLayout
+	        android:id="@+id/messages"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:paddingLeft="10dp"
+		    android:paddingRight="10dp">
+            
+        </RelativeLayout>
+        
+    </ScrollView>
+    
+    <RelativeLayout 
+        android:id="@+id/messageLayout"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="horizontal"
+	    android:background="@drawable/chat_field_background">
+        
+        <TextView
+            android:id="@+id/sendPicture"
+            android:text="@string/button_send_picture"
+            android:gravity="center"
+            android:textColor="@drawable/text_color"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:drawableTop="@drawable/chat_send_picture"
+            android:paddingLeft="3dp" />
+        
+        <TextView
+            android:id="@+id/sendMessage"
+            android:text="@string/button_send_message"
+            android:gravity="center"
+            android:textColor="@drawable/text_color"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:drawableTop="@drawable/chat_send_message"
+            android:paddingRight="1dp" />
+        
+        <EditText
+            android:id="@+id/message"
+            android:inputType="textMultiLine"
+            android:maxLines="3"
+            android:textColor="@android:color/black"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/sendPicture"
+            android:layout_toLeftOf="@id/sendMessage"
+            android:background="@android:color/transparent"
+            android:padding="20dp"/>
+        
+    </RelativeLayout>
+    
+    <RelativeLayout 
+        android:id="@+id/uploadLayout"
+        android:visibility="gone"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="horizontal"
+	    android:background="@drawable/chat_progressbar_background">
+        
+        <ImageView 
+            android:contentDescription="@string/content_description_cancel"
+            android:id="@+id/cancelUpload"
+            android:src="@drawable/chat_stop_upload"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:layout_alignParentRight="true" />
+        
+        <LinearLayout 
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/cancelUpload"
+            android:layout_toLeftOf="@id/cancelUpload"
+            android:paddingBottom="20dp"
+            android:orientation="vertical"
+            android:gravity="center">
+            
+            <TextView
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+            	android:gravity="center"
+                android:text="@string/uploading_image"
+            	android:textColor="@android:color/black"/>
+            
+	        <ProgressBar
+	            android:id="@+id/progressbar"
+	            android:layout_width="match_parent"
+	            android:layout_height="15dp"
+	     		style="@android:style/Widget.ProgressBar.Horizontal"
+	            android:paddingTop="2dp"
+	            android:paddingLeft="2dp"
+	            android:paddingRight="2dp" />
+        
+        </LinearLayout>
+        
+    </RelativeLayout>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-small/menu_about_chat_button.xml b/res/layout-small/menu_about_chat_button.xml
index 2281d3aad..771ab8ed0 100644
--- a/res/layout-small/menu_about_chat_button.xml
+++ b/res/layout-small/menu_about_chat_button.xml
@@ -25,6 +25,6 @@
         android:paddingBottom="5dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_about"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-small/menu_about_settings_button.xml b/res/layout-small/menu_about_settings_button.xml
index 94b0e5774..b660a87de 100644
--- a/res/layout-small/menu_about_settings_button.xml
+++ b/res/layout-small/menu_about_settings_button.xml
@@ -25,6 +25,6 @@
         android:paddingBottom="5dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_about"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-small/menu_chat_button.xml b/res/layout-small/menu_chat_button.xml
index 95810bf35..5b86bbdd5 100644
--- a/res/layout-small/menu_chat_button.xml
+++ b/res/layout-small/menu_chat_button.xml
@@ -23,6 +23,6 @@
         android:paddingBottom="5dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_chat"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-small/menu_contact_button.xml b/res/layout-small/menu_contact_button.xml
index 3f4703f41..84c274880 100644
--- a/res/layout-small/menu_contact_button.xml
+++ b/res/layout-small/menu_contact_button.xml
@@ -24,6 +24,6 @@
         android:paddingBottom="5dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_contacts"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-small/menu_history_button.xml b/res/layout-small/menu_history_button.xml
index f9eac5f2b..2b391f6b1 100644
--- a/res/layout-small/menu_history_button.xml
+++ b/res/layout-small/menu_history_button.xml
@@ -23,6 +23,6 @@
         android:paddingBottom="5dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_history"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-small/menu_settings_button.xml b/res/layout-small/menu_settings_button.xml
index 6a596742d..060b56776 100644
--- a/res/layout-small/menu_settings_button.xml
+++ b/res/layout-small/menu_settings_button.xml
@@ -24,6 +24,6 @@
         android:paddingBottom="5dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_settings"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/menu_about_chat_button.xml b/res/layout/menu_about_chat_button.xml
index e2d57d72f..13c061450 100644
--- a/res/layout/menu_about_chat_button.xml
+++ b/res/layout/menu_about_chat_button.xml
@@ -25,6 +25,6 @@
         android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_about"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/menu_about_settings_button.xml b/res/layout/menu_about_settings_button.xml
index 9aaa7f926..573299c3f 100644
--- a/res/layout/menu_about_settings_button.xml
+++ b/res/layout/menu_about_settings_button.xml
@@ -25,6 +25,6 @@
         android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_about"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/menu_chat_button.xml b/res/layout/menu_chat_button.xml
index 98145c2f3..135cd8c14 100644
--- a/res/layout/menu_chat_button.xml
+++ b/res/layout/menu_chat_button.xml
@@ -23,6 +23,6 @@
         android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_chat"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/menu_contact_button.xml b/res/layout/menu_contact_button.xml
index 357232d94..def2a4161 100644
--- a/res/layout/menu_contact_button.xml
+++ b/res/layout/menu_contact_button.xml
@@ -24,6 +24,6 @@
         android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_contacts"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/menu_history_button.xml b/res/layout/menu_history_button.xml
index 01d624a13..7e1652ef0 100644
--- a/res/layout/menu_history_button.xml
+++ b/res/layout/menu_history_button.xml
@@ -23,6 +23,6 @@
         android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_history"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/menu_settings_button.xml b/res/layout/menu_settings_button.xml
index d03323c89..379b96605 100644
--- a/res/layout/menu_settings_button.xml
+++ b/res/layout/menu_settings_button.xml
@@ -24,6 +24,6 @@
         android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_settings"
-        android:textSize="13dp" />
+        android:textSize="12sp" />
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values-RU/strings.xml b/res/values-RU/strings.xml
index aef47e575..afc5572aa 100755
--- a/res/values-RU/strings.xml
+++ b/res/values-RU/strings.xml
@@ -366,7 +366,7 @@
 	<string name="button_options">Настройки</string>
 	
 	<string name="button_send_message">Послать</string>
-	<string name="button_send_picture">Картинка</string>
+	<string name="button_send_picture">Рис.</string>
 	<string name="uploading_image">Загружаем&#8230;</string>
 	
 	<string name="call_update_title">Запрошено обновление звонка</string>