From 1321d9d6d659db36880f14532603902ff24a339a Mon Sep 17 00:00:00 2001
From: DrKLO <drklo.2kb@gmail.com>
Date: Sat, 5 Apr 2014 04:38:10 +0400
Subject: [PATCH] Fixed lock position in secret chat placeholder for long
 strings

---
 .../ui/ChatProfileChangeNameActivity.java     |   2 +-
 .../layout-ar/encrypted_chat_placeholder.xml  | 130 ++++++++++++------
 .../res/layout/encrypted_chat_placeholder.xml |  74 ----------
 3 files changed, 90 insertions(+), 116 deletions(-)
 delete mode 100644 TMessagesProj/src/main/res/layout/encrypted_chat_placeholder.xml

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java
index ce3fb03e..c4f26ad6 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java
@@ -69,7 +69,7 @@ public class ChatProfileChangeNameActivity extends BaseFragment {
             firstNameField.setOnEditorActionListener(new TextView.OnEditorActionListener() {
                 @Override
                 public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
-                    if (i == EditorInfo.IME_ACTION_DONE) {
+                    if (i == EditorInfo.IME_ACTION_DONE && doneButton != null) {
                         doneButton.performClick();
                         return true;
                     }
diff --git a/TMessagesProj/src/main/res/layout-ar/encrypted_chat_placeholder.xml b/TMessagesProj/src/main/res/layout-ar/encrypted_chat_placeholder.xml
index cf38ff8d..c265685e 100644
--- a/TMessagesProj/src/main/res/layout-ar/encrypted_chat_placeholder.xml
+++ b/TMessagesProj/src/main/res/layout-ar/encrypted_chat_placeholder.xml
@@ -28,52 +28,100 @@
         android:layout_gravity="right"
         android:id="@+id/secret_title"/>
 
-    <TextView android:layout_height="wrap_content"
+    <LinearLayout
+        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:orientation="horizontal"
         android:layout_marginTop="8dp"
-        android:maxWidth="260dp"
-        android:gravity="center_vertical|right"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:layout_gravity="right"
-        android:id="@+id/secret_description1"
-        android:drawableRight="@drawable/ic_lock_white"
-        android:drawablePadding="8dp"/>
+        android:layout_gravity="right">
 
-    <TextView android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="4dp"
-        android:maxWidth="260dp"
-        android:gravity="center_vertical|right"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:layout_gravity="right"
-        android:id="@+id/secret_description2"
-        android:drawableRight="@drawable/ic_lock_white"
-        android:drawablePadding="8dp"/>
+        <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:maxWidth="260dp"
+            android:gravity="center_vertical|right"
+            android:textColor="#ffffff"
+            android:textSize="15dp"
+            android:id="@+id/secret_description1"/>
 
-    <TextView android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="4dp"
-        android:maxWidth="260dp"
-        android:gravity="center_vertical|right"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:layout_gravity="right"
-        android:id="@+id/secret_description3"
-        android:drawableRight="@drawable/ic_lock_white"
-        android:drawablePadding="8dp"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_lock_white"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="3dp"/>
 
-    <TextView android:layout_height="wrap_content"
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginTop="4dp"
-        android:maxWidth="260dp"
-        android:gravity="center_vertical|right"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:layout_gravity="right"
-        android:id="@+id/secret_description4"
-        android:drawableRight="@drawable/ic_lock_white"
-        android:drawablePadding="8dp" />
+        android:orientation="horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_gravity="right">
+
+        <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:maxWidth="260dp"
+            android:gravity="center_vertical|right"
+            android:textColor="#ffffff"
+            android:textSize="15dp"
+            android:id="@+id/secret_description2"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_lock_white"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="3dp"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_gravity="right">
+
+        <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:maxWidth="260dp"
+            android:gravity="center_vertical|right"
+            android:textColor="#ffffff"
+            android:textSize="15dp"
+            android:id="@+id/secret_description3"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_lock_white"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="3dp"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_gravity="right">
+
+        <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:maxWidth="260dp"
+            android:gravity="center_vertical|right"
+            android:textColor="#ffffff"
+            android:textSize="15dp"
+            android:id="@+id/secret_description4"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_lock_white"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="3dp"/>
+
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout/encrypted_chat_placeholder.xml b/TMessagesProj/src/main/res/layout/encrypted_chat_placeholder.xml
deleted file mode 100644
index a820c0e3..00000000
--- a/TMessagesProj/src/main/res/layout/encrypted_chat_placeholder.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:layout_gravity="center"
-    android:padding="20dp"
-    android:layout_centerInParent="true"
-    android:id="@+id/secret_placeholder"
-    android:orientation="vertical"
-    android:visibility="gone"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:id="@+id/invite_text"
-        android:maxWidth="210dp"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center_horizontal"
-        android:textColor="#ffffff"
-        android:textSize="15dp"/>
-
-    <TextView android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="8dp"
-        android:maxWidth="260dp"
-        android:gravity="center_horizontal"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:id="@+id/secret_title"/>
-
-    <TextView android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="8dp"
-        android:maxWidth="260dp"
-        android:gravity="center_vertical"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:id="@+id/secret_description1"
-        android:drawableLeft="@drawable/ic_lock_white"
-        android:drawablePadding="8dp"/>
-
-    <TextView android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="4dp"
-        android:maxWidth="260dp"
-        android:gravity="center_vertical"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:id="@+id/secret_description2"
-        android:drawableLeft="@drawable/ic_lock_white"
-        android:drawablePadding="8dp"/>
-
-    <TextView android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="4dp"
-        android:maxWidth="260dp"
-        android:gravity="center_vertical"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:id="@+id/secret_description3"
-        android:drawableLeft="@drawable/ic_lock_white"
-        android:drawablePadding="8dp"/>
-
-    <TextView android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="4dp"
-        android:maxWidth="260dp"
-        android:gravity="center_vertical"
-        android:textColor="#ffffff"
-        android:textSize="15dp"
-        android:id="@+id/secret_description4"
-        android:drawableLeft="@drawable/ic_lock_white"
-        android:drawablePadding="8dp" />
-
-</LinearLayout>
\ No newline at end of file