OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 06:25:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed lock position in secret chat placeholder for long strings

Browse source
This commit is contained in:
DrKLO 2014-04-05 04:38:10 +04:00
parent d0a686fccb
commit 1321d9d6d6
3 changed files with 90 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java
View file

@ -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;
}

130
TMessagesProj/src/main/res/layout-ar/encrypted_chat_placeholder.xml
View file

@ -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>

74
TMessagesProj/src/main/res/layout/encrypted_chat_placeholder.xml
View file

@ -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>