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

Update to 7.2.1 (2137)

This commit is contained in:
DrKLO 2020-10-30 23:48:42 +03:00
parent 11fbfb1329
commit 00e58e8782
5 changed files with 15 additions and 6 deletions

View File

@ -285,7 +285,7 @@ android {
}
}
defaultConfig.versionCode = 2136
defaultConfig.versionCode = 2137
applicationVariants.all { variant ->
variant.outputs.all { output ->

View File

@ -18,7 +18,7 @@ public class BuildVars {
public static boolean LOGS_ENABLED = false;
public static boolean USE_CLOUD_STRINGS = true;
public static boolean CHECK_UPDATES = true;
public static int BUILD_VERSION = 2136;
public static int BUILD_VERSION = 2137;
public static String BUILD_VERSION_STRING = "7.2.0";
public static int APP_ID = 4;
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

View File

@ -6924,6 +6924,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (chatActivityEnterView.getAnimatedTop() != 0) {
chatListViewPaddingTop += chatActivityEnterView.getHeightWithTopView() - AndroidUtilities.dp(51) - chatActivityEnterView.getAnimatedTop();
} else if (!chatActivityEnterView.pannelAniamationInProgress()) {
chatListViewPaddingTop += chatActivityEnterView.getHeightWithTopView() - AndroidUtilities.dp(51);
chatListViewPaddingTop -= chatListView.getTranslationY();
}
}

View File

@ -359,9 +359,16 @@ public class AvatarDrawable extends Drawable {
}
}
} else if (drawDeleted && Theme.avatarDrawables[1] != null) {
int x = (size - Theme.avatarDrawables[1].getIntrinsicWidth()) / 2;
int y = (size - Theme.avatarDrawables[1].getIntrinsicHeight()) / 2;
Theme.avatarDrawables[1].setBounds(x, y, x + Theme.avatarDrawables[1].getIntrinsicWidth(), y + Theme.avatarDrawables[1].getIntrinsicHeight());
int w = Theme.avatarDrawables[1].getIntrinsicWidth();
int h = Theme.avatarDrawables[1].getIntrinsicHeight();
if (w > size || h > size) {
float scale = size / (float) AndroidUtilities.dp(50);
w *= scale;
h *= scale;
}
int x = (size - w) / 2;
int y = (size - h) / 2;
Theme.avatarDrawables[1].setBounds(x, y, x + w, y + h);
Theme.avatarDrawables[1].draw(canvas);
} else {
if (textLayout != null) {

View File

@ -221,8 +221,9 @@ public class PinnedLineView extends View {
this.totalCount = totalCount;
invalidate();
} else {
if (this.totalCount != totalCount || Math.abs(selectedPosition - position) > 2) {
if (this.totalCount != totalCount || (Math.abs(selectedPosition - position) > 2 && !animationInProgress && !replaceInProgress)) {
if (animator != null) {
nextPosition = 0;
animator.cancel();
}
int viewPadding = AndroidUtilities.dp(8);