From 9523311674d919efbaab278f2b2670e7bda15fb8 Mon Sep 17 00:00:00 2001
From: DrKLO <drklo.2kb@gmail.com>
Date: Tue, 25 Mar 2014 01:10:35 +0400
Subject: [PATCH] Update group chat creation interface

---
 TMessagesProj/build.gradle                    |   4 +-
 .../messenger/ConnectionsManager.java         |   3 +-
 .../messenger/ContactsController.java         |  34 +++----
 .../telegram/messenger/MessagesStorage.java   |   2 +-
 .../org/telegram/messenger/NativeLoader.java  |  16 ++-
 .../org/telegram/messenger/TcpConnection.java |  11 +-
 .../org/telegram/messenger/Utilities.java     |   2 +-
 .../ui/Adapters/ContactsActivityAdapter.java  |   8 +-
 .../org/telegram/ui/Cells/ChatOrUserCell.java |  47 ++++-----
 .../org/telegram/ui/ChatProfileActivity.java  |   1 -
 .../org/telegram/ui/GroupCreateActivity.java  |  50 ++++-----
 .../telegram/ui/GroupCreateFinalActivity.java |   2 +-
 .../java/org/telegram/ui/LaunchActivity.java  |   2 +-
 .../org/telegram/ui/SettingsBlockedUsers.java |   1 -
 .../color/chat_create_bubble_text_states.xml  |   8 --
 .../btn_check_off_pressed_holo_light.png      | Bin 2053 -> 0 bytes
 .../btn_check_on_pressed_holo_light.png       | Bin 2493 -> 0 bytes
 .../drawable-hdpi/compose_bubble_down.9.png   | Bin 195 -> 0 bytes
 .../res/drawable-hdpi/compose_bubble_up.9.png | Bin 192 -> 0 bytes
 .../btn_check_off_pressed_holo_light.png      | Bin 1634 -> 0 bytes
 .../btn_check_on_pressed_holo_light.png       | Bin 1946 -> 0 bytes
 .../drawable-mdpi/compose_bubble_down.9.png   | Bin 153 -> 0 bytes
 .../res/drawable-mdpi/compose_bubble_up.9.png | Bin 147 -> 0 bytes
 .../btn_check_off_pressed_holo_light.png      | Bin 2492 -> 0 bytes
 .../btn_check_on_pressed_holo_light.png       | Bin 3077 -> 0 bytes
 .../drawable-xhdpi/compose_bubble_down.9.png  | Bin 222 -> 0 bytes
 .../drawable-xhdpi/compose_bubble_up.9.png    | Bin 215 -> 0 bytes
 .../btn_check_off_pressed_holo_light.png      | Bin 3482 -> 0 bytes
 .../btn_check_on_pressed_holo_light.png       | Bin 4306 -> 0 bytes
 .../drawable-xxhdpi/compose_bubble_down.9.png | Bin 340 -> 0 bytes
 .../drawable-xxhdpi/compose_bubble_up.9.png   | Bin 321 -> 0 bytes
 .../main/res/drawable/btn_check_off_old.xml   |   8 --
 .../main/res/drawable/btn_check_on_old.xml    |   8 --
 .../drawable/chat_create_bubble_states.xml    |   5 -
 .../layout-ar/group_create_final_layout.xml   |  77 +++++++-------
 .../res/layout-ar/group_create_layout.xml     |  14 +--
 .../res/layout-ar/group_create_row_layout.xml |  96 +++++++++---------
 .../chat_profile_change_name_layout.xml       |   6 +-
 .../main/res/layout/group_create_bubble.xml   |  18 ++--
 .../res/layout/group_create_done_layout.xml   |   5 +-
 .../res/layout/group_create_final_layout.xml  |  77 +++++++-------
 .../main/res/layout/group_create_layout.xml   |  15 +--
 .../res/layout/group_create_row_layout.xml    |  92 +++++++++--------
 43 files changed, 289 insertions(+), 323 deletions(-)
 delete mode 100644 TMessagesProj/src/main/res/color/chat_create_bubble_text_states.xml
 delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_light.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_light.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/compose_bubble_down.9.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/compose_bubble_up.9.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_light.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_light.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/compose_bubble_down.9.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/compose_bubble_up.9.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_light.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_light.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/compose_bubble_down.9.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/compose_bubble_up.9.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/btn_check_off_pressed_holo_light.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/btn_check_on_pressed_holo_light.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/compose_bubble_down.9.png
 delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/compose_bubble_up.9.png
 delete mode 100644 TMessagesProj/src/main/res/drawable/btn_check_off_old.xml
 delete mode 100644 TMessagesProj/src/main/res/drawable/btn_check_on_old.xml
 delete mode 100644 TMessagesProj/src/main/res/drawable/chat_create_bubble_states.xml

diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 1f1941ed..faff78e8 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -82,7 +82,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 19
-        versionCode 208
-        versionName "1.4.7"
+        versionCode 209
+        versionName "1.4.8"
     }
 }
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java b/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
index 7e29e497..9eac980f 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
@@ -479,7 +479,6 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
         processedMessageIdsSet.remove(sessionId);
         nextSeqNoInSession.remove(sessionId);
         processedSessionChanges.remove(sessionId);
-        pingIdToDate.remove(sessionId);
 
         if (sessionId == datacenter.authSessionId) {
             clearRequestsForRequestClass(RPCRequest.RPCRequestClassGeneric, datacenter);
@@ -858,7 +857,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
             }
         } catch(Exception e) {
             FileLog.e("tmessages", e);
-            return false;
+            return true;
         }
         return status;
     }
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
index 37da471a..65b334bd 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
@@ -592,9 +592,9 @@ public class ContactsController {
                     if (!toImport.isEmpty()) {
                         if (BuildVars.DEBUG_VERSION) {
                             FileLog.e("tmessages", "start import contacts");
-                            for (TLRPC.TL_inputPhoneContact contact : toImport) {
-                                FileLog.e("tmessages", "add contact " + contact.first_name + " " + contact.last_name + " " + contact.phone);
-                            }
+//                            for (TLRPC.TL_inputPhoneContact contact : toImport) {
+//                                FileLog.e("tmessages", "add contact " + contact.first_name + " " + contact.last_name + " " + contact.phone);
+//                            }
                         }
                         final int count = (int)Math.ceil(toImport.size() / 500.0f);
                         for (int a = 0; a < count; a++) {
@@ -614,9 +614,9 @@ public class ContactsController {
                                         }
                                         TLRPC.TL_contacts_importedContacts res = (TLRPC.TL_contacts_importedContacts)response;
                                         if (BuildVars.DEBUG_VERSION) {
-                                            for (TLRPC.User user : res.users) {
-                                                FileLog.e("tmessages", "received user " + user.first_name + " " + user.last_name + " " + user.phone);
-                                            }
+//                                            for (TLRPC.User user : res.users) {
+//                                                FileLog.e("tmessages", "received user " + user.first_name + " " + user.last_name + " " + user.phone);
+//                                            }
                                         }
                                         MessagesStorage.getInstance().putUsersAndChats(res.users, null, true, true);
                                         ArrayList<TLRPC.TL_contact> cArr = new ArrayList<TLRPC.TL_contact>();
@@ -776,9 +776,9 @@ public class ContactsController {
                     if (user != null) {
                         usersDict.put(user.id, user);
 
-                        if (BuildVars.DEBUG_VERSION) {
-                            FileLog.e("tmessages", "loaded user contact " + user.first_name + " " + user.last_name + " " + user.phone);
-                        }
+//                        if (BuildVars.DEBUG_VERSION) {
+//                            FileLog.e("tmessages", "loaded user contact " + user.first_name + " " + user.last_name + " " + user.phone);
+//                        }
                     }
                 }
 
@@ -1398,9 +1398,9 @@ public class ContactsController {
         contactsParams.add(c);
         req.contacts = contactsParams;
         req.replace = false;
-        if (BuildVars.DEBUG_VERSION) {
-            FileLog.e("tmessages", "add contact " + user.first_name + " " + user.last_name + " " + user.phone);
-        }
+//        if (BuildVars.DEBUG_VERSION) {
+//            FileLog.e("tmessages", "add contact " + user.first_name + " " + user.last_name + " " + user.phone);
+//        }
         ConnectionsManager.getInstance().performRpc(req, new RPCRequest.RPCRequestDelegate() {
             @Override
             public void run(TLObject response, TLRPC.TL_error error) {
@@ -1410,11 +1410,11 @@ public class ContactsController {
                 final TLRPC.TL_contacts_importedContacts res = (TLRPC.TL_contacts_importedContacts)response;
                 MessagesStorage.getInstance().putUsersAndChats(res.users, null, true, true);
 
-                if (BuildVars.DEBUG_VERSION) {
-                    for (TLRPC.User user : res.users) {
-                        FileLog.e("tmessages", "received user " + user.first_name + " " + user.last_name + " " + user.phone);
-                    }
-                }
+//                if (BuildVars.DEBUG_VERSION) {
+//                    for (TLRPC.User user : res.users) {
+//                        FileLog.e("tmessages", "received user " + user.first_name + " " + user.last_name + " " + user.phone);
+//                    }
+//                }
 
                 for (final TLRPC.User u : res.users) {
                     Utilities.globalQueue.postRunnable(new Runnable() {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
index bf4f3c4c..446e37ae 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
@@ -63,7 +63,7 @@ public class MessagesStorage {
 
     public void openDatabase() {
         NativeLoader.initNativeLibs(ApplicationLoader.applicationContext);
-        
+
         cacheFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "cache4.db");
 
         SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("dbconfig", Context.MODE_PRIVATE);
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/NativeLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/NativeLoader.java
index e07bb636..872d3e3d 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/NativeLoader.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/NativeLoader.java
@@ -34,7 +34,6 @@ public class NativeLoader {
         if (nativeLoaded) {
             return;
         }
-        nativeLoaded = true;
 
         if (Build.VERSION.SDK_INT >= 9) {
             try {
@@ -57,6 +56,7 @@ public class NativeLoader {
                     libSize = sizes[3];
                 } else {
                     System.loadLibrary("tmessages");
+                    nativeLoaded = true;
                     Log.e("tmessages", "Unsupported arch: " + Build.CPU_ABI);
                     return;
                 }
@@ -66,6 +66,7 @@ public class NativeLoader {
                     Log.d("tmessages", "Load normal lib");
                     try {
                         System.loadLibrary("tmessages");
+                        nativeLoaded = true;
                         return;
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -75,9 +76,14 @@ public class NativeLoader {
                 File destLocalFile = new File(context.getFilesDir().getAbsolutePath() + "/libtmessages.so");
                 if (destLocalFile.exists()) {
                     if (destLocalFile.length() == libSize) {
-                        Log.d("tmessages", "Load local lib");
-                        System.load(destLocalFile.getAbsolutePath());
-                        return;
+                        try {
+                            Log.d("tmessages", "Load local lib");
+                            System.load(destLocalFile.getAbsolutePath());
+                            nativeLoaded = true;
+                            return;
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     } else {
                         destLocalFile.delete();
                     }
@@ -105,6 +111,7 @@ public class NativeLoader {
                     out.close();
 
                     System.load(destLocalFile.getAbsolutePath());
+                    nativeLoaded = true;
                     return;
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -130,5 +137,6 @@ public class NativeLoader {
         }
 
         System.loadLibrary("tmessages");
+        nativeLoaded = true;
     }
 }
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java b/TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java
index 65a414d5..c819424c 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java
@@ -60,6 +60,7 @@ public class TcpConnection extends PyroClientAdapter {
     private boolean firstPacket;
 
     private Timer reconnectTimer;
+    private boolean tryWithNoNetworkAnyway = false;
 
     public TcpConnection(int did) {
         if (selector == null) {
@@ -90,9 +91,13 @@ public class TcpConnection extends PyroClientAdapter {
 
                 connectionState = TcpConnectionState.TcpConnectionStageConnecting;
                 try {
-                    if (!ConnectionsManager.isNetworkOnline()) {
-                        handleConnectionError(null);
-                        return;
+                    if(android.os.Build.VERSION.SDK_INT < 11) {
+                        if (!ConnectionsManager.isNetworkOnline() && !tryWithNoNetworkAnyway) {
+                            handleConnectionError(null);
+                            tryWithNoNetworkAnyway = true;
+                            return;
+                        }
+                        tryWithNoNetworkAnyway = false;
                     }
                     try {
                         synchronized (timerSync) {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java b/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
index ae81c160..96a902fc 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
@@ -941,7 +941,7 @@ public class Utilities {
         } else if (result.length() != 0 && lastName.length() != 0) {
             result += " " + lastName;
         }
-        return result;
+        return result.trim();
     }
 
     public static String formatFileSize(long size) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivityAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivityAdapter.java
index d46c4982..f341e93a 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivityAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivityAdapter.java
@@ -9,7 +9,6 @@
 package org.telegram.ui.Adapters;
 
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -114,7 +113,6 @@ public class ContactsActivityAdapter extends SectionedBaseAdapter {
         if (user != null) {
             if (convertView == null) {
                 convertView = new ChatOrUserCell(mContext);
-                ((ChatOrUserCell)convertView).useBoldFont = true;
                 ((ChatOrUserCell)convertView).usePadding = false;
             }
 
@@ -153,11 +151,11 @@ public class ContactsActivityAdapter extends SectionedBaseAdapter {
             }
         }
         if (contact.first_name != null && contact.last_name != null) {
-            textView.setText(Html.fromHtml(contact.first_name + " <b>" + contact.last_name + "</b>"));
+            textView.setText(contact.first_name + " " + contact.last_name);
         } else if (contact.first_name != null && contact.last_name == null) {
-            textView.setText(Html.fromHtml("<b>" + contact.first_name + "</b>"));
+            textView.setText(contact.first_name);
         } else {
-            textView.setText(Html.fromHtml("<b>" + contact.last_name + "</b>"));
+            textView.setText(contact.last_name);
         }
         return convertView;
     }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java
index bbab9c69..48fa5664 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java
@@ -12,7 +12,6 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
-import android.text.Html;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
@@ -55,7 +54,6 @@ public class ChatOrUserCell extends BaseCell {
     private TLRPC.FileLocation lastAvatar = null;
 
     public boolean usePadding = true;
-    public boolean useBoldFont = false;
     public boolean useSeparator = false;
     public float drawAlpha = 1;
 
@@ -294,39 +292,30 @@ public class ChatOrUserCell extends BaseCell {
             if (currentName != null) {
                 nameString = currentName;
             } else {
-                if (useBoldFont) {
-                    if (user != null) {
-                        if (user.first_name.length() != 0 && user.last_name.length() != 0) {
-                            nameString = Html.fromHtml(user.first_name + " <b>" + user.last_name + "</b>");
-                        } else if (user.first_name.length() != 0) {
-                            nameString = Html.fromHtml("<b>" + user.first_name + "</b>");
-                        } else {
-                            nameString = Html.fromHtml("<b>" + user.last_name + "</b>");
-                        }
-                    }
-                } else {
-                    String nameString2 = "";
-                    if (chat != null) {
-                        nameString2 = chat.title;
-                    } else if (user != null) {
-                        if (user.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(user.id) == null) {
-                            if (ContactsController.getInstance().contactsDict.size() == 0 && ContactsController.getInstance().loadingContacts) {
-                                nameString2 = Utilities.formatName(user.first_name, user.last_name);
-                            } else {
-                                if (user.phone != null && user.phone.length() != 0) {
-                                    nameString2 = PhoneFormat.getInstance().format("+" + user.phone);
-                                } else {
-                                    nameString2 = Utilities.formatName(user.first_name, user.last_name);
-                                }
-                            }
-                        } else {
+                String nameString2 = "";
+                if (chat != null) {
+                    nameString2 = chat.title;
+                } else if (user != null) {
+                    if (user.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(user.id) == null) {
+                        if (ContactsController.getInstance().contactsDict.size() == 0 && ContactsController.getInstance().loadingContacts) {
                             nameString2 = Utilities.formatName(user.first_name, user.last_name);
+                        } else {
+                            if (user.phone != null && user.phone.length() != 0) {
+                                nameString2 = PhoneFormat.getInstance().format("+" + user.phone);
+                            } else {
+                                nameString2 = Utilities.formatName(user.first_name, user.last_name);
+                            }
                         }
+                    } else {
+                        nameString2 = Utilities.formatName(user.first_name, user.last_name);
                     }
-                    nameString = nameString2.replace("\n", " ");
                 }
+                nameString = nameString2.replace("\n", " ");
             }
             if (nameString.length() == 0) {
+                if (user.phone != null && user.phone.length() != 0) {
+                    nameString = PhoneFormat.getInstance().format("+" + user.phone);
+                }
                 nameString = LocaleController.getString("HiddenName", R.string.HiddenName);
             }
             if (encryptedChat != null) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
index 726a118c..0d845f2b 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
@@ -684,7 +684,6 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
 
                 if (view == null) {
                     view = new ChatOrUserCell(mContext);
-                    ((ChatOrUserCell)view).useBoldFont = true;
                     ((ChatOrUserCell)view).usePadding = false;
                     ((ChatOrUserCell)view).useSeparator = true;
                 }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
index 3015e4ca..42de51de 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
@@ -18,7 +18,6 @@ import android.os.Bundle;
 import android.support.v4.internal.view.SupportMenuItem;
 import android.support.v7.app.ActionBar;
 import android.text.Editable;
-import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -35,6 +34,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.telegram.PhoneFormat.PhoneFormat;
 import org.telegram.messenger.LocaleController;
 import org.telegram.messenger.TLRPC;
 import org.telegram.messenger.ConnectionsManager;
@@ -60,9 +60,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
     private SectionedBaseAdapter listViewAdapter;
     private PinnedHeaderListView listView;
     private TextView epmtyTextView;
-    private TextView doneTextView;
     private EditText userSelectEditText;
-    private TextView countTextView;
     private boolean ignoreChange = false;
 
     private HashMap<Integer, Emoji.XImageSpan> selectedContacts =  new HashMap<Integer, Emoji.XImageSpan>();
@@ -117,7 +115,6 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
             epmtyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts));
             userSelectEditText = (EditText)fragmentView.findViewById(R.id.bubble_input_text);
             userSelectEditText.setHint(LocaleController.getString("SendMessageTo", R.string.SendMessageTo));
-            countTextView = (TextView)fragmentView.findViewById(R.id.bubble_counter_text);
             if (Build.VERSION.SDK_INT >= 11) {
                 userSelectEditText.setTextIsSelectable(false);
             }
@@ -159,12 +156,10 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
                                         selectedContacts.remove(sp.uid);
                                     }
                                 }
-                                if (selectedContacts.isEmpty()) {
-                                    doneTextView.setText(LocaleController.getString("Done", R.string.Done));
-                                } else {
-                                    doneTextView.setText(LocaleController.getString("Done", R.string.Done) + " (" + selectedContacts.size() + ")");
+                                if (parentActivity != null) {
+                                    ActionBar actionBar = parentActivity.getSupportActionBar();
+                                    actionBar.setSubtitle(String.format("%d/200 %s", selectedContacts.size(), LocaleController.getString("Members", R.string.Members)));
                                 }
-                                countTextView.setText(selectedContacts.size() + "/200");
                                 listView.invalidateViews();
                             } else {
                                 search = true;
@@ -230,12 +225,10 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
                         span.uid = user.id;
                         ignoreChange = false;
                     }
-                    if (selectedContacts.isEmpty()) {
-                        doneTextView.setText(LocaleController.getString("Done", R.string.Done));
-                    } else {
-                        doneTextView.setText(LocaleController.getString("Done", R.string.Done) + " (" + selectedContacts.size() + ")");
+                    if (parentActivity != null) {
+                        ActionBar actionBar = parentActivity.getSupportActionBar();
+                        actionBar.setSubtitle(String.format("%d/200 %s", selectedContacts.size(), LocaleController.getString("Members", R.string.Members)));
                     }
-                    countTextView.setText(selectedContacts.size() + "/200");
                     if (searching || searchWas) {
                         searching = false;
                         searchWas = false;
@@ -279,6 +272,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
         actionBar.setDisplayShowCustomEnabled(false);
         actionBar.setCustomView(null);
         actionBar.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
+        actionBar.setSubtitle(String.format("%d/200 %s", selectedContacts.size(), LocaleController.getString("Members", R.string.Members)));
 
         TextView title = (TextView)parentActivity.findViewById(R.id.action_bar_title);
         if (title == null) {
@@ -305,7 +299,11 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
         LayoutInflater lf = (LayoutInflater)parentActivity.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
         View textView = lf.inflate(R.layout.group_create_bubble, null);
         TextView text = (TextView)textView.findViewById(R.id.bubble_text_view);
-        text.setText(Utilities.formatName(user.first_name, user.last_name));
+        String name = Utilities.formatName(user.first_name, user.last_name);
+        if (name.length() == 0 && user.phone != null && user.phone.length() != 0) {
+            name = PhoneFormat.getInstance().format("+" + user.phone);
+        }
+        text.setText(name + ", ");
 
         int spec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
         textView.measure(spec, spec);
@@ -425,8 +423,8 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.group_create_menu, menu);
         SupportMenuItem doneItem = (SupportMenuItem)menu.findItem(R.id.done_menu_item);
-        doneTextView = (TextView)doneItem.getActionView().findViewById(R.id.done_button);
-        doneTextView.setText(LocaleController.getString("Done", R.string.Done));
+        TextView doneTextView = (TextView)doneItem.getActionView().findViewById(R.id.done_button);
+        doneTextView.setText(LocaleController.getString("Next", R.string.Next));
         doneTextView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -525,9 +523,9 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
 
             ImageView checkButton = (ImageView)convertView.findViewById(R.id.settings_row_check_button);
             if (selectedContacts.containsKey(user.id)) {
-                checkButton.setImageResource(R.drawable.btn_check_on_old);
+                checkButton.setImageResource(R.drawable.btn_check_on_holo_light);
             } else {
-                checkButton.setImageResource(R.drawable.btn_check_off_old);
+                checkButton.setImageResource(R.drawable.btn_check_off_holo_light);
             }
 
             View divider = convertView.findViewById(R.id.settings_row_divider);
@@ -540,13 +538,15 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
             if (searchWas && searching) {
                 holder.nameTextView.setText(searchResultNames.get(position));
             } else {
-                if (user.first_name.length() != 0 && user.last_name.length() != 0) {
-                    holder.nameTextView.setText(Html.fromHtml(user.first_name + " <b>" + user.last_name + "</b>"));
-                } else if (user.first_name.length() != 0) {
-                    holder.nameTextView.setText(Html.fromHtml("<b>" + user.first_name + "</b>"));
-                } else {
-                    holder.nameTextView.setText(Html.fromHtml("<b>" + user.last_name + "</b>"));
+                String name = Utilities.formatName(user.first_name, user.last_name);
+                if (name.length() == 0) {
+                    if (user.phone != null && user.phone.length() != 0) {
+                        name = PhoneFormat.getInstance().format("+" + user.phone);
+                    } else {
+                        name = LocaleController.getString("HiddenName", R.string.HiddenName);
+                    }
                 }
+                holder.nameTextView.setText(name);
             }
 
             TLRPC.FileLocation photo = null;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
index e01022b6..79438d06 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
@@ -148,6 +148,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
         actionBar.setDisplayUseLogoEnabled(false);
         actionBar.setDisplayShowCustomEnabled(false);
         actionBar.setCustomView(null);
+        actionBar.setSubtitle(null);
         actionBar.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
 
         TextView title = (TextView)parentActivity.findViewById(R.id.action_bar_title);
@@ -346,7 +347,6 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
 
             if (convertView == null) {
                 convertView = new ChatOrUserCell(mContext);
-                ((ChatOrUserCell)convertView).useBoldFont = true;
                 ((ChatOrUserCell)convertView).usePadding = false;
             }
 
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
index b7dc4a5d..0b003f29 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
@@ -86,7 +86,7 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
 
         if (!UserConfig.clientActivated) {
             Intent intent = getIntent();
-            if (intent != null && intent.getAction() != null && Intent.ACTION_SEND.equals(intent.getAction()) || intent.getAction().equals(Intent.ACTION_SEND_MULTIPLE)) {
+            if (intent != null && intent.getAction() != null && (Intent.ACTION_SEND.equals(intent.getAction()) || intent.getAction().equals(Intent.ACTION_SEND_MULTIPLE))) {
                 finish();
                 return;
             }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java
index eb284c45..237ef028 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java
@@ -386,7 +386,6 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe
             if (type == 0) {
                 if (view == null) {
                     view = new ChatOrUserCell(mContext);
-                    ((ChatOrUserCell)view).useBoldFont = true;
                     ((ChatOrUserCell)view).usePadding = false;
                     ((ChatOrUserCell)view).useSeparator = true;
                 }
diff --git a/TMessagesProj/src/main/res/color/chat_create_bubble_text_states.xml b/TMessagesProj/src/main/res/color/chat_create_bubble_text_states.xml
deleted file mode 100644
index 36e36ca5..00000000
--- a/TMessagesProj/src/main/res/color/chat_create_bubble_text_states.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:color="#ffffff" />
-    <item android:state_focused="true" android:color="#ffffff" />
-    <item android:state_selected="true" android:color="#ffffff" />
-    <item android:color="#035ea8" />
-</selector>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_light.png b/TMessagesProj/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_light.png
deleted file mode 100644
index 0f54a35b148d10b4339e04ca6dc55dd1f639b873..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2053
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
E12EbvZvX%Q

diff --git a/TMessagesProj/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_light.png b/TMessagesProj/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_light.png
deleted file mode 100644
index d4ce43712f59b53887bb49bf430ff4552fa43868..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2493
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

diff --git a/TMessagesProj/src/main/res/drawable-hdpi/compose_bubble_down.9.png b/TMessagesProj/src/main/res/drawable-hdpi/compose_bubble_down.9.png
deleted file mode 100644
index b298d4ccd8d400ccf3c4117b951d6c66a22fa89e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^3P5bc!3HF4Q*NdJsV+|!$B>F!Z*N+2H5drEUVL*h
zNV<9Vm(3a*H*WCwwlLXcQCO3}q=xbbrkD2wpV#<mC!}%nT<2=*;8*wb^n^6MFVB9(
zwBxAE#yjbCOe(Gn6%9Z$(ZLVf2JM@S5yA}H)DwIdB;F^NW^>uz(2Uyo+RCcf;;HwG
d<42ymALBct7xd+>{OM^R?VhfFF6*2UngF(qM4SKs

diff --git a/TMessagesProj/src/main/res/drawable-hdpi/compose_bubble_up.9.png b/TMessagesProj/src/main/res/drawable-hdpi/compose_bubble_up.9.png
deleted file mode 100644
index 5f65aa7e0f8a58a488c229c5d31418edfa31fe51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^3P5bc!3HF4Q*NdJsdi5n$B>F!Z*N+2H5iDvTzqpf
z===Rlmz<y-43DKsd<5*LDtIVW$otqXpO=2-@5`k%-^}L7hDNPdbm=tO5_gsJLlNic
z?>n>|ESVD6Ie_M&fdlUu*Q5v<q%-KSFZlQ>h&kyw;|g`rvY`1q0=tr)i!ZC$`*%jg
bpA!*`N%d_9Cm!*%2I=>7^>bP0l+XkKc?Lj4

diff --git a/TMessagesProj/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_light.png b/TMessagesProj/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_light.png
deleted file mode 100644
index 4c358b6c77dcb5c93615227c2fb8d4dbce4a4254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1634
zcmbVMYfuwc6kaeQP;3<xEmYYqGHRR6W;Y2Wfrx>Ci5Sd;P^ho6$!^FNvKx}cJbV-%
zXe($zs<a(Mozg<lL5tb~>NM6`w9Z89hzdoqwKFJ+R*Q_b)ON$e_J`vScV_qAbMN`i
z`Oa%U&}A-|7#bA{0Ki0zTBYY!(EkPpabJhWGr%pcvT3<&7Gq|exSa%)1Y;yYjTO%)
z^(0QXi_VZq05Hx$8FJZN?IO8}u?ld%j=*KLacBTYN_N?BQvu0>MlzqG70|t--$Eco
zD4-mPR;ab5k`_wsv6ESzOoPc&V3H9~@;orfCFcxSNfrlP)<W7LcPXG@yK-*tKSm&M
zScNT6KqI7bwK_1Bv6G-gAc0LnR17A_1gHcROHn?E2~iOu6d|YxMlrciCPyXU=mT-y
z?1WjaSEY~o;v@xRVOg6TL7Yyfz$p?i_Iw1D$z+HSLof{HG+>9DW^orxJ7UKys7Qy&
zPT5$Bp+Ubz+{hHO3W#Gm5`xvH)jl;$J4O@5r3`W5HUt$25v$c7*RZyO)sz3xc&4_)
z;I@&7o^&w9b`w_*bL<$H%iZ%G`4u@f^2K(FD+*qyVob$Wl4dn31;pJ52#S!KWVnn>
zkcePWLc9<b8{@^WQAUbju}O*vO{6FxK_(uv^DMk94O6BFQ7j!pF%;zlOc|e|N>7Q8
z=MI%v`WRM2J6N1Hkz>9o&i5!5eJ)m>YA11)u^SksaI6b-7KUXU7RCmqrh;>{xQU|u
z@?3w7MnYDRc4{R_q}v%QIGkiT^$Y@HbG#HK%qVOmQ7(9lAYdtxK)_-`NQzN2Zjy+(
z;79PpizW}@NFn}C`CsRZ9dYgG-#(oKPIx*=B+ZSFotu+Sd3SmMAh1-UQW{)c$8wI+
z-NH$~=?j}eDtzxuo|aRWSvgb`72UGB1Rpn;%u`PVsixCK)WW*Dj%)n5fX%_Ve-OHw
zU+$EJwckrl?Ct)haCh^J?tk3A&TGwzjYGW!U!O~y_r<%Hsv3{frk)zQ9MRGf@WzQV
zK=rIkr(Zi6)Oj2joERQe)4?>Tt{f~tN{;Uh>XOX0HKbcgR^`3VgS^Ev%iMee6@LEu
z@(p2-_dA_epcaP=x#d?Y>*+@^4`VxuT-8Oo$VFdPsOJtMBzx=R{j<oM8G*qqRIkGI
z<dHLbZ`Kxdg5~iI>60~2?tiuRvkf~W0f7&yfLFXTy2kT|V$L>-eWl8%@?}WO)Ydpx
z{l)pbUwQNP_q9LPzup|&V3{4>Tma2%0mj!F%6CLny<|xX=&_ZS(~;N5*R|{s>8sW^
zT6m4MIlRNsv(`0aVf7jN)>f=Mv0bH+7(O~2y}he7C)B;KdgE5@=5qe6$l|=9o@U?o
zg^O>;#ajE_hqjpO9f_V**unz}X8*PyBEq~EZ}!W(LIz6U+sh`m)JhNKlauE_83)A^
z)UxFhw*REB3XGf7-}bT!uW_F6W=E{B{J5;`?I}lgm0K3?nbO|2=`HiRsq^9bR^#V&
zv#N>99wkqp`7<v(YIan3s1&%^w<)$VV{m@q93X_>)^YyaU!E0hOL}5f!w2Zbolr;6
z?rEKFAm+Ur{MLo3J4@?oi2-F@1Z{5&-&VF@jWFP@@I&I}bog&yqHkl^1;;~O7vxRM
zJQev#cA)R{(kthpv!|pfj!moC`g3K|lIH$veP;HqbD-@)#dJe!*>t4uYMAu*V*{Z{
qmv$X)>eX*u+P$s)_TyX2O9FrySs!B$I<q?be|=3_rm86=Z~ea+?_l=;

diff --git a/TMessagesProj/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_light.png b/TMessagesProj/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_light.png
deleted file mode 100644
index e9742a1f903f0055b3846319c824eb5bc5ad9067..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1946
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
G75)t^<@Bro

diff --git a/TMessagesProj/src/main/res/drawable-mdpi/compose_bubble_down.9.png b/TMessagesProj/src/main/res/drawable-mdpi/compose_bubble_down.9.png
deleted file mode 100644
index 254a654fd0d145613c60cedab50aef28c4a259be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^VnD3K!3HFw<24(ARD!3AV@SoV<b(r!|0Z{AWL|FB
zA2sKh-7n4~|22=;JEk4fW#;;`uxVkz;fcKe{C$0joB#Jq*<^iKad0skoWcK%joX)Z
uneXBYh3^)JWtk>BrYUZp`9E0Fn1LZr%=A}8MeJjsT@0SCelF{r5}E+_!Z&{a

diff --git a/TMessagesProj/src/main/res/drawable-mdpi/compose_bubble_up.9.png b/TMessagesProj/src/main/res/drawable-mdpi/compose_bubble_up.9.png
deleted file mode 100644
index dd401ff34be451fc00bab03821a87c6eb13a7e36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^VnD3K!3HFw<24(ARFtQSV@SoVx7Q507!-Jz57@=s
zzh3@=pGA?YsiZ(Ky1+wmir#forRN7z&n*`9<i2&M;*`;)I<x+NJyLfLeekj1In=@_
vtmZSr;Ng94Zw;9+uFc84XSW$2wlrekx-);;dxKI>pe+oZu6{1-oD!M<Uy3n%

diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_light.png b/TMessagesProj/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_light.png
deleted file mode 100644
index 2e8dff7e221da2562c1ad2116d29d77d3a63ce66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2492
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

diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_light.png b/TMessagesProj/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_light.png
deleted file mode 100644
index c1d273a73eb91cba238a1a32a3a4c34911990398..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3077
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
E0OA4|hX4Qo

diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/compose_bubble_down.9.png b/TMessagesProj/src/main/res/drawable-xhdpi/compose_bubble_down.9.png
deleted file mode 100644
index b1003163a2befbba3e738f254e941bd8590bec73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^T0rc?!3HE1Q(SU@)KX6u$B>F!Z*OhnJ!Bx_dNJgU
z>x{;^3!3LuFnmjFxKX;PNzsW(C0Idm0`qh4_4Z}8v!87}Er0L)ov((kA7^fSb!p$*
zM+K4Vk`((UXKuQ?AlGAeRs*X=?z;=K>Nef^z;V`;|I7P@k|KCPNCX4dFBYrG4yzwM
v$*p{`J=I0xQADYW#cZ9=+={PnE54D;ndj>xASrej=wJp<S3j3^P6<r_`u$P+

diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/compose_bubble_up.9.png b/TMessagesProj/src/main/res/drawable-xhdpi/compose_bubble_up.9.png
deleted file mode 100644
index ff521bb2d1e61d05039213dda4dd8d6cbd7c44d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^T0rc?!3HE1Q(SU@)I3iY$B>F!Z*LiL9Wr2OedsqY
z)_m`b!jA%OZ$#(mHbw2?ShVC9>%B=Yy`SxW9cTUXL*27Ga>YJj?XzMnp9W=JI`QkG
z$*p%69v0meDA-hc_7`LBYxU*QIp^(XO=JJ{{X#<%Uckle;Fx}al{M<DTK>~HXKj?$
oyqw*~AwD^^PBEp{x@9lZPl;t)X7wxF2D+5N)78&qol`;+056<ejsO4v

diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/btn_check_off_pressed_holo_light.png b/TMessagesProj/src/main/res/drawable-xxhdpi/btn_check_off_pressed_holo_light.png
deleted file mode 100644
index 98e8965fcdd1b8b37a228c6942196d48471b5c2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3482
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

diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/btn_check_on_pressed_holo_light.png b/TMessagesProj/src/main/res/drawable-xxhdpi/btn_check_on_pressed_holo_light.png
deleted file mode 100644
index fef30cc1dbf8f85c5a6d740bca78d854b183c2f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4306
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

diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/compose_bubble_down.9.png b/TMessagesProj/src/main/res/drawable-xxhdpi/compose_bubble_down.9.png
deleted file mode 100644
index ab413e1798640dceefb968c9f0bf1692c7e96516..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^c0ioO!3HEbdJ|4CFfdAcx;TbZ+<JS*-iz5$<iJDS
zzr{+{n;EV9mqc_}Ha}RG@X|Ku8H3`26t*MA9UI>5*rXDXx%ka*xj(ZKXZ2s-zv|cB
zlK(oNn~$=#&$rzpcilJcO75*|zOU4-F4xrWD&)6Ya5<~!!TYuQJ}}qZTQ-~F#lqbs
zwujPvtGbx<uL<6>-_w4xBL8k{`9vmm_I}3q2M$sJ{1<umiQmHFN6N!QfAKt~gXY#B
z-iC_&*mHKe@}DP$^4EOh{N(3Nf4*Jcy;{A)|NVUaG~Zn>?AQFhr^cc;t#qU4;>DLQ
eK8)S4ia$!*&U~V;ssb>y7(8A5T-G@yGywpK6RTPP

diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/compose_bubble_up.9.png b/TMessagesProj/src/main/res/drawable-xxhdpi/compose_bubble_up.9.png
deleted file mode 100644
index 4202efa5ee3dbf33b810e03504a696dc3a62db13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^c0ioO!3HEbdJ|4CFfej>x;TbZ+<JRwqnERz0PBTt
zx4+LiT3@6`9zCTJ)#l*BbkOF%0*l&ijbD@eqz|8y+;P^YwCwlo()!sJn`gw=#1#EF
zT^(clz0m&tvD<t4GqjF|<X){{S>GKgfBD$~^_9o;|ETZLc^~D@Uu4~~Ug%)B^A9`0
z8v7RaWev^E&l}h+r~rQKKV<qJXq-8>e{}2)AC~xk2eubZX0`j>@jCy<V=KK=MUxop
zDsLTm8p!(baCXnB?4Hwwft#{9qIJ8oR=X{|eDmQ%ox6;iKXSazI(sY;7&Hu?u6{1-
HoD!M<n(Tg)

diff --git a/TMessagesProj/src/main/res/drawable/btn_check_off_old.xml b/TMessagesProj/src/main/res/drawable/btn_check_off_old.xml
deleted file mode 100644
index fff9507b..00000000
--- a/TMessagesProj/src/main/res/drawable/btn_check_off_old.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_check_off_pressed_holo_light" />
-    <item android:state_focused="true" android:drawable="@drawable/btn_check_off_pressed_holo_light" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_check_off_pressed_holo_light" />
-    <item android:drawable="@drawable/btn_check_off_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/drawable/btn_check_on_old.xml b/TMessagesProj/src/main/res/drawable/btn_check_on_old.xml
deleted file mode 100644
index 3923693a..00000000
--- a/TMessagesProj/src/main/res/drawable/btn_check_on_old.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_check_on_pressed_holo_light" />
-    <item android:state_focused="true" android:drawable="@drawable/btn_check_on_pressed_holo_light" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_check_on_pressed_holo_light" />
-    <item android:drawable="@drawable/btn_check_on_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/drawable/chat_create_bubble_states.xml b/TMessagesProj/src/main/res/drawable/chat_create_bubble_states.xml
deleted file mode 100644
index bba9664b..00000000
--- a/TMessagesProj/src/main/res/drawable/chat_create_bubble_states.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/compose_bubble_down" android:state_pressed="true" />
-    <item android:drawable="@drawable/compose_bubble_up" />
-</selector>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml b/TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml
index 8567d67a..bfc16213 100644
--- a/TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml
+++ b/TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml
@@ -1,30 +1,35 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
-    <FrameLayout android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:id="@+id/top_layout"
-                 android:layout_gravity="top">
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/top_layout"
+        android:layout_gravity="top">
 
-        <FrameLayout android:layout_width="64dp"
-                     android:layout_height="64dp"
-                     android:layout_marginTop="12dp"
-                     android:layout_marginBottom="12dp"
-                     android:layout_marginRight="16dp"
-                     android:layout_gravity="top|right">
+        <FrameLayout
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:layout_marginRight="16dp"
+            android:layout_gravity="top|right">
 
             <org.telegram.ui.Views.BackupImageView
                 android:id="@+id/settings_avatar_image"
-                                       android:layout_width="fill_parent"
-                                       android:layout_height="fill_parent"
-                                       android:src="@drawable/group_blue"/>
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:src="@drawable/group_blue"/>
+
+            <ImageButton
+                android:id="@+id/settings_change_avatar_button"
+                android:background="@drawable/photo_spinner"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"/>
 
-            <ImageButton android:id="@+id/settings_change_avatar_button"
-                         android:background="@drawable/photo_spinner"
-                         android:layout_width="fill_parent"
-                         android:layout_height="fill_parent"/>
         </FrameLayout>
 
         <EditText
@@ -47,22 +52,24 @@
 
     </FrameLayout>
 
-    <FrameLayout android:layout_width="match_parent"
-                 android:layout_height="match_parent">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <org.telegram.ui.Views.PinnedHeaderListView
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:id="@+id/listView"
-                android:clipToPadding="false"
-                android:fadingEdge="none"
-                android:fadingEdgeLength="0dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:dividerHeight="0dp"
-                android:divider="@null"
-                android:paddingBottom="16dp"
-                android:scrollbars="none"/>
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:id="@+id/listView"
+            android:clipToPadding="false"
+            android:fadingEdge="none"
+            android:fadingEdgeLength="0dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:dividerHeight="0dp"
+            android:divider="@null"
+            android:paddingBottom="16dp"
+            android:scrollbars="none"/>
+
     </FrameLayout>
 
 </LinearLayout>
diff --git a/TMessagesProj/src/main/res/layout-ar/group_create_layout.xml b/TMessagesProj/src/main/res/layout-ar/group_create_layout.xml
index f674d7df..1de70d4f 100644
--- a/TMessagesProj/src/main/res/layout-ar/group_create_layout.xml
+++ b/TMessagesProj/src/main/res/layout-ar/group_create_layout.xml
@@ -21,7 +21,7 @@
             android:layout_marginRight="5dp"
             android:minHeight="52dp"
             android:gravity="right|center_vertical"
-            android:maxLines="3"
+            android:maxLines="2"
             android:paddingTop="3dp"
             android:layout_marginTop="0dp"
             android:inputType="textFilter|textNoSuggestions|textMultiLine"
@@ -29,18 +29,6 @@
             android:textCursorDrawable="@null"
             android:textColor="#000000"/>
 
-        <TextView
-            android:textSize="16dp"
-            android:textColor="#a6a6a6"
-            android:gravity="center_vertical"
-            android:layout_gravity="top|left|center"
-            android:id="@+id/bubble_counter_text"
-            android:layout_width="wrap_content"
-            android:layout_height="52dp"
-            android:layout_marginLeft="16dp"
-            android:paddingBottom="4dp"
-            android:text="0/200"/>
-
     </FrameLayout>
 
 
diff --git a/TMessagesProj/src/main/res/layout-ar/group_create_row_layout.xml b/TMessagesProj/src/main/res/layout-ar/group_create_row_layout.xml
index 2662414f..d2eaad58 100644
--- a/TMessagesProj/src/main/res/layout-ar/group_create_row_layout.xml
+++ b/TMessagesProj/src/main/res/layout-ar/group_create_row_layout.xml
@@ -1,57 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="66dp"
-             android:layout_gravity="top">
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="66dp"
+    android:layout_gravity="top">
 
     <org.telegram.ui.Views.BackupImageView
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:id="@+id/messages_list_row_avatar"
-            android:contentDescription=""
-            android:layout_marginTop="8dp"
-            android:layout_gravity="top|right"/>
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:id="@+id/messages_list_row_avatar"
+        android:contentDescription=""
+        android:layout_marginTop="8dp"
+        android:layout_gravity="top|right"/>
 
     <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/messages_list_row_name"
-            android:textSize="18dp"
-            android:layout_marginRight="61dp"
-            android:ellipsize="end"
-            android:layout_marginTop="10dp"
-            android:textColor="#000000"
-            android:maxLines="1"
-            android:layout_marginLeft="60dp"
-            android:layout_gravity="top|right"
-            android:gravity="right"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_name"
+        android:textSize="18dp"
+        android:layout_marginRight="61dp"
+        android:ellipsize="end"
+        android:layout_marginTop="10dp"
+        android:textColor="#000000"
+        android:maxLines="1"
+        android:layout_marginLeft="60dp"
+        android:layout_gravity="top|right"
+        android:gravity="right"/>
 
     <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/messages_list_row_message"
-            android:textSize="15dp"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textColor="#808080"
-            android:layout_marginLeft="60dp"
-            android:layout_marginTop="34dp"
-            android:layout_marginRight="61dp"
-            android:layout_gravity="top|right"
-            android:gravity="right"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_message"
+        android:textSize="15dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textColor="#808080"
+        android:layout_marginLeft="60dp"
+        android:layout_marginTop="34dp"
+        android:layout_marginRight="61dp"
+        android:layout_gravity="top|right"
+        android:gravity="right"/>
 
-    <ImageView android:layout_gravity="center_vertical|left"
-               android:id="@+id/settings_row_check_button"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_marginLeft="14dp"
-               android:src="@drawable/btn_check_off_old"/>
+    <ImageView
+        android:layout_gravity="center_vertical|left"
+        android:id="@+id/settings_row_check_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="14dp"
+        android:src="@drawable/btn_check_off_holo_light"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"
+        android:visibility="gone"/>
 
-    <View android:background="@color/divider"
-          android:layout_width="fill_parent"
-          android:layout_height="1px"
-          android:layout_gravity="bottom"
-          android:id="@+id/settings_row_divider"
-          android:visibility="gone"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout/chat_profile_change_name_layout.xml b/TMessagesProj/src/main/res/layout/chat_profile_change_name_layout.xml
index 8e19219e..81e5e34e 100644
--- a/TMessagesProj/src/main/res/layout/chat_profile_change_name_layout.xml
+++ b/TMessagesProj/src/main/res/layout/chat_profile_change_name_layout.xml
@@ -5,14 +5,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout android:orientation="vertical"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:paddingTop="8dp">
 
-        <include layout="@layout/settings_section_layout"/>
+        <include
+            layout="@layout/settings_section_layout"/>
 
         <EditText
             android:textSize="19dp"
diff --git a/TMessagesProj/src/main/res/layout/group_create_bubble.xml b/TMessagesProj/src/main/res/layout/group_create_bubble.xml
index c6c981b3..2f932acf 100644
--- a/TMessagesProj/src/main/res/layout/group_create_bubble.xml
+++ b/TMessagesProj/src/main/res/layout/group_create_bubble.xml
@@ -3,18 +3,16 @@
 <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="41dp"
-        android:paddingRight="9dp"
         android:paddingTop="9dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
-<TextView android:layout_width="wrap_content"
-          android:layout_height="31dp"
-          android:background="@drawable/chat_create_bubble_states"
-          android:textSize="16dp"
-          android:paddingRight="8dp"
-          android:paddingLeft="8dp"
-          android:gravity="center"
-          android:textColor="@color/chat_create_bubble_text_states"
-          android:id="@+id/bubble_text_view"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="26dp"
+        android:textSize="16dp"
+        android:gravity="center"
+        android:textColor="#ff000000"
+        android:id="@+id/bubble_text_view"/>
+
 </FrameLayout>
 
diff --git a/TMessagesProj/src/main/res/layout/group_create_done_layout.xml b/TMessagesProj/src/main/res/layout/group_create_done_layout.xml
index 0edcbfa9..8c61137c 100644
--- a/TMessagesProj/src/main/res/layout/group_create_done_layout.xml
+++ b/TMessagesProj/src/main/res/layout/group_create_done_layout.xml
@@ -1,7 +1,7 @@
 <FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="fill_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_gravity="right|center_vertical"
     android:minHeight="60dp">
 
@@ -19,6 +19,7 @@
         android:paddingRight="16dp"
         android:paddingLeft="16dp"
         android:background="@drawable/bar_selector"
-        android:minHeight="60dp"/>
+        android:minHeight="60dp"
+        android:textAllCaps="true"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout/group_create_final_layout.xml b/TMessagesProj/src/main/res/layout/group_create_final_layout.xml
index 58cabae6..2970282e 100644
--- a/TMessagesProj/src/main/res/layout/group_create_final_layout.xml
+++ b/TMessagesProj/src/main/res/layout/group_create_final_layout.xml
@@ -1,30 +1,35 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
-    <FrameLayout android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:id="@+id/top_layout"
-                 android:layout_gravity="top">
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/top_layout"
+        android:layout_gravity="top">
 
-        <FrameLayout android:layout_width="64dp"
-                     android:layout_height="64dp"
-                     android:layout_marginTop="12dp"
-                     android:layout_marginBottom="12dp"
-                     android:layout_marginLeft="16dp"
-                     android:layout_gravity="top">
+        <FrameLayout
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="top">
 
             <org.telegram.ui.Views.BackupImageView
                 android:id="@+id/settings_avatar_image"
-                                       android:layout_width="fill_parent"
-                                       android:layout_height="fill_parent"
-                                       android:src="@drawable/group_blue"/>
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:src="@drawable/group_blue"/>
+
+            <ImageButton
+                android:id="@+id/settings_change_avatar_button"
+                android:background="@drawable/photo_spinner"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"/>
 
-            <ImageButton android:id="@+id/settings_change_avatar_button"
-                         android:background="@drawable/photo_spinner"
-                         android:layout_width="fill_parent"
-                         android:layout_height="fill_parent"/>
         </FrameLayout>
 
         <EditText
@@ -48,22 +53,24 @@
     </FrameLayout>
 
 
-    <FrameLayout android:layout_width="match_parent"
-                 android:layout_height="match_parent">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <org.telegram.ui.Views.PinnedHeaderListView
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:id="@+id/listView"
-                android:clipToPadding="false"
-                android:fadingEdge="none"
-                android:fadingEdgeLength="0dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:dividerHeight="0dp"
-                android:divider="@null"
-                android:paddingBottom="16dp"
-                android:scrollbars="none"/>
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:id="@+id/listView"
+            android:clipToPadding="false"
+            android:fadingEdge="none"
+            android:fadingEdgeLength="0dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:dividerHeight="0dp"
+            android:divider="@null"
+            android:paddingBottom="16dp"
+            android:scrollbars="none"/>
+
     </FrameLayout>
 
 </LinearLayout>
diff --git a/TMessagesProj/src/main/res/layout/group_create_layout.xml b/TMessagesProj/src/main/res/layout/group_create_layout.xml
index 3a320581..763c3ea2 100644
--- a/TMessagesProj/src/main/res/layout/group_create_layout.xml
+++ b/TMessagesProj/src/main/res/layout/group_create_layout.xml
@@ -14,14 +14,13 @@
             android:textSize="16dp"
             android:textColorHint="#a6a6a6"
             android:id="@+id/bubble_input_text"
-            android:paddingRight="60dp"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:minHeight="52dp"
             android:gravity="left|center_vertical"
-            android:maxLines="3"
+            android:maxLines="2"
             android:paddingTop="3dp"
             android:layout_marginTop="0dp"
             android:inputType="textFilter|textNoSuggestions|textMultiLine"
@@ -29,18 +28,6 @@
             android:textCursorDrawable="@null"
             android:textColor="#000000"/>
 
-        <TextView
-            android:textSize="16dp"
-            android:textColor="#a6a6a6"
-            android:gravity="center_vertical"
-            android:layout_gravity="top|right|center"
-            android:id="@+id/bubble_counter_text"
-            android:layout_width="wrap_content"
-            android:layout_height="52dp"
-            android:layout_marginRight="16dp"
-            android:paddingBottom="4dp"
-            android:text="0/200"/>
-
     </FrameLayout>
 
     <FrameLayout
diff --git a/TMessagesProj/src/main/res/layout/group_create_row_layout.xml b/TMessagesProj/src/main/res/layout/group_create_row_layout.xml
index 7809160c..6323c035 100644
--- a/TMessagesProj/src/main/res/layout/group_create_row_layout.xml
+++ b/TMessagesProj/src/main/res/layout/group_create_row_layout.xml
@@ -1,55 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="66dp"
-             android:layout_gravity="top">
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="66dp"
+    android:layout_gravity="top">
 
     <org.telegram.ui.Views.BackupImageView
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:id="@+id/messages_list_row_avatar"
-            android:contentDescription=""
-            android:layout_marginTop="8dp"
-            android:layout_gravity="top"/>
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:id="@+id/messages_list_row_avatar"
+        android:contentDescription=""
+        android:layout_marginTop="8dp"
+        android:layout_gravity="top"/>
 
     <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/messages_list_row_name"
-            android:textSize="18dp"
-            android:layout_marginLeft="61dp"
-            android:ellipsize="end"
-            android:layout_marginTop="10dp"
-            android:maxLines="1"
-            android:textColor="#000000"
-            android:layout_marginRight="60dp"
-            android:layout_gravity="top"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_name"
+        android:textSize="18dp"
+        android:layout_marginLeft="61dp"
+        android:ellipsize="end"
+        android:layout_marginTop="10dp"
+        android:maxLines="1"
+        android:textColor="#000000"
+        android:layout_marginRight="60dp"
+        android:layout_gravity="top"/>
 
     <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/messages_list_row_message"
-            android:textSize="15dp"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textColor="#808080"
-            android:layout_marginLeft="61dp"
-            android:layout_marginTop="34dp"
-            android:layout_marginRight="60dp"
-            android:layout_gravity="top"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_message"
+        android:textSize="15dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textColor="#808080"
+        android:layout_marginLeft="61dp"
+        android:layout_marginTop="34dp"
+        android:layout_marginRight="60dp"
+        android:layout_gravity="top"/>
 
-    <ImageView android:layout_gravity="center_vertical|right"
-               android:id="@+id/settings_row_check_button"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_marginRight="14dp"
-               android:src="@drawable/btn_check_off_old"/>
+    <ImageView
+        android:layout_gravity="center_vertical|right"
+        android:id="@+id/settings_row_check_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="14dp"
+        android:src="@drawable/btn_check_off_holo_light"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"
+        android:visibility="gone"/>
 
-    <View android:background="@color/divider"
-          android:layout_width="fill_parent"
-          android:layout_height="1px"
-          android:layout_gravity="bottom"
-          android:id="@+id/settings_row_divider"
-          android:visibility="gone"/>
 </FrameLayout>
\ No newline at end of file