From 6b94e8d1805d234eed12acd39e13c43cbdd7e180 Mon Sep 17 00:00:00 2001 From: rafalense Date: Wed, 21 Oct 2015 18:27:19 +0200 Subject: [PATCH] - Added new option in settings to open profile or profile pics when clicking user or group pic in main screen - Added gradient option to chat background color - Added option to forward link without quoting - Added link to official channel in menu - Bug fixes --- TMessagesProj/build.gradle | 4 +- .../telegram/messenger/ApplicationLoader.java | 33 ------- .../ui/Adapters/DrawerLayoutAdapter.java | 16 +-- .../java/org/telegram/ui/Cells/BaseCell.java | 4 +- .../org/telegram/ui/Cells/ChatBaseCell.java | 33 +++---- .../org/telegram/ui/Cells/ChatMediaCell.java | 67 ++++++------- .../telegram/ui/Cells/ProfileSearchCell.java | 20 +++- .../java/org/telegram/ui/ChatActivity.java | 59 ++++++++++-- .../org/telegram/ui/Components/EmojiView.java | 54 ++++++----- .../java/org/telegram/ui/LaunchActivity.java | 24 ++++- .../java/org/telegram/ui/MediaActivity.java | 8 +- .../org/telegram/ui/SettingsActivity.java | 91 +++++++++++++++++- .../org/telegram/ui/ThemingChatActivity.java | 33 +++++-- .../telegram/ui/ThemingContactsActivity.java | 2 +- .../org/telegram/ui/WallpapersActivity.java | 2 - .../src/main/res/drawable-hdpi/Thumbs.db | Bin 539136 -> 551424 bytes .../src/main/res/drawable-mdpi/Thumbs.db | Bin 3072 -> 3072 bytes .../src/main/res/drawable-xhdpi/Thumbs.db | Bin 3072 -> 3072 bytes .../src/main/res/drawable-xxxhdpi/Thumbs.db | Bin 28160 -> 28160 bytes .../src/main/res/values-ar/strings.xml | 2 +- .../src/main/res/values-ca/strings.xml | 14 ++- .../src/main/res/values-de/strings.xml | 7 +- .../src/main/res/values-es/strings.xml | 11 ++- .../src/main/res/values-fr/strings.xml | 2 +- .../src/main/res/values-gl/strings.xml | 7 +- .../src/main/res/values-hi/strings.xml | 2 +- .../src/main/res/values-hr/strings.xml | 2 +- .../src/main/res/values-it/strings.xml | 14 ++- .../src/main/res/values-nl/strings.xml | 2 +- .../src/main/res/values-pt-rBR/strings.xml | 9 +- .../src/main/res/values-pt-rPT/strings.xml | 2 +- .../src/main/res/values-ru/strings.xml | 8 +- .../src/main/res/values-tr/strings.xml | 10 +- .../src/main/res/values-zh-rCN/strings.xml | 30 +++++- .../src/main/res/values-zh-rTW/strings.xml | 6 +- TMessagesProj/src/main/res/values/strings.xml | 11 ++- 36 files changed, 407 insertions(+), 182 deletions(-) diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 7ff9b7af..4a528b63 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -88,8 +88,8 @@ android { applicationId "org.telegram.plus" minSdkVersion 8 targetSdkVersion 22 - versionCode 630 - versionName "3.2.2.1" + versionCode 632 + versionName "3.2.2.2" //multiDexEnabled true } } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java index cfb0879a..35190043 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java @@ -21,7 +21,6 @@ import android.content.pm.PackageInfo; import android.content.res.Configuration; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.graphics.drawable.GradientDrawable; import android.os.AsyncTask; import android.os.Build; import android.os.Handler; @@ -92,14 +91,6 @@ public class ApplicationLoader extends Application { SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); int selectedBackground = preferences.getInt("selectedBackground", 1000001); selectedColor = preferences.getInt("selectedColor", 0); - int cacheColorHint = 0; - // - SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, AndroidUtilities.THEME_PREFS_MODE); - if (themePrefs.getBoolean("chatSolidBGColorCheck", false)) { - cachedWallpaper = null; - selectedColor = themePrefs.getInt("chatSolidBGColor", 0xffffffff); - } - // if (selectedColor == 0) { if (selectedBackground == 1000001) { cachedWallpaper = applicationContext.getResources().getDrawable(R.drawable.background_hd); @@ -123,30 +114,6 @@ public class ApplicationLoader extends Application { selectedColor = -2693905; } cachedWallpaper = new ColorDrawable(selectedColor); - - } - - SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, AndroidUtilities.THEME_PREFS_MODE); - int orientation = themePrefs.getInt("chatGradientBG", 0); - if(orientation > 0 && themePrefs.getBoolean("chatSolidBGColorCheck", false)) { - GradientDrawable.Orientation go; - switch(orientation) { - case 2: - go = GradientDrawable.Orientation.LEFT_RIGHT; - break; - case 3: - go = GradientDrawable.Orientation.TL_BR; - break; - case 4: - go = GradientDrawable.Orientation.BL_TR; - break; - default: - go = GradientDrawable.Orientation.TOP_BOTTOM; - } - int mainColor = selectedColor = themePrefs.getInt("chatSolidBGColor", 0xffffffff); - int gradColor = themePrefs.getInt("chatGradientBGColor", 0xffffffff); - int[] colors = new int[]{mainColor, gradColor}; - cachedWallpaper = new GradientDrawable(go, colors); } } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java index bfa1c5cd..ce09b9ba 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java @@ -37,12 +37,14 @@ public class DrawerLayoutAdapter extends BaseAdapter { private Context mContext; private int versionType = 4; - private int versionRow = 11; private int contactsRow = 6; - private int settingsRow = 9; - private int themingRow = 8; - private int communityRow = 10; private int themesRow = 7; + private int themingRow = 8; + private int settingsRow = 9; + private int channelRow = 10; + private int communityRow = 11; + private int versionRow = 12; + //private int rowCount = 0; @@ -63,7 +65,7 @@ public class DrawerLayoutAdapter extends BaseAdapter { @Override public int getCount() { //return UserConfig.isClientActivated() ? 10 : 0; - return UserConfig.isClientActivated() ? 12 : 0; + return UserConfig.isClientActivated() ? 13 : 0; } @Override @@ -135,11 +137,13 @@ public class DrawerLayoutAdapter extends BaseAdapter { }/* else if (i == 7) { actionCell.setTextAndIcon(LocaleController.getString("InviteFriends", R.string.InviteFriends), R.drawable.menu_invite); }*/ else if (i == themesRow) { - actionCell.setTextAndIcon(LocaleController.getString("Themes", R.string.Themes), R.drawable.menu_themes); + actionCell.setTextAndIcon(LocaleController.getString("DownloadThemes", R.string.DownloadThemes), R.drawable.menu_themes); } else if (i == themingRow) { actionCell.setTextAndIcon(LocaleController.getString("Theming", R.string.Theming), R.drawable.menu_theming); } else if (i == settingsRow) { actionCell.setTextAndIcon(LocaleController.getString("Settings", R.string.Settings), R.drawable.menu_settings); + } else if (i == channelRow) { + actionCell.setTextAndIcon(LocaleController.getString("OfficialChannel", R.string.OfficialChannel), R.drawable.menu_broadcast); } else if (i == communityRow) { actionCell.setTextAndIcon(LocaleController.getString("Community", R.string.Community), R.drawable.menu_forum); } /*else if (i == 10) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/BaseCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/BaseCell.java index 92505cdb..5ee2f776 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/BaseCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/BaseCell.java @@ -52,7 +52,9 @@ public class BaseCell extends View { } protected void setDrawableBounds(Drawable drawable, int x, int y) { - setDrawableBounds(drawable, x, y, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()); + if (drawable != null) { + setDrawableBounds(drawable, x, y, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()); + } } protected void setDrawableBounds(Drawable drawable, int x, int y, int w, int h) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java index 2583d88b..668ba91b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java @@ -230,21 +230,8 @@ public class ChatBaseCell extends BaseCell implements MediaController.FileDownlo linkColor = themePrefs.getInt("chatRLinkColor", defColor); } replyTextPaint.linkColor = linkColor; - //ResourceLoader.loadRecources(getContext()); - /*if(ResourceLoader.mediaBackgroundDrawable == null){ - ResourceLoader.mediaBackgroundDrawable = getResources().getDrawable(R.drawable.phototime); - ResourceLoader.checkDrawable = getResources().getDrawable(R.drawable.msg_check); - ResourceLoader.halfCheckDrawable = getResources().getDrawable(R.drawable.msg_halfcheck); - ResourceLoader.clockDrawable = getResources().getDrawable(R.drawable.msg_clock); - ResourceLoader.checkMediaDrawable = getResources().getDrawable(R.drawable.msg_check_w); - ResourceLoader.halfCheckMediaDrawable = getResources().getDrawable(R.drawable.msg_halfcheck_w); - ResourceLoader.clockMediaDrawable = getResources().getDrawable(R.drawable.msg_clock_photo); - //ResourceLoader.videoIconDrawable = getResources().getDrawable(R.drawable.ic_video); - ResourceLoader.docMenuInDrawable = getResources().getDrawable(R.drawable.doc_actions_b); - ResourceLoader.docMenuOutDrawable = getResources().getDrawable(R.drawable.doc_actions_g); - }*/ - ResourceLoader.mediaBackgroundDrawable.setColorFilter(bColor, PorterDuff.Mode.SRC_IN); + if(ResourceLoader.mediaBackgroundDrawable != null)ResourceLoader.mediaBackgroundDrawable.setColorFilter(bColor, PorterDuff.Mode.SRC_IN); ResourceLoader.backgroundDrawableOut.setColorFilter(rBubbleColor, PorterDuff.Mode.SRC_IN); ResourceLoader.backgroundMediaDrawableOut.setColorFilter(rBubbleColor, PorterDuff.Mode.SRC_IN); @@ -889,6 +876,8 @@ public class ChatBaseCell extends BaseCell implements MediaController.FileDownlo onAfterBackgroundDraw(canvas); SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, AndroidUtilities.THEME_PREFS_MODE); + boolean mCheck = AndroidUtilities.getBoolPref("chatMemberColorCheck"); + int mColor = themePrefs.getInt("chatMemberColor", AndroidUtilities.getIntDarkerColor("themeColor", 0x15)); if (drawName && nameLayout != null) { canvas.save(); if (media) { @@ -897,15 +886,23 @@ public class ChatBaseCell extends BaseCell implements MediaController.FileDownlo canvas.translate(currentBackgroundDrawable.getBounds().left + AndroidUtilities.dp(19) - nameOffsetX, AndroidUtilities.dp(10)); } if (currentUser != null) { - if(AndroidUtilities.getBoolPref("chatMemberColorCheck")){ - namePaint.setColor(themePrefs.getInt("chatMemberColor", AndroidUtilities.getIntDarkerColor("themeColor", 0x15))); + if(mCheck){ + namePaint.setColor(mColor); }else { namePaint.setColor(AvatarDrawable.getNameColorForId(currentUser.id)); } } else if (currentChat != null) { - namePaint.setColor(AvatarDrawable.getNameColorForId(currentChat.id)); + if(mCheck){ + namePaint.setColor(mColor); + }else { + namePaint.setColor(AvatarDrawable.getNameColorForId(currentChat.id)); + } } else { - namePaint.setColor(AvatarDrawable.getNameColorForId(0)); + if(mCheck){ + namePaint.setColor(mColor); + }else { + namePaint.setColor(AvatarDrawable.getNameColorForId(0)); + } } nameLayout.draw(canvas); canvas.restore(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java index e89199e4..4d8ecbb8 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java @@ -475,6 +475,31 @@ public class ChatMediaCell extends ChatBaseCell { return false; } + private String getCurrentNameString(MessageObject messageObject){ + TLRPC.User currentUser = null; + TLRPC.Chat currentChat = null; + String s; + if (messageObject.messageOwner.from_id > 0) { + currentUser = MessagesController.getInstance().getUser(messageObject.messageOwner.from_id); + } else if (messageObject.messageOwner.from_id < 0) { + currentChat = MessagesController.getInstance().getChat(-messageObject.messageOwner.from_id); + } + + if (currentUser != null) { + s = UserObject.getUserName(currentUser); + String currentUsernameString = currentUser.username; + /*if(currentUsernameString != null && AndroidUtilities.getBoolPref("chatShowUsernameCheck")){ + currentNameString = currentNameString.replaceAll("\\p{C}", " "); + currentNameString = currentNameString.trim().replaceAll(" +", " ") + " [@"+currentUsernameString+"]"; + }*/ + } else if (currentChat != null) { + s = currentChat.title; + } else { + s = "DELETED"; + } + return s; + } + @Override public void setMessageObject(MessageObject messageObject) { boolean dataChanged = currentMessageObject == messageObject && (isUserDataChanged() || photoNotSet); @@ -493,6 +518,7 @@ public class ChatMediaCell extends ChatBaseCell { drawBackground = true; photoImage.setForcePreview(messageObject.isSecretPhoto()); + if (messageObject.type == 9) { String name = messageObject.getDocumentName(); if (name == null || name.length() == 0) { @@ -537,20 +563,9 @@ public class ChatMediaCell extends ChatBaseCell { infoLayout2 = null; if(isChat){ - TLRPC.User fromUser = MessagesController.getInstance().getUser(messageObject.messageOwner.from_id); - String senderName = UserObject.getUserName(fromUser); - /*//String senderName = String.format("%s %s", fromUser.first_name, fromUser.last_name); - String senderName = ""; - if (UserObject.isDeleted(fromUser)) { - senderName = "Deleted"; - } else { - if (fromUser.first_name != null && fromUser.first_name.length() > 0) { - senderName = fromUser.first_name; - } else { - senderName = fromUser.last_name; - } - }*/ + String senderName = getCurrentNameString(messageObject); + infoWidth2 = Math.min(maxWidth, (int) Math.ceil(senderPaint.measureText(senderName))); CharSequence str2 = TextUtils.ellipsize(senderName, senderPaint, infoWidth2, TextUtils.TruncateAt.END); infoLayout2 = new StaticLayout(str2, senderPaint, infoWidth2, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false); @@ -587,10 +602,8 @@ public class ChatMediaCell extends ChatBaseCell { if(isChat){ infoOffset2 = ResourceLoader.videoIconDrawable.getIntrinsicWidth() + AndroidUtilities.dp(5); infoOffset = 0; - TLRPC.User fromUser = MessagesController.getInstance().getUser(messageObject.messageOwner.from_id); - //String senderName = String.format("%s %s", fromUser.first_name, fromUser.last_name); - String senderName = UserObject.getUserName(fromUser); + String senderName = getCurrentNameString(messageObject); infoWidth2 = (int) Math.ceil(infoPaint.measureText(currentInfoString)); //infoWidth = (int) Math.ceil(senderPaint.measureText(senderName)); @@ -605,27 +618,11 @@ public class ChatMediaCell extends ChatBaseCell { currentNameString = null; }//Plus: member name in photos else if (messageObject.type == 1) { //PHOTO - TLRPC.User fromUser = MessagesController.getInstance().getUser(messageObject.messageOwner.from_id); - String senderName = UserObject.getUserName(fromUser); - /* - String currentUsernameString = fromUser.username; + currentNameString = getCurrentNameString(messageObject); + + String senderName = currentNameString; - if(currentUsernameString != null && AndroidUtilities.getBoolPref("chatShowUsernameCheck")){ - senderName = senderName.replaceAll("\\p{C}", " "); - senderName = senderName.trim().replaceAll(" +", " ") + " [@"+currentUsernameString+"]"; - }*/ - /* - String senderName = String.format("%s %s", fromUser.first_name, fromUser.last_name); - if (UserObject.isDeleted(fromUser)) { - senderName = "Deleted"; - } else { - if (fromUser.first_name != null && fromUser.first_name.length() > 0) { - senderName = fromUser.first_name; - } else if (fromUser.last_name != null && fromUser.last_name.length() > 0){ - senderName = fromUser.last_name; - } - }*/ if (currentInfoString == null || !currentInfoString.equals(senderName)) { currentInfoString = senderName; infoOffset = 0; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java index b1834108..c147fdf9 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java @@ -12,6 +12,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.graphics.Canvas; import android.graphics.Paint; +import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; import android.text.Layout; @@ -22,17 +23,16 @@ import android.view.MotionEvent; import org.telegram.PhoneFormat.PhoneFormat; import org.telegram.messenger.AndroidUtilities; -import org.telegram.messenger.ContactsController; +import org.telegram.messenger.ApplicationLoader; import org.telegram.messenger.ImageReceiver; import org.telegram.messenger.LocaleController; import org.telegram.messenger.MessagesController; -import org.telegram.messenger.UserObject; -import org.telegram.messenger.ApplicationLoader; import org.telegram.messenger.R; +import org.telegram.messenger.UserConfig; +import org.telegram.messenger.UserObject; import org.telegram.tgnet.ConnectionsManager; import org.telegram.tgnet.TLObject; import org.telegram.tgnet.TLRPC; -import org.telegram.messenger.UserConfig; import org.telegram.ui.Components.AvatarDrawable; public class ProfileSearchCell extends BaseCell { @@ -120,6 +120,8 @@ public class ProfileSearchCell extends BaseCell { lockDrawable = getResources().getDrawable(R.drawable.list_secret); groupDrawable = getResources().getDrawable(R.drawable.list_group); countDrawable = getResources().getDrawable(R.drawable.dialogs_badge); + + updateTheme(); } avatarImage = new ImageReceiver(this); @@ -127,6 +129,16 @@ public class ProfileSearchCell extends BaseCell { avatarDrawable = new AvatarDrawable(); } + private void updateTheme(){ + SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, AndroidUtilities.THEME_PREFS_MODE); + int tColor = themePrefs.getInt("themeColor", AndroidUtilities.defColor); + + countPaint.setTextSize(AndroidUtilities.dp(themePrefs.getInt("chatsCountSize", 13))); + countPaint.setColor(themePrefs.getInt("chatsCountColor", 0xffffffff)); + countDrawable.setColorFilter(themePrefs.getInt("chatsCountBGColor", tColor), PorterDuff.Mode.SRC_IN); + + } + @Override public boolean onTouchEvent(MotionEvent event) { if (Build.VERSION.SDK_INT >= 21 && getBackground() != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 77c47aa2..43fcf68d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -21,6 +21,7 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.PorterDuff; import android.graphics.Rect; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.media.ExifInterface; @@ -332,6 +333,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not private boolean refreshWallpaper; + private boolean quote; + RecyclerListView.OnItemLongClickListener onItemLongClickListener = new RecyclerListView.OnItemLongClickListener() { @Override public void onItemClick(View view, int position) { @@ -360,6 +363,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not public boolean onFragmentCreate() { final int chatId = arguments.getInt("chat_id", 0); chat_id = chatId; //Plus + quote = arguments.getBoolean("quote", false); final int userId = arguments.getInt("user_id", 0); final int encId = arguments.getInt("enc_id", 0); startLoadFromMessageId = arguments.getInt("message_id", 0); @@ -754,6 +758,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not QuoteForward = false; } Bundle args = new Bundle(); + //args.putBoolean("quote", QuoteForward); args.putBoolean("onlySelect", true); args.putInt("dialogsType", 1); DialogsActivity fragment = new DialogsActivity(args); @@ -1310,8 +1315,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not }; SizeNotifierFrameLayout contentView = (SizeNotifierFrameLayout) fragmentView; - contentView.setBackgroundImage(ApplicationLoader.getCachedWallpaper()); - + //contentView.setBackgroundImage(ApplicationLoader.getCachedWallpaper()); + updateBackground(contentView); + //.e("mainColor 0", "" + ApplicationLoader.getCachedWallpaper()); emptyViewContainer = new FrameLayout(context); emptyViewContainer.setVisibility(View.INVISIBLE); contentView.addView(emptyViewContainer, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER)); @@ -2175,6 +2181,38 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not return fragmentView; } + private void updateBackground(SizeNotifierFrameLayout contentView){ + SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, AndroidUtilities.THEME_PREFS_MODE); + if(!themePrefs.getBoolean("chatSolidBGColorCheck", false)){ + contentView.setBackgroundImage(ApplicationLoader.getCachedWallpaper()); + }else{ + int mainColor = themePrefs.getInt("chatSolidBGColor", 0xffffffff); + int orientation = themePrefs.getInt("chatGradientBG", 0); + if(orientation == 0) { + contentView.setBackgroundDrawable(new ColorDrawable(mainColor)); + } else { + GradientDrawable.Orientation go; + switch(orientation) { + case 2: + go = GradientDrawable.Orientation.LEFT_RIGHT; + break; + case 3: + go = GradientDrawable.Orientation.TL_BR; + break; + case 4: + go = GradientDrawable.Orientation.BL_TR; + break; + default: + go = GradientDrawable.Orientation.TOP_BOTTOM; + } + + int gradColor = themePrefs.getInt("chatGradientBGColor", 0xffffffff); + int[] colors = new int[]{mainColor, gradColor}; + contentView.setBackgroundDrawable(new GradientDrawable(go, colors)); + } + } + } + private void openAddMember() { Bundle args = new Bundle(); args.putBoolean("onlyUsers", true); @@ -2498,9 +2536,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (arrayList == null || arrayList.isEmpty()) { return; } - if (!fromMyName) { - SendMessagesHelper.getInstance().sendMessage(arrayList, dialog_id, chatActivityEnterView == null || chatActivityEnterView.asAdmin()); - } else { + if(quote)fromMyName = false; + if (!fromMyName) { + SendMessagesHelper.getInstance().sendMessage(arrayList, dialog_id, chatActivityEnterView == null || chatActivityEnterView.asAdmin()); + } else { for (MessageObject object : arrayList) { SendMessagesHelper.getInstance().processForwardFromMyName(object, dialog_id, chatActivityEnterView == null || chatActivityEnterView.asAdmin()); } @@ -5303,11 +5342,13 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not reportSpamButton.setTextColor(nameColor); addToContactsButton.setTextColor(nameColor); + if(refreshWallpaper) { SizeNotifierFrameLayout contentView = (SizeNotifierFrameLayout) fragmentView; contentView.setBackgroundImage(ApplicationLoader.getCachedWallpaper()); refreshWallpaper = false; } + } catch (Exception e) { FileLog.e("tmessages", e); } @@ -5617,8 +5658,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not items.add(LocaleController.getString("Forward", R.string.Forward)); options.add(22); //items.add(LocaleController.getString("Forward", R.string.Forward)); - items.add(LocaleController.getString("ForwardNoQuote", R.string.ForwardNoQuote)); - options.add(2); + if(selectedObject.messageOwner.media != null && selectedObject.messageOwner.media.caption != null && selectedObject.messageOwner.media.caption.length() > 0){ + //with caption quote doesn't appear + }else { + items.add(LocaleController.getString("ForwardNoQuote", R.string.ForwardNoQuote)); + options.add(2); + } if (message.canDeleteMessage(currentChat)) { items.add(LocaleController.getString("Delete", R.string.Delete)); options.add(1); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java index 8eefb04c..d4a1717c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java @@ -35,13 +35,13 @@ import android.widget.TextView; import org.telegram.messenger.AndroidUtilities; import org.telegram.messenger.AnimationCompat.ViewProxy; +import org.telegram.messenger.ApplicationLoader; import org.telegram.messenger.Emoji; +import org.telegram.messenger.FileLog; import org.telegram.messenger.LocaleController; import org.telegram.messenger.NotificationCenter; -import org.telegram.messenger.query.StickersQuery; -import org.telegram.messenger.ApplicationLoader; -import org.telegram.messenger.FileLog; import org.telegram.messenger.R; +import org.telegram.messenger.query.StickersQuery; import org.telegram.tgnet.TLRPC; import org.telegram.ui.Cells.EmptyCell; import org.telegram.ui.Cells.StickerEmojiCell; @@ -426,27 +426,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific //setBackgroundColor(0xfff5f6f7); setBackgroundColor(bgColor); - int val = themePrefs.getInt("chatEmojiViewBGGradient", 0); - if(val > 0) { - GradientDrawable.Orientation go; - switch(val) { - case 2: - go = GradientDrawable.Orientation.LEFT_RIGHT; - break; - case 3: - go = GradientDrawable.Orientation.TL_BR; - break; - case 4: - go = GradientDrawable.Orientation.BL_TR; - break; - default: - go = GradientDrawable.Orientation.TOP_BOTTOM; - } - int gradColor = themePrefs.getInt("chatEmojiViewBGGradientColor", 0xfff5f6f7); - int[] colors = new int[]{bgColor, gradColor}; - GradientDrawable gd = new GradientDrawable(go, colors); - setBackgroundDrawable(gd); - } + pager = new ViewPager(context) { @Override @@ -471,6 +451,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific pagerSlidingTabStripContainer.setOrientation(LinearLayout.HORIZONTAL); //pagerSlidingTabStripContainer.setBackgroundColor(0xfff5f6f7); pagerSlidingTabStripContainer.setBackgroundColor(bgColor); + addView(pagerSlidingTabStripContainer, LayoutHelper.createFrame(LayoutParams.MATCH_PARENT, 48)); PagerSlidingTabStrip pagerSlidingTabStrip = new PagerSlidingTabStrip(context); @@ -535,6 +516,31 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific View view = new View(context); //view.setBackgroundColor(0xffe2e5e7); view.setBackgroundColor(lineColor); + int val = themePrefs.getInt("chatEmojiViewBGGradient", 0); + if(val > 0) { + GradientDrawable.Orientation go; + switch(val) { + case 2: + go = GradientDrawable.Orientation.LEFT_RIGHT; + break; + case 3: + go = GradientDrawable.Orientation.TL_BR; + break; + case 4: + go = GradientDrawable.Orientation.BL_TR; + break; + default: + go = GradientDrawable.Orientation.TOP_BOTTOM; + } + int gradColor = themePrefs.getInt("chatEmojiViewBGGradientColor", 0xfff5f6f7); + int[] colors = new int[]{bgColor, gradColor}; + GradientDrawable gd = new GradientDrawable(go, colors); + setBackgroundDrawable(gd); + pagerSlidingTabStripContainer.setBackgroundColor(0x00000000); + scrollSlidingTabStrip.setUnderlineColor(0x00000000); + pagerSlidingTabStrip.setUnderlineColor(0x00000000); + view.setBackgroundColor(0x00000000); + } frameLayout.addView(view, LayoutHelper.createFrame(52, 1, Gravity.LEFT | Gravity.BOTTOM)); recentsWrap = new FrameLayout(context); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java index e04ef6e2..502663db 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java @@ -112,13 +112,15 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa private Runnable lockRunnable; - private int versionRow = 11; + private int contactsRow = 6; - private int settingsRow = 9; - private int themingRow = 8; - private int communityRow = 10; - private int faqRow = 12; private int themesRow = 7; + private int themingRow = 8; + private int settingsRow = 9; + private int channelRow = 10; + private int communityRow = 11; + private int versionRow = 12; + private int faqRow = 13; @Override protected void onCreate(Bundle savedInstanceState) { @@ -333,6 +335,18 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa FileLog.e("tmessages", e); } drawerLayoutContainer.closeDrawer(false); + } else if (position == channelRow) { + try { + String link = "https://telegram.me/plusmsn";//https://plus.google.com/101839105638971401281/posts" + String lg = Locale.getDefault().getLanguage(); + if(lg.contains("es") || lg.contains("gl") || lg.contains("ca")){ + link = "https://telegram.me/plusmsnes"; + } + startActivityForResult(new Intent(Intent.ACTION_VIEW, Uri.parse(link)), 504); + } catch (Exception e) { + FileLog.e("tmessages", e); + } + drawerLayoutContainer.closeDrawer(false); } else if (position == communityRow) { try { String link = "https://plus.google.com/u/0/communities/106927015963860485525";//https://plus.google.com/101839105638971401281/posts" diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java index d821ece6..ec374ade 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java @@ -191,6 +191,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No private final static int shared_media_item = 1; private final static int files_item = 2; private final static int links_item = 5; + private final static int quoteforward = 33; private final static int forward = 3; private final static int delete = 4; @@ -305,10 +306,11 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No }); builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); showDialog(builder.create()); - } else if (id == forward) { + } else if (id == forward || id == quoteforward) { Bundle args = new Bundle(); args.putBoolean("onlySelect", true); args.putInt("dialogsType", 1); + final boolean quoteForward = id == forward ? false : true; DialogsActivity fragment = new DialogsActivity(args); fragment.setDelegate(new DialogsActivity.MessagesActivityDelegate() { @Override @@ -317,6 +319,9 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No if (lower_part != 0) { Bundle args = new Bundle(); args.putBoolean("scrollToTopOnResume", true); + //Plus + args.putBoolean("quote", quoteForward); + // if (lower_part > 0) { args.putInt("user_id", lower_part); } else if (lower_part < 0) { @@ -450,6 +455,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No actionMode.addView(selectedMessagesCountTextView, LayoutHelper.createLinear(0, LayoutHelper.MATCH_PARENT, 1.0f)); if ((int) dialog_id != 0) { + actionModeViews.add(actionMode.addItem(quoteforward, R.drawable.ic_ab_fwd_quoteforward, R.drawable.bar_selector_mode, null, AndroidUtilities.dp(54))); actionModeViews.add(actionMode.addItem(forward, R.drawable.ic_ab_fwd_forward, R.drawable.bar_selector_mode, null, AndroidUtilities.dp(54))); } actionModeViews.add(actionMode.addItem(delete, R.drawable.ic_ab_fwd_delete, R.drawable.bar_selector_mode, null, AndroidUtilities.dp(54))); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index 46d68cd9..f07680e5 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -153,6 +153,10 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter private int keepOriginalFilenameDetailRow; private int emojiPopupSize; private int disableAudioStopRow; + private int dialogsSectionRow; + private int dialogsSectionRow2; + private int dialogsPicClickRow; + private int dialogsGroupPicClickRow; private final static int edit_name = 1; private final static int logout = 2; @@ -267,6 +271,11 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter disableAudioStopRow = rowCount++; disableMessageClickRow = rowCount++; + dialogsSectionRow = rowCount++; + dialogsSectionRow2 = rowCount++; + dialogsPicClickRow = rowCount++; + dialogsGroupPicClickRow = rowCount++; + supportSectionRow = rowCount++; supportSectionRow2 = rowCount++; askQuestionRow = rowCount++; @@ -724,6 +733,54 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter if (view instanceof TextCheckCell) { ((TextCheckCell) view).setChecked(!keep); } + } else if (i == dialogsPicClickRow) { + if (getParentActivity() == null) { + return; + } + AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); + builder.setTitle(LocaleController.getString("ClickOnContactPic", R.string.ClickOnContactPic)); + builder.setItems(new CharSequence[]{ + LocaleController.getString("RowGradientDisabled", R.string.RowGradientDisabled), + LocaleController.getString("ShowPics", R.string.ShowPics), + LocaleController.getString("ShowProfile", R.string.ShowProfile) + }, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); + editor.putInt("dialogsClickOnPic", which); + editor.commit(); + if (listView != null) { + listView.invalidateViews(); + } + } + }); + builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); + showDialog(builder.create()); + } else if (i == dialogsGroupPicClickRow) { + if (getParentActivity() == null) { + return; + } + AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); + builder.setTitle(LocaleController.getString("ClickOnGroupPic", R.string.ClickOnGroupPic)); + builder.setItems(new CharSequence[]{ + LocaleController.getString("RowGradientDisabled", R.string.RowGradientDisabled), + LocaleController.getString("ShowPics", R.string.ShowPics), + LocaleController.getString("ShowProfile", R.string.ShowProfile) + }, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); + editor.putInt("dialogsClickOnGroupPic", which); + editor.commit(); + if (listView != null) { + listView.invalidateViews(); + } + } + }); + builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); + showDialog(builder.create()); } } }); @@ -1241,7 +1298,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter i == askQuestionRow || i == sendLogsRow || i == sendByEnterRow || i == privacyRow || i == wifiDownloadRow || i == disableAudioStopRow || i == disableMessageClickRow || i == mobileDownloadRow || i == clearLogsRow || i == roamingDownloadRow || i == languageRow || i == usernameRow || i == switchBackendButtonRow || i == telegramFaqRow || i == contactsSortRow || i == contactsReimportRow || i == saveToGalleryRow || i == keepOriginalFilenameRow || - i == stickersRow; + i == stickersRow || i == dialogsPicClickRow || i == dialogsGroupPicClickRow; } @Override @@ -1329,6 +1386,30 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter textCell.setText(LocaleController.getString("ImportContacts", R.string.ImportContacts), true); } else if (i == stickersRow) { textCell.setText(LocaleController.getString("Stickers", R.string.Stickers), true); + } else if (i == dialogsPicClickRow) { + String value; + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); + int sort = preferences.getInt("dialogsClickOnPic", 0); + if (sort == 0) { + value = LocaleController.getString("RowGradientDisabled", R.string.RowGradientDisabled); + } else if (sort == 1) { + value = LocaleController.getString("ShowPics", R.string.ShowPics); + } else { + value = LocaleController.getString("ShowProfile", R.string.ShowProfile); + } + textCell.setTextAndValue(LocaleController.getString("ClickOnContactPic", R.string.ClickOnContactPic), value, false); + } else if (i == dialogsGroupPicClickRow) { + String value; + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); + int sort = preferences.getInt("dialogsClickOnGroupPic", 0); + if (sort == 0) { + value = LocaleController.getString("RowGradientDisabled", R.string.RowGradientDisabled); + } else if (sort == 1) { + value = LocaleController.getString("ShowPics", R.string.ShowPics); + } else { + value = LocaleController.getString("ShowProfile", R.string.ShowProfile); + } + textCell.setTextAndValue(LocaleController.getString("ClickOnGroupPic", R.string.ClickOnGroupPic), value, true); } } else if (type == 3) { if (view == null) { @@ -1368,6 +1449,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ((HeaderCell) view).setText(LocaleController.getString("AutomaticMediaDownload", R.string.AutomaticMediaDownload)); } else if (i == numberSectionRow) { ((HeaderCell) view).setText(LocaleController.getString("Info", R.string.Info)); + }else if (i == dialogsSectionRow2) { + ((HeaderCell) view).setText(LocaleController.getString("DialogsSettings", R.string.DialogsSettings)); } } else if (type == 5) { if (view == null) { @@ -1461,11 +1544,11 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter if (i == emptyRow || i == overscrollRow) { return 0; } - if (i == settingsSectionRow || i == supportSectionRow /*|| i == messagesSectionRow*/ || i == mediaDownloadSection || i == contactsSectionRow) { + if (i == settingsSectionRow || i == supportSectionRow /*|| i == messagesSectionRow*/ || i == mediaDownloadSection || i == contactsSectionRow || i == dialogsSectionRow) { return 1; } else if (i == enableAnimationsRow || i == sendByEnterRow || i == saveToGalleryRow || i == disableAudioStopRow || i == disableMessageClickRow || i == showAndroidEmojiRow || i == useDeviceFontRow || i == keepOriginalFilenameRow ) { return 3; - } else if (i == notificationRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == privacyRow || i == clearLogsRow || i == switchBackendButtonRow || i == telegramFaqRow || i == contactsReimportRow || i == textSizeRow || i == emojiPopupSize || i == languageRow || i == contactsSortRow || i == stickersRow) { + } else if (i == notificationRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == privacyRow || i == clearLogsRow || i == switchBackendButtonRow || i == telegramFaqRow || i == contactsReimportRow || i == textSizeRow || i == emojiPopupSize || i == languageRow || i == contactsSortRow || i == stickersRow || i == dialogsPicClickRow || i == dialogsGroupPicClickRow) { return 2; } else if (i == versionRow) { return 5; @@ -1473,7 +1556,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter return 6; } else if (i == keepOriginalFilenameDetailRow) { return 7; - } else if (i == settingsSectionRow2 || i == messagesSectionRow2 || i == supportSectionRow2 || i == numberSectionRow || i == mediaDownloadSection2) { + } else if (i == settingsSectionRow2 || i == messagesSectionRow2 || i == supportSectionRow2 || i == numberSectionRow || i == mediaDownloadSection2 || i == dialogsSectionRow2) { return 4; } else { return 2; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ThemingChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ThemingChatActivity.java index ff4c7bb8..e0dbeb15 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ThemingChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ThemingChatActivity.java @@ -26,9 +26,9 @@ import android.widget.FrameLayout; import android.widget.ListView; import org.telegram.messenger.AndroidUtilities; +import org.telegram.messenger.ApplicationLoader; import org.telegram.messenger.LocaleController; import org.telegram.messenger.MessagesController; -import org.telegram.messenger.ApplicationLoader; import org.telegram.messenger.R; import org.telegram.ui.ActionBar.ActionBar; import org.telegram.ui.ActionBar.BaseFragment; @@ -147,8 +147,8 @@ public class ThemingChatActivity extends BaseFragment { solidBGColorCheckRow = rowCount++; solidBGColorRow = rowCount++; - //gradientBGRow = rowCount++; - //gradientBGColorRow = rowCount++; + gradientBGRow = rowCount++; + gradientBGColorRow = rowCount++; showContactAvatar = rowCount++; avatarAlignTopRow = rowCount++; @@ -399,6 +399,9 @@ public class ThemingChatActivity extends BaseFragment { if (view instanceof TextCheckCell) { ((TextCheckCell) view).setChecked(!b); } + if (listView != null) { + listView.invalidateViews(); + } } else if (i == memberColorCheckRow) { boolean b = themePrefs.getBoolean( key, true); @@ -474,6 +477,12 @@ public class ThemingChatActivity extends BaseFragment { public void colorChanged(int color) { commitInt("chatSolidBGColor", color); ApplicationLoader.reloadWallpaper(); + /*AndroidUtilities.runOnUIThread(new Runnable() { + @Override + public void run() { + NotificationCenter.getInstance().postNotificationName(NotificationCenter.wallpaperChanged); + } + });*/ } },themePrefs.getInt("chatSolidBGColor", 0xffffffff), CENTER, 0, true); @@ -488,7 +497,13 @@ public class ThemingChatActivity extends BaseFragment { @Override public void colorChanged(int color) { commitInt("chatGradientBGColor", color); - ApplicationLoader.reloadWallpaper(); + /*ApplicationLoader.reloadWallpaper(); + AndroidUtilities.runOnUIThread(new Runnable() { + @Override + public void run() { + NotificationCenter.getInstance().postNotificationName(NotificationCenter.wallpaperChanged); + } + });*/ } },themePrefs.getInt( "chatGradientBGColor", 0xffffffff), CENTER, 0, false); colorDialog.show(); @@ -508,7 +523,13 @@ public class ThemingChatActivity extends BaseFragment { public void onClick(DialogInterface dialog, int which) { SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, AndroidUtilities.THEME_PREFS_MODE); themePrefs.edit().putInt("chatGradientBG", which).commit(); - ApplicationLoader.reloadWallpaper(); + /*ApplicationLoader.reloadWallpaper(); + AndroidUtilities.runOnUIThread(new Runnable() { + @Override + public void run() { + NotificationCenter.getInstance().postNotificationName(NotificationCenter.wallpaperChanged); + } + });*/ if (listView != null) { listView.invalidateViews(); } @@ -1528,7 +1549,7 @@ public class ThemingChatActivity extends BaseFragment { textCell.setTag("chatHeaderIconsColor"); textCell.setTextAndColor(LocaleController.getString("HeaderIconsColor", R.string.HeaderIconsColor), themePrefs.getInt(textCell.getTag().toString(), 0xffffffff), true); } else if (i == solidBGColorRow) { - textCell.setTextAndColor(LocaleController.getString("SolidBGColor", R.string.SolidBGColor), themePrefs.getBoolean("chatSolidBGColorCheck", false) ? themePrefs.getInt("chatSolidBGColor", 0xffffffff) : 0x00000000, true); + textCell.setTextAndColor(LocaleController.getString("SolidBGColor", R.string.SolidBGColor), themePrefs.getBoolean("chatSolidBGColorCheck", false) ? themePrefs.getInt("chatSolidBGColor", 0xffffffff) : 0x00000000, false); } else if (i == gradientBGColorRow) { textCell.setTextAndColor(LocaleController.getString("RowGradientColor", R.string.RowGradientColor), themePrefs.getInt("chatGradientBG", 0) == 0 || !themePrefs.getBoolean("chatSolidBGColorCheck", false) ? 0x00000000 : themePrefs.getInt("chatGradientBGColor", 0xffffffff), true); } else if (i == memberColorRow) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ThemingContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ThemingContactsActivity.java index f7cfefe0..93684dc0 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ThemingContactsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ThemingContactsActivity.java @@ -633,7 +633,7 @@ public class ThemingContactsActivity extends BaseFragment { if (i == headerColorRow) { textCell.setTextAndColor(LocaleController.getString("HeaderColor", R.string.HeaderColor), themePrefs.getInt("contactsHeaderColor", AndroidUtilities.getIntColor("themeColor")), false); } else if (i == headerGradientColorRow) { - textCell.setTextAndColor(LocaleController.getString("HeaderColor", R.string.HeaderColor), themePrefs.getInt("contactsHeaderGradient", 0) == 0 ? 0x00000000 : themePrefs.getInt("contactsHeaderGradientColor", AndroidUtilities.getIntColor("themeColor")), true); + textCell.setTextAndColor(LocaleController.getString("RowGradientColor", R.string.RowGradientColor), themePrefs.getInt("contactsHeaderGradient", 0) == 0 ? 0x00000000 : themePrefs.getInt("contactsHeaderGradientColor", AndroidUtilities.getIntColor("themeColor")), true); } else if (i == headerTitleColorRow) { textCell.setTextAndColor(LocaleController.getString("HeaderTitleColor", R.string.HeaderTitleColor), themePrefs.getInt("contactsHeaderTitleColor", 0xffffffff), true); } else if (i == headerIconsColorRow) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java index bc20eff8..fcfab8d4 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java @@ -22,7 +22,6 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.MediaStore; -import android.util.Log; import android.view.Gravity; import android.view.MotionEvent; import android.view.View; @@ -244,7 +243,6 @@ public class WallpapersActivity extends BaseFragment implements NotificationCent processSelectedBackground(); } //Plus - Log.e("click", position+""); AndroidUtilities.runOnUIThread(new Runnable() { @Override public void run() { diff --git a/TMessagesProj/src/main/res/drawable-hdpi/Thumbs.db b/TMessagesProj/src/main/res/drawable-hdpi/Thumbs.db index 47b53472c81696f267ed65e44d4c89dea977bf8f..44ad831b129f63bc3db57799f8828e6c6f9be631 100644 GIT binary patch delta 17830 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 OvWk0GJV<}EDE@zpWSD&b delta 6137 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 diff --git a/TMessagesProj/src/main/res/drawable-mdpi/Thumbs.db b/TMessagesProj/src/main/res/drawable-mdpi/Thumbs.db index 9c1bba3fe2d9f1174be574c8e81e85b7b7908f62..48830ca30a61611855e340cb453544173344ed63 100644 GIT binary patch delta 19 acmZpWXpq>D%fhC1#Qr7s#m&Vmz3c!)c?Sdl delta 19 acmZpWXpq>D%fc4L^JDU_3!95sdf5R<*$2@8 diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/Thumbs.db b/TMessagesProj/src/main/res/drawable-xhdpi/Thumbs.db index 04bf64c0663b88cef425f2e5a2831af567d1678c..8087e90e609054a4311d29f350784a45f38bd45a 100644 GIT binary patch delta 20 bcmZpWXpq>D!@}-x=92wO?u(m?S$f$4QGEya delta 20 bcmZpWXpq>D!@?e*F8yQjuM3-tS$f$4PE-f| diff --git a/TMessagesProj/src/main/res/drawable-xxxhdpi/Thumbs.db b/TMessagesProj/src/main/res/drawable-xxxhdpi/Thumbs.db index b116d582df847330805715bf7401d37546700da2..3c563db4b9b558918869005861b46a7f7543418c 100644 GIT binary patch delta 22 ecmZp;!`N_#aYGIZyTaF(r5o8UZZ2l&%>)2))(QOp delta 22 ecmZp;!`N_#aYGIZy8w@`>6Bj=HW#z>W&!|Zc?kXh diff --git a/TMessagesProj/src/main/res/values-ar/strings.xml b/TMessagesProj/src/main/res/values-ar/strings.xml index 0a0a92e1..e345fd6b 100644 --- a/TMessagesProj/src/main/res/values-ar/strings.xml +++ b/TMessagesProj/src/main/res/values-ar/strings.xml @@ -950,7 +950,7 @@ %1$s الساعة %2$s تم تحديث تيليجرام نسخة الآندرويد. الجديد في نسخة 3.2.0:\n\n- إضافة خدمة القنوات - وسيلة جديدة رائعة لإرسال الرسائل الجماعية لعدد لا محدود من الجماهير (تستبدل الرسائل الجماعية القديمة). \n\n- اللاستزادة، اقرأ هنا: https://telegram.org/blog/channels - 630 + 632 بلاس مسنجر للأندرويد diff --git a/TMessagesProj/src/main/res/values-ca/strings.xml b/TMessagesProj/src/main/res/values-ca/strings.xml index f6ae36d3..166652c1 100644 --- a/TMessagesProj/src/main/res/values-ca/strings.xml +++ b/TMessagesProj/src/main/res/values-ca/strings.xml @@ -903,7 +903,7 @@ Si no us interessa, us suggerim crear un canal privat. %1$s a les %2$s S\'ha actualitzat el Telegram per a l\'Android. Novetats a la versió 3.1.3:\n\n- Nova secció \'Enllaços compartits\' a la informació del xat\n- Previsualització, dins de l\'aplicació, per a enllaços a fotos - 630 + 632 Plus Messenger per Android @@ -1045,4 +1045,16 @@ Si no us interessa, us suggerim crear un canal privat. No aturis els àudios Color del divisor de llista Centra l\'avatar, el nom i el número de telèfon + Gradient + Color de gradient + Deshabilitat + De dalt a baix + D\'esquerra a dreta + Dalt-Esquerra Baix-Dreta + Baix-Esquerra Dalt-Dreta + Aplica el gradient al fons de la llista + S\'ha copiat %s al porta-retalls + + +Afegiu-vos al canal oficial del Plus Messenger: https://telegram.me/plusmsnes diff --git a/TMessagesProj/src/main/res/values-de/strings.xml b/TMessagesProj/src/main/res/values-de/strings.xml index 9a4770f9..70101279 100644 --- a/TMessagesProj/src/main/res/values-de/strings.xml +++ b/TMessagesProj/src/main/res/values-de/strings.xml @@ -947,10 +947,10 @@ %1$s um %2$s Telegram für Android wurde aktualisiert. Neu in Version 3.2.0:\n\n- Kanäle: Du kannst nun Nachrichten an eine unbegrenzte Anzahl von Leuten schicken (ersetzen die Verteilerlisten).\n\n Mehr Infos über dieses Update: https://telegram.org/blog/channels - 630 + 632 +\n\nNeues in Version 3.2.2.1:\n\n- Hintergrund vom Chat kann jetzt direkt geändert werden\n- Verbesserte Möglichkeit der Anwendung von Themen Hintergrundbildern\n-Benutzernamen in Zwischenablage kopieren wenn diese in der Profilübersicht ausgewählt wurden\n- Fehlerbeseitigung--> Plus Messenger für Android Themen bearbeiten Ungültiger Hex-Code! @@ -1098,4 +1098,7 @@ von oben Links nach unten Rechts von unten Links nach oben Rechts Hintergrund Farbverlauf Liste oder Seite + %s in die Zwischenablage kopiert + +\n\nPlus Messenger Mitglied werden im offiziellen Kanal: https://telegram.me/plusmsn \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-es/strings.xml b/TMessagesProj/src/main/res/values-es/strings.xml index d03384b2..ff12a4a2 100644 --- a/TMessagesProj/src/main/res/values-es/strings.xml +++ b/TMessagesProj/src/main/res/values-es/strings.xml @@ -947,9 +947,9 @@ %1$s a las %2$s Plus Messenger para Android ha sido actualizada. Novedades en la versión 3.2.0\n\n- Presentamos los Canales - una nueva gran forma de difundir tus mensajes a audiencias ilimitadas (reemplaza a las antiguas difusiones).\n\n Conoce más: https://telegram.org/blog/channels - 630 + 632 - \n\nNovedades en 3.2.2.1:\n\n- Ahora puedes cambiar el fondo directamente desde la pantalla de chat\n- Método mejorado para aplicar fondos de tema\n- El alias se copia al portapapeles si le haces click en la pantalla de perfil\n- Corrección de errores + \n\nNovedades en 3.2.2.2:\n\n- Opción en ajustes para abrir perfil/fotos de perfil de usuario/grupo al hacer click en foto en pantalla principal\n- Opción de gradiente en fondo de chat\n- Añadida opción de reenviar link sin citar\n- Añadido enlace a canal oficial en menú\n- Corrección de errores Plus Messenger para Android Tematización ¡Color hexadecimal inválido! @@ -1099,4 +1099,11 @@ Aplicar gradiente a fondo de lista %s copiado al portapapeles \n\nÚnete al canal oficial de Plus Messenger en español: https://telegram.me/plusmsnes + Descargar temas + Canal oficial + Chats + Click en foto de contacto + Click en foto de grupo + Perfil + Fotos de perfil \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-fr/strings.xml b/TMessagesProj/src/main/res/values-fr/strings.xml index 951e6ced..1ddd5db2 100644 --- a/TMessagesProj/src/main/res/values-fr/strings.xml +++ b/TMessagesProj/src/main/res/values-fr/strings.xml @@ -949,7 +949,7 @@ Plus Messenger pour Android a été mis à jour. Nouveautés de la version 3.1.3:\n\n- Nouvelle section \"Liens partagés\" dans les informations de la conversation\n - Prévisualistaion In-app pour les liens des images - 630 + 632 Plus Messenger pour Android Thème diff --git a/TMessagesProj/src/main/res/values-gl/strings.xml b/TMessagesProj/src/main/res/values-gl/strings.xml index 21ea0a40..5872e02e 100644 --- a/TMessagesProj/src/main/res/values-gl/strings.xml +++ b/TMessagesProj/src/main/res/values-gl/strings.xml @@ -948,9 +948,9 @@ e introduce o teu número. %1$s ás %2$s Telegram para Android foi actualizada. Novidades na versión 3.2.0:\n\n- Presentamos as Canles – unha nova gran forma de difundir as túas mensaxes a audiencias ilimitadas (substitúe ás antigas difusións).\n\n Coñece máis: https://telegram.org/blog/channels - 630 - - \n\nNovo na versión 3.2.2.1:\n\n- Agora podes cambiar o fondo directamente dende a pantalla da conversa\n- Método mellorado para a aplicación dos fondos do tema\n- O alias cópiase ao portapapeis se lle tocas na pantalla do perfil\n- Corrección de erros + 632 + Plus Messenger para Android Tematización Cor hexadecimal inválida! @@ -1099,4 +1099,5 @@ e introduce o teu número. Abaixo-Esquerda Arriba-Dereita Aplicar gradiente ao fondo do listado %s copiado ao portapapeis + \n\nÚnete á canle oficial de Plus Messenger: https://telegram.me/plusmsnes diff --git a/TMessagesProj/src/main/res/values-hi/strings.xml b/TMessagesProj/src/main/res/values-hi/strings.xml index 3025e193..0a141232 100644 --- a/TMessagesProj/src/main/res/values-hi/strings.xml +++ b/TMessagesProj/src/main/res/values-hi/strings.xml @@ -515,7 +515,7 @@ %1$s पर %2$s - 630 + 632 Android के लिए प्लस मैसेंजर diff --git a/TMessagesProj/src/main/res/values-hr/strings.xml b/TMessagesProj/src/main/res/values-hr/strings.xml index 9a935284..337f3b69 100644 --- a/TMessagesProj/src/main/res/values-hr/strings.xml +++ b/TMessagesProj/src/main/res/values-hr/strings.xml @@ -750,7 +750,7 @@ h:mm a %1$s u %2$s - 630 + 632 Plus Messenger za Android Izrada teme diff --git a/TMessagesProj/src/main/res/values-it/strings.xml b/TMessagesProj/src/main/res/values-it/strings.xml index d607f45c..6ecb4e0b 100644 --- a/TMessagesProj/src/main/res/values-it/strings.xml +++ b/TMessagesProj/src/main/res/values-it/strings.xml @@ -947,10 +947,10 @@ %1$s alle %2$s Plus Messenger per Android si è aggiornato. Nuovo nella versione 3.2.0:\n\n- Nuovi Canali - una nuova modalità per diffondere i tuoi messaggi ad un pubblico infinito (rimpiazzano le vecchie liste broadcast).\n\nPiù info: https://telegram.org/blog/channels - 630 + 632 -\n\Novità nella versione 3.2.2.1:\n\n- Adesso lo sfondo può essere cambiato direttamente dalla schermata della chat\n- Migliorato il metodo di applicazione degli sfondi dei temi\n- Nome utente copiato negli appunti se premuto nella schermata del profilo\n- Correzioni bug +\n\nNovità nella versione 3.2.2.2:\n\n- Nuova opzione nelle impostazioni per aprire il profilo/le immagini del profilo quando si preme l\'utente o l\'immagine del gruppo nella schermata principale\n- Aggiunta opzione per il colore gradiente di sfondo\n- Aggiunta opzione per inoltrare i link senza quotare\n- Aggiunto link al canale ufficiale nel menu\n- Correzioni bug Plus Messenger per Android Personalizzazione Codice del colore esadecimale non valido! @@ -1099,5 +1099,13 @@ Fondo-sinistra Intestazione-destra Applica il gradiente allo sfondo della lista %s copiato negli appunti - \n\nEntra nel canale ufficiale di Plus Messenger: https://telegram.me/plusmsn + +\n\nEntra nel canale ufficiale di Plus Messenger: https://telegram.me/plusmsn + Scarica temi + Canale ufficiale + Avvisi + Click sull\'immagine del contatto + Click sull\'immagine del gruppo + Profilo + Immagini del profilo \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-nl/strings.xml b/TMessagesProj/src/main/res/values-nl/strings.xml index cb46cf57..325ed7f5 100644 --- a/TMessagesProj/src/main/res/values-nl/strings.xml +++ b/TMessagesProj/src/main/res/values-nl/strings.xml @@ -947,7 +947,7 @@ %1$s om %2$s Plus Messenger voor Android is bijgewerkt. Nieuw in versie 3.2.0:\n\n- Nieuw, kanalen - een perfecte manier om berichten naar een ongelimiteerd publiek te versturen (vervangt de oude verzendlijsten).\n\nMeer over deze update: https://telegram.org/blog/channels - 630 + 632 Plus Messenger voor Android diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml index fdfdcbe1..14514e90 100644 --- a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml @@ -947,10 +947,10 @@ %1$s às %2$s Plus Messenger para Android foi atualizado. Novidade na versão 3.2.0:\n\n- Introduzindo Canais – Uma grande nova maneira de transmitir suas mensagens, com audiência ilimitada (substitui as antigas Transmissões).\n\nMais sobre a atualização: https://telegram.org/blog/channels - 630 + 632 +\n\nNovidades ne versão 3.2.2.1:\n\n- Agora o papel de parede pode ser alterado pela tela de chat\n- Melhorias no método de aplicação do papel de parede\n- Nome de usuário é copiado para o clipboard se clicado na tela de perfil\n- Correções de erros--> Plus Messenger para Android Personalização Código de cor HEX inválido! @@ -1084,7 +1084,7 @@ Mostrar Avatar do Contato Mostrar Próprio Avatar no Chat Mostrar Próprio Avatar em Grupos - Avatar Próprio no Topo + Alinhar Avatar Próprio no Topo Cor do Título/Botão de Diálogo Exibir Nome de Usuário Não Parar Áudio @@ -1098,4 +1098,7 @@ Superior-Esquerda Inferior-Direita Inferior-Esquerda Superior-Direita Aplicar degradê para a lista de fundo + %s copiado para o clipboard + +\n\nJunte-se ao canal oficial do Plus Messenger: https://telegram.me/plusmsn \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml index 749b40cd..55254e05 100644 --- a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml @@ -950,7 +950,7 @@ %1$s às %2$s Plus Messenger para Android foi atualizado. Novidade na versão 3.2.0:\n\n- Introduzindo Canais – Uma grande nova maneira de transmitir suas mensagens, com audiência ilimitada (substitui as antigas Transmissões).\n\nMais sobre a atualização: https://telegram.org/blog/channels - 630 + 632 Plus Messenger para Android Temas diff --git a/TMessagesProj/src/main/res/values-ru/strings.xml b/TMessagesProj/src/main/res/values-ru/strings.xml index b265acf9..3e503089 100644 --- a/TMessagesProj/src/main/res/values-ru/strings.xml +++ b/TMessagesProj/src/main/res/values-ru/strings.xml @@ -947,10 +947,10 @@ %1$s в %2$s Telegram для Android обновлён. Новое в версии 3.2.0:\n\n- Представляем Каналы – новый отличный способ транслировать свои сообщения неограниченной аудитории (заменяют старые списки рассылок).\n\nЧитать больше: https://telegram.org/blog/channels - 630 - + 632 + Plus Messenger для Android Кастомизация Неверный hex-код цвета! @@ -1099,4 +1099,6 @@ Снизу налево, сверху направо Применить градиент к фону списка %s скопировано в буфер обмена + +\n\nПрисоединяйтесь к официальному каналу Plus Messenger: https://telegram.me/plusmsn diff --git a/TMessagesProj/src/main/res/values-tr/strings.xml b/TMessagesProj/src/main/res/values-tr/strings.xml index 83aefc54..1e3f15a8 100644 --- a/TMessagesProj/src/main/res/values-tr/strings.xml +++ b/TMessagesProj/src/main/res/values-tr/strings.xml @@ -830,10 +830,10 @@ %1$s %2$s - 630 + 632 +\n\n3.2.2.1\'deki Yenilikler:\n\n- Artık duvarkağıdı direkt olarak sohbet ekranından değişebiliyor\n- Tema duvarkağıtlarının uygulama yönteminde geliştirmeler yapıldı\n- Eğer profil ekranında işaretlenmişse kullanıcı adı kopyalanabilir\n- Hata düzeltmeleri--> Android için Plus Messenger Tema Geçersiz renk hex kodu! @@ -878,8 +878,8 @@ Yazı Giriş Boyutu Yazı Giriş Arkaplan Rengi Emoji Arkaplan Rengi - seçilmiş surat sekme rengi - Surat simgesinin rengi + Emoji seçili sekme rengi + Emoji sekmesi ikon rengi Çevrimiçi Rengi Müzik Temayı Kaydet @@ -982,4 +982,6 @@ Alt Sol Üst Sağ Arkaplana gradyan uygula %s panoya kopyalandı + +\n\nPlus Messenger resmi kanalına katılın: https://telegram.me/plusmsn diff --git a/TMessagesProj/src/main/res/values-zh-rCN/strings.xml b/TMessagesProj/src/main/res/values-zh-rCN/strings.xml index 5962e874..e926c9a7 100644 --- a/TMessagesProj/src/main/res/values-zh-rCN/strings.xml +++ b/TMessagesProj/src/main/res/values-zh-rCN/strings.xml @@ -897,7 +897,7 @@ %1$s 的 %2$s - 630 + 632 Plus Messenger for Android @@ -944,7 +944,8 @@ 输入栏字体大小 输入栏背景颜色 表情背景颜色 - 表情标签颜色 + Emoji选择栏颜色 + Emoji选择栏颜色 在线中颜色 音乐 保存主题 @@ -1004,7 +1005,7 @@ 使用“名称_日期”格式保存文件，而不单只是数字序号 头像大小 对齐头像到顶部 - 头像左边距 + 头像边距 群组名称颜色 群组名称大小 姓名颜色（手机号码未知） @@ -1026,4 +1027,27 @@ 使用设备自带字体 Plus Messenger 将重启 群组图标颜色 + 已分享的联系人名称颜色 + 附件背景颜色 + 附件文字颜色 + 在聊天界面显示联系人头像 + 在聊天界面显示自己的头像 + 在群组界面显示自己的头像 + 对齐自己的头像到顶部 + 对话框的标题/按钮颜色 + 同时显示用户名和昵称 + 不停止语音 + 列表分隔线颜色 + 居中头像、名称和电话号码 + 渐变 + 渐变颜色 + 禁用 + 上下 + 左右 + 左上右下 + 左下右上 + 应用渐变色到列表背景 + %s 已复制到剪贴板 + +\n\n加入 Plus Messenger 官方频道： https://telegram.me/plusmsn diff --git a/TMessagesProj/src/main/res/values-zh-rTW/strings.xml b/TMessagesProj/src/main/res/values-zh-rTW/strings.xml index d99de787..84815e9b 100644 --- a/TMessagesProj/src/main/res/values-zh-rTW/strings.xml +++ b/TMessagesProj/src/main/res/values-zh-rTW/strings.xml @@ -947,7 +947,7 @@ 於時間 %1$s %2$s Android 版的 Telegram 已經更新。在版本 3.2.0 中的新功能：\n\n- 引進頻道 – 用來將您的訊息向無限觀眾廣播的新方式 (取代舊式的廣播)。\n\n了解更多：https://telegram.org/blog/channels - 630 + 632 @@ -1085,4 +1085,8 @@ 在群組畫面中顯示擁有的大頭照 對齊擁有的大頭照到頂端 對話框標題/按鈕顏色 + 顯示用戶名稱及成員名稱 + 不要停止音訊 + 選單分隔線顏色 + 將個人照片、姓名和電話號碼置中 diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index d9189694..f605a5a4 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -948,9 +948,9 @@ %1$s at %2$s Telegram for Android has been updated. New in version 3.2.0:\n\n- Introducing Channels – a great new way to broadcast your messages to unlimited audiences (replaces old Broadcasts).\n\nRead more: https://telegram.org/blog/channels - 630 + 632 - \n\nNew in version 3.2.2.1:\n\n- Now wallpaper can be changed directly from chat screen\n- Improved way of applying themes\' wallpapers\n- Username copied to clipboard if clicked in profile screen\n- Bug fixes + \n\nNew in version 3.2.2.2:\n\n- New option in settings to open profile/profile pics when clicking user/group pic in main screen\n- Added gradient option to chat background color\n- Added option to forward link without quoting\n- Added link to official channel in menu\n- Bug fixes Plus Messenger for Android Theming Invalid color hex code! @@ -1100,4 +1100,11 @@ Apply gradient to list background %s copied to clipboard \n\nJoin Plus Messenger official channel: https://telegram.me/plusmsn + Download themes + Official channel + Dialogs + Click on contact pic + Click on group pic + Profile + Profile pics \ No newline at end of file