From 587e0e5dc3d7efbd41de73a05433304fee75a1d7 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 27 Oct 2016 16:16:11 +0200 Subject: [PATCH] Cleanup. --- .../org/telegram/messenger/MessageObject.java | 76 +-------- .../org/telegram/messenger/MrMailbox.java | 32 ++-- .../org/telegram/messenger/UserObject.java | 6 +- .../main/java/org/telegram/tgnet/TLRPC.java | 89 ---------- .../java/org/telegram/ui/ActionBar/Theme.java | 14 -- .../telegram/ui/Cells/ChatMessageCell.java | 157 +----------------- .../ui/Components/ChatAvatarContainer.java | 3 +- .../telegram/ui/Components/TimerDrawable.java | 140 ---------------- .../main/res/drawable-hdpi/header_timer.png | Bin 1300 -> 0 bytes .../main/res/drawable-hdpi/header_timer2.png | Bin 1588 -> 0 bytes .../src/main/res/drawable-hdpi/post_views.png | Bin 1354 -> 0 bytes .../main/res/drawable-hdpi/post_views_s.png | Bin 1380 -> 0 bytes .../main/res/drawable-hdpi/post_views_w.png | Bin 1317 -> 0 bytes .../main/res/drawable-hdpi/post_viewsg.png | Bin 1377 -> 0 bytes .../main/res/drawable-mdpi/header_timer.png | Bin 1200 -> 0 bytes .../main/res/drawable-mdpi/header_timer2.png | Bin 1389 -> 0 bytes .../src/main/res/drawable-mdpi/post_views.png | Bin 1235 -> 0 bytes .../main/res/drawable-mdpi/post_views_s.png | Bin 1234 -> 0 bytes .../main/res/drawable-mdpi/post_views_w.png | Bin 1190 -> 0 bytes .../main/res/drawable-mdpi/post_viewsg.png | Bin 1233 -> 0 bytes .../main/res/drawable-xhdpi/header_timer.png | Bin 1438 -> 0 bytes .../main/res/drawable-xhdpi/header_timer2.png | Bin 1898 -> 0 bytes .../main/res/drawable-xhdpi/post_views.png | Bin 1497 -> 0 bytes .../main/res/drawable-xhdpi/post_views_s.png | Bin 1497 -> 0 bytes .../main/res/drawable-xhdpi/post_views_w.png | Bin 1452 -> 0 bytes .../main/res/drawable-xhdpi/post_viewsg.png | Bin 1496 -> 0 bytes .../main/res/drawable-xxhdpi/header_timer.png | Bin 1759 -> 0 bytes .../res/drawable-xxhdpi/header_timer2.png | Bin 2337 -> 0 bytes .../main/res/drawable-xxhdpi/post_views.png | Bin 1770 -> 0 bytes .../main/res/drawable-xxhdpi/post_views_s.png | Bin 1764 -> 0 bytes .../main/res/drawable-xxhdpi/post_views_w.png | Bin 1725 -> 0 bytes .../main/res/drawable-xxhdpi/post_viewsg.png | Bin 1780 -> 0 bytes 32 files changed, 27 insertions(+), 490 deletions(-) delete mode 100644 TMessagesProj/src/main/java/org/telegram/ui/Components/TimerDrawable.java delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/header_timer.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/header_timer2.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/post_views.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/post_views_s.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/post_views_w.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/post_viewsg.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/header_timer.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/header_timer2.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/post_views.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/post_views_s.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/post_views_w.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/post_viewsg.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/header_timer.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/header_timer2.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/post_views.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/post_views_s.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/post_views_w.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/post_viewsg.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/header_timer.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/header_timer2.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/post_views.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/post_views_s.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/post_views_w.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/post_viewsg.png diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java index c32b5a14d..02b092ee0 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java @@ -60,14 +60,12 @@ public class MessageObject { public ArrayList photoThumbs; public VideoEditedInfo videoEditedInfo; public boolean viewsReloaded; - //public int wantedBotKeyboardWidth; public boolean attachPathExists; public boolean mediaExists; public boolean forceUpdate; private static TextPaint textPaint; - //private static TextPaint botButtonPaint; public int lastLineWidth; public int textWidth; public int textHeight; @@ -397,78 +395,6 @@ public class MessageObject { return textPaint; } - /* - public void generatePinMessageText(TLRPC.User fromUser, TLRPC.Chat chat) { - if (fromUser == null && chat == null) { - if (messageOwner.from_id > 0) { - fromUser = MessagesController.getInstance().getUser(messageOwner.from_id); - } - if (fromUser == null) { - chat = MessagesController.getInstance().getChat(messageOwner.to_id.channel_id); - } - } - if (replyMessageObject == null) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedNoText", R.string.ActionPinnedNoText), "un1", fromUser != null ? fromUser : chat); - } else { - if (replyMessageObject.isMusic()) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedMusic", R.string.ActionPinnedMusic), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.isVideo()) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedVideo", R.string.ActionPinnedVideo), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.isGif()) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedGif", R.string.ActionPinnedGif), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.isVoice()) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedVoice", R.string.ActionPinnedVoice), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.isSticker()) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedSticker", R.string.ActionPinnedSticker), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedFile", R.string.ActionPinnedFile), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.messageOwner.media instanceof TLRPC.TL_messageMediaGeo) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedGeo", R.string.ActionPinnedGeo), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.messageOwner.media instanceof TLRPC.TL_messageMediaContact) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedContact", R.string.ActionPinnedContact), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.messageOwner.media instanceof TLRPC.TL_messageMediaPhoto) { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedPhoto", R.string.ActionPinnedPhoto), "un1", fromUser != null ? fromUser : chat); - } else if (replyMessageObject.messageText != null && replyMessageObject.messageText.length() > 0) { - CharSequence mess = replyMessageObject.messageText; - if (mess.length() > 20) { - mess = mess.subSequence(0, 20) + "..."; - } - mess = Emoji.replaceEmoji(mess, textPaint.getFontMetricsInt(), AndroidUtilities.dp(20), false); - messageText = replaceWithLink(LocaleController.formatString("ActionPinnedText", R.string.ActionPinnedText, mess), "un1", fromUser != null ? fromUser : chat); - } else { - messageText = replaceWithLink(LocaleController.getString("ActionPinnedNoText", R.string.ActionPinnedNoText), "un1", fromUser != null ? fromUser : chat); - } - } - } - */ - - /* - private void measureInlineBotButtons() { - wantedBotKeyboardWidth = 0; - if (!(messageOwner.reply_markup instanceof TLRPC.TL_replyInlineMarkup)) { - return; - } - if (botButtonPaint == null) { - botButtonPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG); - botButtonPaint.setTextSize(AndroidUtilities.dp(15)); - botButtonPaint.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); - } - for (int a = 0; a < messageOwner.reply_markup.rows.size(); a++) { - TLRPC.TL_keyboardButtonRow row = messageOwner.reply_markup.rows.get(a); - int maxButtonSize = 0; - int size = row.buttons.size(); - for (int b = 0; b < size; b++) { - CharSequence text = Emoji.replaceEmoji(row.buttons.get(b).text, botButtonPaint.getFontMetricsInt(), AndroidUtilities.dp(15), false); - StaticLayout staticLayout = new StaticLayout(text, botButtonPaint, AndroidUtilities.dp(2000), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false); - if (staticLayout.getLineCount() > 0) { - maxButtonSize = Math.max(maxButtonSize, (int) Math.ceil(staticLayout.getLineWidth(0) - staticLayout.getLineLeft(0)) + AndroidUtilities.dp(4)); - } - } - wantedBotKeyboardWidth = Math.max(wantedBotKeyboardWidth, (maxButtonSize + AndroidUtilities.dp(12)) * size + AndroidUtilities.dp(5) * (size - 1)); - } - } - */ - public void setType() { int oldType = type; if (messageOwner instanceof TLRPC.TL_message /*|| messageOwner instanceof TLRPC.TL_messageForwarded_old2*/) { @@ -1215,7 +1141,7 @@ public class MessageObject { } public static boolean isMegagroup(TLRPC.Message message) { - return (message.flags & TLRPC.MESSAGE_FLAG_MEGAGROUP) != 0; + return false; } public static boolean isOut(TLRPC.Message message) { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java index 01b0540cc..c144e7294 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java @@ -32,6 +32,7 @@ package org.telegram.messenger; import android.util.Log; +import org.telegram.tgnet.ConnectionsManager; import org.telegram.tgnet.TLRPC; public class MrMailbox { @@ -80,7 +81,7 @@ public class MrMailbox { ret.dialog_id = MrMsgGetChatId(hMsg); ret.unread = state!=MR_OUT_READ; // the state of outgoing messages ret.media_unread = ret.unread; - ret.flags = 0; // posible flags: TLRPC.MESSAGE_FLAG_HAS_FROM_ID, however, this seems to be read only + ret.flags = 0; // posible flags: MESSAGE_FLAG_HAS_FROM_ID, however, this seems to be read only ret.post = false; // ? true=avatar wird in gruppen nicht angezeigt ret.out = ret.from_id==1; // true=outgoing message, read eg. in MessageObject.isOutOwner() @@ -89,24 +90,31 @@ public class MrMailbox { } else if( type == MrMailbox.MR_MSG_IMAGE ) { String path = MrMailbox.MrMsgGetParam(hMsg, 'f', ""); - TLRPC.TL_photo photo = null; if( !path.isEmpty() ) { try { - // TODO: It is very inefficient to load all photos on dialog loading! FIX ME! - photo = SendMessagesHelper.getInstance().generatePhotoSizes(path, null); // TODO: does this degrade image quality? + //TLRPC.TL_photo photo; + //photo = SendMessagesHelper.getInstance().generatePhotoSizes(path, null); // TODO: does this degrade image quality? + + //ret.message = "-1"; + //ret.attachPath = new TLRPC.TL_messageMediaPhoto(); + //ret.media.photo = photo;// search for TL_messageMediaPhoto + + /* + photo = new TLRPC.TL_photo(); + TLRPC.TL_photoSize photoSize = new TLRPC.TL_photoSize(); + photoSize.w = MrMailbox.MrMsgGetParamInt(hMsg, 'w', 800); + photoSize.h = MrMailbox.MrMsgGetParamInt(hMsg, 'w', 800); + photoSize.size = 0; + photoSize.location.mr_path = path; + photoSize.type = "x"; + photo.sizes.add(photoSize); + */ + } catch (Exception e) { // the most common reason is a simple "file not found error" } } - if(photo!=null) { - ret.message = "-1"; - ret.media = new TLRPC.TL_messageMediaPhoto(); - ret.media.photo = photo; - } - else { - ret.message = "<" + LocaleController.getString("CannotLoadFile", R.string.CannotLoadFile) + ">"; - } } else { ret.message = "Messages of this type are not yet supported."; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/UserObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/UserObject.java index abb67205f..a8a9ce6a3 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/UserObject.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/UserObject.java @@ -13,11 +13,7 @@ import org.telegram.tgnet.TLRPC; public class UserObject { public static boolean isDeleted(TLRPC.User user) { - return user == null || user instanceof TLRPC.TL_userDeleted_old2 || user instanceof TLRPC.TL_userEmpty || user.deleted; - } - - public static boolean isContact(TLRPC.User user) { - return user instanceof TLRPC.TL_userContact_old2 || user.contact || user.mutual_contact; + return user == null /*|| user instanceof TLRPC.TL_userDeleted_old2*/ || user instanceof TLRPC.TL_userEmpty || user.deleted; } public static boolean isUserSelf(TLRPC.User user) { diff --git a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java index f5208b85e..c737c0695 100644 --- a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java +++ b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java @@ -21,10 +21,8 @@ public class TLRPC { public static final int MESSAGE_FLAG_HAS_ENTITIES = 0x00000080; public static final int MESSAGE_FLAG_HAS_FROM_ID = 0x00000100; public static final int MESSAGE_FLAG_HAS_MEDIA = 0x00000200; - public static final int MESSAGE_FLAG_HAS_VIEWS = 0x00000400; public static final int MESSAGE_FLAG_HAS_BOT_ID = 0x00000800; public static final int MESSAGE_FLAG_EDITED = 0x00008000; - public static final int MESSAGE_FLAG_MEGAGROUP = 0x80000000; public static final int LAYER = 53; @@ -998,7 +996,6 @@ public class TLRPC { public int duration; public Photo photo; public Document document; - public long query_id; public static BotInlineResult TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) { BotInlineResult result = null; @@ -2017,26 +2014,6 @@ public class TLRPC { } } - public static class TL_userDeleted_old2 extends User { - public static int constructor = 0xd6016d7a; - - - public void readParams(AbstractSerializedData stream, boolean exception) { - id = stream.readInt32(exception); - first_name = stream.readString(exception); - last_name = stream.readString(exception); - username = stream.readString(exception); - } - - public void serializeToStream(AbstractSerializedData stream) { - stream.writeInt32(constructor); - stream.writeInt32(id); - stream.writeString(first_name); - stream.writeString(last_name); - stream.writeString(username); - } - } - public static class TL_userEmpty extends User { public static int constructor = 0x200250ba; @@ -2515,38 +2492,6 @@ public class TLRPC { } } - public static class TL_video_layer45 extends Video { - public static int constructor = 0xf72887d3; - - - public void readParams(AbstractSerializedData stream, boolean exception) { - id = stream.readInt64(exception); - access_hash = stream.readInt64(exception); - date = stream.readInt32(exception); - duration = stream.readInt32(exception); - mime_type = stream.readString(exception); - size = stream.readInt32(exception); - thumb = PhotoSize.TLdeserialize(stream, stream.readInt32(exception), exception); - dc_id = stream.readInt32(exception); - w = stream.readInt32(exception); - h = stream.readInt32(exception); - } - - public void serializeToStream(AbstractSerializedData stream) { - stream.writeInt32(constructor); - stream.writeInt64(id); - stream.writeInt64(access_hash); - stream.writeInt32(date); - stream.writeInt32(duration); - stream.writeString(mime_type); - stream.writeInt32(size); - thumb.serializeToStream(stream); - stream.writeInt32(dc_id); - stream.writeInt32(w); - stream.writeInt32(h); - } - } - public static class TopPeerCategory extends TLObject { public static TopPeerCategory TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) { @@ -4251,37 +4196,6 @@ public class TLRPC { } } - public static class TL_messageRange extends TLObject { - public static int constructor = 0xae30253; - - public int min_id; - public int max_id; - - public static TL_messageRange TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) { - if (TL_messageRange.constructor != constructor) { - if (exception) { - throw new RuntimeException(String.format("can't parse magic %x in TL_messageRange", constructor)); - } else { - return null; - } - } - TL_messageRange result = new TL_messageRange(); - result.readParams(stream, exception); - return result; - } - - public void readParams(AbstractSerializedData stream, boolean exception) { - min_id = stream.readInt32(exception); - max_id = stream.readInt32(exception); - } - - public void serializeToStream(AbstractSerializedData stream) { - stream.writeInt32(constructor); - stream.writeInt32(min_id); - stream.writeInt32(max_id); - } - } - public static class TL_contacts_resolvedPeer extends TLObject { public static int constructor = 0x7f077ad9; @@ -4643,9 +4557,6 @@ public class TLRPC { public boolean min; public InputChannel migrated_to; public String address; - public String venue; - public GeoPoint geo; - public boolean checked_in; public static Chat TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) { Chat result = null; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java index 844d17d2e..619e727b1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java @@ -209,11 +209,8 @@ public class Theme { public static Drawable broadcastMediaDrawable; public static Drawable errorDrawable; public static Drawable systemDrawable; - //public static Drawable backgroundBluePressed; public static Drawable timeBackgroundDrawable; public static Drawable timeStickerBackgroundDrawable; - //public static Drawable botLink; - //public static Drawable botInline; public static Drawable[] clockChannelDrawable = new Drawable[2]; public static Drawable[] cornerOuter = new Drawable[4]; @@ -222,10 +219,6 @@ public class Theme { public static Drawable shareDrawable; public static Drawable shareIconDrawable; - public static Drawable[] viewsCountDrawable = new Drawable[2]; - public static Drawable viewsOutCountDrawable; - public static Drawable viewsMediaCountDrawable; - public static Drawable geoInDrawable; public static Drawable geoOutDrawable; @@ -270,13 +263,6 @@ public class Theme { broadcastDrawable = context.getResources().getDrawable(R.drawable.broadcast3); broadcastMediaDrawable = context.getResources().getDrawable(R.drawable.broadcast4); systemDrawable = context.getResources().getDrawable(R.drawable.system); - //botLink = context.getResources().getDrawable(R.drawable.bot_link); - //botInline = context.getResources().getDrawable(R.drawable.bot_lines); - - viewsCountDrawable[0] = context.getResources().getDrawable(R.drawable.post_views); - viewsCountDrawable[1] = context.getResources().getDrawable(R.drawable.post_views_s); - viewsOutCountDrawable = context.getResources().getDrawable(R.drawable.post_viewsg); - viewsMediaCountDrawable = context.getResources().getDrawable(R.drawable.post_views_w); fileStatesDrawable[0][0] = context.getResources().getDrawable(R.drawable.play_g); fileStatesDrawable[0][1] = context.getResources().getDrawable(R.drawable.play_g_s); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java index 7a890d209..d0ff931c5 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java @@ -46,7 +46,6 @@ import org.telegram.messenger.MrMailbox; import org.telegram.messenger.R; import org.telegram.messenger.SendMessagesHelper; import org.telegram.messenger.UserObject; -import org.telegram.messenger.Utilities; import org.telegram.messenger.browser.Browser; import org.telegram.tgnet.ConnectionsManager; import org.telegram.tgnet.TLRPC; @@ -2742,14 +2741,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate } } - /* EDIT BY MR - if ((currentMessageObject.messageOwner.flags & TLRPC.MESSAGE_FLAG_HAS_VIEWS) != 0) { - viewsLayout = new StaticLayout(currentViewsString, timePaint, viewsTextWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false); - } else { - viewsLayout = null; - } - */ - if (isAvatarVisible) { avatarImage.setImageCoords(dp(6), layoutHeight - dp(44), dp(42), dp(42)); } @@ -3303,70 +3294,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate if (drawImageButton && photoImage.getVisible()) { radialProgress.draw(canvas); } - - /* - if (!botButtons.isEmpty()) { - int addX; - if (currentMessageObject.isOutOwner()) { - addX = getMeasuredWidth() - widthForButtons - dp(10); - } else { - addX = currentBackgroundDrawable.getBounds().left + dp(mediaBackground ? 1 : 7); - } - for (int a = 0; a < botButtons.size(); a++) { - BotButton button = botButtons.get(a); - int y = button.y + layoutHeight - dp(2); - Theme.systemDrawable.setColorFilter(a == pressedBotButton ? Theme.colorPressedFilter : Theme.colorFilter); - Theme.systemDrawable.setBounds(button.x + addX, y, button.x + addX + button.width, y + button.height); - Theme.systemDrawable.draw(canvas); - canvas.save(); - canvas.translate(button.x + addX + dp(5), y + (dp(44) - button.title.getLineBottom(button.title.getLineCount() - 1)) / 2); - button.title.draw(canvas); - canvas.restore(); - if (button.button instanceof TLRPC.TL_keyboardButtonUrl) { - int x = button.x + button.width - dp(3) - Theme.botLink.getIntrinsicWidth() + addX; - setDrawableBounds(Theme.botLink, x, y + dp(3)); - Theme.botLink.draw(canvas); - } else if (button.button instanceof TLRPC.TL_keyboardButtonSwitchInline) { - int x = button.x + button.width - dp(3) - Theme.botInline.getIntrinsicWidth() + addX; - setDrawableBounds(Theme.botInline, x, y + dp(3)); - Theme.botInline.draw(canvas); - } else if (button.button instanceof TLRPC.TL_keyboardButtonCallback || button.button instanceof TLRPC.TL_keyboardButtonRequestGeoLocation) { - boolean drawProgress = button.button instanceof TLRPC.TL_keyboardButtonCallback && SendMessagesHelper.getInstance().isSendingCallback(currentMessageObject, button.button) || - button.button instanceof TLRPC.TL_keyboardButtonRequestGeoLocation && SendMessagesHelper.getInstance().isSendingCurrentLocation(currentMessageObject, button.button); - if (drawProgress || !drawProgress && button.progressAlpha != 0) { - botProgressPaint.setAlpha(Math.min(255, (int) (button.progressAlpha * 255))); - int x = button.x + button.width - dp(9 + 3) + addX; - rect.set(x, y + dp(4), x + dp(8), y + dp(8 + 4)); - canvas.drawArc(rect, button.angle, 220, false, botProgressPaint); - invalidate((int) rect.left - dp(2), (int) rect.top - dp(2), (int) rect.right + dp(2), (int) rect.bottom + dp(2)); - long newTime = System.currentTimeMillis(); - if (Math.abs(button.lastUpdateTime - System.currentTimeMillis()) < 1000) { - long delta = (newTime - button.lastUpdateTime); - float dt = 360 * delta / 2000.0f; - button.angle += dt; - button.angle -= 360 * (button.angle / 360); - if (drawProgress) { - if (button.progressAlpha < 1.0f) { - button.progressAlpha += delta / 200.0f; - if (button.progressAlpha > 1.0f) { - button.progressAlpha = 1.0f; - } - } - } else { - if (button.progressAlpha > 0.0f) { - button.progressAlpha -= delta / 200.0f; - if (button.progressAlpha < 0.0f) { - button.progressAlpha = 0.0f; - } - } - } - } - button.lastUpdateTime = newTime; - } - } - } - } - */ } private Drawable getDrawableForCurrentState() { @@ -3806,14 +3733,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate } timeTextWidth = timeWidth = (int) Math.ceil(timePaint.measureText(currentTimeString)); - /* EDIT BY MR - if ((messageObject.messageOwner.flags & TLRPC.MESSAGE_FLAG_HAS_VIEWS) != 0) { - currentViewsString = String.format("%s", LocaleController.formatShortNumber(Math.max(1, messageObject.messageOwner.views), null)); - viewsTextWidth = (int) Math.ceil(timePaint.measureText(currentViewsString)); - timeWidth += viewsTextWidth + Theme.viewsCountDrawable[0].getIntrinsicWidth() + dp(10); - } - */ - if (hasSign) { if (availableTimeWidth == 0) { availableTimeWidth = dp(1000); @@ -3868,15 +3787,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate } private void setMessageObjectInternal(MessageObject messageObject) { - if ((messageObject.messageOwner.flags & TLRPC.MESSAGE_FLAG_HAS_VIEWS) != 0) { - if (currentMessageObject.isContentUnread() && !currentMessageObject.isOut()) { - MessagesController.getInstance().addToViewsQueue(currentMessageObject.messageOwner, false); - currentMessageObject.setContentIsRead(); - } else if (!currentMessageObject.viewsReloaded) { - MessagesController.getInstance().addToViewsQueue(currentMessageObject.messageOwner, true); - currentMessageObject.viewsReloaded = true; - } - } if (currentMessageObject.isFromUser()) { currentUser = MessagesController.getInstance().getUser(currentMessageObject.messageOwner.from_id); @@ -4363,34 +4273,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate drawable.draw(canvas); int additionalX = 0; - if ((currentMessageObject.messageOwner.flags & TLRPC.MESSAGE_FLAG_HAS_VIEWS) != 0) { - additionalX = (int) (timeWidth - timeLayout.getLineWidth(0)); - - if (currentMessageObject.isSending()) { - if (!currentMessageObject.isOutOwner()) { - setDrawableBounds(Theme.clockMediaDrawable, timeX + dp(11), layoutHeight - dp(13.0f) - Theme.clockMediaDrawable.getIntrinsicHeight()); - Theme.clockMediaDrawable.draw(canvas); - } - } else if (currentMessageObject.isSendError()) { - if (!currentMessageObject.isOutOwner()) { - setDrawableBounds(Theme.errorDrawable, timeX + dp(11), layoutHeight - dp(12.5f) - Theme.errorDrawable.getIntrinsicHeight()); - Theme.errorDrawable.draw(canvas); - } - } else { - Drawable countDrawable = Theme.viewsMediaCountDrawable; - setDrawableBounds(countDrawable, timeX, layoutHeight - dp(9.5f) - timeLayout.getHeight()); - countDrawable.draw(canvas); - - /* EDIT BY MR - if (viewsLayout != null) { - canvas.save(); - canvas.translate(timeX + countDrawable.getIntrinsicWidth() + dp(3), layoutHeight - dp(11.3f) - timeLayout.getHeight()); - viewsLayout.draw(canvas); - canvas.restore(); - } - */ - } - } canvas.save(); canvas.translate(timeX + additionalX, layoutHeight - dp(11.3f) - timeLayout.getHeight()); @@ -4398,39 +4280,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate canvas.restore(); } else { int additionalX = 0; - if ((currentMessageObject.messageOwner.flags & TLRPC.MESSAGE_FLAG_HAS_VIEWS) != 0) { - additionalX = (int) (timeWidth - timeLayout.getLineWidth(0)); - - if (currentMessageObject.isSending()) { - if (!currentMessageObject.isOutOwner()) { - Drawable clockDrawable = Theme.clockChannelDrawable[isDrawSelectedBackground() ? 1 : 0]; - setDrawableBounds(clockDrawable, timeX + dp(11), layoutHeight - dp(8.5f) - clockDrawable.getIntrinsicHeight()); - clockDrawable.draw(canvas); - } - } else if (currentMessageObject.isSendError()) { - if (!currentMessageObject.isOutOwner()) { - setDrawableBounds(Theme.errorDrawable, timeX + dp(11), layoutHeight - dp(6.5f) - Theme.errorDrawable.getIntrinsicHeight()); - Theme.errorDrawable.draw(canvas); - } - } else { - if (!currentMessageObject.isOutOwner()) { - setDrawableBounds(Theme.viewsCountDrawable[isDrawSelectedBackground() ? 1 : 0], timeX, layoutHeight - dp(4.5f) - timeLayout.getHeight()); - Theme.viewsCountDrawable[isDrawSelectedBackground() ? 1 : 0].draw(canvas); - } else { - setDrawableBounds(Theme.viewsOutCountDrawable, timeX, layoutHeight - dp(4.5f) - timeLayout.getHeight()); - Theme.viewsOutCountDrawable.draw(canvas); - } - - /* EDIT BY MR - if (viewsLayout != null) { - canvas.save(); - canvas.translate(timeX + Theme.viewsOutCountDrawable.getIntrinsicWidth() + dp(3), layoutHeight - dp(6.5f) - timeLayout.getHeight()); - viewsLayout.draw(canvas); - canvas.restore(); - } - */ - } - } canvas.save(); canvas.translate(timeX + additionalX, layoutHeight - dp(6.5f) - timeLayout.getHeight()); @@ -4444,7 +4293,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate boolean drawCheck2 = false; boolean drawClock = false; boolean drawError = false; - boolean isBroadcast = (int)(currentMessageObject.getDialogId() >> 32) == 1; if (currentMessageObject.isSending()) { drawCheck1 = false; @@ -4477,7 +4325,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate Theme.clockMediaDrawable.draw(canvas); } } - if (isBroadcast) { + /*if (isBroadcast) { if (drawCheck1 || drawCheck2) { if (!mediaBackground) { setDrawableBounds(Theme.broadcastDrawable, layoutWidth - dp(20.5f) - Theme.broadcastDrawable.getIntrinsicWidth(), layoutHeight - dp(8.0f) - Theme.broadcastDrawable.getIntrinsicHeight()); @@ -4487,7 +4335,8 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate Theme.broadcastMediaDrawable.draw(canvas); } } - } else { + } else */ + { if (drawCheck2) { if (!mediaBackground) { if (drawCheck1) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java index d8c198921..a1f540ea8 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java @@ -39,7 +39,6 @@ public class ChatAvatarContainer extends FrameLayout { private SimpleTextView titleTextView; private SimpleTextView subtitleTextView; private ImageView timeItem; - private TimerDrawable timerDrawable; private ChatActivity parentFragment; private TypingDotsDrawable typingDotsDrawable; private RecordStatusDrawable recordStatusDrawable; @@ -161,10 +160,12 @@ public class ChatAvatarContainer extends FrameLayout { } public void setTime(int value) { + /* if (timerDrawable == null) { return; } timerDrawable.setTime(value); + */ } public void setTitleIcons(int leftIcon, int rightIcon) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/TimerDrawable.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/TimerDrawable.java deleted file mode 100644 index 4cf6853b1..000000000 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/TimerDrawable.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * This is the source code of Telegram for Android v. 1.3.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-2016. - */ - -package org.telegram.ui.Components; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.ColorFilter; -import android.graphics.Paint; -import android.graphics.drawable.Drawable; -import android.text.Layout; -import android.text.StaticLayout; -import android.text.TextPaint; - -import org.telegram.messenger.AndroidUtilities; -import org.telegram.messenger.FileLog; -import org.telegram.messenger.R; - -public class TimerDrawable extends Drawable { - - private static Drawable emptyTimerDrawable; - private static Drawable timerDrawable; - private static TextPaint timePaint; - private StaticLayout timeLayout; - private float timeWidth = 0; - private int timeHeight = 0; - private int time = 0; - - public TimerDrawable(Context context) { - if (emptyTimerDrawable == null) { - emptyTimerDrawable = context.getResources().getDrawable(R.drawable.header_timer); - timerDrawable = context.getResources().getDrawable(R.drawable.header_timer2); - timePaint = new TextPaint(Paint.ANTI_ALIAS_FLAG); - timePaint.setTextSize(AndroidUtilities.dp(11)); - timePaint.setColor(0xffffffff); - timePaint.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); - } - } - - public void setTime(int value) { - time = value; - - String timeString; - if (time >= 1 && time < 60) { - timeString = "" + value; - if (timeString.length() < 2) { - timeString += "s"; - } - } else if (time >= 60 && time < 60 * 60) { - timeString = "" + value / 60; - if (timeString.length() < 2) { - timeString += "m"; - } - } else if (time >= 60 * 60 && time < 60 * 60 * 24) { - timeString = "" + value / 60 / 60; - if (timeString.length() < 2) { - timeString += "h"; - } - } else if (time >= 60 * 60 * 24 && time < 60 * 60 * 24 * 7) { - timeString = "" + value / 60 / 60 / 24; - if (timeString.length() < 2) { - timeString += "d"; - } - } else { - timeString = "" + value / 60 / 60 / 24 / 7; - if (timeString.length() < 2) { - timeString += "w"; - } else if (timeString.length() > 2) { - timeString = "c"; - } - } - - timeWidth = timePaint.measureText(timeString); - try { - timeLayout = new StaticLayout(timeString, timePaint, (int)Math.ceil(timeWidth), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false); - timeHeight = timeLayout.getHeight(); - } catch (Exception e) { - timeLayout = null; - FileLog.e("tmessages", e); - } - - invalidateSelf(); - } - - @Override - public void draw(Canvas canvas) { - int width = timerDrawable.getIntrinsicWidth(); - int height = timerDrawable.getIntrinsicHeight(); - Drawable drawable; - if (time == 0) { - drawable = timerDrawable; - } else { - drawable = emptyTimerDrawable; - } - - int x = (width - drawable.getIntrinsicWidth()) / 2; - int y = (height - drawable.getIntrinsicHeight()) / 2; - drawable.setBounds(x, y, x + drawable.getIntrinsicWidth(), y + drawable.getIntrinsicHeight()); - drawable.draw(canvas); - - if (time != 0 && timeLayout != null) { - int xOffxet = 0; - if (AndroidUtilities.density == 3) { - xOffxet = -1; - } - canvas.translate((int)(width / 2 - Math.ceil(timeWidth / 2)) + xOffxet, (height - timeHeight) / 2); - timeLayout.draw(canvas); - } - } - - @Override - public void setAlpha(int alpha) { - - } - - @Override - public void setColorFilter(ColorFilter cf) { - - } - - @Override - public int getOpacity() { - return 0; - } - - @Override - public int getIntrinsicWidth() { - return timerDrawable.getIntrinsicWidth(); - } - - @Override - public int getIntrinsicHeight() { - return timerDrawable.getIntrinsicHeight(); - } -} diff --git a/TMessagesProj/src/main/res/drawable-hdpi/header_timer.png b/TMessagesProj/src/main/res/drawable-hdpi/header_timer.png deleted file mode 100755 index 0c17b9bbad94617cdb98665f588d9690816cb8f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1300 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 E0NZ0ttN;K2 diff --git a/TMessagesProj/src/main/res/drawable-hdpi/post_views.png b/TMessagesProj/src/main/res/drawable-hdpi/post_views.png deleted file mode 100755 index ec2add861d8472cae2f301eba71c19b886137909..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1354 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 z qPit(oU(2iT-ZyfW&Wn?O^$##O@KwwbijeXH6?&eoelF{r5}E)gA^ODt diff --git a/TMessagesProj/src/main/res/drawable-mdpi/header_timer.png b/TMessagesProj/src/main/res/drawable-mdpi/header_timer.png deleted file mode 100755 index 66aee6c2e3ad03429079d999d9b27a572bc38e92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1200 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQ$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|81#=KlDb#X~hD#E>34K5C;EJ)Q4 zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y2=9ZF3nBND}m`vf$KFjz^NCM6mkoIHoK%2WtOF;xE1B+DuBIgm5JLeE;!AD z>P^Av786&Tdi8;h(Fa8=QbfaqfT;(>geO}d2cGa#^MI+n2$-z*-G8#4fq_xQ)5S5Q z;#SfY@0ZC3m{J;U$alz4w_BkzbRQUSQA^fkCe$zcC?jt*0 zS{}-;u&Q6+m|rN`x1edASVy`eZy94!<&sI?6oWi}OWb8^U|?p@Z?~0q4S8}IREBuE L`njxgN@xNA+Z>Ie diff --git a/TMessagesProj/src/main/res/drawable-mdpi/header_timer2.png b/TMessagesProj/src/main/res/drawable-mdpi/header_timer2.png deleted file mode 100755 index 5b63eb2ad9864eac20b9863f566db6037836f973..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1389 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQ$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|81#=KlDb#X~hD#E>34K5C;EJ)Q4 zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y2=9ZF3nBND}m`vLFjeEsTY(KatnYqyQCInmZhe+73JqDfW2&$iQ6sCIL(9V zO~LIJ7o2+afsWA!MJ!T8!-RmT2gHOYTObFX@Kf`Esl5o8teMP@doVCCKJ;{P45_%4 z^ymM7duF)?y^|gOhQfS>)e7_2j)XVL~}C&!_IDZ(~1q=U?5w zXOH98->d(}K1o3MNvcuE^weU5z^7LNr&;lcc(Fg)y@O{n>!Yumugj;#ZhCtqyyjl# zN2AAnyj%V;r?4@6Oe{HkrSV6~?>}?@m&@$_Hn)-ELE_S*kuzWLaXA+&?BnD%o^arf zWHz6%P__U^!0ll*d3VKJlKiw6cVeX%)>A7jrYhPQ_ zOf!X2p0pcA>BgmgMZCqP*I8c1G8yMA-?;3~&jR!0ydYktmxh-n*z%{mYm#I;DSr z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPCP^Az7DJqR^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5@~J{5{OT!07Jj;uunK ztK^cmhD)NzfsgrZcLOG`bywoO8CBuB=7jR>NR7x1-|qFaYMKQlHOg|IJSL>+nQ4>k z8-8;^jw&~I|3~}FJ4=5(y0ZTE-*-Eo|9)qyzG>&?=X*{#>q<>FQ2hU&>iXaPFWuwr?MRmJ-}S9SQDossZ5w4*KZ7*66W`Z85PQ1f zQg%aV$c#II&s2oV+~a1MxXWFb=GARql6USxzMq2hdds)f5~nTPxok78y}R+_h@RLM y?{oT(O1LJkxcG9d+rqxu1#`LI-0=RxWx&8A<+)ICoA?V*G2`j#=d#Wzp$PySMYdW1 diff --git a/TMessagesProj/src/main/res/drawable-mdpi/post_views_s.png b/TMessagesProj/src/main/res/drawable-mdpi/post_views_s.png deleted file mode 100755 index 2ecc48092ef61898aa7f18a6abd81dac52bdabdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1234 zcmeAS@N?(olHy`uVBq!ia0vp^fDSr z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPCJdP6mkoIHoK%2WtOF;xE1B+DuBIgm5JLe&N$73 z>P^Az78jg)^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5_4@*>W&2FuHlVIEGZ* zD!Fu8+oe$Cz{mSNHw{&z`(2#2O$kp4Q`xjJAS`EZZbU%Nk|RksHcqN{m^^8j$-Irr zR_C0V@>YeL`~3Tv=dQjKUv78z-QMT(?!PZT->Guh{9Lz^$wJ<*8V9xI3Rc67@KCiF;#PvVr=I;fvOC{XH=G!Lnq`vsTrSCa0*k`tQ(LI%S0lijx z*>1S?o}8QHXOvj}WU=Mur-8XExBT#Z{!B(WjeXOHzRUaCH@0%?BrwdqB`f{j;>fPD xlRsVO_&qd`Dy@DSr z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC zb#yi~gz0t3PcF?(%`1WFO+n~&!>JdP6mkoIHoK%2WtOF;xE1B+DuBIgm5JLe&N$73 z>P^Az78jg)^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5>I#M|3bSFiLs4IEGZ* zYPq!A&&g4s;bHLvzvi+yE#A1Kl^KaijoaB77jHaph(o{eR>v=irnL*VH6`S3V6N(! z`{Gx=QMJ*`ggH;N&%Jq*a{k?sb30EQVF}yVs-yO?vwX|Pw*0+{xl&IG`j|7*l3UcW zUZ_OY3l+9Ce(JDE+t|J<>h)ujH@v)lKF!f5mv3l^*!SKi*3jgpDYyQK1lin^TQ{_2 zMqXFH<@wP)_49q*ng>#!Cq*CNZQCTLO01> zs9)davE2HTZ~qy7)4p-UXj#ge-A3PHt-tMO;$f(&4(xTQxbFcfIXqqcT-G@yGywoo CS)khh diff --git a/TMessagesProj/src/main/res/drawable-mdpi/post_viewsg.png b/TMessagesProj/src/main/res/drawable-mdpi/post_viewsg.png deleted file mode 100755 index f59e64f881ad0f1042a319dc4e5cd84da2284991..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1233 zcmeAS@N?(olHy`uVBq!ia0vp^fDSr z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC)Ll(29F1LEj7*$e%#1AD zTue=2dR_99OLJ56N?>|Z5PHpV>IEf*+ybD@E~!PCWvMA{Mftf3U@u!`;&zJ(PV=C8 zQ*gV*6sKN&pkwqw5sMVjFd<;-0Wsmp7RZ4o{M0;PYA*sN>vq-WYZw?9T|HeKLn>~S zT=La$2^2Z-(fTl-YP5W3OOCFAQrMD-y-U_aNVoBFclA#3xUq54rg=+Lmd^Yrm|b;> zEp_$DLx+z4nE!H*)m@9PufM*tet+lpJj{q;=E4;^7w9!P{%T)e#Jk=WN+v)%jWq@4Vn_j8F%+13UZ({CTz zyeDg`NA+cG-G3cku7tNn`P)OcX^suw|z<8CJ9sZ3BBcWzS;Kh#w73+mSmOZ)F`!vzMb^B v+hXpaM3dKF%oh3_x4UqTwd{>*9jgR`*?-T4OJsXBL4}N`tDnm{r-UW|TIjX- diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/header_timer.png b/TMessagesProj/src/main/res/drawable-xhdpi/header_timer.png deleted file mode 100755 index 7bdc8d5694502d1f14b184a1e85594fc68654680..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1438 zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*Ck|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvv ztM~P_^2{qPNz6-5^>ndS0-B(gnVDi`XzuFd=xAVJ=H_Z)Xy|HUX<_N?Y~bi>=;rKV zVqt6w)9aF-T$-DjR|3v4~Pj*wm=R%;iu*SQ+p9GS*vD7@G~$l33<9WhE&`- zGsD)~DNy2g|MIq`D;F1>6kE8@F_kyZHACQ{REX1-CrZ3gJFZSJ5o!I(sKmjYsr}+? zen5irI?Gv2x|#pm<(?+J+Pm-G=XQD5JHPMDUtZk*+;ZB>tIQWu*ba!yU`b98iD=}l zX_WcFkgvcw??Cz9B>s(S>+4_VI~`;FlQ4}n>*%o_2J?9TMcW^+?2)dVU{cV_EYobg z;f{lciNMm|?{@Yrj@6W}crrg|i}=cw+b?uYVSV#SeRJ2jwpX%+wcUZ5y9~Ilxt2SB zYq6&ccd-bvvs$@%GopjEX>jr z|Nr_-kND!Jm%M&jZ{XW19a;DI<#a~_^(!ZA+_D2ciLVY7T&ehLlfL)LDV!&7^G`MM z3-UX9KS`^hMJb5WWO?hSvZo>%|rp)^y41wF-(jF_fi#C$sf>|+9Ox+r$Bz& z&DK`a^QF#zWDYOadm7WZ|M2<>_G=rJt``>HZQDC7?#0?W3~~h*51n}W(~kf8$rpDo zocXAvn^WSj^X&X>zs_7f^}6@lna{2-=2TugwVr{QK{~hKg;G{&9jL_gboFyt=akR{ E0H|Uay8r+H diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/header_timer2.png b/TMessagesProj/src/main/res/drawable-xhdpi/header_timer2.png deleted file mode 100755 index 37c985e6520302a34cca08ce007d8f736f845790..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1898 zcmaJ?X;c$u6io>t#3B{~DsJPT2uKpLOH7I(2@nK@7$8cqhGZZSlSwiI2`VZAYETeV zRNPUMAXqG}D5A8A9G8RZsT-g|MNwq2RjJmt6BX@`(m6BpE$80*-uvF2Gv=6C;jRR4 z0uG0B6-Njq*f`n#I6GnQhFt(28%Cod89E0}L5*?)gySpWWC##zVC87hm8;wWGZS#HOWO&T4>#^JajCY@Z72BAPQl&aS9z@FN(AfQ(AzyxM=P_#|} zsnijR4bYs$v!sf}X^LPa81gN^HE}Qj4TQ=8lV*_?;h1>f2VD*}w{KHG-~$9r!1j1$V7T}kl)+%8m;{O33 z9nBGI5mc^KKw=>e#1zPCwUR?+h=dFljll{N@u^f1V;WmT7x1TrQu)D5wm?7~;0j?y zx(3ps16<`7E^|<>-3l5V7Fh@x)ESU6%m8bE4<&QdgXcmURPPg4Ie0GgLAewx8H&BJ z|7!HW7UmxN^s{ZT#b@I~TFmVR%+`;BCpKYUORHGOmzwT1%ihhD@`)KOtJkL|9cxa% z9G+d89OJ+8da|{Av|~vznC&SX!aEq)NpbGl$rpvlMwFGsyIV@Fpz}8G{hNII2|q9= zB(%gC6Hd^X`1YDpZ@Q1qL?7mqB0anZjaQmWkuYVothtMkI3d5wwX6HJ+r8xz18_P* zOhbFiiT)Pcqha`8h;AyJ5$Cj4xBV+(+o;q1Lax_amwL|?6W%RQ<hsL&VPGfG>$cv) ze6i|mUuDnzlXs`Hr;EiWwRnTZ9O)$8*wQ~=eNL&5t8Dd}`~Do_eWO+1)zKT-lVWMO zG<$qRuVq%Aw7&N7Yk$TQqj}HOx(5YI9bK42j|OYu-q0(WIH?!l&h&kCWZ3Q9w{%VS zs$&P0O~;yqup87Pgkf9;p<*B6ZB8 zWu=+%!|x19FyAO3wGpgue3gW@Yh%_8H}7Rj(!$`Xn{Qxs@D zx$a=OxUFbOW=+(lEw*(X+frqIckigeku^WcHcTcKNw^EMiUL^y(vCpBAFFMTdtK#a3t8hg)Mw|P=MF4u+8Rcr zhfK*M-;NA=bJ+8xsD9MKay&6PHOeRd!2HKkFC?8WX|(C?;7wv%gWnvK(JAoBb)?=r zJ~HN~6W!C-ACA8<`mc+n!^S5dn(v(oUOVTTzb;O?B#vDePpR1Pn`-zOPnvs1!I{*6 zO7(5Qh4R0x+qXXP@s&NE(z^SoXjk#+xTfZ`iF|gK|NWNUUa#sm&Pne>q7IFj?%IOq z-0XE`yV>6Fu63NoW@blH?>)~*+gHb4b-)te?NRuUR9}|3WyFlq2L05=>P3c^b%fA0 zjoAebxug2neGVp5(vWKF&v{|s0*?jb>bFE@zwLcAZ*|WkG}L98OAs!6?X}Xe-eter P|9)c8EMZmXf|dUOn`rBQ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/post_views.png b/TMessagesProj/src/main/res/drawable-xhdpi/post_views.png deleted file mode 100755 index 9cf0d5bdf6e256c369c8d29a23e2088f87aec14e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1497 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 R|675|Pfu4rmvv4FO#oS_DYXCq diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/post_viewsg.png b/TMessagesProj/src/main/res/drawable-xhdpi/post_viewsg.png deleted file mode 100755 index fc3764cc96a556f3813b5f241ec26e41702559cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1496 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}t!3HD?=a?M_Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?_nZLn2Bde0{8v^Kf6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M( zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ2+zz*$uBR~ z1grP;werj>E=kNwPW5!LRRWrzmzkMjW$5H)Y-(g_XzJz)40TsiOGiUj7e`Y=GhATTykh0)To1LPjGb%6c=yjRvm}S)yb4vB_X`6G46}{Bj-Gus< zm>j8)Tvj<@N}!E|abCZO>Xg&n_rw3Myt{4R-t%Xg*Vm=jzh0AH`+x7gz2Bm&%QtKm z2u;vVkX+MJX~28zfc_7b^$W!3&AS;JjV6yry$y;-SZsuG&oW0fku!=+~Z_DpQ-FKqtHJlHBEqO6#3S)kP z|C(BcUk{pNJ-6v!OD}vs$0odUuB`am0-s*3Sj(F*iXrycC7MR(9-YguXE1eDE;(%i#MydbZV{Me!p(D z6x$9Y`wj8 zQu+ZQmh;Dd=^c|hZr{$nG5_pIb+e4>o!*U%)`?m&ZFN5u&vcvhutslrVz2TJ>4Up7 zm-{%D%T(#vZ+ZUBqr_-Uo36n*&6j#C`C&y{Zf?7=Y;w|)vfK0Yo0?Dd?J+)Z?tt%w z1(UAxIj@Os|G}%TFn{6#ooTO&mqyLkzI-rj)!VJ|!t=HLH@$nco`IR++}HVWA>l1g PL1nF{tDnm{r-UW|Savvq diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/header_timer.png b/TMessagesProj/src/main/res/drawable-xxhdpi/header_timer.png deleted file mode 100755 index 9d27a863f42aec0b35e92a55e5c1331db898fa11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1759 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 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/post_views.png b/TMessagesProj/src/main/res/drawable-xxhdpi/post_views.png deleted file mode 100755 index c86017216002e2ce0fff3c54149088b043d53978..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1770 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 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/post_views_w.png b/TMessagesProj/src/main/res/drawable-xxhdpi/post_views_w.png deleted file mode 100755 index 7ddf4de637485dffdacf917f62aa1029ea838fc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1725 zcmaJ?do)ye93M%Pa4eNqyJOf;&663KH8jr}jAI5h9cMMK%M51jZRRpF&Pd4V5T_JH zByFj*S)wLIM@saVL#?uBoAO8-NwrdYwAE?v6xu)5-gEE${eIu``Fy_5du~BY^ah6| z9!pRtlmmAoOMt9vkmp;wMacX7_~-z#xWjBA91AAFTCo~H(Pf|nKy#JiWIzCjW%_M5 zflw668l#94!a`mYRSGI`VhaYRQ$h$Eg$fPVL1Jkt0HY;9vO-0}ylQR7pcOJ2W;2;b z;6Y44uGpBV24XX#r#=u#f-dkOv^T)!Rmy1V& z!CM;puSU)GTi#)zE`!)+g6nPgh1aM|NZo zyi2#A&tncnoKD)cBg=5CqMzMpYl!TcaD|o@#Yg$t*SSBmYUscdP(`+yD@$>q;g_u{ z-OVY@wL`u);-etPsv(x@o4$Bav81h6d3pLtLqe=Ev`c+6RlFpAGGr39|9I4J_8%KwSaBj!P z-V3fq4oom=`F9hp$@aBdYD z9~Ew2yeTfDEFh46V?6cx1Z}ymN4!Vxo-5Q<*?w7%N3mfeEp`2;olP%{+%2N-P#cPk zhJO30EeWvZw?g-4(dU*;#F_fKCNmE&saUXyuMf+6)8r_RmhcZY?Y$`|ExbKZo7^cr zuM!o#JKQ}kd~H)wwXSDP(XEQK%UgU}mkkQKR@z>3T{JEgzZbXW9<&!R#nA^7L6yOsC zSMw!1U7<7=h*;I(hWwE)85Mc145YaGI z5?3k^4aOo?JW2|V>$r5f!C;^nf@vt0Oouoej!lEXpb`kGK23`&j8v`OXGlQ+>y;Ry z!x2;q*c27Z(NvsAAu|2v2pZk6tX4l*CZb?;qe4fAXrS##LqLh-|DhVqFj|jG;m`U0 zr?6g@ri1BHSdXS+N}_Q|KDJOgE+2yxIEu+obmdSLqf<~E)u*63fFH{S{NfO;3N`5c zKj9@3u2`$b6 zOx3_ze2A<1%q5^BaBWu5=!nPy7(-UWDiMZifKNx}A|vJ!AsSI{kgFOw7jQ%_ok)gm zYwW)oJ+wu*$2J|dEwLCjKCC6&juE!rmM3QtUrUNu5H2&eSLa5~-xW^I*j7*5(%{!2 z5KagWxp?x>{&B(Qf*6w%vdWd=_al1ksT*Wt) z+ztyosO2|0T{=h2F?U%*YTC!S^bTBk$m_cr($`YwE`yyij;X+jR?^M6cH~iS=hEMd z?lc<;+Dc3TeN|PKm@sR$Ltt&xc6+Jk(=aDZ!Iz$x~YqA3po+pO+Gu)CZ%_TzWA{vT;`PfrEZGGxJS{QyqSUHr4cd-1+6+ z<{QWCZ&0_pFlxW~xT`DRNlPG1uHJR!<$NJLcpqpPS=- zmLB!EgGXDyfXJKUwGrjBo1(paw8#q=`M6Tfm1e9g@1^qc z&Nu7tS6;U^?Tc?LC@-22%IIv&h_=4$b53y-nw~G3cDEzPFFkQqI#_We@${h`lXSls z_l#M#-nA@8k9*8&N>H0)K9Y@vk0V8|4j^nkr(c+y-6a#5mS=I~E$$bKgPT6~f>lqx zs$k5C3J83~cvHYgy5H z@gen45uvc>c6xDLH|h3?lAPLu&Bb;?-V>jd)$yY)2flM&d+W}UnKP#J1m{hy^#4oX zf45~IB))xfp)_m7`AYLc{r=V&El$}6!`UGB>oVVgNxdHuEbqNx*MatT7AxVP-5KO_ zF@kmd9?wknrw-@47#EZu$t)tbm8LA-BY2i{1?oua4r^G&4Df%z+ju>_tWnKe5*B~; zySo}BdTU4A1&5iQr(5n(w$Ut9xMuw#u)Tnn+1!;-Z)!UoDYnaL;j$Lgt=q85`atz^ zeyr$c)14l${m~i}P(Q||lli-&>Ka53;^0s){q@>LZ{L=sg~oZFuG1%r>%1}=o9saL`yXy8oqi9Y?Uw)#`E zT#t+Mwp2bzwDVb()$sn^y~V+W{fETDC_!mN;)cHgWbeM;