From 76be9be85567bc15f287f3193e2cc6c0743bb30a Mon Sep 17 00:00:00 2001 From: DrKLO Date: Sat, 4 Jan 2020 01:37:09 +0300 Subject: [PATCH] Update to 5.13.1 (1825) --- TMessagesProj/build.gradle | 2 +- .../java/org/telegram/messenger/BuildVars.java | 2 +- .../main/java/org/telegram/ui/ArticleViewer.java | 6 +++--- .../org/telegram/ui/Components/EmojiView.java | 15 ++++++++------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index efbfed4a3..26de3d92b 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -283,7 +283,7 @@ android { } } - defaultConfig.versionCode = 1824 + defaultConfig.versionCode = 1825 applicationVariants.all { variant -> variant.outputs.all { output -> diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java index 6b5f82bda..c51a93274 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java @@ -19,7 +19,7 @@ public class BuildVars { public static boolean USE_CLOUD_STRINGS = true; public static boolean CHECK_UPDATES = true; public static boolean TON_WALLET_STANDALONE = false; - public static int BUILD_VERSION = 1824; + public static int BUILD_VERSION = 1825; public static String BUILD_VERSION_STRING = "5.13.0"; public static int APP_ID = 4; public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103"; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java index eafca11f8..16a2cb426 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java @@ -1164,14 +1164,14 @@ public class ArticleViewer implements NotificationCenter.NotificationCenterDeleg int color2 = Theme.getColor(Theme.key_windowBackgroundWhite); float lightness = (0.2126f * Color.red(color2) + 0.7152f * Color.green(color2) + 0.0722f * Color.blue(color2)) / 255.0f; webpageSearchPaint.setColor(lightness <= 0.705f ? 0xffd1982e : 0xffffe669); - webpageUrlPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection)); - urlPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection)); + webpageUrlPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection) & 0x33ffffff); + urlPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection) & 0x33ffffff); tableHalfLinePaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteInputField)); tableLinePaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteInputField)); photoBackgroundPaint.setColor(0x0f000000); dividerPaint.setColor(Theme.getColor(Theme.key_divider)); - webpageMarkPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection)); + webpageMarkPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection) & 0x33ffffff); int color = Theme.getColor(Theme.key_switchTrack); int r = Color.red(color); 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 99c84cf35..40ef2f364 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java @@ -943,7 +943,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific emojiGridView.setLayoutManager(emojiLayoutManager = new GridLayoutManager(context, 8)); emojiGridView.setTopGlowOffset(AndroidUtilities.dp(38)); emojiGridView.setBottomGlowOffset(AndroidUtilities.dp(48)); - emojiGridView.setPadding(0, AndroidUtilities.dp(38), 0, 0); + emojiGridView.setPadding(0, AndroidUtilities.dp(38), 0, AndroidUtilities.dp(44)); emojiGridView.setGlowColor(Theme.getColor(Theme.key_chat_emojiPanelBackground)); emojiGridView.setClipToPadding(false); emojiLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { @@ -1268,6 +1268,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific } } }); + gifGridView.setPadding(0, 0, 0, AndroidUtilities.dp(44)); gifGridView.setOverScrollMode(RecyclerListView.OVER_SCROLL_NEVER); gifGridView.setAdapter(gifAdapter = new GifAdapter(context)); gifSearchAdapter = new GifSearchAdapter(context); @@ -1387,7 +1388,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific } } }); - stickersGridView.setPadding(0, AndroidUtilities.dp(4 + 48), 0, 0); + stickersGridView.setPadding(0, AndroidUtilities.dp(4 + 48), 0, AndroidUtilities.dp(44)); stickersGridView.setClipToPadding(false); views.add(stickersContainer); stickersSearchGridAdapter = new StickersSearchGridAdapter(context); @@ -1571,7 +1572,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific } }); trendingGridView.setClipToPadding(false); - trendingGridView.setPadding(0, AndroidUtilities.dp(48), 0, 0); + trendingGridView.setPadding(0, AndroidUtilities.dp(48), 0, AndroidUtilities.dp(44)); trendingGridView.setAdapter(trendingGridAdapter = new TrendingGridAdapter(context)); trendingGridView.setOnItemClickListener((view, position) -> { TLRPC.StickerSetCovered pack = trendingGridAdapter.positionsToSets.get(position); @@ -2236,9 +2237,9 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific } gridView.setTranslationY(0); if (gridView == stickersGridView) { - gridView.setPadding(0, AndroidUtilities.dp(48 + 4), 0, 0); + gridView.setPadding(0, AndroidUtilities.dp(48 + 4), 0, AndroidUtilities.dp(44)); } else if (gridView == emojiGridView) { - gridView.setPadding(0, AndroidUtilities.dp(38), 0, 0); + gridView.setPadding(0, AndroidUtilities.dp(38), 0, AndroidUtilities.dp(44)); } if (gridView == gifGridView) { layoutManager.scrollToPositionWithOffset(1, 0); @@ -2266,9 +2267,9 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific tabStrip.setTranslationY(0); } if (gridView == stickersGridView) { - gridView.setPadding(0, AndroidUtilities.dp(48 + 4), 0, 0); + gridView.setPadding(0, AndroidUtilities.dp(48 + 4), 0, AndroidUtilities.dp(44)); } else if (gridView == emojiGridView) { - gridView.setPadding(0, AndroidUtilities.dp(38), 0, 0); + gridView.setPadding(0, AndroidUtilities.dp(38), 0, AndroidUtilities.dp(44)); } } }