More Android L design

TMessagesProj/src/main/java/org/telegram/ui/Cells/TextColorCell.java

@@ -0,0 +1,91 @@
+/*
+ * This is the source code of Telegram for Android v. 1.7.x.
+ * It is licensed under GNU GPL v. 2 or later.
+ * You should have received a copy of the license in this archive (see LICENSE).
+ *
+ * Copyright Nikolai Kudashov, 2013-2014.
+ */
+
+package org.telegram.ui.Cells;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import org.telegram.android.AndroidUtilities;
+import org.telegram.android.LocaleController;
+import org.telegram.messenger.R;
+
+public class TextColorCell extends FrameLayout {
+    private TextView textView;
+    private Drawable colorDrawable;
+    private static Paint paint;
+    private boolean needDivider;
+    private int currentColor;
+
+    public TextColorCell(Context context) {
+        super(context);
+
+        if (paint == null) {
+            paint = new Paint();
+            paint.setColor(0xffd9d9d9);
+            paint.setStrokeWidth(1);
+        }
+
+        textView = new TextView(context);
+        textView.setTextColor(0xff000000);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
+        textView.setLines(1);
+        textView.setMaxLines(1);
+        textView.setSingleLine(true);
+        textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
+        addView(textView);
+        LayoutParams layoutParams = (LayoutParams) textView.getLayoutParams();
+        layoutParams.width = LayoutParams.MATCH_PARENT;
+        layoutParams.height = LayoutParams.MATCH_PARENT;
+        layoutParams.leftMargin = AndroidUtilities.dp(17);
+        layoutParams.rightMargin = AndroidUtilities.dp(17);
+        layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
+        textView.setLayoutParams(layoutParams);
+
+        colorDrawable = getResources().getDrawable(R.drawable.switch_to_on2);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY));
+    }
+
+    public void setTextAndColor(String text, int color, boolean divider) {
+        textView.setText(text);
+        needDivider = divider;
+        currentColor = color;
+        colorDrawable.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
+        setWillNotDraw(!needDivider && currentColor == 0);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (needDivider) {
+            canvas.drawLine(getPaddingLeft(), getHeight() - 1, getWidth() - getPaddingRight(), getHeight() - 1, paint);
+        }
+        if (currentColor != 0 && colorDrawable != null) {
+            int x;
+            int y = (getMeasuredHeight() - colorDrawable.getMinimumHeight()) / 2;
+            if (!LocaleController.isRTL) {
+                x = getMeasuredWidth() - colorDrawable.getIntrinsicWidth() - AndroidUtilities.dp(14.5f);
+            } else {
+                x = AndroidUtilities.dp(14.5f);
+            }
+            colorDrawable.setBounds(x, y, x + colorDrawable.getIntrinsicWidth(), y + colorDrawable.getIntrinsicHeight());
+            colorDrawable.draw(canvas);
+        }
+    }
+}

TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailCell.java

@@ -34,7 +34,7 @@ public class TextDetailCell extends FrameLayout {
         textView.setLines(1);
         textView.setMaxLines(1);
         textView.setSingleLine(true);
-        textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
+        textView.setGravity(LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT);
         addView(textView);
         FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) textView.getLayoutParams();
         layoutParams.width = LayoutParams.WRAP_CONTENT;
@@ -51,7 +51,7 @@ public class TextDetailCell extends FrameLayout {
         valueTextView.setLines(1);
         valueTextView.setMaxLines(1);
         valueTextView.setSingleLine(true);
-        valueTextView.setGravity((LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT) | Gravity.CENTER_VERTICAL);
+        valueTextView.setGravity(LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT);
         addView(valueTextView);
         layoutParams = (FrameLayout.LayoutParams) valueTextView.getLayoutParams();
         layoutParams.width = LayoutParams.WRAP_CONTENT;

TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailSettingsCell.java

@@ -55,10 +55,11 @@ public class TextDetailSettingsCell extends FrameLayout {
         valueTextView = new TextView(context);
         valueTextView.setTextColor(0xff8a8a8a);
         valueTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 13);
+        valueTextView.setGravity(LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT);
         valueTextView.setLines(1);
         valueTextView.setMaxLines(1);
         valueTextView.setSingleLine(true);
-        valueTextView.setGravity((LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT) | Gravity.CENTER_VERTICAL);
+        valueTextView.setPadding(0, 0, 0, 0);
         addView(valueTextView);
         layoutParams = (LayoutParams) valueTextView.getLayoutParams();
         layoutParams.width = LayoutParams.WRAP_CONTENT;
@@ -72,7 +73,25 @@ public class TextDetailSettingsCell extends FrameLayout {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(64) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY));
+        if (valueTextView.getMaxLines() == 1) {
+            super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(64) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY));
+        } else {
+            super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+        }
+    }
+
+    public void setMultilineDetail(boolean value) {
+        if (value) {
+            valueTextView.setLines(0);
+            valueTextView.setMaxLines(0);
+            valueTextView.setSingleLine(false);
+            valueTextView.setPadding(0, 0, 0, AndroidUtilities.dp(12));
+        } else {
+            valueTextView.setLines(1);
+            valueTextView.setMaxLines(1);
+            valueTextView.setSingleLine(true);
+            valueTextView.setPadding(0, 0, 0, 0);
+        }
     }
 
     public void setTextAndValue(String text, String value, boolean divider) {

TMessagesProj/src/main/java/org/telegram/ui/Cells/TextInfoCell.java

@@ -16,11 +16,11 @@ import android.widget.TextView;
 
 import org.telegram.android.AndroidUtilities;
 
-public class DetailTextCell extends FrameLayout {
+public class TextInfoCell extends FrameLayout {
 
     private TextView textView;
 
-    public DetailTextCell(Context context) {
+    public TextInfoCell(Context context) {
         super(context);
 
         textView = new TextView(context);

TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java

@@ -1390,7 +1390,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             printString = TextUtils.replace(printString, new String[]{"..."}, new String[]{""});
         }
         if (printString == null || printString.length() == 0) {
-            lastPrintString = null;
             setTypingAnimation(false);
             if (currentChat != null) {
                 if (currentChat instanceof TLRPC.TL_chatForbidden) {
@@ -1413,11 +1412,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 if (user != null) {
                     currentUser = user;
                 }
-                if (lastStatus != user.status || lastStatus != null && user.status != null && lastStatus.expires != user.status.expires) {
+                if (lastPrintString != null || lastStatus != user.status || lastStatus != null && user.status != null && lastStatus.expires != user.status.expires) {
                     lastStatus = user.status;
                     actionBar.setSubtitle(LocaleController.formatUserStatus(currentUser));
                 }
             }
+            lastPrintString = null;
         } else {
             lastPrintString = printString;
             actionBar.setSubtitle(printString);

TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java

@@ -25,7 +25,6 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ListView;
-import android.widget.TextView;
 
 import org.telegram.android.AndroidUtilities;
 import org.telegram.android.MessagesController;
@@ -39,6 +38,8 @@ import org.telegram.messenger.RPCRequest;
 import org.telegram.messenger.TLObject;
 import org.telegram.messenger.TLRPC;
 import org.telegram.ui.Adapters.BaseFragmentAdapter;
+import org.telegram.ui.Cells.TextColorCell;
+import org.telegram.ui.Cells.TextDetailSettingsCell;
 import org.telegram.ui.Views.ActionBar.ActionBar;
 import org.telegram.ui.Views.ActionBar.BaseFragment;
 import org.telegram.ui.Views.AvatarDrawable;
@@ -64,8 +65,8 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
     public boolean onFragmentCreate() {
         settingsNotificationsRow = rowCount++;
         settingsVibrateRow = rowCount++;
-        settingsLedRow = rowCount++;
         settingsSoundRow = rowCount++;
+        settingsLedRow = rowCount++;
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.notificationsSettingsUpdated);
         return super.onFragmentCreate();
     }
@@ -389,102 +390,77 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
             int type = getItemViewType(i);
             if (type == 0) {
                 if (view == null) {
-                    LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                    view = new TextDetailSettingsCell(mContext);
-                    view = li.inflate(R.layout.user_profile_leftright_row_layout, viewGroup, false);
                 }
-                TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
-                TextView detailTextView = (TextView)view.findViewById(R.id.settings_row_text_detail);
 
-                View divider = view.findViewById(R.id.settings_row_divider);
+                TextDetailSettingsCell textCell = (TextDetailSettingsCell) view;
+
+                SharedPreferences preferences = mContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
+
                 if (i == settingsVibrateRow) {
-                    textView.setText(LocaleController.getString("Vibrate", R.string.Vibrate));
-                    divider.setVisibility(View.VISIBLE);
-                    SharedPreferences preferences = mContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
                     int value = preferences.getInt("vibrate_" + dialog_id, 0);
                     if (value == 0) {
-                        detailTextView.setText(LocaleController.getString("SettingsDefault", R.string.SettingsDefault));
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("SettingsDefault", R.string.SettingsDefault), true);
                     } else if (value == 1) {
-                        detailTextView.setText(LocaleController.getString("Short", R.string.Short));
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Short", R.string.Short), true);
                     } else if (value == 2) {
-                        detailTextView.setText(LocaleController.getString("Disabled", R.string.Disabled));
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Disabled", R.string.Disabled), true);
                     } else if (value == 3) {
-                        detailTextView.setText(LocaleController.getString("Long", R.string.Long));
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Long", R.string.Long), true);
                     } else if (value == 4) {
-                        detailTextView.setText(LocaleController.getString("SystemDefault", R.string.SystemDefault));
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("SystemDefault", R.string.SystemDefault), true);
                     }
                 } else if (i == settingsNotificationsRow) {
-                    textView.setText(LocaleController.getString("Notifications", R.string.Notifications));
-                    divider.setVisibility(View.VISIBLE);
-                    SharedPreferences preferences = mContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
                     int value = preferences.getInt("notify2_" + dialog_id, 0);
                     if (value == 0) {
-                        detailTextView.setText(LocaleController.getString("Default", R.string.Default));
+                        textCell.setTextAndValue(LocaleController.getString("Notifications", R.string.Notifications), LocaleController.getString("Default", R.string.Default), true);
                     } else if (value == 1) {
-                        detailTextView.setText(LocaleController.getString("Enabled", R.string.Enabled));
+                        textCell.setTextAndValue(LocaleController.getString("Notifications", R.string.Notifications), LocaleController.getString("Enabled", R.string.Enabled), true);
                     } else if (value == 2) {
-                        detailTextView.setText(LocaleController.getString("Disabled", R.string.Disabled));
+                        textCell.setTextAndValue(LocaleController.getString("Notifications", R.string.Notifications), LocaleController.getString("Disabled", R.string.Disabled), true);
                     }
+                } else if (i == settingsSoundRow) {
+                    String value = preferences.getString("sound_" + dialog_id, LocaleController.getString("Default", R.string.Default));
+                    if (value.equals("NoSound")) {
+                        value = LocaleController.getString("NoSound", R.string.NoSound);
+                    }
+                    textCell.setTextAndValue(LocaleController.getString("Sound", R.string.Sound), value, true);
                 }
-            } if (type == 1) {
+            } else if (type == 1) {
                 if (view == null) {
-                    LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                    view = new TextColorCell(mContext);
-                    view = li.inflate(R.layout.settings_row_detail_layout, viewGroup, false);
                 }
-                TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
-                TextView detailTextView = (TextView)view.findViewById(R.id.settings_row_text_detail);
 
-                View divider = view.findViewById(R.id.settings_row_divider);
+                TextColorCell textCell = (TextColorCell) view;
-                if (i == settingsSoundRow) {
+
-                    SharedPreferences preferences = mContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
-                    String name = preferences.getString("sound_" + dialog_id, LocaleController.getString("Default", R.string.Default));
-                    if (name.equals("NoSound")) {
-                        detailTextView.setText(LocaleController.getString("NoSound", R.string.NoSound));
-                    } else {
-                        detailTextView.setText(name);
-                    }
-                    textView.setText(LocaleController.getString("Sound", R.string.Sound));
-                    divider.setVisibility(View.INVISIBLE);
-                }
-            } else if (type == 2) {
-                if (view == null) {
-                    LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                    view = li.inflate(R.layout.settings_row_color_layout, viewGroup, false);
-                }
-                TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
-                View colorView = view.findViewById(R.id.settings_color);
-                View divider = view.findViewById(R.id.settings_row_divider);
-                textView.setText(LocaleController.getString("LedColor", R.string.LedColor));
                 SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
 
                 if (preferences.contains("color_" + dialog_id)) {
-                    colorView.setBackgroundColor(preferences.getInt("color_" + dialog_id, 0xff00ff00));
+                    textCell.setTextAndColor(LocaleController.getString("LedColor", R.string.LedColor), preferences.getInt("color_" + dialog_id, 0xff00ff00), false);
                 } else {
                     if ((int)dialog_id < 0) {
-                        colorView.setBackgroundColor(preferences.getInt("GroupLed", 0xff00ff00));
+                        textCell.setTextAndColor(LocaleController.getString("LedColor", R.string.LedColor), preferences.getInt("GroupLed", 0xff00ff00), false);
                     } else {
-                        colorView.setBackgroundColor(preferences.getInt("MessagesLed", 0xff00ff00));
+                        textCell.setTextAndColor(LocaleController.getString("LedColor", R.string.LedColor), preferences.getInt("MessagesLed", 0xff00ff00), false);
                     }
                 }
-                divider.setVisibility(View.VISIBLE);
             }
             return view;
         }
 
         @Override
         public int getItemViewType(int i) {
-            if (i == settingsNotificationsRow || i == settingsVibrateRow) {
+            if (i == settingsNotificationsRow || i == settingsVibrateRow || i == settingsSoundRow) {
                 return 0;
-            } else if (i == settingsSoundRow) {
-                return 1;
             } else if (i == settingsLedRow) {
-                return 2;
+                return 1;
             }
             return 0;
         }
 
         @Override
         public int getViewTypeCount() {
-            return 3;
+            return 2;
         }
 
         @Override

TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java

@@ -58,7 +58,7 @@ import org.telegram.messenger.RPCRequest;
 import org.telegram.messenger.UserConfig;
 import org.telegram.android.MessageObject;
 import org.telegram.ui.Adapters.BaseFragmentAdapter;
-import org.telegram.ui.Cells.DetailTextCell;
+import org.telegram.ui.Cells.TextInfoCell;
 import org.telegram.ui.Cells.EmptyCell;
 import org.telegram.ui.Cells.HeaderCell;
 import org.telegram.ui.Cells.ShadowSectionCell;
@@ -1052,10 +1052,10 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
                 }
             } else if (type == 5) {
                 if (view == null) {
-                    view = new DetailTextCell(mContext);
+                    view = new TextInfoCell(mContext);
                     try {
                         PackageInfo pInfo = ApplicationLoader.applicationContext.getPackageManager().getPackageInfo(ApplicationLoader.applicationContext.getPackageName(), 0);
-                        ((DetailTextCell) view).setText(String.format(Locale.US, "Telegram for Android v%s (%d)", pInfo.versionName, pInfo.versionCode));
+                        ((TextInfoCell) view).setText(String.format(Locale.US, "Telegram for Android v%s (%d)", pInfo.versionName, pInfo.versionCode));
                     } catch (Exception e) {
                         FileLog.e("tmessages", e);
                     }

TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java

@@ -23,9 +23,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import org.telegram.android.AndroidUtilities;
@@ -40,18 +38,22 @@ import org.telegram.android.MessagesController;
 import org.telegram.messenger.R;
 import org.telegram.messenger.RPCRequest;
 import org.telegram.ui.Adapters.BaseFragmentAdapter;
+import org.telegram.ui.Cells.HeaderCell;
+import org.telegram.ui.Cells.ShadowSectionCell;
 import org.telegram.ui.Cells.TextCheckCell;
+import org.telegram.ui.Cells.TextColorCell;
+import org.telegram.ui.Cells.TextDetailSettingsCell;
 import org.telegram.ui.Views.ActionBar.ActionBar;
 import org.telegram.ui.Views.ActionBar.BaseFragment;
 import org.telegram.ui.Views.AvatarDrawable;
 import org.telegram.ui.Views.ColorPickerView;
-import org.telegram.ui.Views.SettingsSectionLayout;
 
 public class SettingsNotificationsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate {
     private ListView listView;
     private boolean reseting = false;
 
     private int notificationsServiceRow;
+    private int messageSectionRow2;
     private int messageSectionRow;
     private int messageAlertRow;
     private int messagePreviewRow;
@@ -59,6 +61,7 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
     private int messageSoundRow;
     private int messageLedRow;
     private int messagePopupNotificationRow;
+    private int groupSectionRow2;
     private int groupSectionRow;
     private int groupAlertRow;
     private int groupPreviewRow;
@@ -66,15 +69,19 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
     private int groupSoundRow;
     private int groupLedRow;
     private int groupPopupNotificationRow;
+    private int inappSectionRow2;
     private int inappSectionRow;
     private int inappSoundRow;
     private int inappVibrateRow;
     private int inappPreviewRow;
+    private int eventsSectionRow2;
     private int eventsSectionRow;
     private int contactJoinedRow;
+    private int otherSectionRow2;
     private int otherSectionRow;
     private int badgeNumberRow;
     private int pebbleAlertRow;
+    private int resetSectionRow2;
     private int resetSectionRow;
     private int resetNotificationsRow;
     private int rowCount = 0;
@@ -82,29 +89,35 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
     @Override
     public boolean onFragmentCreate() {
         notificationsServiceRow = rowCount++;
+        messageSectionRow2 = rowCount++;
         messageSectionRow = rowCount++;
         messageAlertRow = rowCount++;
         messagePreviewRow = rowCount++;
-        messageVibrateRow = rowCount++;
         messageLedRow = rowCount++;
+        messageVibrateRow = rowCount++;
         messagePopupNotificationRow = rowCount++;
         messageSoundRow = rowCount++;
+        groupSectionRow2 = rowCount++;
         groupSectionRow = rowCount++;
         groupAlertRow = rowCount++;
         groupPreviewRow = rowCount++;
-        groupVibrateRow = rowCount++;
         groupLedRow = rowCount++;
+        groupVibrateRow = rowCount++;
         groupPopupNotificationRow = rowCount++;
         groupSoundRow = rowCount++;
+        inappSectionRow2 = rowCount++;
         inappSectionRow = rowCount++;
         inappSoundRow = rowCount++;
         inappVibrateRow = rowCount++;
         inappPreviewRow = rowCount++;
+        eventsSectionRow2 = rowCount++;
         eventsSectionRow = rowCount++;
         contactJoinedRow = rowCount++;
+        otherSectionRow2 = rowCount++;
         otherSectionRow = rowCount++;
         badgeNumberRow = rowCount++;
         pebbleAlertRow = rowCount++;
+        resetSectionRow2 = rowCount++;
         resetSectionRow = rowCount++;
         resetNotificationsRow = rowCount++;
 
@@ -527,7 +540,10 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
 
         @Override
         public boolean isEnabled(int i) {
-            return !(i == messageSectionRow || i == groupSectionRow || i == inappSectionRow || i == eventsSectionRow || i == otherSectionRow || i == resetSectionRow);
+            return !(i == messageSectionRow || i == groupSectionRow || i == inappSectionRow ||
+                    i == eventsSectionRow || i == otherSectionRow || i == resetSectionRow ||
+                    i == messageSectionRow2 || i == eventsSectionRow2 || i == groupSectionRow2 ||
+                    i == inappSectionRow2 || i == otherSectionRow2 || i == resetSectionRow2);
         }
 
         @Override
@@ -555,20 +571,20 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
             int type = getItemViewType(i);
             if (type == 0) {
                 if (view == null) {
-                    view = new SettingsSectionLayout(mContext);
+                    view = new HeaderCell(mContext);
                 }
                 if (i == messageSectionRow) {
-                    ((SettingsSectionLayout) view).setText(LocaleController.getString("MessageNotifications", R.string.MessageNotifications));
+                    ((HeaderCell) view).setText(LocaleController.getString("MessageNotifications", R.string.MessageNotifications));
                 } else if (i == groupSectionRow) {
-                    ((SettingsSectionLayout) view).setText(LocaleController.getString("GroupNotifications", R.string.GroupNotifications));
+                    ((HeaderCell) view).setText(LocaleController.getString("GroupNotifications", R.string.GroupNotifications));
                 } else if (i == inappSectionRow) {
-                    ((SettingsSectionLayout) view).setText(LocaleController.getString("InAppNotifications", R.string.InAppNotifications));
+                    ((HeaderCell) view).setText(LocaleController.getString("InAppNotifications", R.string.InAppNotifications));
                 } else if (i == eventsSectionRow) {
-                    ((SettingsSectionLayout) view).setText(LocaleController.getString("Events", R.string.Events));
+                    ((HeaderCell) view).setText(LocaleController.getString("Events", R.string.Events));
                 } else if (i == otherSectionRow) {
-                    ((SettingsSectionLayout) view).setText(LocaleController.getString("PhoneOther", R.string.PhoneOther));
+                    ((HeaderCell) view).setText(LocaleController.getString("PhoneOther", R.string.PhoneOther));
                 } else if (i == resetSectionRow) {
-                    ((SettingsSectionLayout) view).setText(LocaleController.getString("Reset", R.string.Reset));
+                    ((HeaderCell) view).setText(LocaleController.getString("Reset", R.string.Reset));
                 }
             } if (type == 1) {
                 if (view == null) {
@@ -577,24 +593,14 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
                 TextCheckCell checkCell = (TextCheckCell) view;
 
                 SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
-                boolean enabled = false;
+                if (i == messageAlertRow) {
-                boolean enabledAll = preferences.getBoolean("EnableAll", true);
+                    checkCell.setTextAndCheck(LocaleController.getString("Alert", R.string.Alert), preferences.getBoolean("EnableAll", true), true);
-                boolean enabledGroup = preferences.getBoolean("EnableGroup", true);
+                } else if (i == groupAlertRow) {
-
+                    checkCell.setTextAndCheck(LocaleController.getString("Alert", R.string.Alert), preferences.getBoolean("EnableGroup", true), true);
-                if (i == messageAlertRow || i == groupAlertRow) {
+                } else if (i == messagePreviewRow) {
-                    if (i == messageAlertRow) {
+                    checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), preferences.getBoolean("EnablePreviewAll", true), true);
-                        enabled = enabledAll;
+                } else if (i == groupPreviewRow) {
-                    } else if (i == groupAlertRow) {
+                    checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), preferences.getBoolean("EnablePreviewGroup", true), true);
-                        enabled = enabledGroup;
-                    }
-                    checkCell.setTextAndCheck(LocaleController.getString("Alert", R.string.Alert), enabled, true);
-                } else if (i == messagePreviewRow || i == groupPreviewRow) {
-                    if (i == messagePreviewRow) {
-                        enabled = preferences.getBoolean("EnablePreviewAll", true);
-                    } else if (i == groupPreviewRow) {
-                        enabled = preferences.getBoolean("EnablePreviewGroup", true);
-                    }
-                    checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), enabled, true);
                 } else if (i == inappSoundRow) {
                     checkCell.setTextAndCheck(LocaleController.getString("InAppSounds", R.string.InAppSounds), preferences.getBoolean("EnableInAppSounds", true), true);
                 } else if (i == inappVibrateRow) {
@@ -612,95 +618,81 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
                 }
             } else if (type == 2) {
                 if (view == null) {
-                    LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                    view = new TextDetailSettingsCell(mContext);
-                    view = li.inflate(R.layout.settings_row_detail_layout, viewGroup, false);
                 }
-                TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
+
-                TextView textViewDetail = (TextView)view.findViewById(R.id.settings_row_text_detail);
+                TextDetailSettingsCell textCell = (TextDetailSettingsCell) view;
-                View divider = view.findViewById(R.id.settings_row_divider);
+
                 SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
-                boolean enabledAll = preferences.getBoolean("EnableAll", true);
-                boolean enabledGroup = preferences.getBoolean("EnableGroup", true);
 
                 if (i == messageSoundRow || i == groupSoundRow) {
-                    String name = null;
+                    textCell.setMultilineDetail(false);
+                    String value = null;
                     if (i == messageSoundRow) {
-                        name = preferences.getString("GlobalSound", LocaleController.getString("Default", R.string.Default));
+                        value = preferences.getString("GlobalSound", LocaleController.getString("Default", R.string.Default));
                     } else if (i == groupSoundRow) {
-                        name = preferences.getString("GroupSound", LocaleController.getString("Default", R.string.Default));
+                        value = preferences.getString("GroupSound", LocaleController.getString("Default", R.string.Default));
                     }
-                    if (name.equals("NoSound")) {
+                    if (value.equals("NoSound")) {
-                        textViewDetail.setText(LocaleController.getString("NoSound", R.string.NoSound));
+                        value = LocaleController.getString("NoSound", R.string.NoSound);
-                    } else {
-                        textViewDetail.setText(name);
                     }
-                    textView.setText(LocaleController.getString("Sound", R.string.Sound));
+                    textCell.setTextAndValue(LocaleController.getString("Sound", R.string.Sound), value, false);
-                    divider.setVisibility(View.INVISIBLE);
                 } else if (i == resetNotificationsRow) {
-                    textView.setText(LocaleController.getString("ResetAllNotifications", R.string.ResetAllNotifications));
+                    textCell.setMultilineDetail(true);
-                    textViewDetail.setText(LocaleController.getString("UndoAllCustom", R.string.UndoAllCustom));
+                    textCell.setTextAndValue(LocaleController.getString("ResetAllNotifications", R.string.ResetAllNotifications), LocaleController.getString("UndoAllCustom", R.string.UndoAllCustom), false);
-                    divider.setVisibility(View.INVISIBLE);
                 } else if (i == messagePopupNotificationRow || i == groupPopupNotificationRow) {
-                    textView.setText(LocaleController.getString("PopupNotification", R.string.PopupNotification));
+                    textCell.setMultilineDetail(false);
                     int option = 0;
                     if (i == messagePopupNotificationRow) {
                         option = preferences.getInt("popupAll", 0);
                     } else if (i == groupPopupNotificationRow) {
                         option = preferences.getInt("popupGroup", 0);
                     }
+                    String value;
                     if (option == 0) {
-                        textViewDetail.setText(LocaleController.getString("NoPopup", R.string.NoPopup));
+                        value = LocaleController.getString("NoPopup", R.string.NoPopup);
                     } else if (option == 1) {
-                        textViewDetail.setText(LocaleController.getString("OnlyWhenScreenOn", R.string.OnlyWhenScreenOn));
+                        value = LocaleController.getString("OnlyWhenScreenOn", R.string.OnlyWhenScreenOn);
                     } else if (option == 2) {
-                        textViewDetail.setText(LocaleController.getString("OnlyWhenScreenOff", R.string.OnlyWhenScreenOff));
+                        value = LocaleController.getString("OnlyWhenScreenOff", R.string.OnlyWhenScreenOff);
-                    } else if (option == 3) {
+                    } else {
-                        textViewDetail.setText(LocaleController.getString("AlwaysShowPopup", R.string.AlwaysShowPopup));
+                        value = LocaleController.getString("AlwaysShowPopup", R.string.AlwaysShowPopup);
+                    }
+                    textCell.setTextAndValue(LocaleController.getString("PopupNotification", R.string.PopupNotification), value, true);
+                } else if (i == messageVibrateRow || i == groupVibrateRow) {
+                    textCell.setMultilineDetail(false);
+                    int value = 0;
+                    if (i == messageVibrateRow) {
+                        value = preferences.getInt("vibrate_messages", 0);
+                    } else if (i == groupVibrateRow) {
+                        value = preferences.getInt("vibrate_group", 0);
+                    }
+                    if (value == 0) {
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Default", R.string.Default), true);
+                    } else if (value == 1) {
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Short", R.string.Short), true);
+                    } else if (value == 2) {
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Disabled", R.string.Disabled), true);
+                    } else if (value == 3) {
+                        textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Long", R.string.Long), true);
                     }
-                    divider.setVisibility(View.VISIBLE);
                 }
             } else if (type == 3) {
                 if (view == null) {
-                    LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                    view = new TextColorCell(mContext);
-                    view = li.inflate(R.layout.settings_row_color_layout, viewGroup, false);
                 }
-                TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
+
-                View colorView = view.findViewById(R.id.settings_color);
+                TextColorCell textCell = (TextColorCell) view;
-                View divider = view.findViewById(R.id.settings_row_divider);
+
-                textView.setText(LocaleController.getString("LedColor", R.string.LedColor));
                 SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
                 if (i == messageLedRow) {
-                    colorView.setBackgroundColor(preferences.getInt("MessagesLed", 0xff00ff00));
+                    textCell.setTextAndColor(LocaleController.getString("LedColor", R.string.LedColor), preferences.getInt("MessagesLed", 0xff00ff00), true);
                 } else if (i == groupLedRow) {
-                    colorView.setBackgroundColor(preferences.getInt("GroupLed", 0xff00ff00));
+                    textCell.setTextAndColor(LocaleController.getString("LedColor", R.string.LedColor), preferences.getInt("GroupLed", 0xff00ff00), true);
                 }
-                divider.setVisibility(View.VISIBLE);
             } else if (type == 4) {
                 if (view == null) {
-                    LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                    view = new ShadowSectionCell(mContext);
-                    view = li.inflate(R.layout.user_profile_leftright_row_layout, viewGroup, false);
-                }
-                TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
-                TextView detailTextView = (TextView)view.findViewById(R.id.settings_row_text_detail);
-
-                View divider = view.findViewById(R.id.settings_row_divider);
-                SharedPreferences preferences = mContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
-                int value = 0;
-                textView.setText(LocaleController.getString("Vibrate", R.string.Vibrate));
-                divider.setVisibility(View.VISIBLE);
-                if (i == messageVibrateRow) {
-                    value = preferences.getInt("vibrate_messages", 0);
-                } else if (i == groupVibrateRow) {
-                    value = preferences.getInt("vibrate_group", 0);
-                }
-                if (value == 0) {
-                    detailTextView.setText(LocaleController.getString("Default", R.string.Default));
-                } else if (value == 1) {
-                    detailTextView.setText(LocaleController.getString("Short", R.string.Short));
-                } else if (value == 2) {
-                    detailTextView.setText(LocaleController.getString("Disabled", R.string.Disabled));
-                } else if (value == 3) {
-                    detailTextView.setText(LocaleController.getString("Long", R.string.Long));
                 }
             }
             return view;
@@ -708,17 +700,18 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
 
         @Override
         public int getItemViewType(int i) {
-            if (i == messageSectionRow || i == groupSectionRow || i == inappSectionRow || i == eventsSectionRow || i == otherSectionRow || i == resetSectionRow) {
+            if (i == messageSectionRow || i == groupSectionRow || i == inappSectionRow ||
+                    i == eventsSectionRow || i == otherSectionRow || i == resetSectionRow) {
                 return 0;
-            } else if (i == messageAlertRow || i == messagePreviewRow ||
+            } else if (i == messageAlertRow || i == messagePreviewRow || i == groupAlertRow ||
-                    i == groupAlertRow || i == groupPreviewRow ||
+                    i == groupPreviewRow || i == inappSoundRow || i == inappVibrateRow ||
-                    i == inappSoundRow || i == inappVibrateRow || i == inappPreviewRow ||
+                    i == inappPreviewRow || i == contactJoinedRow || i == pebbleAlertRow ||
-                    i == contactJoinedRow ||
+                    i == notificationsServiceRow || i == badgeNumberRow) {
-                    i == pebbleAlertRow || i == notificationsServiceRow || i == badgeNumberRow) {
                 return 1;
             } else if (i == messageLedRow || i == groupLedRow) {
                 return 3;
-            } else if (i == groupVibrateRow || i == messageVibrateRow) {
+            } else if (i == messageSectionRow2 || i == eventsSectionRow2 || i == groupSectionRow2 ||
+                    i == inappSectionRow2 || i == otherSectionRow2 || i == resetSectionRow2) {
                 return 4;
             } else {
                 return 2;

TMessagesProj/src/main/res/layout-ar/contacts_invite_row_layout.xml

@@ -1,36 +0,0 @@
-<?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">
-
-    <ImageView
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:id="@+id/messages_list_row_avatar"
-        android:src="@drawable/ic_ab_share"
-        android:contentDescription=""
-        android:scaleType="center"
-        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:maxLines="1"
-        android:gravity="right"
-        android:textColor="#006fc8"
-        android:layout_gravity="center_vertical|right"/>
-
-    <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>

TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml

@@ -1,75 +0,0 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="13dp"
-    android:paddingBottom="12dp">
-
-    <ImageButton
-        android:id="@+id/settings_edit_name"
-        android:background="@drawable/list_selector"
-        android:clickable="true"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_edit"
-        android:layout_marginTop="4dp"/>
-
-    <View
-        android:background="#e8e8e8"
-        android:layout_width="1dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="4dp"/>
-
-    <LinearLayout
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="13dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginTop="1dp"
-        android:layout_weight="1.0"
-        android:gravity="right">
-
-        <TextView
-            android:textSize="19dp"
-            android:textColor="#000000"
-            android:ellipsize="end"
-            android:id="@+id/settings_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lines="1"
-            android:singleLine="true"
-            android:gravity="right"/>
-
-        <TextView
-            android:textSize="17dp"
-            android:textColor="#ababab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:id="@+id/settings_online"
-            android:gravity="right"/>
-
-    </LinearLayout>
-
-    <FrameLayout
-        android:layout_width="64dp"
-        android:layout_height="64dp">
-
-        <org.telegram.ui.Views.BackupImageView
-            android:id="@+id/settings_avatar_image"
-            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>
-
-</LinearLayout>

TMessagesProj/src/main/res/layout-ar/settings_row_check_layout.xml

@@ -1,33 +0,0 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="50dp"
-    android:layout_gravity="top">
-
-    <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="8dp"
-        android:src="@drawable/btn_check_on" />
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="104dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical|right"
-        android:layout_gravity="top|right"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/layout-ar/settings_row_check_notify_layout.xml

@@ -1,33 +0,0 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="64dp"
-    android:layout_gravity="top">
-
-    <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_on"/>
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="104dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical|right"
-        android:layout_gravity="top|right"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/layout-ar/settings_row_color_layout.xml

@@ -1,41 +0,0 @@
-<!--
-  ~ This is the source code of Telegram for Android v. 1.4.x.
-  ~ It is licensed under GNU GPL v. 2 or later.
-  ~ You should have received a copy of the license in this archive (see LICENSE).
-  ~
-  ~ Copyright Nikolai Kudashov, 2013-2014.
-  -->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="50dp"
-    android:layout_gravity="top">
-
-    <FrameLayout
-        android:id="@+id/settings_color"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="14dp"
-        android:layout_marginRight="8dp"
-        android:layout_gravity="center_vertical"/>
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical|right"
-        android:layout_gravity="top|right"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/layout-ar/settings_row_detail_layout.xml

@@ -1,39 +0,0 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_gravity="top">
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical|right"
-        android:layout_marginTop="10dp"
-        android:layout_gravity="top|right"/>
-
-    <TextView
-        android:textSize="14dp"
-        android:textColor="#999999"
-        android:id="@+id/settings_row_text_detail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical|right"
-        android:layout_marginBottom="12dp"
-        android:layout_gravity="bottom|right"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</LinearLayout>

TMessagesProj/src/main/res/layout-ar/user_profile_avatar_layout.xml

@@ -1,48 +0,0 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:gravity="center_vertical|right"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="13dp"
-    android:paddingBottom="12dp">
-
-    <LinearLayout
-        android:layout_gravity="center_vertical|left"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="13dp"
-        android:layout_marginBottom="1dp">
-
-        <TextView
-            android:textSize="21dp"
-            android:textColor="#333333"
-            android:ellipsize="end"
-            android:id="@+id/settings_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lines="1"
-            android:singleLine="true"
-            android:gravity="right"
-            android:layout_gravity="right"/>
-
-        <TextView
-            android:textSize="14dp"
-            android:textColor="#999999"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:id="@+id/settings_online"
-            android:gravity="right"
-            android:layout_gravity="right"/>
-
-    </LinearLayout>
-
-    <org.telegram.ui.Views.BackupImageView
-        android:id="@+id/settings_avatar_image"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:layout_gravity="right"/>
-
-</LinearLayout>

TMessagesProj/src/main/res/layout-ar/user_profile_phone_layout.xml

@@ -1,68 +0,0 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="64dp"
-    android:background="@drawable/list_selector"
-    android:layout_gravity="top">
-
-    <ImageButton
-        android:id="@+id/settings_edit_name"
-        android:background="@drawable/list_selector"
-        android:clickable="true"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_profile_send_message"
-        android:layout_gravity="left|center_vertical"
-        android:paddingTop="2dp"/>
-
-    <View
-        android:background="#e8e8e8"
-        android:layout_width="1dp"
-        android:layout_height="48dp"
-        android:layout_gravity="left|center_vertical"
-        android:layout_marginLeft="48dp"/>
-
-    <ImageButton
-        android:id="@+id/settings_call_phone"
-        android:background="@drawable/list_selector"
-        android:clickable="true"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginLeft="48dp"
-        android:src="@drawable/call"
-        android:layout_gravity="left|center_vertical"
-        android:paddingTop="2dp"/>
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical|right"
-        android:layout_marginTop="9dp"
-        android:layout_gravity="top|right"/>
-
-    <TextView
-        android:textSize="13dp"
-        android:textColor="#999999"
-        android:id="@+id/settings_row_text_detail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical|right"
-        android:layout_marginBottom="9dp"
-        android:textAllCaps="true"
-        android:layout_gravity="bottom|right"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/layout/contacts_invite_row_layout.xml

@@ -1,35 +0,0 @@
-<?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">
-
-    <ImageView
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:id="@+id/messages_list_row_avatar"
-        android:src="@drawable/ic_ab_share"
-        android:contentDescription=""
-        android:scaleType="center"
-        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:maxLines="1"
-        android:textColor="#006fc8"
-        android:layout_gravity="center_vertical"/>
-
-    <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>

TMessagesProj/src/main/res/layout/settings_logout_button.xml

@@ -1,3 +1,11 @@
+<!--
+  ~ This is the source code of Telegram for Android v. 1.7.x.
+  ~ It is licensed under GNU GPL v. 2 or later.
+  ~ You should have received a copy of the license in this archive (see LICENSE).
+  ~
+  ~ Copyright Nikolai Kudashov, 2013-2014.
+  -->
+
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"

TMessagesProj/src/main/res/layout/settings_name_layout.xml

@@ -1,72 +0,0 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="13dp"
-    android:paddingBottom="12dp">
-
-    <FrameLayout
-        android:layout_width="64dp"
-        android:layout_height="64dp">
-
-        <org.telegram.ui.Views.BackupImageView
-            android:id="@+id/settings_avatar_image"
-            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>
-
-    <LinearLayout
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="13dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="1dp"
-        android:layout_weight="1.0">
-
-        <TextView
-            android:textSize="21dp"
-            android:textColor="#333333"
-            android:ellipsize="end"
-            android:id="@+id/settings_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lines="1"
-            android:singleLine="true" />
-
-        <TextView
-            android:textSize="14dp"
-            android:textColor="#999999"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:id="@+id/settings_online"/>
-
-    </LinearLayout>
-
-    <View
-        android:background="#e8e8e8"
-        android:layout_width="1dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="4dp"/>
-
-    <ImageButton
-        android:id="@+id/settings_edit_name"
-        android:background="@drawable/list_selector"
-        android:clickable="true"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_edit"
-        android:layout_marginTop="4dp"/>
-
-</LinearLayout>

TMessagesProj/src/main/res/layout/settings_row_check_layout.xml

@@ -1,34 +0,0 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="50dp"
-    android:layout_gravity="top">
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="104dp"
-        android:gravity="center_vertical"
-        android:layout_gravity="top"/>
-
-    <ImageView
-        android:layout_gravity="center_vertical|right"
-        android:id="@+id/settings_row_check_button"
-        android:duplicateParentState="false"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="8dp"
-        android:src="@drawable/btn_check_on"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/layout/settings_row_check_notify_layout.xml

@@ -1,33 +0,0 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="64dp"
-    android:layout_gravity="top">
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="104dp"
-        android:gravity="center_vertical"
-        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_on" />
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/layout/settings_row_color_layout.xml

@@ -1,33 +0,0 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="50dp"
-    android:layout_gravity="top">
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical"
-        android:layout_gravity="top"/>
-
-    <FrameLayout
-        android:id="@+id/settings_color"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="14dp"
-        android:layout_gravity="center_vertical|right"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/layout/settings_row_detail_layout.xml

@@ -1,39 +0,0 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_gravity="top">
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="8dp"
-        android:paddingLeft="8dp"
-        android:gravity="center_vertical"
-        android:layout_marginTop="10dp"
-        android:layout_gravity="top"/>
-
-    <TextView
-        android:textSize="14dp"
-        android:textColor="#999999"
-        android:id="@+id/settings_row_text_detail"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical"
-        android:layout_marginBottom="12dp"
-        android:layout_gravity="bottom"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</LinearLayout>

TMessagesProj/src/main/res/layout/settings_row_version.xml

@@ -1,16 +0,0 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="56dp"
-    android:paddingTop="8dp">
-
-    <TextView
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:textSize="14dp"
-        android:textColor="#a0a0a0"
-        android:id="@+id/settings_row_text"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/layout/user_profile_avatar_layout.xml

@@ -1,43 +0,0 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="13dp"
-    android:paddingBottom="12dp">
-
-    <org.telegram.ui.Views.BackupImageView
-        android:id="@+id/settings_avatar_image"
-        android:layout_width="64dp"
-        android:layout_height="64dp"/>
-
-    <LinearLayout
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="13dp"
-        android:layout_marginBottom="1dp">
-
-        <TextView
-            android:textSize="21dp"
-            android:textColor="#333333"
-            android:ellipsize="end"
-            android:id="@+id/settings_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lines="1"
-            android:singleLine="true"/>
-
-        <TextView
-            android:textSize="14dp"
-            android:textColor="#999999"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:id="@+id/settings_online"/>
-
-    </LinearLayout>
-
-</LinearLayout>

TMessagesProj/src/main/res/layout/user_profile_phone_layout.xml

@@ -1,68 +0,0 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="64dp"
-    android:background="@drawable/list_selector"
-    android:layout_gravity="top">
-
-    <TextView
-        android:textSize="18dp"
-        android:textColor="#333333"
-        android:id="@+id/settings_row_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical"
-        android:layout_marginTop="9dp"
-        android:layout_gravity="top"/>
-
-    <TextView
-        android:textSize="13dp"
-        android:textColor="#999999"
-        android:id="@+id/settings_row_text_detail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:gravity="center_vertical"
-        android:layout_marginBottom="9dp"
-        android:textAllCaps="true"
-        android:layout_gravity="bottom"/>
-
-    <ImageButton
-        android:id="@+id/settings_call_phone"
-        android:background="@drawable/list_selector"
-        android:clickable="true"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginRight="48dp"
-        android:src="@drawable/call"
-        android:layout_gravity="right|center_vertical"
-        android:paddingTop="2dp"/>
-
-    <View
-        android:background="#e8e8e8"
-        android:layout_width="1dp"
-        android:layout_height="48dp"
-        android:layout_gravity="right|center_vertical"
-        android:layout_marginRight="48dp"/>
-
-    <ImageButton
-        android:id="@+id/settings_edit_name"
-        android:background="@drawable/list_selector"
-        android:clickable="true"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_profile_send_message"
-        android:layout_gravity="right|center_vertical"
-        android:paddingTop="2dp"/>
-
-    <View
-        android:background="@color/divider"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:layout_gravity="bottom"
-        android:id="@+id/settings_row_divider"/>
-
-</FrameLayout>

TMessagesProj/src/main/res/values-ar/strings.xml

@@ -285,6 +285,7 @@
     <string name="WhenRoaming">عند تواجدك خارج البلاد</string>
     <string name="NoMediaAutoDownload">لا يوجد وسائط</string>
     <string name="SaveToGallerySettings">حفظ في الجهاز</string>
+    <string name="EditName">Edit Name</string>
     <!--media view-->
     <string name="NoMedia">لا توجد وسائط بعد</string>
     <string name="CancelDownload">إلغاء التنزيل</string>

TMessagesProj/src/main/res/values-de/strings.xml

@@ -285,6 +285,7 @@
     <string name="WhenRoaming">bei Roaming</string>
     <string name="NoMediaAutoDownload">kein automatischer Download</string>
     <string name="SaveToGallerySettings">In der Galerie speichern</string>
+    <string name="EditName">Edit Name</string>
     <!--media view-->
     <string name="NoMedia">Noch keine geteilten Medien vorhanden</string>
     <string name="CancelDownload">Download abbrechen</string>

TMessagesProj/src/main/res/values-es/strings.xml

@@ -285,6 +285,7 @@
     <string name="WhenRoaming">Con itinerancia de datos</string>
     <string name="NoMediaAutoDownload">Ningún contenido multimedia</string>
     <string name="SaveToGallerySettings">Guardar en galería</string>
+    <string name="EditName">Edit Name</string>
     <!--media view-->
     <string name="NoMedia">Aún no hay fotos ni vídeos</string>
     <string name="CancelDownload">Cancelar descarga</string>

TMessagesProj/src/main/res/values-it/strings.xml

@@ -285,6 +285,7 @@
     <string name="WhenRoaming">In roaming</string>
     <string name="NoMediaAutoDownload">Nessun media</string>
     <string name="SaveToGallerySettings">Salva nella galleria</string>
+    <string name="EditName">Edit Name</string>
     <!--media view-->
     <string name="NoMedia">Nessun media condiviso</string>
     <string name="CancelDownload">Annulla scaricamento</string>

TMessagesProj/src/main/res/values-ko/strings.xml

@@ -285,6 +285,7 @@
     <string name="WhenRoaming">로밍 중일 때</string>
     <string name="NoMediaAutoDownload">다운로드 안함</string>
     <string name="SaveToGallerySettings">앨범에 자동 저장</string>
+    <string name="EditName">Edit Name</string>
     <!--media view-->
     <string name="NoMedia">공유한 미디어가 없습니다</string>
     <string name="CancelDownload">다운로드 취소</string>

TMessagesProj/src/main/res/values-nl/strings.xml

@@ -285,6 +285,7 @@
     <string name="WhenRoaming">Bij roaming</string>
     <string name="NoMediaAutoDownload">Geen media</string>
     <string name="SaveToGallerySettings">Opslaan in galerij</string>
+    <string name="EditName">Edit Name</string>
     <!--media view-->
     <string name="NoMedia">Nog geen media gedeeld</string>
     <string name="CancelDownload">Downloaden annuleren</string>

TMessagesProj/src/main/res/values-pt-rBR/strings.xml

@@ -285,6 +285,7 @@
     <string name="WhenRoaming">Quando em roaming</string>
     <string name="NoMediaAutoDownload">Sem mídia</string>
     <string name="SaveToGallerySettings">Salvar na galeria</string>
+    <string name="EditName">Edit Name</string>
     <!--media view-->
     <string name="NoMedia">Ainda não há mídia compartilhada</string>
     <string name="CancelDownload">Cancelar Download</string>

TMessagesProj/src/main/res/values-pt-rPT/strings.xml

@@ -285,6 +285,7 @@
     <string name="WhenRoaming">Quando em roaming</string>
     <string name="NoMediaAutoDownload">Sem mídia</string>
     <string name="SaveToGallerySettings">Salvar na galeria</string>
+    <string name="EditName">Edit Name</string>
     <!--media view-->
     <string name="NoMedia">Ainda não há mídia compartilhada</string>
     <string name="CancelDownload">Cancelar Download</string>

TMessagesProj/src/main/res/values/strings.xml

@@ -224,17 +224,17 @@
     <string name="Unblock">Unblock</string>
     <string name="UnblockText">Tap and hold on user to unblock.</string>
     <string name="NoBlocked">No blocked users yet</string>
-    <string name="MessageNotifications">MESSAGE NOTIFICATIONS</string>
+    <string name="MessageNotifications">Message notifications</string>
     <string name="Alert">Alert</string>
     <string name="MessagePreview">Message Preview</string>
-    <string name="GroupNotifications">GROUP NOTIFICATIONS</string>
+    <string name="GroupNotifications">Group notifications</string>
     <string name="Sound">Sound</string>
-    <string name="InAppNotifications">IN-APP NOTIFICATIONS</string>
+    <string name="InAppNotifications">In-app notifications</string>
     <string name="InAppSounds">In-App Sounds</string>
     <string name="InAppVibrate">In-App Vibrate</string>
     <string name="Vibrate">Vibrate</string>
     <string name="InAppPreview">In-App Preview</string>
-    <string name="Reset">RESET</string>
+    <string name="Reset">Reset</string>
     <string name="ResetAllNotifications">Reset All Notifications</string>
     <string name="UndoAllCustom">Undo all custom notification settings for all your contacts and groups</string>
     <string name="NotificationsAndSounds">Notifications and Sounds</string>
@@ -249,7 +249,7 @@
     <string name="MessagesSettings">Messages</string>
     <string name="SendByEnter">Send by Enter</string>
     <string name="TerminateAllSessions">Terminate All Other Sessions</string>
-    <string name="Events">EVENTS</string>
+    <string name="Events">Events</string>
     <string name="ContactJoined">Contact joined Telegram</string>
     <string name="Pebble">PEBBLE</string>
     <string name="Language">Language</string>