From 4104a21f6dd2f0503d8434ac32e781dcdadeeebd Mon Sep 17 00:00:00 2001 From: DrKLO Date: Wed, 12 Nov 2014 13:41:46 +0300 Subject: [PATCH] More Android L design --- .../org/telegram/ui/Cells/TextColorCell.java | 91 +++++++++ .../org/telegram/ui/Cells/TextDetailCell.java | 4 +- .../ui/Cells/TextDetailSettingsCell.java | 23 ++- ...{DetailTextCell.java => TextInfoCell.java} | 4 +- .../java/org/telegram/ui/ChatActivity.java | 4 +- .../ui/ProfileNotificationsActivity.java | 88 +++------ .../org/telegram/ui/SettingsActivity.java | 6 +- .../ui/SettingsNotificationsActivity.java | 187 +++++++++--------- .../layout-ar/contacts_invite_row_layout.xml | 36 ---- .../res/layout-ar/settings_name_layout.xml | 75 ------- .../layout-ar/settings_row_check_layout.xml | 33 ---- .../settings_row_check_notify_layout.xml | 33 ---- .../layout-ar/settings_row_color_layout.xml | 41 ---- .../layout-ar/settings_row_detail_layout.xml | 39 ---- .../layout-ar/user_profile_avatar_layout.xml | 48 ----- .../layout-ar/user_profile_phone_layout.xml | 68 ------- .../res/layout/contacts_invite_row_layout.xml | 35 ---- .../res/layout/settings_logout_button.xml | 8 + .../main/res/layout/settings_name_layout.xml | 72 ------- .../res/layout/settings_row_check_layout.xml | 34 ---- .../settings_row_check_notify_layout.xml | 33 ---- .../res/layout/settings_row_color_layout.xml | 33 ---- .../res/layout/settings_row_detail_layout.xml | 39 ---- .../main/res/layout/settings_row_version.xml | 16 -- .../res/layout/user_profile_avatar_layout.xml | 43 ---- .../res/layout/user_profile_phone_layout.xml | 68 ------- .../src/main/res/values-ar/strings.xml | 1 + .../src/main/res/values-de/strings.xml | 1 + .../src/main/res/values-es/strings.xml | 1 + .../src/main/res/values-it/strings.xml | 1 + .../src/main/res/values-ko/strings.xml | 1 + .../src/main/res/values-nl/strings.xml | 1 + .../src/main/res/values-pt-rBR/strings.xml | 1 + .../src/main/res/values-pt-rPT/strings.xml | 1 + TMessagesProj/src/main/res/values/strings.xml | 10 +- 35 files changed, 264 insertions(+), 915 deletions(-) create mode 100644 TMessagesProj/src/main/java/org/telegram/ui/Cells/TextColorCell.java rename TMessagesProj/src/main/java/org/telegram/ui/Cells/{DetailTextCell.java => TextInfoCell.java} (94%) delete mode 100644 TMessagesProj/src/main/res/layout-ar/contacts_invite_row_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/settings_row_check_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/settings_row_check_notify_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/settings_row_color_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/settings_row_detail_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/user_profile_avatar_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/user_profile_phone_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/contacts_invite_row_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/settings_name_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/settings_row_check_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/settings_row_check_notify_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/settings_row_color_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/settings_row_detail_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/settings_row_version.xml delete mode 100644 TMessagesProj/src/main/res/layout/user_profile_avatar_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/user_profile_phone_layout.xml diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextColorCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextColorCell.java new file mode 100644 index 000000000..2d4fe3721 --- /dev/null +++ b/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); + } + } +} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailCell.java index f85c4b949..e3b6c7c2a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailCell.java +++ b/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; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailSettingsCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailSettingsCell.java index 5d23153b7..c2eba3bfa 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailSettingsCell.java +++ b/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) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DetailTextCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextInfoCell.java similarity index 94% rename from TMessagesProj/src/main/java/org/telegram/ui/Cells/DetailTextCell.java rename to TMessagesProj/src/main/java/org/telegram/ui/Cells/TextInfoCell.java index 4386dfd90..5125a3c72 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DetailTextCell.java +++ b/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); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 61cd94c00..5442af079 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/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); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java index 8ab9fd8c1..cda48c603 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java +++ b/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 = li.inflate(R.layout.user_profile_leftright_row_layout, viewGroup, false); + view = new TextDetailSettingsCell(mContext); } - 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 = li.inflate(R.layout.settings_row_detail_layout, viewGroup, false); + view = new TextColorCell(mContext); } - 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); - 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)); + TextColorCell textCell = (TextColorCell) view; + 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 diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index de6a54d6b..2d1ea6aa1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/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); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java index 835035f96..7ac173018 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java +++ b/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; - boolean enabledAll = preferences.getBoolean("EnableAll", true); - boolean enabledGroup = preferences.getBoolean("EnableGroup", true); - - if (i == messageAlertRow || i == groupAlertRow) { - if (i == messageAlertRow) { - enabled = enabledAll; - } else if (i == groupAlertRow) { - 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); + if (i == messageAlertRow) { + checkCell.setTextAndCheck(LocaleController.getString("Alert", R.string.Alert), preferences.getBoolean("EnableAll", true), true); + } else if (i == groupAlertRow) { + checkCell.setTextAndCheck(LocaleController.getString("Alert", R.string.Alert), preferences.getBoolean("EnableGroup", true), true); + } else if (i == messagePreviewRow) { + checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), preferences.getBoolean("EnablePreviewAll", true), true); + } else if (i == groupPreviewRow) { + checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), preferences.getBoolean("EnablePreviewGroup", true), 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 = li.inflate(R.layout.settings_row_detail_layout, viewGroup, false); + view = new TextDetailSettingsCell(mContext); } - TextView textView = (TextView)view.findViewById(R.id.settings_row_text); - TextView textViewDetail = (TextView)view.findViewById(R.id.settings_row_text_detail); - View divider = view.findViewById(R.id.settings_row_divider); + + TextDetailSettingsCell textCell = (TextDetailSettingsCell) view; + 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")) { - textViewDetail.setText(LocaleController.getString("NoSound", R.string.NoSound)); - } else { - textViewDetail.setText(name); + if (value.equals("NoSound")) { + value = LocaleController.getString("NoSound", R.string.NoSound); } - textView.setText(LocaleController.getString("Sound", R.string.Sound)); - divider.setVisibility(View.INVISIBLE); + textCell.setTextAndValue(LocaleController.getString("Sound", R.string.Sound), value, false); } else if (i == resetNotificationsRow) { - textView.setText(LocaleController.getString("ResetAllNotifications", R.string.ResetAllNotifications)); - textViewDetail.setText(LocaleController.getString("UndoAllCustom", R.string.UndoAllCustom)); - divider.setVisibility(View.INVISIBLE); + textCell.setMultilineDetail(true); + textCell.setTextAndValue(LocaleController.getString("ResetAllNotifications", R.string.ResetAllNotifications), LocaleController.getString("UndoAllCustom", R.string.UndoAllCustom), false); } 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)); - } else if (option == 3) { - textViewDetail.setText(LocaleController.getString("AlwaysShowPopup", R.string.AlwaysShowPopup)); + value = LocaleController.getString("OnlyWhenScreenOff", R.string.OnlyWhenScreenOff); + } else { + 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 = li.inflate(R.layout.settings_row_color_layout, viewGroup, false); + view = new TextColorCell(mContext); } - 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)); + + TextColorCell textCell = (TextColorCell) view; + 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 = 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)); + view = new ShadowSectionCell(mContext); } } 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 || - i == groupAlertRow || i == groupPreviewRow || - i == inappSoundRow || i == inappVibrateRow || i == inappPreviewRow || - i == contactJoinedRow || - i == pebbleAlertRow || i == notificationsServiceRow || i == badgeNumberRow) { + } else if (i == messageAlertRow || i == messagePreviewRow || i == groupAlertRow || + i == groupPreviewRow || i == inappSoundRow || i == inappVibrateRow || + i == inappPreviewRow || i == contactJoinedRow || 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; diff --git a/TMessagesProj/src/main/res/layout-ar/contacts_invite_row_layout.xml b/TMessagesProj/src/main/res/layout-ar/contacts_invite_row_layout.xml deleted file mode 100644 index 8f701ee02..000000000 --- a/TMessagesProj/src/main/res/layout-ar/contacts_invite_row_layout.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml b/TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml deleted file mode 100644 index f6e3dc5bd..000000000 --- a/TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/settings_row_check_layout.xml b/TMessagesProj/src/main/res/layout-ar/settings_row_check_layout.xml deleted file mode 100644 index 6c4e623c2..000000000 --- a/TMessagesProj/src/main/res/layout-ar/settings_row_check_layout.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/settings_row_check_notify_layout.xml b/TMessagesProj/src/main/res/layout-ar/settings_row_check_notify_layout.xml deleted file mode 100644 index 2ce84a1cb..000000000 --- a/TMessagesProj/src/main/res/layout-ar/settings_row_check_notify_layout.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/settings_row_color_layout.xml b/TMessagesProj/src/main/res/layout-ar/settings_row_color_layout.xml deleted file mode 100644 index 389e955b8..000000000 --- a/TMessagesProj/src/main/res/layout-ar/settings_row_color_layout.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/settings_row_detail_layout.xml b/TMessagesProj/src/main/res/layout-ar/settings_row_detail_layout.xml deleted file mode 100644 index 86079f12e..000000000 --- a/TMessagesProj/src/main/res/layout-ar/settings_row_detail_layout.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/user_profile_avatar_layout.xml b/TMessagesProj/src/main/res/layout-ar/user_profile_avatar_layout.xml deleted file mode 100644 index 34a2b99cf..000000000 --- a/TMessagesProj/src/main/res/layout-ar/user_profile_avatar_layout.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/user_profile_phone_layout.xml b/TMessagesProj/src/main/res/layout-ar/user_profile_phone_layout.xml deleted file mode 100644 index 544b7294c..000000000 --- a/TMessagesProj/src/main/res/layout-ar/user_profile_phone_layout.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/contacts_invite_row_layout.xml b/TMessagesProj/src/main/res/layout/contacts_invite_row_layout.xml deleted file mode 100644 index 6788172d0..000000000 --- a/TMessagesProj/src/main/res/layout/contacts_invite_row_layout.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/settings_logout_button.xml b/TMessagesProj/src/main/res/layout/settings_logout_button.xml index eab1e25f4..d51462dc8 100644 --- a/TMessagesProj/src/main/res/layout/settings_logout_button.xml +++ b/TMessagesProj/src/main/res/layout/settings_logout_button.xml @@ -1,3 +1,11 @@ + + - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/settings_row_check_layout.xml b/TMessagesProj/src/main/res/layout/settings_row_check_layout.xml deleted file mode 100644 index de29a61f2..000000000 --- a/TMessagesProj/src/main/res/layout/settings_row_check_layout.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/settings_row_check_notify_layout.xml b/TMessagesProj/src/main/res/layout/settings_row_check_notify_layout.xml deleted file mode 100644 index c9ee80459..000000000 --- a/TMessagesProj/src/main/res/layout/settings_row_check_notify_layout.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/settings_row_color_layout.xml b/TMessagesProj/src/main/res/layout/settings_row_color_layout.xml deleted file mode 100644 index c0bf51125..000000000 --- a/TMessagesProj/src/main/res/layout/settings_row_color_layout.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/settings_row_detail_layout.xml b/TMessagesProj/src/main/res/layout/settings_row_detail_layout.xml deleted file mode 100644 index f7d3d9f31..000000000 --- a/TMessagesProj/src/main/res/layout/settings_row_detail_layout.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/settings_row_version.xml b/TMessagesProj/src/main/res/layout/settings_row_version.xml deleted file mode 100644 index 8620120b6..000000000 --- a/TMessagesProj/src/main/res/layout/settings_row_version.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/user_profile_avatar_layout.xml b/TMessagesProj/src/main/res/layout/user_profile_avatar_layout.xml deleted file mode 100644 index 5f8796188..000000000 --- a/TMessagesProj/src/main/res/layout/user_profile_avatar_layout.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/user_profile_phone_layout.xml b/TMessagesProj/src/main/res/layout/user_profile_phone_layout.xml deleted file mode 100644 index 3b8b75597..000000000 --- a/TMessagesProj/src/main/res/layout/user_profile_phone_layout.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-ar/strings.xml b/TMessagesProj/src/main/res/values-ar/strings.xml index 8902545c9..e0852969c 100644 --- a/TMessagesProj/src/main/res/values-ar/strings.xml +++ b/TMessagesProj/src/main/res/values-ar/strings.xml @@ -285,6 +285,7 @@ عند تواجدك خارج البلاد لا يوجد وسائط حفظ في الجهاز + Edit Name لا توجد وسائط بعد إلغاء التنزيل diff --git a/TMessagesProj/src/main/res/values-de/strings.xml b/TMessagesProj/src/main/res/values-de/strings.xml index ccc7c267c..9ace024ea 100644 --- a/TMessagesProj/src/main/res/values-de/strings.xml +++ b/TMessagesProj/src/main/res/values-de/strings.xml @@ -285,6 +285,7 @@ bei Roaming kein automatischer Download In der Galerie speichern + Edit Name Noch keine geteilten Medien vorhanden Download abbrechen diff --git a/TMessagesProj/src/main/res/values-es/strings.xml b/TMessagesProj/src/main/res/values-es/strings.xml index 6c9642248..fab9504bc 100644 --- a/TMessagesProj/src/main/res/values-es/strings.xml +++ b/TMessagesProj/src/main/res/values-es/strings.xml @@ -285,6 +285,7 @@ Con itinerancia de datos Ningún contenido multimedia Guardar en galería + Edit Name Aún no hay fotos ni vídeos Cancelar descarga diff --git a/TMessagesProj/src/main/res/values-it/strings.xml b/TMessagesProj/src/main/res/values-it/strings.xml index 6eb70c6e7..424a0dedd 100644 --- a/TMessagesProj/src/main/res/values-it/strings.xml +++ b/TMessagesProj/src/main/res/values-it/strings.xml @@ -285,6 +285,7 @@ In roaming Nessun media Salva nella galleria + Edit Name Nessun media condiviso Annulla scaricamento diff --git a/TMessagesProj/src/main/res/values-ko/strings.xml b/TMessagesProj/src/main/res/values-ko/strings.xml index 46c3abe97..7c82d008e 100644 --- a/TMessagesProj/src/main/res/values-ko/strings.xml +++ b/TMessagesProj/src/main/res/values-ko/strings.xml @@ -285,6 +285,7 @@ 로밍 중일 때 다운로드 안함 앨범에 자동 저장 + Edit Name 공유한 미디어가 없습니다 다운로드 취소 diff --git a/TMessagesProj/src/main/res/values-nl/strings.xml b/TMessagesProj/src/main/res/values-nl/strings.xml index e1e5cfbd6..710ab1e07 100644 --- a/TMessagesProj/src/main/res/values-nl/strings.xml +++ b/TMessagesProj/src/main/res/values-nl/strings.xml @@ -285,6 +285,7 @@ Bij roaming Geen media Opslaan in galerij + Edit Name Nog geen media gedeeld Downloaden annuleren diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml index e720194fd..369790c0c 100644 --- a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml @@ -285,6 +285,7 @@ Quando em roaming Sem mídia Salvar na galeria + Edit Name Ainda não há mídia compartilhada Cancelar Download diff --git a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml index dda2b67c0..b2d99d241 100644 --- a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml @@ -285,6 +285,7 @@ Quando em roaming Sem mídia Salvar na galeria + Edit Name Ainda não há mídia compartilhada Cancelar Download diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index 3ae05de84..a80f83130 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -224,17 +224,17 @@ Unblock Tap and hold on user to unblock. No blocked users yet - MESSAGE NOTIFICATIONS + Message notifications Alert Message Preview - GROUP NOTIFICATIONS + Group notifications Sound - IN-APP NOTIFICATIONS + In-app notifications In-App Sounds In-App Vibrate Vibrate In-App Preview - RESET + Reset Reset All Notifications Undo all custom notification settings for all your contacts and groups Notifications and Sounds @@ -249,7 +249,7 @@ Messages Send by Enter Terminate All Other Sessions - EVENTS + Events Contact joined Telegram PEBBLE Language