MGislv/NekoX
1
0
Fork 0
mirror of https://github.com/MGislv/NekoX.git synced 2024-07-04 11:13:36 +00:00
Code Releases Activity

Merge branch 'master' of github.com:DrKLO/Telegram

Browse Source
This commit is contained in:
Riko Sakurauchi 2020-01-23 23:59:08 +08:00
commit 2a217a6e4a
No known key found for this signature in database
GPG Key ID: 25AC0345B92902AF
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/build.gradle
View File

@ -290,7 +290,7 @@ android {
}
}
defaultConfig.versionCode = 10 * 1848
defaultConfig.versionCode = 10 * 1849
applicationVariants.all { variant ->
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 CHECK_UPDATES = true;
public static boolean TON_WALLET_STANDALONE = false;
public static int BUILD_VERSION = 1848;
public static int BUILD_VERSION = 1849;
public static String BUILD_VERSION_STRING = "5.14.0";
public static int APP_ID = 336779; //obtain your own APP_ID at https://core.telegram.org/api/obtaining_api_id
public static String APP_HASH = "b91eefacc86747c068c8d8a16b41500d"; //obtain your own APP_HASH at https://core.telegram.org/api/obtaining_api_id

16
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View File

@ -3041,11 +3041,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
holder = chatListView.findViewHolderForAdapterPosition(prevPosition);
if (holder != null) {
top = holder.itemView.getTop();
if (y - AndroidUtilities.dp(48) < holder.itemView.getBottom()) {
tx = Math.min(holder.itemView.getTranslationX(), tx);
}
if (holder.itemView instanceof ChatMessageCell) {
cell = (ChatMessageCell) holder.itemView;
if (y - AndroidUtilities.dp(48) < holder.itemView.getBottom()) {
//tx = Math.min(cell.getTranslationX(), tx);
}
if (!cell.isPinnedTop()) {
break;
}
@ -10393,6 +10393,16 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
dayArray.add(0, obj);
if (chatAdapter != null && placeToPaste >= 0 && placeToPaste < messages.size()) {
MessageObject prevMessage = messages.get(placeToPaste);
if (prevMessage.hasValidGroupId() && prevMessage.getGroupId() != obj.getGroupId()) {
MessageObject.GroupedMessages group = groupedMessagesMap.get(prevMessage.getGroupId());
if (group != null && group.messages.size() > 1) {
int size = group.messages.size();
chatAdapter.notifyItemRangeChanged(1, size - 1);
}
}
}
messages.add(placeToPaste, obj);
if (chatAdapter != null) {
chatAdapter.notifyItemChanged(placeToPaste);

2
TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java
View File

@ -1014,7 +1014,7 @@ public class ThemeActivity extends BaseFragment implements NotificationCenter.No
}
int fontSize = AndroidUtilities.isTablet() ? 18 : 16;
Theme.ThemeInfo currentTheme = Theme.getCurrentTheme();
if (SharedConfig.fontSize != fontSize || SharedConfig.bubbleRadius != 6 || !currentTheme.firstAccentIsDefault || currentTheme.currentAccentId != Theme.DEFALT_THEME_ACCENT_ID) {
if (SharedConfig.fontSize != fontSize || SharedConfig.bubbleRadius != 10 || !currentTheme.firstAccentIsDefault || currentTheme.currentAccentId != Theme.DEFALT_THEME_ACCENT_ID) {
menuItem.showSubItem(reset_settings);
} else {
menuItem.hideSubItem(reset_settings);