OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 14:35:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to 5.13.1 (1825)

Browse source
This commit is contained in:
DrKLO 2020-01-04 01:37:09 +03:00
parent 44dadb1055
commit 76be9be855
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/build.gradle
View file

@ -283,7 +283,7 @@ android {
} }
} }
defaultConfig.versionCode = 1824 defaultConfig.versionCode = 1825
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.all { output -> variant.outputs.all { output ->

2
TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
View file

@ -19,7 +19,7 @@ public class BuildVars {
public static boolean USE_CLOUD_STRINGS = true; public static boolean USE_CLOUD_STRINGS = true;
public static boolean CHECK_UPDATES = true; public static boolean CHECK_UPDATES = true;
public static boolean TON_WALLET_STANDALONE = false; 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 String BUILD_VERSION_STRING = "5.13.0";
public static int APP_ID = 4; public static int APP_ID = 4;
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103"; public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

6
TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java
View file

@ -1164,14 +1164,14 @@ public class ArticleViewer implements NotificationCenter.NotificationCenterDeleg
int color2 = Theme.getColor(Theme.key_windowBackgroundWhite); 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; 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); webpageSearchPaint.setColor(lightness <= 0.705f ? 0xffd1982e : 0xffffe669);
webpageUrlPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection)); webpageUrlPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection) & 0x33ffffff);
urlPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection)); urlPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteLinkSelection) & 0x33ffffff);
tableHalfLinePaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteInputField)); tableHalfLinePaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteInputField));
tableLinePaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteInputField)); tableLinePaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteInputField));
photoBackgroundPaint.setColor(0x0f000000); photoBackgroundPaint.setColor(0x0f000000);
dividerPaint.setColor(Theme.getColor(Theme.key_divider)); 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 color = Theme.getColor(Theme.key_switchTrack);
int r = Color.red(color); int r = Color.red(color);

15
TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java
View file

@ -943,7 +943,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific
emojiGridView.setLayoutManager(emojiLayoutManager = new GridLayoutManager(context, 8)); emojiGridView.setLayoutManager(emojiLayoutManager = new GridLayoutManager(context, 8));
emojiGridView.setTopGlowOffset(AndroidUtilities.dp(38)); emojiGridView.setTopGlowOffset(AndroidUtilities.dp(38));
emojiGridView.setBottomGlowOffset(AndroidUtilities.dp(48)); 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.setGlowColor(Theme.getColor(Theme.key_chat_emojiPanelBackground));
emojiGridView.setClipToPadding(false); emojiGridView.setClipToPadding(false);
emojiLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { 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.setOverScrollMode(RecyclerListView.OVER_SCROLL_NEVER);
gifGridView.setAdapter(gifAdapter = new GifAdapter(context)); gifGridView.setAdapter(gifAdapter = new GifAdapter(context));
gifSearchAdapter = new GifSearchAdapter(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); stickersGridView.setClipToPadding(false);
views.add(stickersContainer); views.add(stickersContainer);
stickersSearchGridAdapter = new StickersSearchGridAdapter(context); stickersSearchGridAdapter = new StickersSearchGridAdapter(context);
@ -1571,7 +1572,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific
} }
}); });
trendingGridView.setClipToPadding(false); 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.setAdapter(trendingGridAdapter = new TrendingGridAdapter(context));
trendingGridView.setOnItemClickListener((view, position) -> { trendingGridView.setOnItemClickListener((view, position) -> {
TLRPC.StickerSetCovered pack = trendingGridAdapter.positionsToSets.get(position); TLRPC.StickerSetCovered pack = trendingGridAdapter.positionsToSets.get(position);
@ -2236,9 +2237,9 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific
} }
gridView.setTranslationY(0); gridView.setTranslationY(0);
if (gridView == stickersGridView) { 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) { } 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) { if (gridView == gifGridView) {
layoutManager.scrollToPositionWithOffset(1, 0); layoutManager.scrollToPositionWithOffset(1, 0);
@ -2266,9 +2267,9 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific
tabStrip.setTranslationY(0); tabStrip.setTranslationY(0);
} }
if (gridView == stickersGridView) { 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) { } else if (gridView == emojiGridView) {
gridView.setPadding(0, AndroidUtilities.dp(38), 0, 0); gridView.setPadding(0, AndroidUtilities.dp(38), 0, AndroidUtilities.dp(44));
} }
} }
} }